Skip to content

Commit 5329a27

Browse files
DonnaChen888DonnaChen888
authored
Merge branch 'release/8.0.3xx' into merge/release/8.0.1xx-to-release/8.0.3xx
2 parents c4096e9 + 59d2709 commit 5329a27

File tree

5 files changed

+28
-28
lines changed

5 files changed

+28
-28
lines changed

‎NuGet.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<add key="darc-int-dotnet-runtime-a2266c7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-a2266c72/nuget/v3/index.json" />
2222
<!-- End: Package sources from dotnet-runtime -->
2323
<!-- Begin: Package sources from dotnet-templating -->
24-
<add key="darc-pub-dotnet-templating-d3b5c6c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-d3b5c6c0/nuget/v3/index.json" />
24+
<add key="darc-pub-dotnet-templating-71d44aa" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-71d44aae/nuget/v3/index.json" />
2525
<!-- End: Package sources from dotnet-templating -->
2626
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2727
<add key="darc-int-dotnet-windowsdesktop-4519b9f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-4519b9f0/nuget/v3/index.json" />

‎eng/Version.Details.xml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<ProductDependencies>
44
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.320">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>d3b5c6c0e06f7edd8f2187a230f1dfebed8e5592</Sha>
6+
<Sha>71d44aae51c38b1ab1df8ef1a853dfff01b5a22d</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.320-servicing.25559.1">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.320-servicing.25566.6">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>d3b5c6c0e06f7edd8f2187a230f1dfebed8e5592</Sha>
10+
<Sha>71d44aae51c38b1ab1df8ef1a853dfff01b5a22d</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.320-servicing.25559.1">
12+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.320-servicing.25566.6">
1313
<Uri>https://github.com/dotnet/templating</Uri>
14-
<Sha>d3b5c6c0e06f7edd8f2187a230f1dfebed8e5592</Sha>
14+
<Sha>71d44aae51c38b1ab1df8ef1a853dfff01b5a22d</Sha>
1515
<SourceBuild RepoName="templating" ManagedOnly="true" />
1616
</Dependency>
1717
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.22">
@@ -293,16 +293,16 @@
293293
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
294294
<Sha>ee417479933278bb5aadc5944706a96b5ef74a5d</Sha>
295295
</Dependency>
296-
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.25526.1">
296+
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.25573.9">
297297
<Uri>https://github.com/dotnet/razor</Uri>
298298
<Sha>e4d60febefa08cd99a7eccca17cce2310fa32ded</Sha>
299299
<SourceBuild RepoName="razor" ManagedOnly="true" />
300300
</Dependency>
301-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.25526.1">
301+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.25573.9">
302302
<Uri>https://github.com/dotnet/razor</Uri>
303303
<Sha>e4d60febefa08cd99a7eccca17cce2310fa32ded</Sha>
304304
</Dependency>
305-
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.25526.1">
305+
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.25573.9">
306306
<Uri>https://github.com/dotnet/razor</Uri>
307307
<Sha>e4d60febefa08cd99a7eccca17cce2310fa32ded</Sha>
308308
</Dependency>
@@ -354,9 +354,9 @@
354354
<Sha>16bcad1c13be082bd52ce178896d1119a73081a9</Sha>
355355
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
356356
</Dependency>
357-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25522.3">
357+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25564.4">
358358
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
359-
<Sha>449148366d9105de8a6470ebc4ba198926e9a30a</Sha>
359+
<Sha>1bffa52c9f78c19618fa929eea4916b0c6d27403</Sha>
360360
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
361361
</Dependency>
362362
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25064.1">
@@ -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: 6 additions & 6 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>
@@ -146,7 +146,7 @@
146146
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
147147
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
148148
<!-- test dependencies -->
149-
<MicrosoftTemplateEngineMocksPackageVersion>8.0.320-servicing.25559.1</MicrosoftTemplateEngineMocksPackageVersion>
149+
<MicrosoftTemplateEngineMocksPackageVersion>8.0.320-servicing.25566.6</MicrosoftTemplateEngineMocksPackageVersion>
150150
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
151151
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
152152
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -178,9 +178,9 @@
178178
</PropertyGroup>
179179
<!-- Dependencies from https://github.com/dotnet/razor -->
180180
<PropertyGroup>
181-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.25526.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
182-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.25526.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
183-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.25526.1</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
181+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.25573.9</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
182+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.25573.9</MicrosoftCodeAnalysisRazorToolingInternalVersion>
183+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.25573.9</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
184184
</PropertyGroup>
185185
<PropertyGroup>
186186
<!-- Dependencies from https://github.com/dotnet/wpf -->
@@ -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)