Skip to content

Commit 666e419

Browse files
committed
Merge branch 'release/8.0.3xx' into internal-merge-8.0.3xx-2025-06-10-1317
# Conflicts: # NuGet.config # eng/Version.Details.xml # eng/Versions.props
2 parents a64549a + d2d0bdc commit 666e419

File tree

3 files changed

+12
-14
lines changed

3 files changed

+12
-14
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-6512c54" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-6512c545/nuget/v3/index.json" />
11-
<add key="darc-int-dotnet-format-6512c54-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-6512c545-2/nuget/v3/index.json" />
12-
<add key="darc-int-dotnet-format-6512c54-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-6512c545-1/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-format-c7e5d39" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c7e5d39b/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" />
@@ -23,7 +21,7 @@
2321
<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" />
2422
<!-- End: Package sources from dotnet-runtime -->
2523
<!-- Begin: Package sources from dotnet-templating -->
26-
<add key="darc-pub-dotnet-templating-21cba55" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-21cba556/nuget/v3/index.json" />
24+
<add key="darc-pub-dotnet-templating-7994f94" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7994f94e/nuget/v3/index.json" />
2725
<!-- End: Package sources from dotnet-templating -->
2826
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2927
<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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<ProductDependencies>
44
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.315">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>21cba5567f1417702a6dc27e9e225b48a35686f7</Sha>
6+
<Sha>7994f94ec4071d4803af1b4f75f4ba964d3391f2</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.315-servicing.25304.12">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.315-servicing.25311.2">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>21cba5567f1417702a6dc27e9e225b48a35686f7</Sha>
10+
<Sha>7994f94ec4071d4803af1b4f75f4ba964d3391f2</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.315-servicing.25304.12">
12+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.315-servicing.25311.2">
1313
<Uri>https://github.com/dotnet/templating</Uri>
14-
<Sha>21cba5567f1417702a6dc27e9e225b48a35686f7</Sha>
14+
<Sha>7994f94ec4071d4803af1b4f75f4ba964d3391f2</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>80c165644db640d0f309affe0daa281c7e17b939</Sha>
7878
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
7979
</Dependency>
80-
<Dependency Name="dotnet-format" Version="8.3.626605">
81-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-format</Uri>
82-
<Sha>6512c545de4e74d1cafcf305430185287c19a549</Sha>
80+
<Dependency Name="dotnet-format" Version="8.3.631206">
81+
<Uri>https://github.com/dotnet/format</Uri>
82+
<Sha>c7e5d39bdc5e4a2fedd4fb4f46e35a9843ddff4a</Sha>
8383
<SourceBuild RepoName="format" ManagedOnly="true" />
8484
</Dependency>
8585
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-3.25064.8">

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
</PropertyGroup>
116116
<PropertyGroup>
117117
<!-- Dependencies from https://github.com/dotnet/format -->
118-
<dotnetformatVersion>8.3.626605</dotnetformatVersion>
118+
<dotnetformatVersion>8.3.631206</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.315-servicing.25304.12</MicrosoftTemplateEngineMocksPackageVersion>
150+
<MicrosoftTemplateEngineMocksPackageVersion>8.0.315-servicing.25311.2</MicrosoftTemplateEngineMocksPackageVersion>
151151
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
152152
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
153153
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

0 commit comments

Comments
 (0)