Skip to content

Commit

Permalink
Bump to dotnet/installer@dc43d363d2 9.0.100-preview.4.24175.5 (#8828)
Browse files Browse the repository at this point in the history 
Changes: dotnet/installer@b40c445...dc43d36
Changes: dotnet/runtime@596a1f7...17f8138
Changes: dotnet/emsdk@a5f4de7...5dd0620
Changes: dotnet/cecil@ba53c75...9c8ea96

Updates:

* Microsoft.Dotnet.Sdk.Internal: from 9.0.100-preview.3.24165.20 to 9.0.100-preview.4.24175.5
* Microsoft.NETCore.App.Ref: from 9.0.0-preview.3.24162.31 to 9.0.0-preview.4.24173.6
* Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport: from 9.0.0-preview.3.24156.3 to 9.0.0-preview.3.24160.1
* Microsoft.NET.ILLink.Tasks: from 9.0.0-preview.3.24162.31 to 9.0.0-preview.4.24173.6
* Microsoft.DotNet.Cecil: from 0.11.4-alpha.24158.1 to 0.11.4-alpha.24168.1

Other changes:

* [tests] set `$(TrimmerSingleWarn)` to false

This allows us to get more information, in the case of new trimmer warnings.

* Default `$(_AndroidIncludeSystemGlobalizationNative)` to true

Prevents runtime crash:

    03-25 19:42:25.386  8502  8502 W Mono    : DllImport unable to load library 'libSystem.Globalization.Native'.
    03-25 19:42:25.409  8502  8502 W         : Process terminated.

* Update `.apkdesc` files for `libSystem.Globalization.Native.so`

* FIXME: dotnet/runtime#100256

Various tests have the trimmer warning:

    dotnet\packs\Microsoft.NETCore.App.Runtime.Mono.android-x86\9.0.0-preview.4.24173.6\runtimes\android-x86\native\System.Private.CoreLib.dll : warning IL2104: Assembly 'System.Private.CoreLib' produced trim warnings. For more information see https://aka.ms/dotnet-illink/libraries 

    ILLink warning IL2045: System.Runtime.CompilerServices.RuntimeFeature.IsDynamicCodeCompiled: Attribute 'System.Diagnostics.CodeAnalysis.RequiresDynamicCodeAttribute' is being referenced in code but the trimmer was instructed to remove all instances of this attribute. If the attribute instances are necessary make sure to either remove the trimmer attribute XML portion which removes the attribute instances, or override the removal by using the trimmer XML descriptor to keep the attribute type (which in turn keeps all of its instances).

For now, we can assert there are 4 warnings (one per RID).

When this is fixed in the future, we can go back to asserting 0 warnings.

Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
  • Loading branch information
@dotnet-maestro @jonathanpeppers
dotnet-maestro[bot] and jonathanpeppers authored Mar 28, 2024
1 parent 164a9b9 commit 378b492
Show file tree
Hide file tree
Showing 7 changed files with 109 additions and 89 deletions.
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-preview.3.24165.20">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-preview.4.24175.5">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>b40c44502deca1e7f51674b97b2d6ca2d5e0abac</Sha>
<Sha>dc43d363d284c26cb1b463683d6ebb2c88ab0b58</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.3.24162.31" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.4.24173.6" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>596a1f7b6429fc06cf71465238cb349cab4edc35</Sha>
<Sha>17f8138a726b8af269bffc59e9baa12dcb7abca5</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.3.24162.31" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.4.24173.6" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>596a1f7b6429fc06cf71465238cb349cab4edc35</Sha>
<Sha>17f8138a726b8af269bffc59e9baa12dcb7abca5</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.3.24156.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.3.24160.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>a5f4de78fca42544771977f8e8e04c4aa83e1d02</Sha>
<Sha>5dd0620274178dd73cac5049e5187c00e07ecf0c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.24158.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.24168.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
<Uri>https://github.com/dotnet/cecil</Uri>
<Sha>ba53c75483aa4980a332fa48e61076f80adfec40</Sha>
<Sha>9c8ea966df62f764523b51772763e74e71040a92</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
10 changes: 5 additions & 5 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>9.0.100-preview.3.24165.20</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.3.24162.31</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.3.24162.31</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>9.0.100-preview.4.24175.5</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.4.24173.6</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.4.24173.6</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-preview.3.24156.3</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-preview.3.24160.1</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.24158.1</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.24168.1</MicrosoftDotNetCecilPackageVersion>
<SystemIOHashingPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemIOHashingPackageVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down
3 changes: 3 additions & 0 deletions ...uild.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,9 @@ _ResolveAssemblies MSBuild target.
</Target>

<Target Name="_IncludeNativeSystemLibraries">
<PropertyGroup>
<_AndroidIncludeSystemGlobalizationNative Condition=" '$(_AndroidIncludeSystemGlobalizationNative)' == '' ">true</_AndroidIncludeSystemGlobalizationNative>
</PropertyGroup>
<ItemGroup>
<_ResolvedNativeLibraries Include="@(ResolvedFileToPublish)" Condition=" '%(ResolvedFileToPublish.Extension)' == '.so' " />
</ItemGroup>
Expand Down
8 changes: 7 additions & 1 deletion src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,15 @@ public void BuildHasNoWarnings (bool isRelease, bool xamarinForms, bool multidex
proj.PackageReferences.Add (new Package { Id = "BenchmarkDotNet", Version = "0.13.1" });
proj.SetProperty ("XamarinAndroidSupportSkipVerifyVersions", "True"); // Disables API 29 warning in Xamarin.Build.Download
proj.SetProperty ("AndroidPackageFormat", packageFormat);
proj.SetProperty ("TrimmerSingleWarn", "false");
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
b.AssertHasNoWarnings ();
// FIXME: https://github.com/dotnet/runtime/issues/100256
if (!xamarinForms && isRelease) {
Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, " 4 Warning(s)"), $"{b.BuildLogFile} should have 4 MSBuild warnings.");
} else {
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
11 changes: 8 additions & 3 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,17 @@ public void DotNetNew ([Values ("android", "androidlib", "android-bindinglib", "
Assert.IsTrue (dotnet.New ("android-layout", Path.Combine (dotnet.ProjectDirectory, "Resources", "layout")), "`dotnet new android-layout` should succeed");

// Debug build
Assert.IsTrue (dotnet.Build (parameters: new [] { "Configuration=Debug" }), "`dotnet build` should succeed");
Assert.IsTrue (dotnet.Build (parameters: new [] { "Configuration=Debug", "TrimmerSingleWarn=false" }), "`dotnet build` should succeed");
dotnet.AssertHasNoWarnings ();

// Release build
Assert.IsTrue (dotnet.Build (parameters: new [] { "Configuration=Release" }), "`dotnet build` should succeed");
dotnet.AssertHasNoWarnings ();
Assert.IsTrue (dotnet.Build (parameters: new [] { "Configuration=Release", "TrimmerSingleWarn=false" }), "`dotnet build` should succeed");
// FIXME: https://github.com/dotnet/runtime/issues/100256
if (template.Contains ("lib")) {
dotnet.AssertHasNoWarnings ();
} else {
Assert.IsTrue (StringAssertEx.ContainsText (dotnet.LastBuildOutput, " 4 Warning(s)"), $"{dotnet.BuildLogFile} should have 4 MSBuild warnings.");
}
}

static readonly object[] DotNetPackTargetFrameworks = new object[] {
Expand Down
41 changes: 22 additions & 19 deletions ...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,70 +5,73 @@
"Size": 3036
},
"classes.dex": {
"Size": 377684
"Size": 377764
},
"lib/arm64-v8a/lib__Microsoft.Android.Resource.Designer.dll.so": {
"Size": 1027
},
"lib/arm64-v8a/lib_Java.Interop.dll.so": {
"Size": 63889
"Size": 64234
},
"lib/arm64-v8a/lib_Mono.Android.dll.so": {
"Size": 90449
"Size": 91668
},
"lib/arm64-v8a/lib_Mono.Android.Runtime.dll.so": {
"Size": 5145
"Size": 5222
},
"lib/arm64-v8a/lib_System.Console.dll.so": {
"Size": 6541
"Size": 6548
},
"lib/arm64-v8a/lib_System.Linq.dll.so": {
"Size": 8647
"Size": 8483
},
"lib/arm64-v8a/lib_System.Private.CoreLib.dll.so": {
"Size": 553289
"Size": 566421
},
"lib/arm64-v8a/lib_System.Runtime.dll.so": {
"Size": 2545
"Size": 2552
},
"lib/arm64-v8a/lib_System.Runtime.InteropServices.dll.so": {
"Size": 4022
"Size": 4025
},
"lib/arm64-v8a/lib_UnnamedProject.dll.so": {
"Size": 2932
"Size": 2934
},
"lib/arm64-v8a/libarc.bin.so": {
"Size": 1512
},
"lib/arm64-v8a/libmono-component-marshal-ilgen.so": {
"Size": 87080
"Size": 87352
},
"lib/arm64-v8a/libmonodroid.so": {
"Size": 355872
"Size": 354064
},
"lib/arm64-v8a/libmonosgen-2.0.so": {
"Size": 3185656
"Size": 3132992
},
"lib/arm64-v8a/libSystem.Globalization.Native.so": {
"Size": 67248
},
"lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
"Size": 723560
},
"lib/arm64-v8a/libSystem.Native.so": {
"Size": 94504
"Size": 94720
},
"lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
"Size": 155560
"Size": 155568
},
"lib/arm64-v8a/libxamarin-app.so": {
"Size": 12336
"Size": 12656
},
"META-INF/BNDLTOOL.RSA": {
"Size": 1221
},
"META-INF/BNDLTOOL.SF": {
"Size": 3147
"Size": 3266
},
"META-INF/MANIFEST.MF": {
"Size": 3020
"Size": 3139
},
"res/drawable-hdpi-v4/icon.png": {
"Size": 2178
Expand All @@ -95,5 +98,5 @@
"Size": 1904
}
},
"PackageSize": 2668984
"PackageSize": 2689557
}
Loading

0 comments on commit 378b492

Please sign in to comment.