Skip to content

Commit d6aff2f

Browse files
MiYanniMiYanni
committed
Merge branch 'release/8.0.4xx' into internal-merge-8.0.4xx-2025-06-10-1318
# Conflicts: # NuGet.config # eng/Version.Details.xml # eng/Versions.props
2 parents 386a54a + 3b23520 commit d6aff2f

File tree

4 files changed

+25
-27
lines changed

4 files changed

+25
-27
lines changed

‎NuGet.config

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
<add key="darc-pub-dotnet-emsdk-2b0cca8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2b0cca8a/nuget/v3/index.json" />
88
<!-- End: Package sources from dotnet-emsdk -->
99
<!-- Begin: Package sources from dotnet-format -->
10-
<add key="darc-int-dotnet-format-2e56b0d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-2e56b0d5/nuget/v3/index.json" />
11-
<add key="darc-int-dotnet-format-2e56b0d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-2e56b0d5-2/nuget/v3/index.json" />
12-
<add key="darc-int-dotnet-format-2e56b0d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-2e56b0d5-1/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-format-64cbc6c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-64cbc6c3/nuget/v3/index.json" />
1311
<!-- End: Package sources from dotnet-format -->
1412
<!-- Begin: Package sources from dotnet-aspnetcore -->
1513
<add key="darc-int-dotnet-aspnetcore-fa4d80b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-fa4d80b7/nuget/v3/index.json" />
@@ -22,7 +20,7 @@
2220
<add key="darc-int-dotnet-runtime-77545d6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-77545d6f/nuget/v3/index.json" />
2321
<!-- End: Package sources from dotnet-runtime -->
2422
<!-- Begin: Package sources from dotnet-templating -->
25-
<add key="darc-pub-dotnet-templating-79dc927" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-79dc9273/nuget/v3/index.json" />
23+
<add key="darc-pub-dotnet-templating-62bbe0a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-62bbe0ac/nuget/v3/index.json" />
2624
<!-- End: Package sources from dotnet-templating -->
2725
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2826
<add key="darc-int-dotnet-windowsdesktop-5ce68f2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-5ce68f29/nuget/v3/index.json" />

‎eng/Version.Details.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<ProductDependencies>
44
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.412">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>79dc9273076fe84acb697994deea579f84ea7242</Sha>
6+
<Sha>62bbe0ac8fc5bb955e8d5f3ed0c930037edc3172</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.412-servicing.25304.13">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.412-servicing.25311.3">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>79dc9273076fe84acb697994deea579f84ea7242</Sha>
10+
<Sha>62bbe0ac8fc5bb955e8d5f3ed0c930037edc3172</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.412-servicing.25304.13">
12+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.412-servicing.25311.3">
1313
<Uri>https://github.com/dotnet/templating</Uri>
14-
<Sha>79dc9273076fe84acb697994deea579f84ea7242</Sha>
14+
<Sha>62bbe0ac8fc5bb955e8d5f3ed0c930037edc3172</Sha>
1515
<SourceBuild RepoName="templating" ManagedOnly="true" />
1616
</Dependency>
1717
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.17">
@@ -77,9 +77,9 @@
7777
<Sha>e11d7079bebc6f101c5313fe0d1de9e3d38a7c02</Sha>
7878
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
7979
</Dependency>
80-
<Dependency Name="dotnet-format" Version="8.3.626607">
81-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-format</Uri>
82-
<Sha>2e56b0d5d177375fc6d54c055025d16a7772724d</Sha>
80+
<Dependency Name="dotnet-format" Version="8.3.631204">
81+
<Uri>https://github.com/dotnet/format</Uri>
82+
<Sha>64cbc6c3f71ff573a72b0c83c407612ad07d5c6e</Sha>
8383
<SourceBuild RepoName="format" ManagedOnly="true" />
8484
</Dependency>
8585
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.11.0-3.24554.2">
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25264.2">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25310.3">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>983d15077d88cfed26837e40e8f984fdee5d1715</Sha>
496+
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25264.2">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25310.3">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>983d15077d88cfed26837e40e8f984fdee5d1715</Sha>
501+
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25264.2">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25310.3">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>983d15077d88cfed26837e40e8f984fdee5d1715</Sha>
505+
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25264.2">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25310.3">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>983d15077d88cfed26837e40e8f984fdee5d1715</Sha>
509+
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</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.25264.2</MicrosoftDotNetSignToolVersion>
39+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25310.3</MicrosoftDotNetSignToolVersion>
4040
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
4141
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4242
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -115,7 +115,7 @@
115115
</PropertyGroup>
116116
<PropertyGroup>
117117
<!-- Dependencies from https://github.com/dotnet/format -->
118-
<dotnetformatVersion>8.3.626607</dotnetformatVersion>
118+
<dotnetformatVersion>8.3.631204</dotnetformatVersion>
119119
</PropertyGroup>
120120
<PropertyGroup>
121121
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
@@ -147,7 +147,7 @@
147147
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
148148
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
149149
<!-- test dependencies -->
150-
<MicrosoftTemplateEngineMocksPackageVersion>8.0.412-servicing.25304.13</MicrosoftTemplateEngineMocksPackageVersion>
150+
<MicrosoftTemplateEngineMocksPackageVersion>8.0.412-servicing.25311.3</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.25264.2</MicrosoftDotNetXUnitExtensionsVersion>
216+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25310.3</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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "8.0.116",
3+
"dotnet": "8.0.117",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25264.2",
18-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25264.2"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25310.3",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25310.3"
1919
}
2020
}

0 commit comments

Comments
 (0)