Skip to content

Commit eac887c

Browse files
committed
Merge remote-tracking branch 'upstream/release/9.0.1xx' into darc-release/9.0.1xx-9c303213-9e37-4345-938c-1430f75a884c
2 parents affb751 + 60ae371 commit eac887c

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<add key="darc-int-dotnet-aspnetcore-704f7cb-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-1/nuget/v3/index.json" />
6161
<!-- End: Package sources from dotnet-aspnetcore -->
6262
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
63-
<add key="darc-pub-DotNet-msbuild-Trusted-e0b90a9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-e0b90a9a/nuget/v3/index.json" />
63+
<add key="darc-pub-DotNet-msbuild-Trusted-990a07e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-990a07ed/nuget/v3/index.json" />
6464
<!-- End: Package sources from DotNet-msbuild-Trusted -->
6565
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
6666
<!-- End: Package sources from dotnet-roslyn-analyzers -->

eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,18 @@
7373
<Sha>2c27e405e17595694d91892159593d6dd10e61e2</Sha>
7474
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build" Version="17.12.27">
76+
<Dependency Name="Microsoft.Build" Version="17.12.29">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>e0b90a9a8ad3d8fdd186566b33859450c9e4e06c</Sha>
78+
<Sha>990a07ed6852e478b0c05599154c3a28c124cdeb</Sha>
7979
</Dependency>
80-
<Dependency Name="Microsoft.Build.Localization" Version="17.12.27-preview-25106-01">
80+
<Dependency Name="Microsoft.Build.Localization" Version="17.12.29-preview-25111-06">
8181
<Uri>https://github.com/dotnet/msbuild</Uri>
82-
<Sha>e0b90a9a8ad3d8fdd186566b33859450c9e4e06c</Sha>
82+
<Sha>990a07ed6852e478b0c05599154c3a28c124cdeb</Sha>
8383
</Dependency>
8484
<!-- Intermediate is necessary for source build. -->
85-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.27-preview-25106-01">
85+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.29-preview-25111-06">
8686
<Uri>https://github.com/dotnet/msbuild</Uri>
87-
<Sha>e0b90a9a8ad3d8fdd186566b33859450c9e4e06c</Sha>
87+
<Sha>990a07ed6852e478b0c05599154c3a28c124cdeb</Sha>
8888
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8989
</Dependency>
9090
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.9.101-beta.25070.7">
@@ -631,14 +631,14 @@
631631
<Uri>https://github.com/dotnet/arcade-services</Uri>
632632
<Sha>47e3672c762970073e4282bd563233da86bcca3e</Sha>
633633
</Dependency>
634-
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25102.1">
634+
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25112.2">
635635
<Uri>https://github.com/dotnet/scenario-tests</Uri>
636-
<Sha>008b3a357044b102ec30e15ac381c2e880f573af</Sha>
636+
<Sha>f219fd635f701e3142be92cb0bb4039cadb39d4d</Sha>
637637
</Dependency>
638638
<!-- Intermediate is necessary for source build. -->
639-
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25102.1">
639+
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25112.2">
640640
<Uri>https://github.com/dotnet/scenario-tests</Uri>
641-
<Sha>008b3a357044b102ec30e15ac381c2e880f573af</Sha>
641+
<Sha>f219fd635f701e3142be92cb0bb4039cadb39d4d</Sha>
642642
<SourceBuild RepoName="scenario-tests" ManagedOnly="true" />
643643
</Dependency>
644644
<!--

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@
180180
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
181181
182182
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
183-
<MicrosoftBuildVersion>17.12.27</MicrosoftBuildVersion>
184-
<MicrosoftBuildLocalizationVersion>17.12.27-preview-25106-01</MicrosoftBuildLocalizationVersion>
183+
<MicrosoftBuildVersion>17.12.29</MicrosoftBuildVersion>
184+
<MicrosoftBuildLocalizationVersion>17.12.29-preview-25111-06</MicrosoftBuildLocalizationVersion>
185185
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
186186
<MinimumVSVersion>17.12</MinimumVSVersion>
187187
</PropertyGroup>
@@ -261,7 +261,7 @@
261261
<PropertyGroup Label="Infrastructure and test only dependencies">
262262
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
263263
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
264-
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25102.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
264+
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25112.2</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
265265
</PropertyGroup>
266266
<PropertyGroup Label="Manually updated">
267267
<!-- 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.24572.2">
5+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25065.2">
66
<Uri>https://github.com/dotnet/arcade</Uri>
7-
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
7+
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</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.102</PrivateSourceBuiltSdkVersion>
27-
<PrivateSourceBuiltArtifactsVersion>9.0.102-servicing.24611.1</PrivateSourceBuiltArtifactsVersion>
26+
<PrivateSourceBuiltSdkVersion>9.0.103</PrivateSourceBuiltSdkVersion>
27+
<PrivateSourceBuiltArtifactsVersion>9.0.103-servicing.25071.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.102"
3+
"dotnet": "9.0.103"
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.24572.2"
8+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25065.2"
99
}
1010
}

0 commit comments

Comments
 (0)