Skip to content

Commit 9a69324

Browse files
authored
Merge branch 'main' into darc-main-cda2b935-ea16-4d54-8b6b-292f3a770a20
2 parents 20f4f17 + e08a921 commit 9a69324

File tree

7 files changed

+19
-65
lines changed

7 files changed

+19
-65
lines changed

eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,18 @@
6969
<Sha>99ea0c06b84d3084d090da537080dd35d2a193cf</Sha>
7070
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7171
</Dependency>
72-
<Dependency Name="Microsoft.Build" Version="17.12.0-preview-24373-07">
72+
<Dependency Name="Microsoft.Build" Version="17.12.0-preview-24374-02">
7373
<Uri>https://github.com/dotnet/msbuild</Uri>
74-
<Sha>dd550ddf967167fcbbec13bc2ef8be9b5765d87b</Sha>
74+
<Sha>48e81c6f136e6ee3c568d0a38180cfea151129dd</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build.Localization" Version="17.12.0-preview-24373-07">
76+
<Dependency Name="Microsoft.Build.Localization" Version="17.12.0-preview-24374-02">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>dd550ddf967167fcbbec13bc2ef8be9b5765d87b</Sha>
78+
<Sha>48e81c6f136e6ee3c568d0a38180cfea151129dd</Sha>
7979
</Dependency>
8080
<!-- Intermediate is necessary for source build. -->
81-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.0-preview-24373-07">
81+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.0-preview-24374-02">
8282
<Uri>https://github.com/dotnet/msbuild</Uri>
83-
<Sha>dd550ddf967167fcbbec13bc2ef8be9b5765d87b</Sha>
83+
<Sha>48e81c6f136e6ee3c568d0a38180cfea151129dd</Sha>
8484
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8585
</Dependency>
8686
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.400-beta.24351.2">
@@ -623,14 +623,14 @@
623623
<Uri>https://github.com/dotnet/arcade-services</Uri>
624624
<Sha>47e3672c762970073e4282bd563233da86bcca3e</Sha>
625625
</Dependency>
626-
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.24279.2">
626+
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.24372.1">
627627
<Uri>https://github.com/dotnet/scenario-tests</Uri>
628-
<Sha>54700bbee86f660d37bd519a905b62bb50adc8c8</Sha>
628+
<Sha>d92413b87d36250859d8cb51ff69a03b5f5c4cab</Sha>
629629
</Dependency>
630630
<!-- Intermediate is necessary for source build. -->
631-
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.24279.2">
631+
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.24372.1">
632632
<Uri>https://github.com/dotnet/scenario-tests</Uri>
633-
<Sha>54700bbee86f660d37bd519a905b62bb50adc8c8</Sha>
633+
<Sha>d92413b87d36250859d8cb51ff69a03b5f5c4cab</Sha>
634634
<SourceBuild RepoName="scenario-tests" ManagedOnly="true" />
635635
</Dependency>
636636
<!--

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@
207207
then use that in Directory.Packages.props.
208208
209209
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. -->
210-
<MicrosoftBuildVersion>17.12.0-preview-24373-07</MicrosoftBuildVersion>
211-
<MicrosoftBuildLocalizationVersion>17.12.0-preview-24373-07</MicrosoftBuildLocalizationVersion>
210+
<MicrosoftBuildVersion>17.12.0-preview-24374-02</MicrosoftBuildVersion>
211+
<MicrosoftBuildLocalizationVersion>17.12.0-preview-24374-02</MicrosoftBuildLocalizationVersion>
212212
<MicrosoftBuildMinimumVersion Condition="Exists('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildSourceOnly)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildMinimumVersion>
213213
</PropertyGroup>
214214
<PropertyGroup>
@@ -299,7 +299,7 @@
299299
<PropertyGroup Label="Infrastructure and test only dependencies">
300300
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
301301
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
302-
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.24279.2</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
302+
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.24372.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
303303
</PropertyGroup>
304304
<PropertyGroup Label="Manually updated">
305305
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

src/SourceBuild/content/eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<ProductDependencies>
33
</ProductDependencies>
44
<ToolsetDependencies>
5-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24352.2">
5+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24368.9">
66
<Uri>https://github.com/dotnet/arcade</Uri>
7-
<Sha>4a7d983f833d6b86365ea1b2b4d6ee72fbdbf944</Sha>
7+
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
88
</Dependency>
99
</ToolsetDependencies>
1010
</Dependencies>

src/SourceBuild/content/eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts
2424
are not necessary, and this property is removed from the file.
2525
-->
26-
<PrivateSourceBuiltSdkVersion>9.0.100-preview.7.24357.1</PrivateSourceBuiltSdkVersion>
27-
<PrivateSourceBuiltArtifactsVersion>9.0.100-preview.7.24357.1</PrivateSourceBuiltArtifactsVersion>
26+
<PrivateSourceBuiltSdkVersion>9.0.100-preview.7.24373.1</PrivateSourceBuiltSdkVersion>
27+
<PrivateSourceBuiltArtifactsVersion>9.0.100-preview.7.24373.1</PrivateSourceBuiltArtifactsVersion>
2828
<!-- command-line-api dependencies -->
2929
<SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>
3030
<!-- msbuild dependencies -->

src/SourceBuild/content/global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.100-preview.7.24357.2"
3+
"dotnet": "9.0.100-preview.7.24373.6"
44
},
55
"msbuild-sdks": {
66
"Microsoft.Build.NoTargets": "3.7.0",
77
"Microsoft.Build.Traversal": "3.4.0",
8-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24352.2"
8+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24368.9"
99
}
1010
}

src/SourceBuild/patches/scenario-tests/0001-Disable-Aspire-scenario-test.patch

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/SourceBuild/patches/scenario-tests/0002-Disable-WPF-scenario-test.patch

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)