Skip to content

Commit e4f2098

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20240213.1 (#98463)
Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 6.0.0-beta.24059.3 -> To Version 6.0.0-beta.24113.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent d2014c7 commit e4f2098

File tree

7 files changed

+79
-79
lines changed

7 files changed

+79
-79
lines changed

‎eng/Version.Details.xml‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -26,77 +26,77 @@
2626
</Dependency>
2727
</ProductDependencies>
2828
<ToolsetDependencies>
29-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24059.3">
29+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24113.1">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
31+
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24059.3">
33+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24113.1">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
35+
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24059.3">
37+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24113.1">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
39+
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24059.3">
41+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24113.1">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
43+
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.24059.3">
45+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.24113.1">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
47+
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24059.3">
49+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24113.1">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
51+
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24059.3">
53+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24113.1">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
55+
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.24059.3">
57+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.24113.1">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
59+
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.24059.3">
61+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.24113.1">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
63+
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24059.3">
65+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24113.1">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
67+
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24059.3">
69+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24113.1">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
71+
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.24059.3">
73+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.24113.1">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
75+
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24059.3">
77+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24113.1">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
79+
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.24059.3">
81+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.24113.1">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
83+
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.24059.3">
85+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.24113.1">
8686
<Uri>https://github.com/dotnet/arcade</Uri>
87-
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
87+
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.24059.3">
89+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.24113.1">
9090
<Uri>https://github.com/dotnet/arcade</Uri>
91-
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
91+
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
9292
</Dependency>
93-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.24059.3">
93+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.24113.1">
9494
<Uri>https://github.com/dotnet/arcade</Uri>
95-
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
95+
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.24059.3">
97+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.24113.1">
9898
<Uri>https://github.com/dotnet/arcade</Uri>
99-
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
99+
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
100100
</Dependency>
101101
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
102102
<Uri>https://github.com/microsoft/vstest</Uri>
@@ -222,9 +222,9 @@
222222
<Uri>https://github.com/dotnet/xharness</Uri>
223223
<Sha>9cffd0b49204fa44c7577fa1a132e39e7cf4d038</Sha>
224224
</Dependency>
225-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.24059.3">
225+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.24113.1">
226226
<Uri>https://github.com/dotnet/arcade</Uri>
227-
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
227+
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
228228
</Dependency>
229229
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21416.5">
230230
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,21 @@
4242
<!-- SDK dependencies -->
4343
<MicrosoftDotNetCompatibilityVersion>1.1.0-preview.22164.17</MicrosoftDotNetCompatibilityVersion>
4444
<!-- Arcade dependencies -->
45-
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.24059.3</MicrosoftDotNetApiCompatVersion>
46-
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.24059.3</MicrosoftDotNetBuildTasksFeedVersion>
47-
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.24059.3</MicrosoftDotNetCodeAnalysisVersion>
48-
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.24059.3</MicrosoftDotNetGenAPIVersion>
49-
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.24059.3</MicrosoftDotNetGenFacadesVersion>
50-
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24059.3</MicrosoftDotNetXUnitExtensionsVersion>
51-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24059.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
52-
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.24059.3</MicrosoftDotNetBuildTasksArchivesVersion>
53-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24059.3</MicrosoftDotNetBuildTasksInstallersVersion>
54-
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.24059.3</MicrosoftDotNetBuildTasksPackagingVersion>
55-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24059.3</MicrosoftDotNetBuildTasksTemplatingVersion>
56-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.24059.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
57-
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.24059.3</MicrosoftDotNetRemoteExecutorVersion>
58-
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.24059.3</MicrosoftDotNetVersionToolsTasksVersion>
59-
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.24059.3</MicrosoftDotNetPackageTestingVersion>
45+
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.24113.1</MicrosoftDotNetApiCompatVersion>
46+
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.24113.1</MicrosoftDotNetBuildTasksFeedVersion>
47+
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.24113.1</MicrosoftDotNetCodeAnalysisVersion>
48+
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.24113.1</MicrosoftDotNetGenAPIVersion>
49+
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.24113.1</MicrosoftDotNetGenFacadesVersion>
50+
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24113.1</MicrosoftDotNetXUnitExtensionsVersion>
51+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24113.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
52+
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.24113.1</MicrosoftDotNetBuildTasksArchivesVersion>
53+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24113.1</MicrosoftDotNetBuildTasksInstallersVersion>
54+
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.24113.1</MicrosoftDotNetBuildTasksPackagingVersion>
55+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24113.1</MicrosoftDotNetBuildTasksTemplatingVersion>
56+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.24113.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
57+
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.24113.1</MicrosoftDotNetRemoteExecutorVersion>
58+
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.24113.1</MicrosoftDotNetVersionToolsTasksVersion>
59+
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.24113.1</MicrosoftDotNetPackageTestingVersion>
6060
<!-- NuGet dependencies -->
6161
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
6262
<!-- Installer dependencies -->

‎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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
checkDownloadedFiles: true
5252
condition: ${{ parameters.condition }}
5353
continueOnError: ${{ parameters.continueOnError }}
54-
54+
5555
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
5656
- task: NuGetAuthenticate@1
5757

@@ -74,7 +74,7 @@ jobs:
7474
/p:OfficialBuildId=$(Build.BuildNumber)
7575
condition: ${{ parameters.condition }}
7676
continueOnError: ${{ parameters.continueOnError }}
77-
77+
7878
- task: powershell@2
7979
displayName: Create ReleaseConfigs Artifact
8080
inputs:
@@ -83,7 +83,7 @@ jobs:
8383
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId)
8484
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)"
8585
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild)
86-
86+
8787
- task: PublishBuildArtifacts@1
8888
displayName: Publish ReleaseConfigs Artifact
8989
inputs:
@@ -109,7 +109,7 @@ jobs:
109109
110110
- task: PublishBuildArtifacts@1
111111
displayName: Publish SymbolPublishingExclusionsFile Artifact
112-
condition: eq(variables['SymbolExclusionFile'], 'true')
112+
condition: eq(variables['SymbolExclusionFile'], 'true')
113113
inputs:
114114
PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
115115
PublishLocation: Container
@@ -118,4 +118,4 @@ jobs:
118118
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
119119
- template: /eng/common/templates/steps/publish-logs.yml
120120
parameters:
121-
JobLabel: 'Publish_Artifacts_Logs'
121+
JobLabel: 'Publish_Artifacts_Logs'

