Skip to content

Commit 9b14138

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20240309.1 (#7052)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24151.5 -> To Version 9.0.0-beta.24159.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Eric StJohn <ericstj@microsoft.com>
1 parent 86c11e1 commit 9b14138

File tree

12 files changed

+46
-36
lines changed

12 files changed

+46
-36
lines changed

eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,33 @@
77
</Dependency>
88
</ProductDependencies>
99
<ToolsetDependencies>
10-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24151.5">
10+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24159.1">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
12+
<Sha>f4538b1f8ff5ceb197aea509f3f61872b217b09e</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24151.5">
14+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24159.1">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
16+
<Sha>f4538b1f8ff5ceb197aea509f3f61872b217b09e</Sha>
1717
</Dependency>
18-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24151.5">
18+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24159.1">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
20+
<Sha>f4538b1f8ff5ceb197aea509f3f61872b217b09e</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24151.5">
22+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24159.1">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
24+
<Sha>f4538b1f8ff5ceb197aea509f3f61872b217b09e</Sha>
2525
</Dependency>
26-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.24151.5">
26+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.24159.1">
2727
<Uri>https://github.com/dotnet/arcade</Uri>
28-
<Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
28+
<Sha>f4538b1f8ff5ceb197aea509f3f61872b217b09e</Sha>
2929
</Dependency>
30-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24151.5">
30+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24159.1">
3131
<Uri>https://github.com/dotnet/arcade</Uri>
32-
<Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
32+
<Sha>f4538b1f8ff5ceb197aea509f3f61872b217b09e</Sha>
3333
</Dependency>
34-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24151.5">
34+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24159.1">
3535
<Uri>https://github.com/dotnet/arcade</Uri>
36-
<Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
36+
<Sha>f4538b1f8ff5ceb197aea509f3f61872b217b09e</Sha>
3737
</Dependency>
3838
</ToolsetDependencies>
3939
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<DotNetRuntime80Version>8.0.1</DotNetRuntime80Version>
8080
<FluentAssertionVersion>5.10.2</FluentAssertionVersion>
8181
<MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.23431.1</MicrosoftCodeAnalysisTestingVersion>
82-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24151.5</MicrosoftDotNetXUnitExtensionsVersion>
82+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24159.1</MicrosoftDotNetXUnitExtensionsVersion>
8383
<MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
8484
<MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
8585
<MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>

eng/common/SetupNugetSources.ps1

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Set-StrictMode -Version 2.0
3535
. $PSScriptRoot\tools.ps1
3636

3737
# Add source entry to PackageSources
38-
function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) {
38+
function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) {
3939
$packageSource = $sources.SelectSingleNode("add[@key='$SourceName']")
4040

4141
if ($packageSource -eq $null)
@@ -48,12 +48,11 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern
4848
else {
4949
Write-Host "Package source $SourceName already present."
5050
}
51-
52-
AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password
51+
AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd
5352
}
5453

5554
# Add a credential node for the specified source
56-
function AddCredential($creds, $source, $username, $password) {
55+
function AddCredential($creds, $source, $username, $pwd) {
5756
# Looks for credential configuration for the given SourceName. Create it if none is found.
5857
$sourceElement = $creds.SelectSingleNode($Source)
5958
if ($sourceElement -eq $null)
@@ -82,17 +81,18 @@ function AddCredential($creds, $source, $username, $password) {
8281
$passwordElement.SetAttribute("key", "ClearTextPassword")
8382
$sourceElement.AppendChild($passwordElement) | Out-Null
8483
}
85-
$passwordElement.SetAttribute("value", $Password)
84+
85+
$passwordElement.SetAttribute("value", $pwd)
8686
}
8787

88-
function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) {
88+
function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) {
8989
$maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]")
9090

9191
Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds."
9292

9393
ForEach ($PackageSource in $maestroPrivateSources) {
9494
Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key
95-
AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password
95+
AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd
9696
}
9797
}
9898

