Skip to content

Commit 1da4d8f

Browse files
dotnet-maestro[bot]ericstj
dotnet-maestro[bot]
and
ericstj
authored
[release/6.0-staging] Update dependencies from dotnet/arcade (#99694)
* Update dependencies from https://github.com/dotnet/arcade build 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.24113.1 -> To Version 6.0.0-beta.24162.4 * Update dependencies from https://github.com/dotnet/arcade build 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.24113.1 -> To Version 6.0.0-beta.24163.13 * Update dependencies from https://github.com/dotnet/arcade build 20240404.4 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.24113.1 -> To Version 6.0.0-beta.24204.4 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Eric StJohn <[email protected]>
1 parent eb55202 commit 1da4d8f

File tree

12 files changed

+77
-72
lines changed

12 files changed

+77
-72
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.24163.13">
29+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24204.4">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
31+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24163.13">
33+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24204.4">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
35+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24163.13">
37+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24204.4">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
39+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24163.13">
41+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24204.4">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
43+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.24163.13">
45+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.24204.4">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
47+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24163.13">
49+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24204.4">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
51+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24163.13">
53+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24204.4">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
55+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.24163.13">
57+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.24204.4">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
59+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.24163.13">
61+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.24204.4">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
63+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24163.13">
65+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24204.4">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
67+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24163.13">
69+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24204.4">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
71+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.24163.13">
73+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.24204.4">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
75+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24163.13">
77+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24204.4">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
79+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.24163.13">
81+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.24204.4">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
83+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.24163.13">
85+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.24204.4">
8686
<Uri>https://github.com/dotnet/arcade</Uri>
87-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
87+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.24163.13">
89+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.24204.4">
9090
<Uri>https://github.com/dotnet/arcade</Uri>
91-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
91+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
9292
</Dependency>
93-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.24163.13">
93+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.24204.4">
9494
<Uri>https://github.com/dotnet/arcade</Uri>
95-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
95+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.24163.13">
97+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.24204.4">
9898
<Uri>https://github.com/dotnet/arcade</Uri>
99-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
99+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</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>e3f823d9e7dd5b42dde2fc3cdc1fb3650dd197f2</Sha>
224224
</Dependency>
225-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.24163.13">
225+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.24204.4">
226226
<Uri>https://github.com/dotnet/arcade</Uri>
227-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
227+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</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.24163.13</MicrosoftDotNetApiCompatVersion>
46-
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.24163.13</MicrosoftDotNetBuildTasksFeedVersion>
47-
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.24163.13</MicrosoftDotNetCodeAnalysisVersion>
48-
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.24163.13</MicrosoftDotNetGenAPIVersion>
49-
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.24163.13</MicrosoftDotNetGenFacadesVersion>
50-
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24163.13</MicrosoftDotNetXUnitExtensionsVersion>
51-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24163.13</MicrosoftDotNetXUnitConsoleRunnerVersion>
52-
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.24163.13</MicrosoftDotNetBuildTasksArchivesVersion>
53-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24163.13</MicrosoftDotNetBuildTasksInstallersVersion>
54-
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.24163.13</MicrosoftDotNetBuildTasksPackagingVersion>
55-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24163.13</MicrosoftDotNetBuildTasksTemplatingVersion>
56-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.24163.13</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
57-
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.24163.13</MicrosoftDotNetRemoteExecutorVersion>
58-
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.24163.13</MicrosoftDotNetVersionToolsTasksVersion>
59-
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.24163.13</MicrosoftDotNetPackageTestingVersion>
45+
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.24204.4</MicrosoftDotNetApiCompatVersion>
46+
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.24204.4</MicrosoftDotNetBuildTasksFeedVersion>
47+
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.24204.4</MicrosoftDotNetCodeAnalysisVersion>
48+
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.24204.4</MicrosoftDotNetGenAPIVersion>
49+
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.24204.4</MicrosoftDotNetGenFacadesVersion>
50+
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24204.4</MicrosoftDotNetXUnitExtensionsVersion>
51+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24204.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
52+
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.24204.4</MicrosoftDotNetBuildTasksArchivesVersion>
53+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24204.4</MicrosoftDotNetBuildTasksInstallersVersion>
54+
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.24204.4</MicrosoftDotNetBuildTasksPackagingVersion>
55+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24204.4</MicrosoftDotNetBuildTasksTemplatingVersion>
56+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.24204.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
57+
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.24204.4</MicrosoftDotNetRemoteExecutorVersion>
58+
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.24204.4</MicrosoftDotNetVersionToolsTasksVersion>
59+
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.24204.4</MicrosoftDotNetPackageTestingVersion>
6060
<!-- NuGet dependencies -->
6161
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
6262
<!-- Installer dependencies -->

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,15 @@ jobs:
116116

117117
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
118118
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
119-
- task: MicroBuildSigningPlugin@3
119+
- task: MicroBuildSigningPlugin@4
120120
displayName: Install MicroBuild plugin
121121
inputs:
122122
signType: $(_SignType)
123123
zipSources: false
124124
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
125125
env:
126126
TeamName: $(_TeamName)
127+
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
127128
continueOnError: ${{ parameters.continueOnError }}
128129
condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
129130

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
# If it's not devdiv, it's dnceng
4444
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
4545
name: NetCore1ESPool-Svc-Internal
46-
image: 1es-windows-2022-pt
46+
image: 1es-windows-2022
4747
os: windows
4848

4949
variables:

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,16 @@ jobs:
8080
inputs:
8181
targetType: inline
8282
script: |
83-
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId)
84-
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)"
85-
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild)
83+
New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force
84+
$filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt"
85+
Add-Content -Path $filePath -Value $(BARBuildId)
86+
Add-Content -Path $filePath -Value "$(DefaultChannels)"
87+
Add-Content -Path $filePath -Value $(IsStableBuild)
8688
8789
- task: 1ES.PublishBuildArtifacts@1
8890
displayName: Publish ReleaseConfigs Artifact
8991
inputs:
90-
PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt'
92+
PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs'
9193
PublishLocation: Container
9294
ArtifactName: ReleaseConfigs
9395