‎eng/common/templates/jobs/jobs.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ parameters:
2020
enabled: false
2121
# Optional: Include toolset dependencies in the generated graph files
2222
includeToolset: false
23-
23+
2424
# Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job
2525
jobs: []
2626

@@ -40,7 +40,7 @@ parameters:
4040
jobs:
4141
- ${{ each job in parameters.jobs }}:
4242
- template: ../job/job.yml
43-
parameters:
43+
parameters:
4444
# pass along parameters
4545
${{ each parameter in parameters }}:
4646
${{ if ne(parameter.key, 'jobs') }}:
@@ -68,7 +68,7 @@ jobs:
6868
${{ parameter.key }}: ${{ parameter.value }}
6969

7070
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
71-
71+
7272
- ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}:
7373
- template: ../job/publish-build-assets.yml
7474
parameters:
@@ -88,8 +88,8 @@ jobs:
8888
name: VSEngSS-MicroBuild2022-1ES
8989
demands: Cmd
9090
# If it's not devdiv, it's dnceng
91-
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
92-
name: NetCore1ESPool-Svc-Internal
91+
${{ else }}:
92+
name: NetCore1ESPool-Publishing-Internal
9393
demands: ImageOverride -equals windows.vs2019.amd64
9494

9595
runAsPublic: ${{ parameters.runAsPublic }}

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

Lines changed: 10 additions & 10 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
@@ -124,8 +124,8 @@ stages:
124124
displayName: Validate
125125
inputs:
126126
filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1
127-
arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/
128-
-ToolDestinationPath $(Agent.BuildDirectory)/Extract/
127+
arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/
128+
-ToolDestinationPath $(Agent.BuildDirectory)/Extract/
129129

130130
- job:
131131
displayName: Signing Validation
@@ -220,9 +220,9 @@ stages:
220220
displayName: Validate
221221
inputs:
222222
filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1
223-
arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/
224-
-ExtractPath $(Agent.BuildDirectory)/Extract/
225-
-GHRepoName $(Build.Repository.Name)
223+
arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/
224+
-ExtractPath $(Agent.BuildDirectory)/Extract/
225+
-GHRepoName $(Build.Repository.Name)
226226
-GHCommit $(Build.SourceVersion)
227227
-SourcelinkCliVersion $(SourceLinkCLIVersion)
228228
continueOnError: true
@@ -253,8 +253,8 @@ stages:
253253
name: VSEngSS-MicroBuild2022-1ES
254254
demands: Cmd
255255
# If it's not devdiv, it's dnceng
256-
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
257-
name: NetCore1ESPool-Svc-Internal
256+
${{ else }}:
257+
name: NetCore1ESPool-Publishing-Internal
258258
demands: ImageOverride -equals windows.vs2019.amd64
259259
steps:
260260
- template: setup-maestro-vars.yml
@@ -266,10 +266,10 @@ stages:
266266
displayName: Publish Using Darc
267267
inputs:
268268
filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
269-
arguments: -BuildId $(BARBuildId)
269+
arguments: -BuildId $(BARBuildId)
270270
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
271271
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
272272
-MaestroToken '$(MaestroApiAccessToken)'
273273
-WaitPublishingFinish true
274274
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
275-
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
275+
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

‎global.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
"python3": "3.7.1"
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.24059.3",
16-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24059.3",
17-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24059.3",
18-
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.24059.3",
15+
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.24113.1",
16+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24113.1",
17+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24113.1",
18+
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.24113.1",
1919
"Microsoft.Build.NoTargets": "3.1.0",
2020
"Microsoft.Build.Traversal": "3.0.23",
2121
"Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6"

0 commit comments

Comments
 (0)