Skip to content

Commit 378b492

Browse files
dotnet-maestro[bot]jonathanpeppers
dotnet-maestro[bot]
and
jonathanpeppers
authored
Bump to dotnet/installer@dc43d363d2 9.0.100-preview.4.24175.5 (#8828)
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>
1 parent 164a9b9 commit 378b492

File tree

7 files changed

+109
-89
lines changed

7 files changed

+109
-89
lines changed

‎eng/Version.Details.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-preview.3.24165.20">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-preview.4.24175.5">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>b40c44502deca1e7f51674b97b2d6ca2d5e0abac</Sha>
5+
<Sha>dc43d363d284c26cb1b463683d6ebb2c88ab0b58</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.3.24162.31" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
7+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.4.24173.6" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
88
<Uri>https://github.com/dotnet/runtime</Uri>
9-
<Sha>596a1f7b6429fc06cf71465238cb349cab4edc35</Sha>
9+
<Sha>17f8138a726b8af269bffc59e9baa12dcb7abca5</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.3.24162.31" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.4.24173.6" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>596a1f7b6429fc06cf71465238cb349cab4edc35</Sha>
13+
<Sha>17f8138a726b8af269bffc59e9baa12dcb7abca5</Sha>
1414
</Dependency>
15-
<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">
15+
<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">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>a5f4de78fca42544771977f8e8e04c4aa83e1d02</Sha>
17+
<Sha>5dd0620274178dd73cac5049e5187c00e07ecf0c</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.24158.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
19+
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.24168.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
2020
<Uri>https://github.com/dotnet/cecil</Uri>
21-
<Sha>ba53c75483aa4980a332fa48e61076f80adfec40</Sha>
21+
<Sha>9c8ea966df62f764523b51772763e74e71040a92</Sha>
2222
</Dependency>
2323
</ProductDependencies>
2424
<ToolsetDependencies>

‎eng/Versions.props

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftDotnetSdkInternalPackageVersion>9.0.100-preview.3.24165.20</MicrosoftDotnetSdkInternalPackageVersion>
5-
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.3.24162.31</MicrosoftNETILLinkTasksPackageVersion>
6-
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.3.24162.31</MicrosoftNETCoreAppRefPackageVersion>
4+
<MicrosoftDotnetSdkInternalPackageVersion>9.0.100-preview.4.24175.5</MicrosoftDotnetSdkInternalPackageVersion>
5+
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.4.24173.6</MicrosoftNETILLinkTasksPackageVersion>
6+
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.4.24173.6</MicrosoftNETCoreAppRefPackageVersion>
77
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
88
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
9-
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-preview.3.24156.3</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
9+
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-preview.3.24160.1</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
1010
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
1111
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
12-
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.24158.1</MicrosoftDotNetCecilPackageVersion>
12+
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.24168.1</MicrosoftDotNetCecilPackageVersion>
1313
<SystemIOHashingPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemIOHashingPackageVersion>
1414
</PropertyGroup>
1515
<PropertyGroup>

‎src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets

+3
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,9 @@ _ResolveAssemblies MSBuild target.
212212
</Target>
213213

214214
<Target Name="_IncludeNativeSystemLibraries">
215+
<PropertyGroup>
216+
<_AndroidIncludeSystemGlobalizationNative Condition=" '$(_AndroidIncludeSystemGlobalizationNative)' == '' ">true</_AndroidIncludeSystemGlobalizationNative>
217+
</PropertyGroup>
215218
<ItemGroup>
216219
<_ResolvedNativeLibraries Include="@(ResolvedFileToPublish)" Condition=" '%(ResolvedFileToPublish.Extension)' == '.so' " />
217220
</ItemGroup>

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -257,9 +257,15 @@ public void BuildHasNoWarnings (bool isRelease, bool xamarinForms, bool multidex
257257
proj.PackageReferences.Add (new Package { Id = "BenchmarkDotNet", Version = "0.13.1" });
258258
proj.SetProperty ("XamarinAndroidSupportSkipVerifyVersions", "True"); // Disables API 29 warning in Xamarin.Build.Download
259259
proj.SetProperty ("AndroidPackageFormat", packageFormat);
260+
proj.SetProperty ("TrimmerSingleWarn", "false");
260261
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
261262
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
262-
b.AssertHasNoWarnings ();
263+
// FIXME: https://github.com/dotnet/runtime/issues/100256
264+
if (!xamarinForms && isRelease) {
265+
Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, " 4 Warning(s)"), $"{b.BuildLogFile} should have 4 MSBuild warnings.");
266+
} else {
267+
b.AssertHasNoWarnings ();
268+
}
263269
Assert.IsFalse (StringAssertEx.ContainsText (b.LastBuildOutput, "Warning: end of file not at end of a line"),
264270
"Should not get a warning from the <CompileNativeAssembly/> task.");
265271
var lockFile = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath, ".__lock");

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

