Skip to content

Commit f8ce9de

Browse files
v-wuzhaiv-wuzhai
authored
[release/6.0.1xx] Update dependencies from dotnet/arcade (#40109)
2 parents caa08f3 + 954d1ed commit f8ce9de

File tree

11 files changed

+34
-24
lines changed

11 files changed

+34
-24
lines changed

‎NuGet.config

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-aspnetcore -->
77
<add key="darc-int-dotnet-aspnetcore-c83354d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c83354d4/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-aspnetcore-c83354d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c83354d4-2/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-aspnetcore-c83354d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c83354d4-1/nuget/v3/index.json" />
810
<!-- End: Package sources from dotnet-aspnetcore -->
911
<!-- Begin: Package sources from dotnet-runtime -->
10-
<add key="darc-int-dotnet-runtime-189fbbd" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-189fbbd8/nuget/v3/index.json" />
1112
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
1213
<add key="darc-pub-DotNet-msbuild-Trusted-d679d20" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-d679d209/nuget/v3/index.json" />
1314
<!-- End: Package sources from DotNet-msbuild-Trusted -->
@@ -16,9 +17,13 @@
1617
<!-- End: Package sources from dotnet-runtime -->
1718
<!-- Begin: Package sources from dotnet-templating -->
1819
<add key="darc-int-dotnet-templating-f68b1f2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-f68b1f21/nuget/v3/index.json" />
20+
<add key="darc-int-dotnet-templating-f68b1f2-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-f68b1f21-2/nuget/v3/index.json" />
21+
<add key="darc-int-dotnet-templating-f68b1f2-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-f68b1f21-1/nuget/v3/index.json" />
1922
<!-- End: Package sources from dotnet-templating -->
2023
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2124
<add key="darc-int-dotnet-windowsdesktop-75c9b26" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-75c9b263/nuget/v3/index.json" />
25+
<add key="darc-int-dotnet-windowsdesktop-75c9b26-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-75c9b263-2/nuget/v3/index.json" />
26+
<add key="darc-int-dotnet-windowsdesktop-75c9b26-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-75c9b263-1/nuget/v3/index.json" />
2227
<!-- End: Package sources from dotnet-windowsdesktop -->
2328
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2429
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -35,17 +40,22 @@
3540
<disabledPackageSources>
3641
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
3742
<!-- Begin: Package sources from dotnet-aspnetcore -->
43+
<add key="darc-int-dotnet-aspnetcore-c83354d-1" value="true" />
44+
<add key="darc-int-dotnet-aspnetcore-c83354d-2" value="true" />
3845
<add key="darc-int-dotnet-aspnetcore-c83354d" value="true" />
3946
<!-- End: Package sources from dotnet-aspnetcore -->
4047
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
4148
<!-- End: Package sources from DotNet-msbuild-Trusted -->
4249
<!-- Begin: Package sources from dotnet-runtime -->
43-
<add key="darc-int-dotnet-runtime-189fbbd" value="true" />
4450
<!-- End: Package sources from dotnet-runtime -->
4551
<!-- Begin: Package sources from dotnet-templating -->
52+
<add key="darc-int-dotnet-templating-f68b1f2-1" value="true" />
53+
<add key="darc-int-dotnet-templating-f68b1f2-2" value="true" />
4654
<add key="darc-int-dotnet-templating-f68b1f2" value="true" />
4755
<!-- End: Package sources from dotnet-templating -->
4856
<!-- Begin: Package sources from dotnet-windowsdesktop -->
57+
<add key="darc-int-dotnet-windowsdesktop-75c9b26-1" value="true" />
58+
<add key="darc-int-dotnet-windowsdesktop-75c9b26-2" value="true" />
4959
<add key="darc-int-dotnet-windowsdesktop-75c9b26" value="true" />
5060
<!-- End: Package sources from dotnet-windowsdesktop -->
5161
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -296,22 +296,22 @@
296296
</Dependency>
297297
</ProductDependencies>
298298
<ToolsetDependencies>
299-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24176.9">
299+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24204.4">
300300
<Uri>https://github.com/dotnet/arcade</Uri>
301-
<Sha>e438144bbffb29ed5d7c113dc4947b51650344dc</Sha>
301+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
302302
<SourceBuild RepoName="arcade" ManagedOnly="true" />
303303
</Dependency>
304-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24176.9">
304+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24204.4">
305305
<Uri>https://github.com/dotnet/arcade</Uri>
306-
<Sha>e438144bbffb29ed5d7c113dc4947b51650344dc</Sha>
306+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
307307
</Dependency>
308-
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.24176.9">
308+
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.24204.4">
309309
<Uri>https://github.com/dotnet/arcade</Uri>
310-
<Sha>e438144bbffb29ed5d7c113dc4947b51650344dc</Sha>
310+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
311311
</Dependency>
312-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24176.9">
312+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24204.4">
313313
<Uri>https://github.com/dotnet/arcade</Uri>
314-
<Sha>e438144bbffb29ed5d7c113dc4947b51650344dc</Sha>
314+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
315315
</Dependency>
316316
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0">
317317
<Uri>https://github.com/dotnet/runtime</Uri>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
2828
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
2929
<SystemSecurityCryptographyPkcsPackageVersion>6.0.4</SystemSecurityCryptographyPkcsPackageVersion>
30-
<MicrosoftDotNetSignToolVersion>6.0.0-beta.24176.9</MicrosoftDotNetSignToolVersion>
30+
<MicrosoftDotNetSignToolVersion>6.0.0-beta.24204.4</MicrosoftDotNetSignToolVersion>
3131
<MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
3232
<SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
3333
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -166,7 +166,7 @@
166166
<PropertyGroup>
167167
<FluentAssertionsVersion>4.19.2</FluentAssertionsVersion>
168168
<FluentAssertionsJsonVersion>4.19.0</FluentAssertionsJsonVersion>
169-
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24176.9</MicrosoftDotNetXUnitExtensionsVersion>
169+
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24204.4</MicrosoftDotNetXUnitExtensionsVersion>
170170
<MoqPackageVersion>4.8.2</MoqPackageVersion>
171171
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>6.0.0-beta.21376.2</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
172172
</PropertyGroup>

‎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/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: 4 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:
@@ -143,7 +143,7 @@ stages:
143143
# If it's not devdiv, it's dnceng
144144
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
145145
name: NetCore1ESPool-Svc-Internal
146-
image: 1es-windows-2022-pt
146+
image: 1es-windows-2022
147147
os: windows
148148
steps:
149149
- template: setup-maestro-vars.yml
@@ -206,7 +206,7 @@ stages:
206206
# If it's not devdiv, it's dnceng
207207
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
208208
name: NetCore1ESPool-Svc-Internal
209-
image: 1es-windows-2022-pt
209+
image: 1es-windows-2022
210210
os: windows
211211
steps:
212212
- template: setup-maestro-vars.yml
@@ -258,7 +258,7 @@ stages:
258258
# If it's not devdiv, it's dnceng
259259
${{ else }}:
260260
name: NetCore1ESPool-Svc-Internal
261-
image: 1es-windows-2022-pt
261+
image: 1es-windows-2022
262262
os: windows
263263
steps:
264264
- 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

‎eng/common/templates/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)