‎eng/common/templates-official/job/source-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
5151
${{ if eq(variables['System.TeamProject'], 'internal') }}:
5252
name: NetCore1ESPool-Svc-Internal
53-
image: 1es-mariner-2-pt
53+
image: 1es-mariner-2
5454
os: linux
5555
${{ if ne(parameters.platform.pool, '') }}:
5656
pool: ${{ parameters.platform.pool }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ parameters:
77
binlogPath: artifacts/log/Debug/Build.binlog
88
pool:
99
name: NetCore1ESPool-Svc-Internal
10-
image: 1es-windows-2022-pt
10+
image: 1es-windows-2022
1111
os: windows
1212
condition: ''
1313
dependsOn: ''

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
# If it's not devdiv, it's dnceng
9393
${{ else }}:
9494
name: NetCore1ESPool-Svc-Internal
95-
image: 1es-windows-2022-pt
95+
image: 1es-windows-2022
9696
os: windows
9797

9898
runAsPublic: ${{ parameters.runAsPublic }}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ stages:
103103
# If it's not devdiv, it's dnceng
104104
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
105105
name: NetCore1ESPool-Svc-Internal
106-
image: 1es-windows-2022-pt
106+
image: 1es-windows-2022
107107
os: windows
108108

109109
steps:
@@ -137,12 +137,13 @@ stages:
137137
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
138138
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
139139
name: AzurePipelines-EO
140+
image: 1ESPT-Windows2022
140141
demands: Cmd
141142
os: windows
142143
# If it's not devdiv, it's dnceng
143144
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
144145
name: NetCore1ESPool-Svc-Internal
145-
image: 1es-windows-2022-pt
146+
image: 1es-windows-2022
146147
os: windows
147148
steps:
148149
- template: setup-maestro-vars.yml
@@ -205,7 +206,7 @@ stages:
205206
# If it's not devdiv, it's dnceng
206207
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
207208
name: NetCore1ESPool-Svc-Internal
208-
image: 1es-windows-2022-pt
209+
image: 1es-windows-2022
209210
os: windows
210211
steps:
211212
- template: setup-maestro-vars.yml
@@ -251,12 +252,13 @@ stages:
251252
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
252253
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
253254
name: AzurePipelines-EO
255+
image: 1ESPT-Windows2022
254256
demands: Cmd
255257
os: windows
256258
# If it's not devdiv, it's dnceng
257259
${{ else }}:
258260
name: NetCore1ESPool-Svc-Internal
259-
image: 1es-windows-2022-pt
261+
image: 1es-windows-2022
260262
os: windows
261263
steps:
262264
- template: setup-maestro-vars.yml

‎eng/common/templates-official/steps/component-governance.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ parameters:
33

44
steps:
55
- ${{ if eq(parameters.disableComponentGovernance, 'true') }}:
6-
- script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
6+
- script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
77
displayName: Set skipComponentGovernanceDetection variable
88
- ${{ if ne(parameters.disableComponentGovernance, 'true') }}:
99
- task: ComponentGovernanceComponentDetection@0

0 commit comments

Comments
 (0)