Skip to content

Commit 6750290

Browse files
authored
Merge branch 'release/8.0.1xx' into internal-merge-8.0.1xx-2025-11-11-1150
2 parents 769773a + 59b8a59 commit 6750290

File tree

3 files changed

+19
-18
lines changed

3 files changed

+19
-18
lines changed

NuGet.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616
<add key="darc-int-dotnet-aspnetcore-ee41747" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-ee417479/nuget/v3/index.json" />
1717
<!-- End: Package sources from dotnet-aspnetcore -->
1818
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
19+
<add key="darc-pub-DotNet-msbuild-Trusted-2a7a854" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-2a7a854c/nuget/v3/index.json" />
1920
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2021
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
2122
<!-- End: Package sources from dotnet-roslyn-analyzers -->
2223
<!-- Begin: Package sources from dotnet-runtime -->
2324
<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" />
2425
<!-- End: Package sources from dotnet-runtime -->
2526
<!-- Begin: Package sources from dotnet-templating -->
26-
<add key="darc-pub-dotnet-templating-2a3d0e6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-2a3d0e60/nuget/v3/index.json" />
27+
<add key="darc-pub-dotnet-templating-7066728" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7066728c/nuget/v3/index.json" />
2728
<!-- End: Package sources from dotnet-templating -->
2829
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2930
<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: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<ProductDependencies>
44
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.123">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>2a3d0e60b37359c350cc045fecdadb0c7b652591</Sha>
6+
<Sha>7066728cb1da9d640b5350ac7082e93c17197216</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.123-servicing.25557.4">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.123-servicing.25562.11">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>2a3d0e60b37359c350cc045fecdadb0c7b652591</Sha>
10+
<Sha>7066728cb1da9d640b5350ac7082e93c17197216</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.123-servicing.25557.4">
12+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.123-servicing.25562.11">
1313
<Uri>https://github.com/dotnet/templating</Uri>
14-
<Sha>2a3d0e60b37359c350cc045fecdadb0c7b652591</Sha>
14+
<Sha>7066728cb1da9d640b5350ac7082e93c17197216</Sha>
1515
<SourceBuild RepoName="templating" ManagedOnly="true" />
1616
</Dependency>
1717
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.22">
@@ -55,17 +55,17 @@
5555
<Uri>https://github.com/dotnet/emsdk</Uri>
5656
<Sha>9e37ff5ebf5f464d80bdae6ad9d24e7a01ee11f8</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.Build" Version="17.8.43">
59-
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
60-
<Sha>f0cbb13971c30ad15a3f252a8d0171898a01ec11</Sha>
58+
<Dependency Name="Microsoft.Build" Version="17.8.45">
59+
<Uri>https://github.com/dotnet/msbuild</Uri>
60+
<Sha>2a7a854c1b8dd412669c2c114ff18c9fa412ace7</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.8.43-servicing-25466-03">
63-
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
64-
<Sha>f0cbb13971c30ad15a3f252a8d0171898a01ec11</Sha>
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.8.45-servicing-25560-07">
63+
<Uri>https://github.com/dotnet/msbuild</Uri>
64+
<Sha>2a7a854c1b8dd412669c2c114ff18c9fa412ace7</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.43-servicing-25466-03">
67-
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
68-
<Sha>f0cbb13971c30ad15a3f252a8d0171898a01ec11</Sha>
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.45-servicing-25560-07">
67+
<Uri>https://github.com/dotnet/msbuild</Uri>
68+
<Sha>2a7a854c1b8dd412669c2c114ff18c9fa412ace7</Sha>
6969
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
7070
</Dependency>
7171
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.102-beta.24081.2">

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
</PropertyGroup>
124124
<PropertyGroup>
125125
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
126-
<MicrosoftBuildPackageVersion>17.8.43</MicrosoftBuildPackageVersion>
126+
<MicrosoftBuildPackageVersion>17.8.45</MicrosoftBuildPackageVersion>
127127
<MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
128128
<!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
129129
so target one that matches the version in minimumMSBuildVersion.
@@ -135,7 +135,7 @@
135135
<MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion> -->
136136
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
137137
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
138-
<MicrosoftBuildLocalizationPackageVersion>17.8.43-servicing-25466-03</MicrosoftBuildLocalizationPackageVersion>
138+
<MicrosoftBuildLocalizationPackageVersion>17.8.45-servicing-25560-07</MicrosoftBuildLocalizationPackageVersion>
139139
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
140140
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
141141
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
@@ -148,7 +148,7 @@
148148
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
149149
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
150150
<!-- test dependencies -->
151-
<MicrosoftTemplateEngineMocksPackageVersion>8.0.123-servicing.25557.4</MicrosoftTemplateEngineMocksPackageVersion>
151+
<MicrosoftTemplateEngineMocksPackageVersion>8.0.123-servicing.25562.11</MicrosoftTemplateEngineMocksPackageVersion>
152152
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
153153
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
154154
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

0 commit comments

Comments
 (0)