Skip to content

Commit 86cc62e

Browse files
author
Jason Zhai
committed
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/sdk into darc-release/8.0.3xx-b9d1b637-83e9-4a64-a3c8-97caf637d466
2 parents 2f56879 + 19603b8 commit 86cc62e

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
@@ -28,7 +28,7 @@
2828
<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" />
2929
<!-- End: Package sources from dotnet-aspnetcore -->
3030
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
31-
<add key="darc-pub-DotNet-msbuild-Trusted-7c2b926" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-7c2b9262/nuget/v3/index.json" />
31+
<add key="darc-pub-DotNet-msbuild-Trusted-939cc33" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-939cc332/nuget/v3/index.json" />
3232
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3333
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3434
<!-- End: Package sources from dotnet-roslyn-analyzers -->
@@ -46,6 +46,7 @@
4646
<add key="darc-pub-dotnet-templating-ee4a55e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-3/nuget/v3/index.json" />
4747
<add key="darc-pub-dotnet-templating-ee4a55e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-2/nuget/v3/index.json" />
4848
<add key="darc-pub-dotnet-templating-ee4a55e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-1/nuget/v3/index.json" />
49+
<add key="darc-pub-dotnet-templating-6ede63a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-6ede63a6/nuget/v3/index.json" />
4950
<!-- End: Package sources from dotnet-templating -->
5051
<!-- Begin: Package sources from dotnet-windowsdesktop -->
5152
<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.309">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>ee4a55eed3826b986bdacb0a833061fe2e7e54cc</Sha>
6+
<Sha>6ede63a60b3426dad74a95eb1bcddf5669d067c2</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.309-servicing.25066.1">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.309-servicing.25066.9">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>ee4a55eed3826b986bdacb0a833061fe2e7e54cc</Sha>
10+
<Sha>6ede63a60b3426dad74a95eb1bcddf5669d067c2</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.309-servicing.25066.1">
12+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.309-servicing.25066.9">
1313
<Uri>https://github.com/dotnet/templating</Uri>
14-
<Sha>ee4a55eed3826b986bdacb0a833061fe2e7e54cc</Sha>
14+
<Sha>6ede63a60b3426dad74a95eb1bcddf5669d067c2</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.10.14">
58+
<Dependency Name="Microsoft.Build" Version="17.10.19">
5959
<Uri>https://github.com/dotnet/msbuild</Uri>
60-
<Sha>7c2b92622c44c2d0ad0cc9d9f5fa2796d0c5c81c</Sha>
60+
<Sha>939cc332cc357d59cc6cfdde70ddc03372e22c26</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.10.14-preview-24613-10">
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.10.19-preview-25071-10">
6363
<Uri>https://github.com/dotnet/msbuild</Uri>
64-
<Sha>7c2b92622c44c2d0ad0cc9d9f5fa2796d0c5c81c</Sha>
64+
<Sha>939cc332cc357d59cc6cfdde70ddc03372e22c26</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.14-preview-24613-10">
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.19-preview-25071-10">
6767
<Uri>https://github.com/dotnet/msbuild</Uri>
68-
<Sha>7c2b92622c44c2d0ad0cc9d9f5fa2796d0c5c81c</Sha>
68+
<Sha>939cc332cc357d59cc6cfdde70ddc03372e22c26</Sha>
6969
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
7070
</Dependency>
7171
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.301-beta.24271.6">

‎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.309</VersionPrefix>
14+
<VersionPrefix>8.0.310</VersionPrefix>
1515
<WorkloadsFeatureBand>8.0.300</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.10.14</MicrosoftBuildPackageVersion>
127+
<MicrosoftBuildPackageVersion>17.10.19</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
<MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
134134
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
135135
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
136-
<MicrosoftBuildLocalizationPackageVersion>17.10.14-preview-24613-10</MicrosoftBuildLocalizationPackageVersion>
136+
<MicrosoftBuildLocalizationPackageVersion>17.10.19-preview-25071-10</MicrosoftBuildLocalizationPackageVersion>
137137
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
138138
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
139139
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
@@ -147,7 +147,7 @@
147147
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
148148
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
149149
<!-- test dependencies -->
150-
<MicrosoftTemplateEngineMocksPackageVersion>8.0.309-servicing.25066.1</MicrosoftTemplateEngineMocksPackageVersion>
150+
<MicrosoftTemplateEngineMocksPackageVersion>8.0.309-servicing.25066.9</MicrosoftTemplateEngineMocksPackageVersion>
151151
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
152152
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
153153
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

0 commit comments

Comments
 (0)