Skip to content

Commit

Permalink
Bump to dotnet/sdk@7ef0791 9.0.100-rc.1.24381.10 (#9119)
Browse files Browse the repository at this point in the history
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 Microsoft.NET.Sdk@9.0.100-rc.1.24381.10
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 Microsoft.NETCore.App.Ref@9.0.0-preview.7.24366.18
Updating 'Microsoft.NET.ILLink.Tasks': '9.0.0-preview.7.24366.18' => '9.0.0-rc.1.24380.7' to ensure coherency with Microsoft.NET.Sdk@9.0.100-rc.1.24381.10
Updating 'Microsoft.DotNet.Cecil': '0.11.5-alpha.24324.1' => '0.11.5-alpha.24372.1' to ensure coherency with Microsoft.NET.ILLink.Tasks@9.0.0-preview.7.24366.18
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 <jonathan.peppers@microsoft.com>
  • Loading branch information
dotnet-maestro[bot] and jonathanpeppers authored Aug 5, 2024
1 parent 95bf32a commit 6adb4d9
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 27 deletions.
3 changes: 0 additions & 3 deletions build-tools/automation/yaml-templates/variables.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,3 @@ variables:
value: 'cat != SystemApplication & cat != TimeZoneInfo & cat != Localization'
- name: RunMAUITestJob
value: true
# Workaround: https://github.com/dotnet/msbuild/issues/10378
- name: MSBUILDDISABLEFEATURESFROMVERSION
value: 17.12
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="VS.Tools.Net.Core.SDK.Resolver" Version="9.0.100-preview.7.24367.21">
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-rc.1.24381.10">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>2f14fea98bd6e87f8583f59495a8a664155f1c8a</Sha>
<Sha>7ef0791037ef761b6767a843bbb8b63d4253a3ab</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.7.24366.18" CoherentParentDependency="VS.Tools.Net.Core.SDK.Resolver">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-rc.1.24380.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1f70f0cc663b5d45f77840e9728386e5fa7944f9</Sha>
<Sha>c86bcbb7a573bb09fcb1f4fcd7bc24323e9d6f44</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.7.24366.18" CoherentParentDependency="VS.Tools.Net.Core.SDK.Resolver">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rc.1.24380.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1f70f0cc663b5d45f77840e9728386e5fa7944f9</Sha>
<Sha>c86bcbb7a573bb09fcb1f4fcd7bc24323e9d6f44</Sha>
</Dependency>
<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">
<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">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>99ea0c06b84d3084d090da537080dd35d2a193cf</Sha>
<Sha>40781ca2fc6be1dd81143d8773105a0f9f77d923</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.24324.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.24372.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
<Uri>https://github.com/dotnet/cecil</Uri>
<Sha>7e4af02521473d89d6144b3da58fef253e498974</Sha>
<Sha>085c55c477228926915f7cadfd28cee55a18850e</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
13 changes: 6 additions & 7 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<!-- NOTE: $(VSToolsNetCoreSDKResolverPackageVersion) may be temporary -->
<VSToolsNetCoreSDKResolverPackageVersion>9.0.100-preview.7.24367.21</VSToolsNetCoreSDKResolverPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>$(VSToolsNetCoreSDKResolverPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.7.24366.18</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.7.24366.18</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETSdkPackageVersion>9.0.100-rc.1.24381.10</MicrosoftNETSdkPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-rc.1.24380.7</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-rc.1.24380.7</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>8.0.0-beta.24225.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-preview.7.24365.1</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-rc.1.24373.3</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.24324.1</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.24372.1</MicrosoftDotNetCecilPackageVersion>
<SystemIOHashingPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemIOHashingPackageVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,7 @@ public void CheckMonoComponentsMask (bool enableProfiler, bool useInterpreter, b

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

List<EnvironmentHelper.EnvironmentFile> envFiles = EnvironmentHelper.GatherEnvironmentFiles (objPath, String.Join (";", abis), true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -261,9 +261,7 @@ public void BuildHasNoWarnings (bool isRelease, bool xamarinForms, bool multidex
proj.SetProperty ("TrimmerSingleWarn", "false");
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
//FIXME: https://github.com/dotnet/runtime/issues/105044
if (!xamarinForms)
b.AssertHasNoWarnings ();
b.AssertHasNoWarnings ();
Assert.IsFalse (StringAssertEx.ContainsText (b.LastBuildOutput, "Warning: end of file not at end of a line"),
"Should not get a warning from the <CompileNativeAssembly/> task.");
var lockFile = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath, ".__lock");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -340,8 +340,7 @@ void SuccessfulBuild_AndroidX (TestProjectInfo testInfo, bool many, bool dtb, Lo

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

CopyGeneratedFiles (testInfo);

Expand Down

0 comments on commit 6adb4d9

Please sign in to comment.