Skip to content

Commit 9f4b1f5

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/8.0' changes
2 parents 0c7efec + 62304a6 commit 9f4b1f5

File tree

9 files changed

+78
-84
lines changed

9 files changed

+78
-84
lines changed

‎NuGet.config

-5
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-emsdk -->
1212
<add key="darc-pub-dotnet-emsdk-9a29abd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-9a29abdd/nuget/v3/index.json" />
13-
<add key="darc-pub-dotnet-emsdk-2fc2ffd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2fc2ffd9/nuget/v3/index.json" />
14-
<add key="darc-pub-dotnet-emsdk-201f4da" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-201f4dae/nuget/v3/index.json" />
15-
<add key="darc-pub-dotnet-emsdk-201f4da-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-201f4dae-3/nuget/v3/index.json" />
16-
<add key="darc-pub-dotnet-emsdk-201f4da-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-201f4dae-2/nuget/v3/index.json" />
17-
<add key="darc-pub-dotnet-emsdk-201f4da-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-201f4dae-1/nuget/v3/index.json" />
1813
<!-- End: Package sources from dotnet-emsdk -->
1914
<!-- Begin: Package sources from dotnet-sdk -->
2015
<!-- End: Package sources from dotnet-sdk -->

‎eng/Version.Details.xml

+36-36
Original file line numberDiff line numberDiff line change
@@ -111,79 +111,79 @@
111111
</Dependency>
112112
</ProductDependencies>
113113
<ToolsetDependencies>
114-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24059.4">
114+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24113.2">
115115
<Uri>https://github.com/dotnet/arcade</Uri>
116-
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
116+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
117117
<SourceBuild RepoName="arcade" ManagedOnly="true" />
118118
</Dependency>
119119
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
120120
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
121121
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
122122
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
123123
</Dependency>
124-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24059.4">
124+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24113.2">
125125
<Uri>https://github.com/dotnet/arcade</Uri>
126-
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
126+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
127127
</Dependency>
128-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.24059.4">
128+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.24113.2">
129129
<Uri>https://github.com/dotnet/arcade</Uri>
130-
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
130+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
131131
</Dependency>
132-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.24059.4">
132+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.24113.2">
133133
<Uri>https://github.com/dotnet/arcade</Uri>
134-
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
134+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
135135
</Dependency>
136-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24059.4">
136+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24113.2">
137137
<Uri>https://github.com/dotnet/arcade</Uri>
138-
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
138+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
139139
</Dependency>
140-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24059.4">
140+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24113.2">
141141
<Uri>https://github.com/dotnet/arcade</Uri>
142-
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
142+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
143143
</Dependency>
144-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.24059.4">
144+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.24113.2">
145145
<Uri>https://github.com/dotnet/arcade</Uri>
146-
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
146+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
147147
</Dependency>
148-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.24059.4">
148+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.24113.2">
149149
<Uri>https://github.com/dotnet/arcade</Uri>
150-
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
150+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
151151
</Dependency>
152-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24059.4">
152+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24113.2">
153153
<Uri>https://github.com/dotnet/arcade</Uri>
154-
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
154+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
155155
</Dependency>
156-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24059.4">
156+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24113.2">
157157
<Uri>https://github.com/dotnet/arcade</Uri>
158-
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
158+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
159159
</Dependency>
160-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.24059.4">
160+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.24113.2">
161161
<Uri>https://github.com/dotnet/arcade</Uri>
162-
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
162+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
163163
</Dependency>
164-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.24059.4">
164+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.24113.2">
165165
<Uri>https://github.com/dotnet/arcade</Uri>
166-
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
166+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
167167
</Dependency>
168-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.24059.4">
168+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.24113.2">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
170+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
171171
</Dependency>
172-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24059.4">
172+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24113.2">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174-
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
174+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.24059.4">
176+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.24113.2">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
178+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
179179
</Dependency>
180-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.24059.4">
180+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.24113.2">
181181
<Uri>https://github.com/dotnet/arcade</Uri>
182-
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
182+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
183183
</Dependency>
184-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.24059.4">
184+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.24113.2">
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186-
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
186+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
187187
</Dependency>
188188
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.24108.4">
189189
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -334,9 +334,9 @@
334334
<Uri>https://github.com/dotnet/xharness</Uri>
335335
<Sha>a417169d3ba558fd6daa522f04e686574bbce520</Sha>
336336
</Dependency>
337-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.24059.4">
337+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.24113.2">
338338
<Uri>https://github.com/dotnet/arcade</Uri>
339-
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
339+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
340340
</Dependency>
341341
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23566.3">
342342
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props

