Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade vss api netcore version, has BuildXL changes #4220

Merged
merged 16 commits into from
Apr 24, 2023
Merged

Upgrade vss api netcore version, has BuildXL changes #4220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6875795
Upgrade vss api netcore version, has BuildXL changes
fadnavistanmay Mar 29, 2023
299636e
Adding Nuget authenticate task
fadnavistanmay Mar 29, 2023
8b195a8
Nuget auth task before the build
fadnavistanmay Mar 29, 2023
653413a
Try v0
fadnavistanmay Mar 29, 2023
c9a6aab
Remove nuget auth task
fadnavistanmay Mar 29, 2023
7f125a7
Nuget auth
fadnavistanmay Mar 31, 2023
e7fb45b
Remove auth task
fadnavistanmay Mar 31, 2023
68c2605
Remove redundant security package declaration
fadnavistanmay Mar 31, 2023
e8d48ff
Adding System.Security.Cryptography.ProtectedData back
fadnavistanmay Mar 31, 2023
7e1f17b
Adding cred provider
fadnavistanmay Mar 31, 2023
f83bf1b
Removing redundant system.buffers reference
fadnavistanmay Mar 31, 2023
637ede3
Merge branch 'master' into users/tafadnav/netcorepkgupgrade
fadnavistanmay Apr 18, 2023
eb580b0
Supress warnings
fadnavistanmay Apr 18, 2023
4ed4430
Remove unused variable
fadnavistanmay Apr 18, 2023
4821808
Removing HashType.64k hardcoding
fadnavistanmay Apr 18, 2023
9717bc7
Merge branch 'master' into users/tafadnav/netcorepkgupgrade
fadnavistanmay Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Agent.Listener/Agent.Listener.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/Agent.PluginHost/Agent.PluginHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/Agent.Plugins/Agent.Plugins.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
</PropertyGroup>

<ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions src/Agent.Sdk/Agent.Sdk.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
fadnavistanmay marked this conversation as resolved.
Show resolved Hide resolved
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" Condition="$(CodeAnalysis)=='true'" />
<PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.7.0" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.4.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" />
<PackageReference Include="System.Security.Cryptography.Cng" Version="4.5.0" />
<PackageReference Include="vss-api-netcore" Version="$(VssApiVersion)" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/Agent.Sdk/Util/PlatformUtil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ public static bool DetectDockerContainer()
}
}
}
catch (Exception ex)
catch (Exception)
{
// Logging exception will be handled by JobRunner
throw;
Expand All @@ -411,7 +411,7 @@ public static bool DetectAzureVM()
if (metadataProvider.HasMetadata())
isAzureVM = true;
}
catch (Exception ex)
catch (Exception)
{
// Logging exception will be handled by JobRunner
throw;
Expand Down
2 changes: 1 addition & 1 deletion src/Agent.Worker/Agent.Worker.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
</PropertyGroup>

<ItemGroup>
Expand All @@ -14,7 +15,6 @@
<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.6.1" />
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" Condition="$(CodeAnalysis)=='true'" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.7.0" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.4.0" />
<PackageReference Include="vss-api-netcore" Version="$(VssApiVersion)" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<OSPlatform>OS_UNKNOWN</OSPlatform>
<OSArchitecture>ARCH_UNKNOWN</OSArchitecture>
<DebugConstant></DebugConstant>
<VssApiVersion>0.5.181-private</VssApiVersion>
<VssApiVersion>0.5.183-private</VssApiVersion>
<CodeAnalysis>$(CodeAnalysis)</CodeAnalysis>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.VisualStudio.Services.Agent/Blob/BlobFileInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public DedupIdentifier DedupId
{
get
{
return Node.GetDedupIdentifier(HashType.Dedup64K);
return Node.GetDedupIdentifier();
}
}
public bool Success { get; set; }
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.VisualStudio.Services.Agent/Blob/BlobStoreUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public static class BlobStoreUtils
foreach (var file in fileNodes.Where(x => x.Success))
{
// ChunkHelper uses 64k block default size
var dedupId = file.Node.GetDedupIdentifier(HashType.Dedup64K);
var dedupId = file.Node.GetDedupIdentifier();
fileDedupIds[dedupId] = file.Path;
}

Expand Down Expand Up @@ -180,7 +180,7 @@ private static DedupNode CreateNodeToUpload(IEnumerable<DedupNode> nodes)
var chunk = await ChunkerHelper.CreateFromFileAsync(FileSystem.Instance, itemPath, cancellationToken, false);
var rootNode = new DedupNode(new[] { chunk });
// ChunkHelper uses 64k block default size
var dedupId = rootNode.GetDedupIdentifier(HashType.Dedup64K);
var dedupId = rootNode.GetDedupIdentifier();

// Setup upload session to keep file for at mimimum one day
// Blobs will need to be associated with the server with an ID ref otherwise they will be
Expand Down
3 changes: 1 addition & 2 deletions src/Microsoft.VisualStudio.Services.Agent/Microsoft.VisualStudio.Services.Agent.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
</PropertyGroup>

<ItemGroup>
Expand All @@ -13,8 +14,6 @@
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" Condition="$(CodeAnalysis)=='true'" />
<PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
<PackageReference Include="System.Security.Cryptography.Cng" Version="4.5.0" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.7.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" />
<PackageReference Include="vss-api-netcore" Version="$(VssApiVersion)" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Test/L1/Mock/FakeJobServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ public Task<BlobIdentifierWithBlocks> UploadLogToBlobStore(Stream blob, string h
UploadedAttachmentBlobFiles.Add(itemPath);
var chunk = await ChunkerHelper.CreateFromFileAsync(FileSystem.Instance, itemPath, cancellationToken, false);
var rootNode = new DedupNode(new[] { chunk });
var dedupId = rootNode.GetDedupIdentifier(HashType.Dedup64K);
var dedupId = rootNode.GetDedupIdentifier();

return (dedupId, rootNode.TransitiveContentBytes);
}
Expand Down
5 changes: 4 additions & 1 deletion src/Test/Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,16 @@
<ProjectReference Include="..\Agent.Sdk\Agent.Sdk.csproj" />
</ItemGroup>

<PropertyGroup>
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="azuredevops-testresultparser" Version="1.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Include="Microsoft.CodeCoverage" Version="16.4.0" />
<PackageReference Include="Microsoft.TestPlatform.TestHost" Version="16.4.0" GeneratePathProperty="true" />
<PackageReference Include="Moq" Version="4.6.36-alpha" />
<PackageReference Include="System.Buffers" Version="4.3.0" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.4.0" />
<PackageReference Include="System.Threading.ThreadPool" Version="4.3.0" />
<PackageReference Include="vss-api-netcore" Version="$(VssApiVersion)" />
Expand Down