Skip to content

Commit 6adb4d9

Browse files
dotnet-maestro[bot]jonathanpeppers
dotnet-maestro[bot]
and
jonathanpeppers
authored
Bump to dotnet/sdk@7ef0791 9.0.100-rc.1.24381.10 (#9119)
Changes: dotnet/sdk@2f14fea...7ef0791 Changes: dotnet/runtime@1f70f0c...c86bcbb Updates: * Microsoft.NET.Sdk: from 9.0.100-preview.7.24367.21 to 9.0.100-rc.1.24381.10 * Microsoft.NETCore.App.Ref: from 9.0.0-preview.7.24366.18 to 9.0.0-rc.1.24380.7 ~~ Other changes ~~ * Revert workarounds for trimming & MSBuild This partially reverts commit 580166e. The underlying issues are fixed, so we can remove workarounds. * Changes for Maestro/darc dependencies They renamed `VS.Tools.Net.Core.SDK.Resolver` -> `Microsoft.NET.Sdk`. Then I chose a recent build via: > darc update-dependencies --id 233463 Looking up build with BAR id 233463 Updating 'Microsoft.NET.Sdk': '9.0.100-preview.7.24376.5' => '9.0.100-rc.1.24381.10' (from build '20240731.10' of 'https://github.com/dotnet/sdk') Checking for coherency updates... Using 'Strict' coherency mode. If this fails, a second attempt utilizing 'Legacy' Coherency mode will be made. Updating 'Microsoft.NETCore.App.Ref': '9.0.0-preview.7.24366.18' => '9.0.0-rc.1.24380.7' to ensure coherency with [email protected] Updating 'Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport': '9.0.0-preview.7.24365.1' => '9.0.0-rc.1.24373.3' to ensure coherency with [email protected] Updating 'Microsoft.NET.ILLink.Tasks': '9.0.0-preview.7.24366.18' => '9.0.0-rc.1.24380.7' to ensure coherency with [email protected] Updating 'Microsoft.DotNet.Cecil': '0.11.5-alpha.24324.1' => '0.11.5-alpha.24372.1' to ensure coherency with [email protected] Local dependencies updated based on build with BAR id 233463 (20240731.10 from https://github.com/dotnet/sdk@main) I found the build by using the website at: * https://maestro-prod.westus2.cloudapp.azure.com/ Co-authored-by: Jonathan Peppers <[email protected]>
1 parent 95bf32a commit 6adb4d9

File tree

6 files changed

+19
-27
lines changed

6 files changed

+19
-27
lines changed

‎build-tools/automation/yaml-templates/variables.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,3 @@ variables:
5656
value: 'cat != SystemApplication & cat != TimeZoneInfo & cat != Localization'
5757
- name: RunMAUITestJob
5858
value: true
59-
# Workaround: https://github.com/dotnet/msbuild/issues/10378
60-
- name: MSBUILDDISABLEFEATURESFROMVERSION
61-
value: 17.12

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="VS.Tools.Net.Core.SDK.Resolver" Version="9.0.100-preview.7.24367.21">
3+
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-rc.1.24381.10">
44
<Uri>https://github.com/dotnet/sdk</Uri>
5-
<Sha>2f14fea98bd6e87f8583f59495a8a664155f1c8a</Sha>
5+
<Sha>7ef0791037ef761b6767a843bbb8b63d4253a3ab</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.7.24366.18" CoherentParentDependency="VS.Tools.Net.Core.SDK.Resolver">
7+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-rc.1.24380.7" CoherentParentDependency="Microsoft.NET.Sdk">
88
<Uri>https://github.com/dotnet/runtime</Uri>
9-
<Sha>1f70f0cc663b5d45f77840e9728386e5fa7944f9</Sha>
9+
<Sha>c86bcbb7a573bb09fcb1f4fcd7bc24323e9d6f44</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.7.24366.18" CoherentParentDependency="VS.Tools.Net.Core.SDK.Resolver">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rc.1.24380.7" CoherentParentDependency="Microsoft.NET.Sdk">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>1f70f0cc663b5d45f77840e9728386e5fa7944f9</Sha>
13+
<Sha>c86bcbb7a573bb09fcb1f4fcd7bc24323e9d6f44</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.7.24365.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
15+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-rc.1.24373.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>99ea0c06b84d3084d090da537080dd35d2a193cf</Sha>
17+
<Sha>40781ca2fc6be1dd81143d8773105a0f9f77d923</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.24324.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
19+
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.24372.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
2020
<Uri>https://github.com/dotnet/cecil</Uri>
21-
<Sha>7e4af02521473d89d6144b3da58fef253e498974</Sha>
21+
<Sha>085c55c477228926915f7cadfd28cee55a18850e</Sha>
2222
</Dependency>
2323
</ProductDependencies>
2424
<ToolsetDependencies>

‎eng/Versions.props

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<!-- NOTE: $(VSToolsNetCoreSDKResolverPackageVersion) may be temporary -->
5-
<VSToolsNetCoreSDKResolverPackageVersion>9.0.100-preview.7.24367.21</VSToolsNetCoreSDKResolverPackageVersion>
6-
<MicrosoftDotnetSdkInternalPackageVersion>$(VSToolsNetCoreSDKResolverPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
7-
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.7.24366.18</MicrosoftNETILLinkTasksPackageVersion>
8-
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.7.24366.18</MicrosoftNETCoreAppRefPackageVersion>
4+
<MicrosoftNETSdkPackageVersion>9.0.100-rc.1.24381.10</MicrosoftNETSdkPackageVersion>
5+
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
6+
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-rc.1.24380.7</MicrosoftNETILLinkTasksPackageVersion>
7+
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-rc.1.24380.7</MicrosoftNETCoreAppRefPackageVersion>
98
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
109
<MicrosoftDotNetBuildTasksFeedPackageVersion>8.0.0-beta.24225.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
11-
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-preview.7.24365.1</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
10+
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-rc.1.24373.3</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
1211
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
1312
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
14-
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.24324.1</MicrosoftDotNetCecilPackageVersion>
13+
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.24372.1</MicrosoftDotNetCecilPackageVersion>
1514
<SystemIOHashingPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemIOHashingPackageVersion>
1615
</PropertyGroup>
1716
<PropertyGroup>

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,7 @@ public void CheckMonoComponentsMask (bool enableProfiler, bool useInterpreter, b
208208

209209
using (var b = CreateApkBuilder ()) {
210210
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
211-
//FIXME: https://github.com/dotnet/runtime/issues/105044
212-
//b.AssertHasNoWarnings ();
211+
b.AssertHasNoWarnings ();
213212
string objPath = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath);
214213

215214
List<EnvironmentHelper.EnvironmentFile> envFiles = EnvironmentHelper.GatherEnvironmentFiles (objPath, String.Join (";", abis), true);

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,9 +261,7 @@ public void BuildHasNoWarnings (bool isRelease, bool xamarinForms, bool multidex
261261
proj.SetProperty ("TrimmerSingleWarn", "false");
262262
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
263263
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
264-
//FIXME: https://github.com/dotnet/runtime/issues/105044
265-
if (!xamarinForms)
266-
b.AssertHasNoWarnings ();
264+
b.AssertHasNoWarnings ();
267265
Assert.IsFalse (StringAssertEx.ContainsText (b.LastBuildOutput, "Warning: end of file not at end of a line"),
268266
"Should not get a warning from the <CompileNativeAssembly/> task.");
269267
var lockFile = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath, ".__lock");

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/CodeBehindTests.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,8 +340,7 @@ void SuccessfulBuild_AndroidX (TestProjectInfo testInfo, bool many, bool dtb, Lo
340340

341341
CopyLogs (testInfo, true);
342342
Assert.That (success, Is.True, "Build should have succeeded");
343-
//FIXME: https://github.com/dotnet/runtime/issues/105044
344-
//Assert.IsTrue (StringAssertEx.ContainsText (builder.LastBuildOutput, " 0 Warning(s)"), $"{builder.BuildLogFile} should have no MSBuild warnings.");
343+
Assert.IsTrue (StringAssertEx.ContainsText (builder.LastBuildOutput, " 0 Warning(s)"), $"{builder.BuildLogFile} should have no MSBuild warnings.");
345344

346345
CopyGeneratedFiles (testInfo);
347346

0 commit comments

Comments
 (0)