Skip to content

Commit 35db527

Browse files
dotnet-maestro[bot]jonathanpepperssimonrozsival
authored
Bump to dotnet/installer@779a644 8.0.100-alpha.1.23070.23 (#7728)
Changes: dotnet/installer@9962c6a...779a644 Changes: dotnet/linker@4b3f78c...c790896 Changes: dotnet/runtime@5da4a9e...ddb6988 Changes: dotnet/emsdk@66b9845...5b46122 Updates: * Microsoft.Dotnet.Sdk.Internal: from 8.0.100-alpha.1.23063.11 to 8.0.100-alpha.1.23070.23 * Microsoft.NET.ILLink.Tasks: from 8.0.100-1.23055.2 to 8.0.100-1.23067.1 * Microsoft.NETCore.App.Ref: from 8.0.0-alpha.1.23058.2 to 8.0.0-alpha.1.23070.1 * Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100: from 8.0.0-alpha.1.22620.1 to 8.0.0-alpha.1.23066.1 ~~ Other Changes ~~ * Update `.apkdesc` files for app size changes. * Use .jar files from the .NET runtime pack (#7665) Since [dotnet/runtime#77386][0] has been merged, .NET will require a certain class from `libSystem.Security.Cryptography.Native.Android.jar` that will be located in the runtime pack files. [0]: dotnet/runtime#77386 * Disambiguate `.jar` files from Mono runtime packs. We were getting the build error: error JAVA0000: Caused by: com.android.tools.r8.internal.f: Type net.dot.android.crypto.DotnetProxyTrustManager is defined multiple times This `.jar` file is contained in each runtime pack (4 architectures) gives us 4 `.jar` files! We can pass in these files to the `<ProcessAssemblies/>` MSBuild task. We also filter them based on `%(NuGetPackageId)`, so that any random `.jar` file doesn't get added to `@(AndroidJavaLibrary)`. I renamed the `IsFrameworkAssembly()` method to `IsFromAKnownRuntimePack()` to make this more clear in the existing code. * Update `proguard_xamarin.cfg` for .NET 8. Apps using `$(AndroidLinkTool)` of r8, now need to preserve: -keep class net.dot.android.crypto.DotnetProxyTrustManager { *; <init>(...); } Otherwise we run into a crash when this type isn't present, such as: 01-26 23:59:19.855 8684 8684 F DEBUG : #2 pc 00000000000191d6 /data/app/Mono.Android.NET_Tests-cpTzt8Q9KwgS-znzkuAdNQ==/split_config.x86_64.apk!libSystem.Security.Cryptography.Native.Android.so (offset 0xe7000) (JNI_OnLoad+31302) (BuildId: 7d9e4013a9dd99810070587ab42956703fef69f9) Co-authored-by: Jonathan Peppers <[email protected]> Co-authored-by: Šimon Rozsíval <[email protected]>
1 parent b18ad16 commit 35db527

File tree

7 files changed

+91
-67
lines changed

7 files changed

+91
-67
lines changed

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-alpha.1.23063.11">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-alpha.1.23070.23">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>9962c6a686a31ba1e7c20983a810ba7989c3fc0c</Sha>
5+
<Sha>779a6442daf6b95c5662d2f0c20801de5e179a05</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.100-1.23055.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
7+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.100-1.23067.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
88
<Uri>https://github.com/dotnet/linker</Uri>
9-
<Sha>4b3f78cbc7284b4198652a695e9fe0267133728e</Sha>
9+
<Sha>c790896f128957acd2999208f44f09ae1e826c8c</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.23058.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.23070.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>5da4a9e919dcee35f831ab69b6e475baaf798875</Sha>
13+
<Sha>ddb69889684da95dc8d83a51b987774de5e47598</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100" Version="8.0.0-alpha.1.22620.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
15+
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100" Version="8.0.0-alpha.1.23066.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>66b984594a008151bdb14dc60589373e3d44be83</Sha>
17+
<Sha>5b46122b31036064483ce2e55b5e2240e5548204</Sha>
1818
</Dependency>
1919
</ProductDependencies>
2020
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-alpha.1.23063.11</MicrosoftDotnetSdkInternalPackageVersion>
5-
<MicrosoftNETILLinkTasksPackageVersion>8.0.100-1.23055.2</MicrosoftNETILLinkTasksPackageVersion>
6-
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.23058.2</MicrosoftNETCoreAppRefPackageVersion>
4+
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-alpha.1.23070.23</MicrosoftDotnetSdkInternalPackageVersion>
5+
<MicrosoftNETILLinkTasksPackageVersion>8.0.100-1.23067.1</MicrosoftNETILLinkTasksPackageVersion>
6+
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.23070.1</MicrosoftNETCoreAppRefPackageVersion>
77
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
88
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
9-
<MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>8.0.0-alpha.1.22620.1</MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>
9+
<MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>8.0.0-alpha.1.23066.1</MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>
1010
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptennet7Manifest80100Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
1111
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
1212
</PropertyGroup>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,17 @@ _ResolveAssemblies MSBuild target.
116116
<ItemGroup>
117117
<_ResolvedAssemblyFiles Include="@(ResolvedFileToPublish)" Condition=" '%(ResolvedFileToPublish.Extension)' == '.dll' " />
118118
<_ResolvedSymbolFiles Include="@(ResolvedFileToPublish)" Condition=" '%(ResolvedFileToPublish.Extension)' == '.pdb' " />
119+
<_ResolvedJavaLibraries Include="@(ResolvedFileToPublish)" Condition=" '%(ResolvedFileToPublish.Extension)' == '.jar' " />
119120
</ItemGroup>
120121
<ProcessAssemblies
121122
RuntimeIdentifiers="@(_RIDs)"
122123
InputAssemblies="@(_ResolvedAssemblyFiles->Distinct())"
124+
InputJavaLibraries="@(_ResolvedJavaLibraries->Distinct())"
123125
ResolvedSymbols="@(_ResolvedSymbolFiles->Distinct())"
124126
AndroidIncludeDebugSymbols="$(AndroidIncludeDebugSymbols)"
125127
PublishTrimmed="$(PublishTrimmed)">
126128
<Output TaskParameter="OutputAssemblies" ItemName="_ProcessedAssemblies" />
129+
<Output TaskParameter="OutputJavaLibraries" ItemName="AndroidJavaLibrary" />
127130
<Output TaskParameter="ResolvedSymbols" ItemName="ResolvedSymbols" />
128131
<Output TaskParameter="ShrunkAssemblies" ItemName="_ProcessedShrunkAssemblies" />
129132
</ProcessAssemblies>

‎src/Xamarin.Android.Build.Tasks/Resources/proguard_xamarin.cfg‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
-keep class md52ce486a14f4bcd95899665e9d932190b.** { *; <init>(...); }
2626
-keepclassmembers class md52ce486a14f4bcd95899665e9d932190b.** { *; <init>(...); }
2727

28+
# .NET 8 runtime
29+
-keep class net.dot.android.crypto.DotnetProxyTrustManager { *; <init>(...); }
30+
2831
# Android's template misses fluent setters...
2932
-keepclassmembers class * extends android.view.View {
3033
*** set*(...);

‎src/Xamarin.Android.Build.Tasks/Tasks/ProcessAssemblies.cs‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,14 @@ public class ProcessAssemblies : AndroidTask
3232

3333
public ITaskItem [] InputAssemblies { get; set; } = Array.Empty<ITaskItem> ();
3434

35+
public ITaskItem [] InputJavaLibraries { get; set; } = Array.Empty<ITaskItem> ();
36+
3537
[Output]
3638
public ITaskItem []? OutputAssemblies { get; set; }
3739

40+
[Output]
41+
public ITaskItem []? OutputJavaLibraries { get; set; }
42+
3843
[Output]
3944
public ITaskItem []? ShrunkAssemblies { get; set; }
4045

@@ -78,6 +83,19 @@ public override bool RunTask ()
7883
ShrunkAssemblies = shrunkAssemblies.ToArray ();
7984
}
8085

86+
if (InputJavaLibraries != null) {
87+
var javaLibraries = new Dictionary<string, ITaskItem> (StringComparer.OrdinalIgnoreCase);
88+
foreach (var item in InputJavaLibraries) {
89+
if (!IsFromAKnownRuntimePack (item))
90+
continue;
91+
var name = Path.GetFileNameWithoutExtension(item.ItemSpec);
92+
if (!javaLibraries.ContainsKey (name)) {
93+
javaLibraries [name] = item;
94+
}
95+
}
96+
OutputJavaLibraries = javaLibraries.Values.ToArray ();
97+
}
98+
8199
return !Log.HasLoggedErrors;
82100
}
83101

@@ -112,7 +130,7 @@ void SetMetadataForAssemblies (List<ITaskItem> output, Dictionary<string, ITaskI
112130
SetAssemblyAbiMetadata (assembly, symbol, isDuplicate: false);
113131
symbol?.SetDestinationSubPath ();
114132
assembly.SetDestinationSubPath ();
115-
assembly.SetMetadata ("FrameworkAssembly", IsFrameworkAssembly (assembly).ToString ());
133+
assembly.SetMetadata ("FrameworkAssembly", IsFromAKnownRuntimePack (assembly).ToString ());
116134
assembly.SetMetadata ("HasMonoAndroidReference", MonoAndroidHelper.HasMonoAndroidReference (assembly).ToString ());
117135
output.Add (assembly);
118136
}
@@ -134,7 +152,7 @@ void DeduplicateAssemblies (List<ITaskItem> output, Dictionary<string, ITaskItem
134152

135153
// Calculate %(FrameworkAssembly) and %(HasMonoAndroidReference) for the first
136154
if (frameworkAssembly == null) {
137-
frameworkAssembly = IsFrameworkAssembly (assembly);
155+
frameworkAssembly = IsFromAKnownRuntimePack (assembly);
138156
}
139157
if (hasMonoAndroidReference == null) {
140158
hasMonoAndroidReference = MonoAndroidHelper.IsMonoAndroidAssembly (assembly) ||
@@ -170,7 +188,7 @@ void DeduplicateAssemblies (List<ITaskItem> output, Dictionary<string, ITaskItem
170188
}
171189
}
172190

173-
static bool IsFrameworkAssembly (ITaskItem assembly)
191+
static bool IsFromAKnownRuntimePack (ITaskItem assembly)
174192
{
175193
string packageId = assembly.GetMetadata ("NuGetPackageId") ?? "";
176194
return packageId.StartsWith ("Microsoft.NETCore.App.Runtime.", StringComparison.Ordinal) ||

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,31 @@
1111
"Size": 58913
1212
},
1313
"assemblies/Mono.Android.dll": {
14-
"Size": 87106
14+
"Size": 87163
1515
},
1616
"assemblies/Mono.Android.Runtime.dll": {
17-
"Size": 5860
17+
"Size": 5895
1818
},
1919
"assemblies/rc.bin": {
2020
"Size": 1182
2121
},
2222
"assemblies/System.Console.dll": {
23-
"Size": 6586
23+
"Size": 6438
2424
},
2525
"assemblies/System.Linq.dll": {
26-
"Size": 9252
26+
"Size": 9122
2727
},
2828
"assemblies/System.Private.CoreLib.dll": {
29-
"Size": 517260
29+
"Size": 516811
3030
},
3131
"assemblies/System.Runtime.dll": {
32-
"Size": 2611
32+
"Size": 2620
3333
},
3434
"assemblies/System.Runtime.InteropServices.dll": {
35-
"Size": 2265
35+
"Size": 3753
3636
},
3737
"assemblies/UnnamedProject.dll": {
38-
"Size": 3258
38+
"Size": 3219
3939
},
4040
"classes.dex": {
4141
"Size": 19020
@@ -47,7 +47,7 @@
4747
"Size": 379320
4848
},
4949
"lib/arm64-v8a/libmonosgen-2.0.so": {
50-
"Size": 3089272
50+
"Size": 3090760
5151
},
5252
"lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
5353
"Size": 723840
@@ -56,7 +56,7 @@
5656
"Size": 94328
5757
},
5858
"lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
59-
"Size": 152960
59+
"Size": 155056
6060
},
6161
"lib/arm64-v8a/libxamarin-app.so": {
6262
"Size": 16720

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

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -14,124 +14,124 @@
1414
"Size": 66786
1515
},
1616
"assemblies/Mono.Android.dll": {
17-
"Size": 444701
17+
"Size": 444703
1818
},
1919
"assemblies/Mono.Android.Runtime.dll": {
20-
"Size": 5860
20+
"Size": 5895
2121
},
2222
"assemblies/mscorlib.dll": {
23-
"Size": 3863
23+
"Size": 3857
2424
},
2525
"assemblies/netstandard.dll": {
26-
"Size": 5572
26+
"Size": 5567
2727
},
2828
"assemblies/rc.bin": {
2929
"Size": 1182
3030
},
3131
"assemblies/System.Collections.Concurrent.dll": {
32-
"Size": 10661
32+
"Size": 10529
3333
},
3434
"assemblies/System.Collections.dll": {
35-
"Size": 15394
35+
"Size": 15258
3636
},
3737
"assemblies/System.Collections.NonGeneric.dll": {
38-
"Size": 7648
38+
"Size": 7487
3939
},
4040
"assemblies/System.ComponentModel.dll": {
41-
"Size": 2151
41+
"Size": 1964
4242
},
4343
"assemblies/System.ComponentModel.Primitives.dll": {
44-
"Size": 2641
44+
"Size": 2579
4545
},
4646
"assemblies/System.ComponentModel.TypeConverter.dll": {
47-
"Size": 6198
47+
"Size": 6069
4848
},
4949
"assemblies/System.Console.dll": {
50-
"Size": 6750
50+
"Size": 6610
5151
},
5252
"assemblies/System.Core.dll": {
53-
"Size": 1988
53+
"Size": 1982
5454
},
5555
"assemblies/System.Diagnostics.TraceSource.dll": {
56-
"Size": 6738
56+
"Size": 6580
5757
},
5858
"assemblies/System.dll": {
59-
"Size": 2344
59+
"Size": 2338
6060
},
6161
"assemblies/System.Drawing.dll": {
62-
"Size": 2029
62+
"Size": 2023
6363
},
6464
"assemblies/System.Drawing.Primitives.dll": {
65-
"Size": 12091
65+
"Size": 11996
6666
},
6767
"assemblies/System.IO.Compression.dll": {
68-
"Size": 16975
68+
"Size": 16847
6969
},
7070
"assemblies/System.IO.IsolatedStorage.dll": {
71-
"Size": 10151
71+
"Size": 9957
7272
},
7373
"assemblies/System.Linq.dll": {
74-
"Size": 19591
74+
"Size": 19441
7575
},
7676
"assemblies/System.Linq.Expressions.dll": {
77-
"Size": 163969
77+
"Size": 164128
7878
},
7979
"assemblies/System.Net.Http.dll": {
80-
"Size": 66013
80+
"Size": 65982
8181
},
8282
"assemblies/System.Net.Primitives.dll": {
83-
"Size": 22534
83+
"Size": 22441
8484
},
8585
"assemblies/System.Net.Requests.dll": {
86-
"Size": 3738
86+
"Size": 3620
8787
},
8888
"assemblies/System.ObjectModel.dll": {
89-
"Size": 8186
89+
"Size": 8144
9090
},
9191
"assemblies/System.Private.CoreLib.dll": {
92-
"Size": 805075
92+
"Size": 808708
9393
},
9494
"assemblies/System.Private.DataContractSerialization.dll": {
95-
"Size": 192436
95+
"Size": 192356
9696
},
9797
"assemblies/System.Private.Uri.dll": {
98-
"Size": 42864
98+
"Size": 42878
9999
},
100100
"assemblies/System.Private.Xml.dll": {
101-
"Size": 215941
101+
"Size": 216193
102102
},
103103
"assemblies/System.Private.Xml.Linq.dll": {
104-
"Size": 16796
104+
"Size": 16662
105105
},
106106
"assemblies/System.Runtime.dll": {
107-
"Size": 2756
107+
"Size": 2763
108108
},
109109
"assemblies/System.Runtime.InteropServices.dll": {
110-
"Size": 2265
110+
"Size": 3753
111111
},
112112
"assemblies/System.Runtime.Serialization.dll": {
113-
"Size": 1950
113+
"Size": 1943
114114
},
115115
"assemblies/System.Runtime.Serialization.Formatters.dll": {
116-
"Size": 2677
116+
"Size": 2509
117117
},
118118
"assemblies/System.Runtime.Serialization.Primitives.dll": {
119-
"Size": 3847
119+
"Size": 3791
120120
},
121121
"assemblies/System.Security.Cryptography.dll": {
122-
"Size": 7900
122+
"Size": 7766
123123
},
124124
"assemblies/System.Text.RegularExpressions.dll": {
125-
"Size": 156731
125+
"Size": 156677
126126
},
127127
"assemblies/System.Xml.dll": {
128-
"Size": 1839
128+
"Size": 1833
129129
},
130130
"assemblies/System.Xml.Linq.dll": {
131-
"Size": 1862
131+
"Size": 1856
132132
},
133133
"assemblies/UnnamedProject.dll": {
134-
"Size": 5335
134+
"Size": 5294
135135
},
136136
"assemblies/Xamarin.AndroidX.Activity.dll": {
137137
"Size": 5870
@@ -209,7 +209,7 @@
209209
"Size": 379320
210210
},
211211
"lib/arm64-v8a/libmonosgen-2.0.so": {
212-
"Size": 3089272
212+
"Size": 3090760
213213
},
214214
"lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
215215
"Size": 723840
@@ -218,7 +218,7 @@
218218
"Size": 94328
219219
},
220220
"lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
221-
"Size": 152960
221+
"Size": 155056
222222
},
223223
"lib/arm64-v8a/libxamarin-app.so": {
224224
"Size": 333720
@@ -1976,5 +1976,5 @@
19761976
"Size": 341228
19771977
}
19781978
},
1979-
"PackageSize": 7807748
1979+
"PackageSize": 7828228
19801980
}

0 commit comments

Comments
 (0)