Skip to content

Commit c084097

Browse files
authored
Merge branch 'release/9.0.1xx' into merge/release/8.0.4xx-to-release/9.0.1xx
2 parents e676f11 + 3a3ccbb commit c084097

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

eng/Version.Details.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -451,9 +451,9 @@
451451
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
452452
</Dependency>
453453
<!-- Intermediate is necessary for source build. -->
454-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25521.3">
454+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25564.5">
455455
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
456-
<Sha>a9cadb09ddcc99b1e535efb0648047634f0c4f40</Sha>
456+
<Sha>6092b62b7f35fddbd6bf31e19b2ab64bbe2443ae</Sha>
457457
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
458458
</Dependency>
459459
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25059.4">
@@ -589,34 +589,34 @@
589589
</Dependency>
590590
</ProductDependencies>
591591
<ToolsetDependencies>
592-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25561.1">
592+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25562.4">
593593
<Uri>https://github.com/dotnet/arcade</Uri>
594-
<Sha>bcc287603101fa751ff666f17b661c5e40fef60f</Sha>
594+
<Sha>6e2d8e204cebac7d3989c1996f96e5a9ed63fa80</Sha>
595595
</Dependency>
596-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25561.1">
596+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25562.4">
597597
<Uri>https://github.com/dotnet/arcade</Uri>
598-
<Sha>bcc287603101fa751ff666f17b661c5e40fef60f</Sha>
598+
<Sha>6e2d8e204cebac7d3989c1996f96e5a9ed63fa80</Sha>
599599
</Dependency>
600-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25561.1">
600+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25562.4">
601601
<Uri>https://github.com/dotnet/arcade</Uri>
602-
<Sha>bcc287603101fa751ff666f17b661c5e40fef60f</Sha>
602+
<Sha>6e2d8e204cebac7d3989c1996f96e5a9ed63fa80</Sha>
603603
</Dependency>
604-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25561.1">
604+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25562.4">
605605
<Uri>https://github.com/dotnet/arcade</Uri>
606-
<Sha>bcc287603101fa751ff666f17b661c5e40fef60f</Sha>
606+
<Sha>6e2d8e204cebac7d3989c1996f96e5a9ed63fa80</Sha>
607607
</Dependency>
608-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25561.1">
608+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25562.4">
609609
<Uri>https://github.com/dotnet/arcade</Uri>
610-
<Sha>bcc287603101fa751ff666f17b661c5e40fef60f</Sha>
610+
<Sha>6e2d8e204cebac7d3989c1996f96e5a9ed63fa80</Sha>
611611
</Dependency>
612-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25561.1">
612+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25562.4">
613613
<Uri>https://github.com/dotnet/arcade</Uri>
614-
<Sha>bcc287603101fa751ff666f17b661c5e40fef60f</Sha>
614+
<Sha>6e2d8e204cebac7d3989c1996f96e5a9ed63fa80</Sha>
615615
</Dependency>
616616
<!-- Intermediate is necessary for source build. -->
617-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25561.1">
617+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25562.4">
618618
<Uri>https://github.com/dotnet/arcade</Uri>
619-
<Sha>bcc287603101fa751ff666f17b661c5e40fef60f</Sha>
619+
<Sha>6e2d8e204cebac7d3989c1996f96e5a9ed63fa80</Sha>
620620
<SourceBuild RepoName="arcade" ManagedOnly="true" />
621621
</Dependency>
622622
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.10">

eng/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
183183
<MicrosoftBuildVersion>17.12.52</MicrosoftBuildVersion>
184184
<MicrosoftBuildLocalizationVersion>17.12.52-preview-25520-14</MicrosoftBuildLocalizationVersion>
185-
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.31</MicrosoftBuildMinimumVersion>
185+
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.48</MicrosoftBuildMinimumVersion>
186186
<MinimumVSVersion>17.12</MinimumVSVersion>
187187
</PropertyGroup>
188188
<PropertyGroup>
@@ -270,10 +270,10 @@
270270
</PropertyGroup>
271271
<PropertyGroup>
272272
<!-- Dependencies from https://github.com/dotnet/arcade -->
273-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25561.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
274-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25561.1</MicrosoftDotNetSignToolVersion>
275-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25561.1</MicrosoftDotNetXliffTasksVersion>
276-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25561.1</MicrosoftDotNetXUnitExtensionsVersion>
273+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25562.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
274+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25562.4</MicrosoftDotNetSignToolVersion>
275+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25562.4</MicrosoftDotNetXliffTasksVersion>
276+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25562.4</MicrosoftDotNetXUnitExtensionsVersion>
277277
</PropertyGroup>
278278
<PropertyGroup>
279279
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

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": "9.0.111",
3+
"dotnet": "9.0.112",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25561.1",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25561.1",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25562.4",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25562.4",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

0 commit comments

Comments
 (0)