Skip to content

Commit 6fac578

Browse files
authored
Merge pull request #656 from dotnet/darc-release/8.0.4xx-e5711034-24f6-4c15-a09d-dd7769206a77
2 parents b900ddd + 920ed96 commit 6fac578

File tree

7 files changed

+4
-24
lines changed

7 files changed

+4
-24
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.25574.4">
42+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25515.1">
4343
<Uri>https://github.com/dotnet/arcade</Uri>
44-
<Sha>f95859accbb8e8312e39c1dcd7d1639c4d2c0c51</Sha>
44+
<Sha>6544413e02741855b701468aa8afc6cf8ca62c72</Sha>
4545
</Dependency>
4646
</ToolsetDependencies>
4747
</Dependencies>

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,6 @@ 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-
160155
- task: AzureCLI@2
161156
displayName: Publish Using Darc
162157
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-azurelinux-3
64+
image: 1es-mariner-2
6565
os: linux
6666

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

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -271,11 +271,6 @@ 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-
279274
- task: AzureCLI@2
280275
displayName: Publish Using Darc
281276
inputs:

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,6 @@ 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-
156151
- task: AzureCLI@2
157152
displayName: Publish Using Darc
158153
inputs:

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -267,11 +267,6 @@ 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-
275270
- task: AzureCLI@2
276271
displayName: Publish Using Darc
277272
inputs:

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.25574.4",
7+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25515.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)