Skip to content

Commit bca5a01

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/8.0] Update dependencies from dotnet/arcade (#4654)
[release/8.0] Update dependencies from dotnet/arcade
1 parent 85094a1 commit bca5a01

17 files changed

+78
-45
lines changed

‎NuGet.config‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@
1313
<!-- End: Package sources from dotnet-runtime -->
1414
<!-- Begin: Package sources from dotnet-winforms -->
1515
<add key="darc-int-dotnet-winforms-bd16455" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-bd164556/nuget/v3/index.json" />
16+
<add key="darc-int-dotnet-winforms-bd16455-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-bd164556-9/nuget/v3/index.json" />
17+
<add key="darc-int-dotnet-winforms-bd16455-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-bd164556-8/nuget/v3/index.json" />
18+
<add key="darc-int-dotnet-winforms-bd16455-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-bd164556-7/nuget/v3/index.json" />
19+
<add key="darc-int-dotnet-winforms-bd16455-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-bd164556-6/nuget/v3/index.json" />
20+
<add key="darc-int-dotnet-winforms-bd16455-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-bd164556-5/nuget/v3/index.json" />
21+
<add key="darc-int-dotnet-winforms-bd16455-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-bd164556-4/nuget/v3/index.json" />
22+
<add key="darc-int-dotnet-winforms-bd16455-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-bd164556-3/nuget/v3/index.json" />
23+
<add key="darc-int-dotnet-winforms-bd16455-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-bd164556-2/nuget/v3/index.json" />
24+
<add key="darc-int-dotnet-winforms-bd16455-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-bd164556-1/nuget/v3/index.json" />
1625
<!-- End: Package sources from dotnet-winforms -->
1726
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1827
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -28,6 +37,15 @@
2837
<add key="darc-int-dotnet-runtime-08338fc" value="true" />
2938
<!-- End: Package sources from dotnet-runtime -->
3039
<!-- Begin: Package sources from dotnet-winforms -->
40+
<add key="darc-int-dotnet-winforms-bd16455-1" value="true" />
41+
<add key="darc-int-dotnet-winforms-bd16455-2" value="true" />
42+
<add key="darc-int-dotnet-winforms-bd16455-3" value="true" />
43+
<add key="darc-int-dotnet-winforms-bd16455-4" value="true" />
44+
<add key="darc-int-dotnet-winforms-bd16455-5" value="true" />
45+
<add key="darc-int-dotnet-winforms-bd16455-6" value="true" />
46+
<add key="darc-int-dotnet-winforms-bd16455-7" value="true" />
47+
<add key="darc-int-dotnet-winforms-bd16455-8" value="true" />
48+
<add key="darc-int-dotnet-winforms-bd16455-9" value="true" />
3149
<add key="darc-int-dotnet-winforms-bd16455" value="true" />
3250
<!-- End: Package sources from dotnet-winforms -->
3351
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎eng/Version.Details.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -151,29 +151,29 @@
151151
</Dependency>
152152
</ProductDependencies>
153153
<ToolsetDependencies>
154-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24360.5">
154+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24461.2">
155155
<Uri>https://github.com/dotnet/arcade</Uri>
156-
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
156+
<Sha>0028fccccc2181a64c5c4a283ac0baae3913284b</Sha>
157157
</Dependency>
158-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.24360.5">
158+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.24461.2">
159159
<Uri>https://github.com/dotnet/arcade</Uri>
160-
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
160+
<Sha>0028fccccc2181a64c5c4a283ac0baae3913284b</Sha>
161161
</Dependency>
162-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.24360.5">
162+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.24461.2">
163163
<Uri>https://github.com/dotnet/arcade</Uri>
164-
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
164+
<Sha>0028fccccc2181a64c5c4a283ac0baae3913284b</Sha>
165165
</Dependency>
166-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.24360.5">
166+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.24461.2">
167167
<Uri>https://github.com/dotnet/arcade</Uri>
168-
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
168+
<Sha>0028fccccc2181a64c5c4a283ac0baae3913284b</Sha>
169169
</Dependency>
170-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24360.5">
170+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24461.2">
171171
<Uri>https://github.com/dotnet/arcade</Uri>
172-
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
172+
<Sha>0028fccccc2181a64c5c4a283ac0baae3913284b</Sha>
173173
</Dependency>
174-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.24360.5">
174+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.24461.2">
175175
<Uri>https://github.com/dotnet/arcade</Uri>
176-
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
176+
<Sha>0028fccccc2181a64c5c4a283ac0baae3913284b</Sha>
177177
</Dependency>
178178
</ToolsetDependencies>
179179
</Dependencies>

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
</PropertyGroup>
1313
<PropertyGroup>
1414
<!-- arcade -->
15-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.24360.5</MicrosoftDotNetBuildTasksFeedVersion>
16-
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.24360.5</MicrosoftDotNetBuildTasksArchivesVersion>
17-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.24360.5</MicrosoftDotNetBuildTasksInstallersVersion>
18-
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.24360.5</MicrosoftDotNetVersionToolsTasksVersion>
15+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.24461.2</MicrosoftDotNetBuildTasksFeedVersion>
16+
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.24461.2</MicrosoftDotNetBuildTasksArchivesVersion>
17+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.24461.2</MicrosoftDotNetBuildTasksInstallersVersion>
18+
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.24461.2</MicrosoftDotNetVersionToolsTasksVersion>
1919
<!-- corefx -->
2020
<SystemDataDataSetExtensionsVersion>4.5.0</SystemDataDataSetExtensionsVersion>
2121
<SystemDataSqlClientVersion>4.8.6</SystemDataSqlClientVersion>

‎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)