Skip to content

Commit 4ae582b

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20240213.2 (#7000)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24075.5 -> To Version 8.0.0-beta.24113.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 1335d81 commit 4ae582b

File tree

7 files changed

+38
-38
lines changed

7 files changed

+38
-38
lines changed

eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@
77
</Dependency>
88
</ProductDependencies>
99
<ToolsetDependencies>
10-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24075.5">
10+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24113.2">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>07cf24f27ee58b5d1a9662334a101d84bd1e07e5</Sha>
12+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.24075.5">
14+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.24113.2">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>07cf24f27ee58b5d1a9662334a101d84bd1e07e5</Sha>
16+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
1717
</Dependency>
18-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24075.5">
18+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24113.2">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>07cf24f27ee58b5d1a9662334a101d84bd1e07e5</Sha>
20+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24075.5">
22+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24113.2">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>07cf24f27ee58b5d1a9662334a101d84bd1e07e5</Sha>
24+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
2525
</Dependency>
26-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.24075.5">
26+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.24113.2">
2727
<Uri>https://github.com/dotnet/arcade</Uri>
28-
<Sha>07cf24f27ee58b5d1a9662334a101d84bd1e07e5</Sha>
28+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
2929
</Dependency>
3030
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20074.1">
3131
<Uri>https://github.com/dotnet/arcade-services</Uri>
@@ -39,9 +39,9 @@
3939
<Uri>https://github.com/dotnet/xharness</Uri>
4040
<Sha>89cb4b1d368e0f15b4df8e02a176dd1f1c33958b</Sha>
4141
</Dependency>
42-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24075.5">
42+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24113.2">
4343
<Uri>https://github.com/dotnet/arcade</Uri>
44-
<Sha>07cf24f27ee58b5d1a9662334a101d84bd1e07e5</Sha>
44+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
4545
</Dependency>
4646
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-3.20460.2">
4747
<Uri>https://github.com/dotnet/roslyn</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<DotNetRuntime80Version>8.0.1</DotNetRuntime80Version>
8282
<FluentAssertionVersion>5.10.2</FluentAssertionVersion>
8383
<MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.23431.1</MicrosoftCodeAnalysisTestingVersion>
84-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24075.5</MicrosoftDotNetXUnitExtensionsVersion>
84+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24113.2</MicrosoftDotNetXUnitExtensionsVersion>
8585
<MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
8686
<MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
8787
<MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>

eng/common/post-build/publish-using-darc.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ param(
1212
try {
1313
. $PSScriptRoot\post-build-utils.ps1
1414

15-
$darc = Get-Darc
15+
$darc = Get-Darc
1616

1717
$optionalParams = [System.Collections.ArrayList]::new()
1818

@@ -46,7 +46,7 @@ try {
4646
}
4747

4848
Write-Host 'done.'
49-
}
49+
}
5050
catch {
5151
Write-Host $_
5252
Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels."

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
demands: Cmd
5959
# If it's not devdiv, it's dnceng
6060
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
61-
name: $(DncEngInternalBuildPool)
61+
name: NetCore1ESPool-Publishing-Internal
6262
demands: ImageOverride -equals windows.vs2019.amd64
6363

6464
steps:
@@ -71,7 +71,7 @@ jobs:
7171
checkDownloadedFiles: true
7272
condition: ${{ parameters.condition }}
7373
continueOnError: ${{ parameters.continueOnError }}
74-
74+
7575
- task: NuGetAuthenticate@1
7676

7777
- task: PowerShell@2
@@ -86,7 +86,7 @@ jobs:
8686
/p:OfficialBuildId=$(Build.BuildNumber)
8787
condition: ${{ parameters.condition }}
8888
continueOnError: ${{ parameters.continueOnError }}
89-
89+
9090
- task: powershell@2
9191
displayName: Create ReleaseConfigs Artifact
9292
inputs:
@@ -95,7 +95,7 @@ jobs:
9595
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId)
9696
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)"
9797
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild)
98-
98+
9999
- task: PublishBuildArtifacts@1
100100
displayName: Publish ReleaseConfigs Artifact
101101
inputs:
@@ -121,7 +121,7 @@ jobs:
121121
122122
- task: PublishBuildArtifacts@1
123123
displayName: Publish SymbolPublishingExclusionsFile Artifact
124-
condition: eq(variables['SymbolExclusionFile'], 'true')
124+
condition: eq(variables['SymbolExclusionFile'], 'true')
125125
inputs:
126126
PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
127127
PublishLocation: Container
@@ -137,7 +137,7 @@ jobs:
137137
displayName: Publish Using Darc
138138
inputs:
139139
filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
140-
arguments: -BuildId $(BARBuildId)
140+
arguments: -BuildId $(BARBuildId)
141141
-PublishingInfraVersion 3
142142
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
143143
-MaestroToken '$(MaestroApiAccessToken)'
@@ -148,4 +148,4 @@ jobs:
148148
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
149149
- template: /eng/common/templates/steps/publish-logs.yml
150150
parameters:
151-
JobLabel: 'Publish_Artifacts_Logs'
151+
JobLabel: 'Publish_Artifacts_Logs'

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ parameters:
3939
displayName: Enable NuGet validation
4040
type: boolean
4141
default: true
42-
42+
4343
- name: publishInstallersAndChecksums
4444
displayName: Publish installers and checksums
4545
type: boolean
@@ -131,8 +131,8 @@ stages:
131131
displayName: Validate
132132
inputs:
133133
filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1
134-
arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/
135-
-ToolDestinationPath $(Agent.BuildDirectory)/Extract/
134+
arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/
135+
-ToolDestinationPath $(Agent.BuildDirectory)/Extract/
136136

