Skip to content

Commit 1ddf604

Browse files
marcpopMSFTmarcpopMSFT
authored
[release/8.0.1xx] Update dependencies from dotnet/arcade (#39927)
2 parents 7051f0f + c5b21de commit 1ddf604

File tree

14 files changed

+29
-27
lines changed

14 files changed

+29
-27
lines changed

‎NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<!-- End: Package sources from dotnet-runtime -->
2626
<!-- Begin: Package sources from dotnet-templating -->
2727
<add key="darc-pub-dotnet-templating-2d33450" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-2d334501/nuget/v3/index.json" />
28+
<add key="darc-pub-dotnet-templating-2d33450-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-2d334501-2/nuget/v3/index.json" />
2829
<add key="darc-pub-dotnet-templating-2d33450-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-2d334501-1/nuget/v3/index.json" />
2930
<!-- End: Package sources from dotnet-templating -->
3031
<!-- Begin: Package sources from dotnet-windowsdesktop -->

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -483,22 +483,22 @@
483483
</Dependency>
484484
</ProductDependencies>
485485
<ToolsetDependencies>
486-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24165.4">
486+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24204.3">
487487
<Uri>https://github.com/dotnet/arcade</Uri>
488-
<Sha>f311667e0587f19c3fa9553a909975662107a351</Sha>
488+
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
489489
<SourceBuild RepoName="arcade" ManagedOnly="true" />
490490
</Dependency>
491-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24165.4">
491+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24204.3">
492492
<Uri>https://github.com/dotnet/arcade</Uri>
493-
<Sha>f311667e0587f19c3fa9553a909975662107a351</Sha>
493+
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
494494
</Dependency>
495-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24165.4">
495+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24204.3">
496496
<Uri>https://github.com/dotnet/arcade</Uri>
497-
<Sha>f311667e0587f19c3fa9553a909975662107a351</Sha>
497+
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24165.4">
499+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24204.3">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>f311667e0587f19c3fa9553a909975662107a351</Sha>
501+
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
502502
</Dependency>
503503
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0">
504504
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
3333
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3434
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
35-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.24165.4</MicrosoftDotNetSignToolVersion>
35+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.24204.3</MicrosoftDotNetSignToolVersion>
3636
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
3737
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
3838
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -205,7 +205,7 @@
205205
<PropertyGroup>
206206
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
207207
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
208-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24165.4</MicrosoftDotNetXUnitExtensionsVersion>
208+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24204.3</MicrosoftDotNetXUnitExtensionsVersion>
209209
<MoqPackageVersion>4.18.4</MoqPackageVersion>
210210
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
211211
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

‎eng/common/native/init-compiler.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ if [ -z "$CLR_CC" ]; then
6363
# Set default versions
6464
if [ -z "$majorVersion" ]; then
6565
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
66-
if [ "$compiler" = "clang" ]; then versions="17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5"
66+
if [ "$compiler" = "clang" ]; then versions="18 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5"
6767
elif [ "$compiler" = "gcc" ]; then versions="13 12 11 10 9 8 7 6 5 4.9"; fi
6868

6969
for version in $versions; do

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

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

129129
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
130130
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
131-
- task: MicroBuildSigningPlugin@3
131+
- task: MicroBuildSigningPlugin@4
132132
displayName: Install MicroBuild plugin
133133
inputs:
134134
signType: $(_SignType)
135135
zipSources: false
136136
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
137137
env:
138138
TeamName: $(_TeamName)
139+
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
139140
continueOnError: ${{ parameters.continueOnError }}
140141
condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
141142

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
# If it's not devdiv, it's dnceng
5757
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
5858
name: $(DncEngInternalBuildPool)
59-
image: 1es-windows-2022-pt
59+
image: 1es-windows-2022
6060
os: windows
6161

6262
steps:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ jobs:
6060
os: windows
6161
# If it's not devdiv, it's dnceng
6262
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
63-
name: $(DncEngInternalBuildPool)
64-
image: 1es-windows-2022-pt
63+
name: NetCore1ESPool-Publishing-Internal
64+
image: windows.vs2019.amd64
6565
os: windows
6666
steps:
6767
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252

5353
${{ if eq(variables['System.TeamProject'], 'internal') }}:
5454
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
55-
image: 1es-mariner-2-pt
55+
image: 1es-mariner-2
5656
os: linux
5757

5858
${{ if ne(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
@@ -33,7 +33,7 @@ jobs:
3333
demands: ImageOverride -equals windows.vs2019.amd64.open
3434
${{ if eq(variables['System.TeamProject'], 'internal') }}:
3535
name: $(DncEngInternalBuildPool)
36-
image: 1es-windows-2022-pt
36+
image: windows.vs2022.amd64
3737
os: windows
3838

3939
steps:

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ stages:
110110
# If it's not devdiv, it's dnceng
111111
${{ else }}:
112112
name: $(DncEngInternalBuildPool)
113-
image: 1es-windows-2022-pt
113+
image: 1es-windows-2022
114114
os: windows
115115

116116
steps:
@@ -150,7 +150,7 @@ stages:
150150
# If it's not devdiv, it's dnceng
151151
${{ else }}:
152152
name: $(DncEngInternalBuildPool)
153-
image: 1es-windows-2022-pt
153+
image: 1es-windows-2022
154154
os: windows
155155
steps:
156156
- template: setup-maestro-vars.yml
@@ -208,7 +208,7 @@ stages:
208208
# If it's not devdiv, it's dnceng
209209
${{ else }}:
210210
name: $(DncEngInternalBuildPool)
211-
image: 1es-windows-2022-pt
211+
image: 1es-windows-2022
212212
os: windows
213213
steps:
214214
- template: setup-maestro-vars.yml
@@ -261,8 +261,8 @@ stages:
261261
os: windows
262262
# If it's not devdiv, it's dnceng
263263
${{ else }}:
264-
name: $(DncEngInternalBuildPool)
265-
image: 1es-windows-2022-pt
264+
name: NetCore1ESPool-Publishing-Internal
265+
image: windows.vs2019.amd64
266266
os: windows
267267
steps:
268268
- template: setup-maestro-vars.yml

0 commit comments

Comments
 (0)