Skip to content

Commit b8bc18d

Browse files
author
Jason Zhai
committed
Merge branch 'release/8.0.4xx' of https://github.com/dotnet/sdk into merge/release/8.0.3xx-to-release/8.0.4xx
2 parents 60cd23d + fe73c6d commit b8bc18d

File tree

4 files changed

+21
-26
lines changed

4 files changed

+21
-26
lines changed

‎NuGet.config

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,7 @@
2323
<!-- Begin: Package sources from dotnet-runtime -->
2424
<!-- End: Package sources from dotnet-runtime -->
2525
<!-- Begin: Package sources from dotnet-templating -->
26-
<add key="darc-pub-dotnet-templating-731d469" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-731d4697/nuget/v3/index.json" />
27-
<add key="darc-pub-dotnet-templating-731d469-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-731d4697-7/nuget/v3/index.json" />
28-
<add key="darc-pub-dotnet-templating-731d469-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-731d4697-6/nuget/v3/index.json" />
29-
<add key="darc-pub-dotnet-templating-731d469-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-731d4697-5/nuget/v3/index.json" />
30-
<add key="darc-pub-dotnet-templating-731d469-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-731d4697-4/nuget/v3/index.json" />
31-
<add key="darc-pub-dotnet-templating-731d469-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-731d4697-3/nuget/v3/index.json" />
26+
<add key="darc-pub-dotnet-templating-e3bb940" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-e3bb940a/nuget/v3/index.json" />
3227
<!-- End: Package sources from dotnet-templating -->
3328
<!-- Begin: Package sources from dotnet-windowsdesktop -->
3429
<!-- End: Package sources from dotnet-windowsdesktop -->

‎eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.409">
4+
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.410">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>731d4697ceb43ca5ab88a4994b5a226e0cbf16c4</Sha>
6+
<Sha>e3bb940a424c2ec7d25f32a6fa872776f78b711c</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.409-servicing.25209.2">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.410-servicing.25257.11">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>731d4697ceb43ca5ab88a4994b5a226e0cbf16c4</Sha>
10+
<Sha>e3bb940a424c2ec7d25f32a6fa872776f78b711c</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.409-servicing.25209.2">
12+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.410-servicing.25257.11">
1313
<Uri>https://github.com/dotnet/templating</Uri>
14-
<Sha>731d4697ceb43ca5ab88a4994b5a226e0cbf16c4</Sha>
14+
<Sha>e3bb940a424c2ec7d25f32a6fa872776f78b711c</Sha>
1515
<SourceBuild RepoName="templating" ManagedOnly="true" />
1616
</Dependency>
1717
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.15">
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25230.1">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25263.1">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>4246a31e5de9de87f760218c4f588cebf4661f45</Sha>
496+
<Sha>abb15166a8da9284d6ed177924cfd9b6f74c9f08</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25230.1">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25263.1">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>4246a31e5de9de87f760218c4f588cebf4661f45</Sha>
501+
<Sha>abb15166a8da9284d6ed177924cfd9b6f74c9f08</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25230.1">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25263.1">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>4246a31e5de9de87f760218c4f588cebf4661f45</Sha>
505+
<Sha>abb15166a8da9284d6ed177924cfd9b6f74c9f08</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25230.1">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25263.1">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>4246a31e5de9de87f760218c4f588cebf4661f45</Sha>
509+
<Sha>abb15166a8da9284d6ed177924cfd9b6f74c9f08</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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<SystemCollectionsImmutablePackageVersion>8.0.0</SystemCollectionsImmutablePackageVersion>
3737
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3838
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
39-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25230.1</MicrosoftDotNetSignToolVersion>
39+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25263.1</MicrosoftDotNetSignToolVersion>
4040
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
4141
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4242
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -141,13 +141,13 @@
141141
</PropertyGroup>
142142
<PropertyGroup>
143143
<!-- Dependencies from https://github.com/dotnet/templating -->
144-
<MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.409</MicrosoftTemplateEngineAbstractionsPackageVersion>
144+
<MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.410</MicrosoftTemplateEngineAbstractionsPackageVersion>
145145
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
146146
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
147147
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
148148
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
149149
<!-- test dependencies -->
150-
<MicrosoftTemplateEngineMocksPackageVersion>8.0.409-servicing.25209.2</MicrosoftTemplateEngineMocksPackageVersion>
150+
<MicrosoftTemplateEngineMocksPackageVersion>8.0.410-servicing.25257.11</MicrosoftTemplateEngineMocksPackageVersion>
151151
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
152152
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
153153
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -213,7 +213,7 @@
213213
<PropertyGroup>
214214
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
215215
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
216-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25230.1</MicrosoftDotNetXUnitExtensionsVersion>
216+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25263.1</MicrosoftDotNetXUnitExtensionsVersion>
217217
<MoqPackageVersion>4.18.4</MoqPackageVersion>
218218
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
219219
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

‎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.25230.1",
18-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25230.1"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25263.1",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25263.1"
1919
}
2020
}

0 commit comments

Comments
 (0)