137137
- job:
138138
displayName: Signing Validation
@@ -221,9 +221,9 @@ stages:
221221
displayName: Validate
222222
inputs:
223223
filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1
224-
arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/
225-
-ExtractPath $(Agent.BuildDirectory)/Extract/
226-
-GHRepoName $(Build.Repository.Name)
224+
arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/
225+
-ExtractPath $(Agent.BuildDirectory)/Extract/
226+
-GHRepoName $(Build.Repository.Name)
227227
-GHCommit $(Build.SourceVersion)
228228
-SourcelinkCliVersion $(SourceLinkCLIVersion)
229229
continueOnError: true
@@ -258,7 +258,7 @@ stages:
258258
demands: Cmd
259259
# If it's not devdiv, it's dnceng
260260
${{ else }}:
261-
name: $(DncEngInternalBuildPool)
261+
name: NetCore1ESPool-Publishing-Internal
262262
demands: ImageOverride -equals windows.vs2019.amd64
263263
steps:
264264
- template: setup-maestro-vars.yml
@@ -272,7 +272,7 @@ stages:
272272
displayName: Publish Using Darc
273273
inputs:
274274
filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
275-
arguments: -BuildId $(BARBuildId)
275+
arguments: -BuildId $(BARBuildId)
276276
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
277277
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
278278
-MaestroToken '$(MaestroApiAccessToken)'

eng/common/templates/variables/pool-providers.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool,
1+
# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool,
22
# otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches.
33

4-
# Motivation:
4+
# Motivation:
55
# Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS
66
# (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing
77
# (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS.
8-
# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services
9-
# team needs to move resources around and create new and potentially differently-named pools. Using this template
8+
# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services
9+
# team needs to move resources around and create new and potentially differently-named pools. Using this template
1010
# file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming.
1111

12-
# How to use:
12+
# How to use:
1313
# This yaml assumes your shipped product branches use the naming convention "release/..." (which many do).
1414
# If we find alternate naming conventions in broad usage it can be added to the condition below.
1515
#
@@ -54,4 +54,4 @@ variables:
5454
False,
5555
'NetCore1ESPool-Internal'
5656
)
57-
]
57+
]

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
}
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24075.5",
15-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24075.5",
14+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24113.2",
15+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24113.2",
1616
"Microsoft.Build.Traversal": "3.2.0",
1717
"Microsoft.SourceLink.GitHub": "1.1.0-beta-20206-02",
1818
"Microsoft.SourceLink.Common": "1.1.0-beta-20206-02"

0 commit comments

Comments
 (0)