Skip to content

Commit 2c232aa

Browse files
marcpopMSFTmarcpopMSFT
authored
[release/8.0.1xx] Update dependencies from dotnet/arcade (#43443)
2 parents 843e6e5 + b70d645 commit 2c232aa

17 files changed

+53
-42
lines changed

‎NuGet.config

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@
5050
<!-- End: Package sources from dotnet-runtime -->
5151
<!-- Begin: Package sources from dotnet-templating -->
5252
<add key="darc-pub-dotnet-templating-450f4db" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-450f4db7/nuget/v3/index.json" />
53-
<add key="darc-pub-dotnet-templating-b8bd284" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b8bd2846/nuget/v3/index.json" />
54-
<add key="darc-pub-dotnet-templating-b8bd284-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b8bd2846-3/nuget/v3/index.json" />
55-
<add key="darc-pub-dotnet-templating-b8bd284-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b8bd2846-2/nuget/v3/index.json" />
56-
<add key="darc-pub-dotnet-templating-b8bd284-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b8bd2846-1/nuget/v3/index.json" />
5753
<!-- End: Package sources from dotnet-templating -->
5854
<!-- Begin: Package sources from dotnet-windowsdesktop -->
5955
<add key="darc-int-dotnet-windowsdesktop-1526afd" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1526afd4/nuget/v3/index.json" />

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -487,22 +487,22 @@
487487
</Dependency>
488488
</ProductDependencies>
489489
<ToolsetDependencies>
490-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24360.5">
490+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24463.3">
491491
<Uri>https://github.com/dotnet/arcade</Uri>
492-
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
492+
<Sha>8c08d889b3c0b3f19398faceaccd74d0f184a3fb</Sha>
493493
<SourceBuild RepoName="arcade" ManagedOnly="true" />
494494
</Dependency>
495-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24360.5">
495+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24463.3">
496496
<Uri>https://github.com/dotnet/arcade</Uri>
497-
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
497+
<Sha>8c08d889b3c0b3f19398faceaccd74d0f184a3fb</Sha>
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24360.5">
499+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24463.3">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
501+
<Sha>8c08d889b3c0b3f19398faceaccd74d0f184a3fb</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24360.5">
503+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24463.3">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
505+
<Sha>8c08d889b3c0b3f19398faceaccd74d0f184a3fb</Sha>
506506
</Dependency>
507507
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0">
508508
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
3535
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3636
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
37-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.24360.5</MicrosoftDotNetSignToolVersion>
37+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.24463.3</MicrosoftDotNetSignToolVersion>
3838
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
3939
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4040
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -208,7 +208,7 @@
208208
<PropertyGroup>
209209
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
210210
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
211-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24360.5</MicrosoftDotNetXUnitExtensionsVersion>
211+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24463.3</MicrosoftDotNetXUnitExtensionsVersion>
212212
<MoqPackageVersion>4.18.4</MoqPackageVersion>
213213
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
214214
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

‎eng/common/sdl/NuGet.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
</solution>
66
<packageSources>
77
<clear />
8-
<add key="guardian" value="https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json" />
8+
<add key="guardian" value="https://pkgs.dev.azure.com/dnceng/_packaging/Guardian1ESPTUpstreamOrgFeed/nuget/v3/index.json" />
99
</packageSources>
1010
<packageSourceMapping>
1111
<packageSource key="guardian">
12-
<package pattern="microsoft.guardian.cli" />
12+
<package pattern="Microsoft.Guardian.Cli.win-x64" />
1313
</packageSource>
1414
</packageSourceMapping>
1515
<disabledPackageSources>

‎eng/common/sdl/execute-all-sdl-tools.ps1

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ Param(
66
[string] $BranchName=$env:BUILD_SOURCEBRANCH, # Optional: name of branch or version of gdn settings; defaults to master
77
[string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY, # Required: the directory where source files are located
88
[string] $ArtifactsDirectory = (Join-Path $env:BUILD_ARTIFACTSTAGINGDIRECTORY ('artifacts')), # Required: the directory where build artifacts are located
9-
[string] $AzureDevOpsAccessToken, # Required: access token for dnceng; should be provided via KeyVault
109

1110
# Optional: list of SDL tools to run on source code. See 'configure-sdl-tool.ps1' for tools list
1211
# format.
@@ -75,7 +74,7 @@ try {
7574
}
7675

7776
Exec-BlockVerbosely {
78-
& $(Join-Path $PSScriptRoot 'init-sdl.ps1') -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $workingDirectory -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel
77+
& $(Join-Path $PSScriptRoot 'init-sdl.ps1') -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $workingDirectory -GuardianLoggerLevel $GuardianLoggerLevel
7978
}
8079
$gdnFolder = Join-Path $workingDirectory '.gdn'
8180

@@ -104,7 +103,6 @@ try {
104103
-TargetDirectory $targetDirectory `
105104
-GdnFolder $gdnFolder `
106105
-ToolsList $tools `
107-
-AzureDevOpsAccessToken $AzureDevOpsAccessToken `
108106
-GuardianLoggerLevel $GuardianLoggerLevel `
109107
-CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams `
110108
-PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams `

‎eng/common/sdl/init-sdl.ps1

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ Param(
33
[string] $Repository,
44
[string] $BranchName='master',
55
[string] $WorkingDirectory,
6-
[string] $AzureDevOpsAccessToken,
76
[string] $GuardianLoggerLevel='Standard'
87
)
98

@@ -21,14 +20,7 @@ $ci = $true
2120
# Don't display the console progress UI - it's a huge perf hit
2221
$ProgressPreference = 'SilentlyContinue'
2322

24-
# Construct basic auth from AzDO access token; construct URI to the repository's gdn folder stored in that repository; construct location of zip file
25-
$encodedPat = [Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes(":$AzureDevOpsAccessToken"))
26-
$escapedRepository = [Uri]::EscapeDataString("/$Repository/$BranchName/.gdn")
27-
$uri = "https://dev.azure.com/dnceng/internal/_apis/git/repositories/sdl-tool-cfg/Items?path=$escapedRepository&versionDescriptor[versionOptions]=0&`$format=zip&api-version=5.0"
28-
$zipFile = "$WorkingDirectory/gdn.zip"
29-
3023
Add-Type -AssemblyName System.IO.Compression.FileSystem
31-
$gdnFolder = (Join-Path $WorkingDirectory '.gdn')
3224

3325
try {
3426
# if the folder does not exist, we'll do a guardian init and push it to the remote repository

‎eng/common/sdl/sdl.ps1

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ function Install-Gdn {
44
[Parameter(Mandatory=$true)]
55
[string]$Path,
66

7+
[string]$Source = "https://pkgs.dev.azure.com/dnceng/_packaging/Guardian1ESPTUpstreamOrgFeed/nuget/v3/index.json",
8+
79
# If omitted, install the latest version of Guardian, otherwise install that specific version.
810
[string]$Version
911
)
@@ -19,7 +21,7 @@ function Install-Gdn {
1921
$ci = $true
2022
. $PSScriptRoot\..\tools.ps1
2123

22-
$argumentList = @("install", "Microsoft.Guardian.Cli", "-Source https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json", "-OutputDirectory $Path", "-NonInteractive", "-NoCache")
24+
$argumentList = @("install", "Microsoft.Guardian.Cli.win-x64", "-Source $Source", "-OutputDirectory $Path", "-NonInteractive", "-NoCache")
2325

2426
if ($Version) {
2527
$argumentList += "-Version $Version"

‎eng/common/templates-official/job/publish-build-assets.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ jobs:
149149
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
150150
arguments: -BuildId $(BARBuildId)
151151
-PublishingInfraVersion 3
152-
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
152+
-AzdoToken '$(System.AccessToken)'
153153
-WaitPublishingFinish true
154154
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
155155
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

‎eng/common/templates-official/post-build/post-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ stages:
281281
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
282282
arguments: -BuildId $(BARBuildId)
283283
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
284-
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
284+
-AzdoToken '$(System.AccessToken)'
285285
-WaitPublishingFinish true
286286
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
287287
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

‎eng/common/templates-official/steps/execute-sdl.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ parameters:
99

1010
steps:
1111
- task: NuGetAuthenticate@1
12-
inputs:
13-
nuGetServiceConnections: GuardianConnect
1412

1513
- task: NuGetToolInstaller@1
1614
displayName: 'Install NuGet.exe'

0 commit comments

Comments
 (0)