Skip to content

Commit 9b1097b

Browse files
author
Jason Zhai
committed
Merge branch 'release/8.0.4xx' of https://github.com/dotnet/sdk into darc-release/8.0.4xx-8db430b9-8261-414a-b4e6-99062ac70230
2 parents 193b498 + 9d7683a commit 9b1097b

File tree

3 files changed

+17
-16
lines changed

3 files changed

+17
-16
lines changed

NuGet.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<add key="darc-int-dotnet-aspnetcore-31d685b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-1/nuget/v3/index.json" />
2020
<!-- End: Package sources from dotnet-aspnetcore -->
2121
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
22-
<add key="darc-pub-DotNet-msbuild-Trusted-17752ce" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-17752ceb/nuget/v3/index.json" />
22+
<add key="darc-pub-DotNet-msbuild-Trusted-89b5892" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-89b58924/nuget/v3/index.json" />
2323
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2424
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
2525
<!-- End: Package sources from dotnet-roslyn-analyzers -->
@@ -32,6 +32,7 @@
3232
<add key="darc-pub-dotnet-templating-93a5894-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-3/nuget/v3/index.json" />
3333
<add key="darc-pub-dotnet-templating-93a5894-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-2/nuget/v3/index.json" />
3434
<add key="darc-pub-dotnet-templating-93a5894-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-1/nuget/v3/index.json" />
35+
<add key="darc-pub-dotnet-templating-40256cc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-40256cc3/nuget/v3/index.json" />
3536
<!-- End: Package sources from dotnet-templating -->
3637
<!-- Begin: Package sources from dotnet-windowsdesktop -->
3738
<add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />

eng/Version.Details.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<ProductDependencies>
44
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.406">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>93a589449f7f40bbef42d1e8df97737b1ba976ed</Sha>
6+
<Sha>40256cc3ba6c47902104c959770822e91642f4a7</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.406-servicing.25066.2">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.406-servicing.25066.12">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>93a589449f7f40bbef42d1e8df97737b1ba976ed</Sha>
10+
<Sha>40256cc3ba6c47902104c959770822e91642f4a7</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.406-servicing.25066.2">
12+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.406-servicing.25066.12">
1313
<Uri>https://github.com/dotnet/templating</Uri>
14-
<Sha>93a589449f7f40bbef42d1e8df97737b1ba976ed</Sha>
14+
<Sha>40256cc3ba6c47902104c959770822e91642f4a7</Sha>
1515
<SourceBuild RepoName="templating" ManagedOnly="true" />
1616
</Dependency>
1717
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.12">
@@ -55,17 +55,17 @@
5555
<Uri>https://github.com/dotnet/emsdk</Uri>
5656
<Sha>c458a7647c04e323c238f381eb176af24254b3ff</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.Build" Version="17.11.22">
58+
<Dependency Name="Microsoft.Build" Version="17.11.24">
5959
<Uri>https://github.com/dotnet/msbuild</Uri>
60-
<Sha>17752cebd2495744980da84649957e5b66144af0</Sha>
60+
<Sha>89b58924da213679505c63060e5c84786865000f</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.11.22-servicing-25065-03">
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.11.24-servicing-25072-01">
6363
<Uri>https://github.com/dotnet/msbuild</Uri>
64-
<Sha>17752cebd2495744980da84649957e5b66144af0</Sha>
64+
<Sha>89b58924da213679505c63060e5c84786865000f</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.22-servicing-25065-03">
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.24-servicing-25072-01">
6767
<Uri>https://github.com/dotnet/msbuild</Uri>
68-
<Sha>17752cebd2495744980da84649957e5b66144af0</Sha>
68+
<Sha>89b58924da213679505c63060e5c84786865000f</Sha>
6969
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
7070
</Dependency>
7171
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.403-beta.24526.2">

eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212
<!-- Repo Version Information -->
1313
<PropertyGroup>
14-
<VersionPrefix>8.0.406</VersionPrefix>
14+
<VersionPrefix>8.0.407</VersionPrefix>
1515
<WorkloadsFeatureBand>8.0.400</WorkloadsFeatureBand>
1616
<!-- Enable to remove prerelease label. -->
1717
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
@@ -124,7 +124,7 @@
124124
</PropertyGroup>
125125
<PropertyGroup>
126126
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
127-
<MicrosoftBuildPackageVersion>17.11.22</MicrosoftBuildPackageVersion>
127+
<MicrosoftBuildPackageVersion>17.11.24</MicrosoftBuildPackageVersion>
128128
<MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
129129
<!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
130130
so target one that matches the version in minimumMSBuildVersion.
@@ -133,7 +133,7 @@
133133
<MicrosoftBuildMinimumVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildMinimumVersion>
134134
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildFrameworkPackageVersion>
135135
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildRuntimePackageVersion>
136-
<MicrosoftBuildLocalizationPackageVersion>17.11.22-servicing-25065-03</MicrosoftBuildLocalizationPackageVersion>
136+
<MicrosoftBuildLocalizationPackageVersion>17.11.24-servicing-25072-01</MicrosoftBuildLocalizationPackageVersion>
137137
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
138138
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildTasksCorePackageVersion>
139139
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
@@ -147,7 +147,7 @@
147147
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
148148
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
149149
<!-- test dependencies -->
150-
<MicrosoftTemplateEngineMocksPackageVersion>8.0.406-servicing.25066.2</MicrosoftTemplateEngineMocksPackageVersion>
150+
<MicrosoftTemplateEngineMocksPackageVersion>8.0.406-servicing.25066.12</MicrosoftTemplateEngineMocksPackageVersion>
151151
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
152152
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
153153
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

0 commit comments

Comments
 (0)