Skip to content

Commit df54a4f

Browse files
authored
Merge branch 'release/8.0.3xx' into darc-release/8.0.3xx-4dab2098-68f5-454e-940b-41ab003328b5
2 parents 5636b60 + a8fd56e commit df54a4f

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25562.3">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25574.4">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
496+
<Sha>f95859accbb8e8312e39c1dcd7d1639c4d2c0c51</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25562.3">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25574.4">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
501+
<Sha>f95859accbb8e8312e39c1dcd7d1639c4d2c0c51</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25562.3">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25574.4">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
505+
<Sha>f95859accbb8e8312e39c1dcd7d1639c4d2c0c51</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25562.3">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25574.4">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
509+
<Sha>f95859accbb8e8312e39c1dcd7d1639c4d2c0c51</Sha>
510510
</Dependency>
511511
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
512512
<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
@@ -35,7 +35,7 @@
3535
<SystemCollectionsImmutablePackageVersion>8.0.0</SystemCollectionsImmutablePackageVersion>
3636
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3737
<SystemReflectionMetadataVersion>8.0.1</SystemReflectionMetadataVersion>
38-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25562.3</MicrosoftDotNetSignToolVersion>
38+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25574.4</MicrosoftDotNetSignToolVersion>
3939
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
4040
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4141
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -212,7 +212,7 @@
212212
<PropertyGroup>
213213
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
214214
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
215-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25562.3</MicrosoftDotNetXUnitExtensionsVersion>
215+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25574.4</MicrosoftDotNetXUnitExtensionsVersion>
216216
<MoqPackageVersion>4.18.4</MoqPackageVersion>
217217
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
218218
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

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, '') }}:

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25562.3",
18-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25562.3"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25574.4",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25574.4"
1919
}
2020
}

0 commit comments

Comments
 (0)