+8-3
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,17 @@ public void DotNetNew ([Values ("android", "androidlib", "android-bindinglib", "
3737
Assert.IsTrue (dotnet.New ("android-layout", Path.Combine (dotnet.ProjectDirectory, "Resources", "layout")), "`dotnet new android-layout` should succeed");
3838

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

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

4853
static readonly object[] DotNetPackTargetFrameworks = new object[] {

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc

+22-19
Original file line numberDiff line numberDiff line change
@@ -5,70 +5,73 @@
55
"Size": 3036
66
},
77
"classes.dex": {
8-
"Size": 377684
8+
"Size": 377764
99
},
1010
"lib/arm64-v8a/lib__Microsoft.Android.Resource.Designer.dll.so": {
1111
"Size": 1027
1212
},
1313
"lib/arm64-v8a/lib_Java.Interop.dll.so": {
14-
"Size": 63889
14+
"Size": 64234
1515
},
1616
"lib/arm64-v8a/lib_Mono.Android.dll.so": {
17-
"Size": 90449
17+
"Size": 91668
1818
},
1919
"lib/arm64-v8a/lib_Mono.Android.Runtime.dll.so": {
20-
"Size": 5145
20+
"Size": 5222
2121
},
2222
"lib/arm64-v8a/lib_System.Console.dll.so": {
23-
"Size": 6541
23+
"Size": 6548
2424
},
2525
"lib/arm64-v8a/lib_System.Linq.dll.so": {
26-
"Size": 8647
26+
"Size": 8483
2727
},
2828
"lib/arm64-v8a/lib_System.Private.CoreLib.dll.so": {
29-
"Size": 553289
29+
"Size": 566421
3030
},
3131
"lib/arm64-v8a/lib_System.Runtime.dll.so": {
32-
"Size": 2545
32+
"Size": 2552
3333
},
3434
"lib/arm64-v8a/lib_System.Runtime.InteropServices.dll.so": {
35-
"Size": 4022
35+
"Size": 4025
3636
},
3737
"lib/arm64-v8a/lib_UnnamedProject.dll.so": {
38-
"Size": 2932
38+
"Size": 2934
3939
},
4040
"lib/arm64-v8a/libarc.bin.so": {
4141
"Size": 1512
4242
},
4343
"lib/arm64-v8a/libmono-component-marshal-ilgen.so": {
44-
"Size": 87080
44+
"Size": 87352
4545
},
4646
"lib/arm64-v8a/libmonodroid.so": {
47-
"Size": 355872
47+
"Size": 354064
4848
},
4949
"lib/arm64-v8a/libmonosgen-2.0.so": {
50-
"Size": 3185656
50+
"Size": 3132992
51+
},
52+
"lib/arm64-v8a/libSystem.Globalization.Native.so": {
53+
"Size": 67248
5154
},
5255
"lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
5356
"Size": 723560
5457
},
5558
"lib/arm64-v8a/libSystem.Native.so": {
56-
"Size": 94504
59+
"Size": 94720
5760
},
5861
"lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
59-
"Size": 155560
62+
"Size": 155568
6063
},
6164
"lib/arm64-v8a/libxamarin-app.so": {
62-
"Size": 12336
65+
"Size": 12656
6366
},
6467
"META-INF/BNDLTOOL.RSA": {
6568
"Size": 1221
6669
},
6770
"META-INF/BNDLTOOL.SF": {
68-
"Size": 3147
71+
"Size": 3266
6972
},
7073
"META-INF/MANIFEST.MF": {
71-
"Size": 3020
74+
"Size": 3139
7275
},
7376
"res/drawable-hdpi-v4/icon.png": {
7477
"Size": 2178
@@ -95,5 +98,5 @@
9598
"Size": 1904
9699
}
97100
},
98-
"PackageSize": 2668984
101+
"PackageSize": 2689557
99102
}

0 commit comments

Comments
 (0)