@@ -144,13 +144,13 @@ if ($disabledSources -ne $null) {
144144
$userName = "dn-bot"
145145

146146
# Insert credential nodes for Maestro's private feeds
147-
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password
147+
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password
148148

149149
# 3.1 uses a different feed url format so it's handled differently here
150150
$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']")
151151
if ($dotnet31Source -ne $null) {
152-
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
153-
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
152+
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password
153+
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
154154
}
155155

156156
$dotnetVersions = @('5','6','7','8')
@@ -159,9 +159,9 @@ foreach ($dotnetVersion in $dotnetVersions) {
159159
$feedPrefix = "dotnet" + $dotnetVersion;
160160
$dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']")
161161
if ($dotnetSource -ne $null) {
162-
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
163-
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
162+
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password
163+
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
164164
}
165165
}
166166

167-
$doc.Save($filename)
167+
$doc.Save($filename)

eng/common/build.ps1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ function Build {
125125
/p:Test=$test `
126126
/p:Pack=$pack `
127127
/p:DotNetBuildRepo=$($productBuild -or $verticalBuild) `
128-
/p:ArcadeBuildVertical=$verticalBuild `
129128
/p:IntegrationTest=$integrationTest `
130129
/p:PerformanceTest=$performanceTest `
131130
/p:Sign=$sign `

eng/common/build.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,6 @@ function Build {
241241
/p:DotNetBuildRepo=$product_build \
242242
/p:ArcadeBuildFromSource=$source_build \
243243
/p:DotNetBuildSourceOnly=$source_build \
244-
/p:ArcadeBuildVertical=$vertical_build \
245244
/p:Rebuild=$rebuild \
246245
/p:Test=$test \
247246
/p:Pack=$pack \

eng/common/templates-official/job/job.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ parameters:
1515
timeoutInMinutes: ''
1616
variables: []
1717
workspace: ''
18+
templateContext: ''
1819

1920
# Job base template specific parameters
2021
# See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md
@@ -68,6 +69,9 @@ jobs:
6869
${{ if ne(parameters.timeoutInMinutes, '') }}:
6970
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
7071

72+
${{ if ne(parameters.templateContext, '') }}:
73+
templateContext: ${{ parameters.templateContext }}
74+
7175
variables:
7276
- ${{ if ne(parameters.enableTelemetry, 'false') }}:
7377
- name: DOTNET_CLI_TELEMETRY_PROFILE

eng/common/templates-official/job/source-index-stage1.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexPackageVersion: 1.0.1-20231213.4
3+
sourceIndexPackageVersion: 1.0.1-20240129.2
44
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
55
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
66
preSteps: []

eng/common/templates-official/steps/send-to-helix.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ parameters:
55
HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number
66
HelixTargetQueues: '' # required -- semicolon-delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues
77
HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group
8+
HelixProjectPath: 'eng/common/helixpublish.proj' # optional -- path to the project file to build relative to BUILD_SOURCESDIRECTORY
9+
HelixProjectArguments: '' # optional -- arguments passed to the build command
810
HelixConfiguration: '' # optional -- additional property attached to a job
911
HelixPreCommands: '' # optional -- commands to run before Helix work item execution
1012
HelixPostCommands: '' # optional -- commands to run after Helix work item execution
@@ -29,7 +31,7 @@ parameters:
2931
continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false
3032

3133
steps:
32-
- powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
34+
- powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY/${{ parameters.HelixProjectPath }} /restore /p:TreatWarningsAsErrors=false ${{ parameters.HelixProjectArguments }} /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
3335
displayName: ${{ parameters.DisplayNamePrefix }} (Windows)
3436
env:
3537
BuildConfig: $(_BuildConfig)
@@ -59,7 +61,7 @@ steps:
5961
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
6062
condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT'))
6163
continueOnError: ${{ parameters.continueOnError }}
62-
- script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
64+
- script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/${{ parameters.HelixProjectPath }} /restore /p:TreatWarningsAsErrors=false ${{ parameters.HelixProjectArguments }} /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
6365
displayName: ${{ parameters.DisplayNamePrefix }} (Unix)
6466
env:
6567
BuildConfig: $(_BuildConfig)

eng/common/templates-official/steps/source-build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ steps:
9494
$baseOsArgs \
9595
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
9696
/p:ArcadeBuildFromSource=true \
97+
/p:DotNetBuildSourceOnly=true \
98+
/p:DotNetBuildRepo=true \
9799
/p:AssetManifestFileName=$assetManifestFileName
98100
displayName: Build
99101

eng/common/templates/job/job.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ parameters:
1515
timeoutInMinutes: ''
1616
variables: []
1717
workspace: ''
18+
templateContext: ''
1819

1920
# Job base template specific parameters
2021
# See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md
@@ -68,6 +69,9 @@ jobs:
6869
${{ if ne(parameters.timeoutInMinutes, '') }}:
6970
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
7071

72+
${{ if ne(parameters.templateContext, '') }}:
73+
templateContext: ${{ parameters.templateContext }}
74+
7175
variables:
7276
- ${{ if ne(parameters.enableTelemetry, 'false') }}:
7377
- name: DOTNET_CLI_TELEMETRY_PROFILE

0 commit comments

Comments
 (0)