Skip to content

[main] Update dependencies from dotnet/sdk #9119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Aug 5, 2024
Merged

[main] Update dependencies from dotnet/sdk #9119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
997e929
Update dependencies from https://github.com/dotnet/sdk build 20240718.3
dotnet-maestro[bot] Jul 18, 2024
052871d
Revert workarounds for trimming & MSbuild
jonathanpeppers Jul 18, 2024
a88fbb8
Update dependencies from https://github.com/dotnet/sdk build 20240718.5
dotnet-maestro[bot] Jul 19, 2024
03ed2a0
Update dependencies from https://github.com/dotnet/sdk build 20240721.4
dotnet-maestro[bot] Jul 22, 2024
0d0cfeb
Update dependencies from https://github.com/dotnet/sdk build 20240723.6
dotnet-maestro[bot] Jul 23, 2024
a35d821
Update dependencies from https://github.com/dotnet/sdk build 20240724.7
dotnet-maestro[bot] Jul 24, 2024
9211d96
Update dependencies from https://github.com/dotnet/sdk build 20240725.4
dotnet-maestro[bot] Jul 25, 2024
a5ff76f
Update dependencies from https://github.com/dotnet/sdk build 20240726.5
dotnet-maestro[bot] Jul 26, 2024
21c35f6
VS.Tools.Net.Core.SDK.Resolver -> Microsoft.NET.Sdk
jonathanpeppers Aug 1, 2024
f777dae
darc update-dependencies --id 233463
jonathanpeppers Aug 1, 2024
5401b20
Update Versions.props
jonathanpeppers Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions build-tools/automation/yaml-templates/variables.yaml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
3 changes: 1 addition & 2 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
View file
Open in desktop
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
4 changes: 1 addition & 3 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs
View file
Open in desktop
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
3 changes: 1 addition & 2 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/CodeBehindTests.cs
View file
Open in desktop
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