+15-16
Original file line numberDiff line numberDiff line change
@@ -87,21 +87,21 @@
8787
<!-- SDK dependencies -->
8888
<MicrosoftDotNetApiCompatTaskVersion>8.0.100</MicrosoftDotNetApiCompatTaskVersion>
8989
<!-- Arcade dependencies -->
90-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.24059.4</MicrosoftDotNetBuildTasksFeedVersion>
91-
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.24059.4</MicrosoftDotNetCodeAnalysisVersion>
92-
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.24059.4</MicrosoftDotNetGenAPIVersion>
93-
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.24059.4</MicrosoftDotNetGenFacadesVersion>
94-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24059.4</MicrosoftDotNetXUnitExtensionsVersion>
95-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24059.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
96-
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.24059.4</MicrosoftDotNetBuildTasksArchivesVersion>
97-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.24059.4</MicrosoftDotNetBuildTasksInstallersVersion>
98-
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.24059.4</MicrosoftDotNetBuildTasksPackagingVersion>
99-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.24059.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
100-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.24059.4</MicrosoftDotNetBuildTasksTemplatingVersion>
101-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.24059.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
102-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24059.4</MicrosoftDotNetRemoteExecutorVersion>
103-
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.24059.4</MicrosoftDotNetVersionToolsTasksVersion>
104-
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.24059.4</MicrosoftDotNetPackageTestingVersion>
90+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.24113.2</MicrosoftDotNetBuildTasksFeedVersion>
91+
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.24113.2</MicrosoftDotNetCodeAnalysisVersion>
92+
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.24113.2</MicrosoftDotNetGenAPIVersion>
93+
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.24113.2</MicrosoftDotNetGenFacadesVersion>
94+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24113.2</MicrosoftDotNetXUnitExtensionsVersion>
95+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24113.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
96+
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.24113.2</MicrosoftDotNetBuildTasksArchivesVersion>
97+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.24113.2</MicrosoftDotNetBuildTasksInstallersVersion>
98+
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.24113.2</MicrosoftDotNetBuildTasksPackagingVersion>
99+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.24113.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
100+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.24113.2</MicrosoftDotNetBuildTasksTemplatingVersion>
101+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.24113.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
102+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24113.2</MicrosoftDotNetRemoteExecutorVersion>
103+
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.24113.2</MicrosoftDotNetVersionToolsTasksVersion>
104+
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.24113.2</MicrosoftDotNetPackageTestingVersion>
105105
<!-- NuGet dependencies -->
106106
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
107107
<!-- Installer dependencies -->
@@ -244,7 +244,6 @@
244244
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</MicrosoftNETRuntimeEmscriptenVersion>
245245
<!-- workloads -->
246246
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
247-
<WixPackageVersion>1.0.0-v3.14.0.5722</WixPackageVersion>
248247
<!-- JIT Tools -->
249248
<runtimelinuxarm64MicrosoftNETCoreRuntimeJITToolsVersion>16.0.5-alpha.1.23566.1</runtimelinuxarm64MicrosoftNETCoreRuntimeJITToolsVersion>
250249
<runtimelinuxx64MicrosoftNETCoreRuntimeJITToolsVersion>16.0.5-alpha.1.23566.1</runtimelinuxx64MicrosoftNETCoreRuntimeJITToolsVersion>

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

+2-2
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

+7-7
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

+8-8
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

+6-6
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

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"dotnet": "8.0.101"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24059.4",
12-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24059.4",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.24059.4",
11+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24113.2",
12+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24113.2",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.24113.2",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
1616
"Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"

0 commit comments

Comments
 (0)