Skip to content

Commit 574c839

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20240329.6 (#54867)
[main] Update dependencies from dotnet/arcade
1 parent 5d78927 commit 574c839

File tree

10 files changed

+30
-29
lines changed

10 files changed

+30
-29
lines changed

‎eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -383,31 +383,31 @@
383383
<Uri>https://github.com/dotnet/winforms</Uri>
384384
<Sha>0bf0cd0a97f1f76e133879501e3553d4b7825dbf</Sha>
385385
</Dependency>
386-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24172.4">
386+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24179.6">
387387
<Uri>https://github.com/dotnet/arcade</Uri>
388-
<Sha>c936d1bc358744730613d8ce54bc3e0294e5ea56</Sha>
388+
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
389389
</Dependency>
390390
<!-- Intermediate is necessary for source build. -->
391-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24172.4">
391+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24179.6">
392392
<Uri>https://github.com/dotnet/arcade</Uri>
393-
<Sha>c936d1bc358744730613d8ce54bc3e0294e5ea56</Sha>
393+
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
394394
<SourceBuild RepoName="arcade" ManagedOnly="true" />
395395
</Dependency>
396-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24172.4">
396+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24179.6">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>c936d1bc358744730613d8ce54bc3e0294e5ea56</Sha>
398+
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
399399
</Dependency>
400-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24172.4">
400+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24179.6">
401401
<Uri>https://github.com/dotnet/arcade</Uri>
402-
<Sha>c936d1bc358744730613d8ce54bc3e0294e5ea56</Sha>
402+
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
403403
</Dependency>
404-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24172.4">
404+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24179.6">
405405
<Uri>https://github.com/dotnet/arcade</Uri>
406-
<Sha>c936d1bc358744730613d8ce54bc3e0294e5ea56</Sha>
406+
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
407407
</Dependency>
408-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24172.4">
408+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24179.6">
409409
<Uri>https://github.com/dotnet/arcade</Uri>
410-
<Sha>c936d1bc358744730613d8ce54bc3e0294e5ea56</Sha>
410+
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
411411
</Dependency>
412412
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.0.0-preview.3.24175.2">
413413
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,10 @@
159159
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
160160
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
161161
<!-- Packages from dotnet/arcade -->
162-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24172.4</MicrosoftDotNetBuildTasksInstallersVersion>
163-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24172.4</MicrosoftDotNetBuildTasksTemplatingVersion>
164-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24172.4</MicrosoftDotNetRemoteExecutorVersion>
165-
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.24172.4</MicrosoftSourceBuildIntermediatearcadeVersion>
162+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24179.6</MicrosoftDotNetBuildTasksInstallersVersion>
163+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24179.6</MicrosoftDotNetBuildTasksTemplatingVersion>
164+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24179.6</MicrosoftDotNetRemoteExecutorVersion>
165+
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.24179.6</MicrosoftSourceBuildIntermediatearcadeVersion>
166166
<!-- Packages from dotnet/source-build-externals -->
167167
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>9.0.0-alpha.1.24175.4</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
168168
<!-- Packages from dotnet/source-build-reference-packages -->

‎eng/common/native/init-distro-rid.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ getNonPortableDistroRid()
2020
# shellcheck disable=SC1091
2121
if [ -e "${rootfsDir}/etc/os-release" ]; then
2222
. "${rootfsDir}/etc/os-release"
23-
if [ "${ID}" = "rhel" ] || [ "${ID}" = "rocky" ] || [ "${ID}" = "alpine" ]; then
23+
if [ "${ID}" = "rhel" ] || [ "${ID}" = "rocky" ] || [ "${ID}" = "alpine" ] || [ "${ID}" = "ol" ]; then
2424
VERSION_ID="${VERSION_ID%.*}" # Remove the last version digit for these distros
2525
fi
2626

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ jobs:
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/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

‎eng/common/templates-official/variables/pool-providers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#
2424
# pool:
2525
# name: $(DncEngInternalBuildPool)
26-
# image: 1es-windows-2022-pt
26+
# image: 1es-windows-2022
2727

2828
variables:
2929
# Coalesce the target and source branches so we know when a PR targets a release branch

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"jdk": "11.0.22"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24172.4",
31-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24172.4"
30+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24179.6",
31+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24179.6"
3232
}
3333
}

0 commit comments

Comments
 (0)