Skip to content

Commit a996c61

Browse files
authored
Merge pull request #657 from dotnet/darc-release/8.0.4xx-3e08197a-dfb6-47a8-ba56-e88751646f81
[release/8.0.4xx] Update dependencies from dotnet/arcade
2 parents 6fac578 + 05827a2 commit a996c61

File tree

9 files changed

+26
-6
lines changed

9 files changed

+26
-6
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
</Dependency>
4040
</ProductDependencies>
4141
<ToolsetDependencies>
42-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25515.1">
42+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25577.1">
4343
<Uri>https://github.com/dotnet/arcade</Uri>
44-
<Sha>6544413e02741855b701468aa8afc6cf8ca62c72</Sha>
44+
<Sha>1be4bb105d0b2b0b9c9b36b8705eb6eb00250e42</Sha>
4545
</Dependency>
4646
</ToolsetDependencies>
4747
</Dependencies>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,11 @@ jobs:
152152
BARBuildId: ${{ parameters.BARBuildId }}
153153
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
154154

155+
# Darc is targeting 8.0, so make sure it's installed
156+
- task: UseDotNet@2
157+
inputs:
158+
version: 8.0.x
159+
155160
- task: AzureCLI@2
156161
displayName: Publish Using Darc
157162
inputs:

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

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

6262
${{ if eq(variables['System.TeamProject'], 'internal') }}:
6363
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')]
64-
image: 1es-mariner-2
64+
image: 1es-azurelinux-3
6565
os: linux
6666

6767
${{ if ne(parameters.platform.pool, '') }}:

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,11 @@ stages:
271271

272272
- task: NuGetAuthenticate@1
273273

274+
# Darc is targeting 8.0, so make sure it's installed
275+
- task: UseDotNet@2
276+
inputs:
277+
version: 8.0.x
278+
274279
- task: AzureCLI@2
275280
displayName: Publish Using Darc
276281
inputs:

eng/common/templates-official/steps/source-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ steps:
4747
# in the default public locations.
4848
internalRuntimeDownloadArgs=
4949
if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
50-
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
50+
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
5151
fi
5252
5353
buildConfig=Release

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,11 @@ jobs:
148148
BARBuildId: ${{ parameters.BARBuildId }}
149149
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
150150

151+
# Darc is targeting 8.0, so make sure it's installed
152+
- task: UseDotNet@2
153+
inputs:
154+
version: 8.0.x
155+
151156
- task: AzureCLI@2
152157
displayName: Publish Using Darc
153158
inputs:

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,11 @@ stages:
267267

268268
- task: NuGetAuthenticate@1
269269

270+
# Darc is targeting 8.0, so make sure it's installed
271+
- task: UseDotNet@2
272+
inputs:
273+
version: 8.0.x
274+
270275
- task: AzureCLI@2
271276
displayName: Publish Using Darc
272277
inputs:

eng/common/templates/steps/source-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ steps:
4747
# in the default public locations.
4848
internalRuntimeDownloadArgs=
4949
if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
50-
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
50+
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
5151
fi
5252
5353
buildConfig=Release

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
},
55
"msbuild-sdks": {
66
"Microsoft.Build.NoTargets": "3.7.0",
7-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25515.1",
7+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25577.1",
88
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23552.3",
99
"Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174"
1010
}

0 commit comments

Comments
 (0)