Skip to content

Commit 23fe98b

Browse files
Bump to dotnet/installer@167a4ed 8.0.100-alpha.1.22611.1 (#7630)
Changes: dotnet/installer@243326d...167a4ed Changes: dotnet/linker@13b8d6d...27ce032 Changes: dotnet/runtime@dd7fdb7...1a37caf Changes: dotnet/emsdk@b6656f5...96351a7 Updates: * Microsoft.Dotnet.Sdk.Internal: from 8.0.100-alpha.1.22602.5 to 8.0.100-alpha.1.22611.1 * Microsoft.NET.ILLink.Tasks: from 7.0.100-1.22564.1 to 8.0.100-1.22609.1 * Microsoft.NETCore.App.Ref: from 8.0.0-alpha.1.22559.2 to 8.0.0-alpha.1.22605.1 * Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100: from 8.0.0-alpha.1.22554.1 to 8.0.0-alpha.1.22558.2 Other changes: * Update `.apkdesc` files * [illink] avoid `IL1034` for `.exe` files Context: dotnet/linker#3124 (comment) Android projects are class libraries, and this currently triggers: ILLink error IL1034: Root assembly 'MyAndroidApp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null' does not have entry point. Issue filed at: dotnet/linker#3165 Co-authored-by: Jonathan Peppers <[email protected]>
1 parent c893add commit 23fe98b

File tree

5 files changed

+99
-87
lines changed

5 files changed

+99
-87
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.22602.5">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-alpha.1.22611.1">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>243326d8d19c03876ba6a037fcddfb7ebe8b0b4d</Sha>
5+
<Sha>167a4ed5b457e404bd6eadb4b0fd307000aefd57</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22564.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
7+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.100-1.22609.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
88
<Uri>https://github.com/dotnet/linker</Uri>
9-
<Sha>13b8d6d68a07a47e52e13705313bc32d5540edf5</Sha>
9+
<Sha>27ce03227f4822aaff660ec9bac6fe6c20d001d2</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.22559.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.22605.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8</Sha>
13+
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100" Version="8.0.0-alpha.1.22554.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
15+
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100" Version="8.0.0-alpha.1.22558.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>b6656f5b78cd25f984355f973e65da3d844ac6d1</Sha>
17+
<Sha>96351a7e97093d88eb097b4a489f949ebf8a901b</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.22602.5</MicrosoftDotnetSdkInternalPackageVersion>
5-
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22564.1</MicrosoftNETILLinkTasksPackageVersion>
6-
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.22559.2</MicrosoftNETCoreAppRefPackageVersion>
4+
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-alpha.1.22611.1</MicrosoftDotnetSdkInternalPackageVersion>
5+
<MicrosoftNETILLinkTasksPackageVersion>8.0.100-1.22609.1</MicrosoftNETILLinkTasksPackageVersion>
6+
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.22605.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.22554.1</MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>
9+
<MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>8.0.0-alpha.1.22558.2</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.ILLink.targets

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,12 @@ This file contains the .NET 5-specific targets to customize ILLink
9797
</ItemGroup>
9898
</Target>
9999

100+
<Target Name="_FixRootAssembly" AfterTargets="PrepareForILLink">
101+
<ItemGroup>
102+
<TrimmerRootAssembly Update="@(TrimmerRootAssembly)" Condition=" '%(RootMode)' == 'EntryPoint' " RootMode="Library" />
103+
</ItemGroup>
104+
</Target>
105+
100106
<Target Name="_LinkAssemblies"
101107
DependsOnTargets="_ResolveAssemblies;_CreatePackageWorkspace;$(_BeforeLinkAssemblies);_GenerateJniMarshalMethods;_LinkAssembliesNoShrink"
102108
/>

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

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,79 +5,82 @@
55
"Size": 3032
66
},
77
"assemblies/Java.Interop.dll": {
8-
"Size": 58990
8+
"Size": 58924
99
},
1010
"assemblies/Mono.Android.dll": {
11-
"Size": 87490
11+
"Size": 87710
1212
},
1313
"assemblies/Mono.Android.Runtime.dll": {
14-
"Size": 5860
14+
"Size": 5924
1515
},
1616
"assemblies/rc.bin": {
1717
"Size": 1182
1818
},
1919
"assemblies/System.Console.dll": {
20-
"Size": 6627
20+
"Size": 6593
2121
},
2222
"assemblies/System.Linq.dll": {
23-
"Size": 9252
23+
"Size": 9253
2424
},
2525
"assemblies/System.Private.CoreLib.dll": {
26-
"Size": 470830
26+
"Size": 484001
2727
},
2828
"assemblies/System.Runtime.dll": {
29-
"Size": 2626
29+
"Size": 2629
3030
},
3131
"assemblies/System.Runtime.InteropServices.dll": {
32-
"Size": 2267
32+
"Size": 2269
3333
},
3434
"assemblies/UnnamedProject.dll": {
35-
"Size": 3629
35+
"Size": 3628
3636
},
3737
"classes.dex": {
3838
"Size": 18968
3939
},
40+
"lib/arm64-v8a/libmono-component-marshal-ilgen.so": {
41+
"Size": 93552
42+
},
4043
"lib/arm64-v8a/libmonodroid.so": {
41-
"Size": 434632
44+
"Size": 434704
4245
},
4346
"lib/arm64-v8a/libmonosgen-2.0.so": {
44-
"Size": 3076080
47+
"Size": 3064488
4548
},
4649
"lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
4750
"Size": 723840
4851
},
4952
"lib/arm64-v8a/libSystem.Native.so": {
50-
"Size": 94136
53+
"Size": 94312
5154
},
5255
"lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
53-
"Size": 149552
56+
"Size": 150584
5457
},
5558
"lib/arm64-v8a/libxamarin-app.so": {
56-
"Size": 16128
59+
"Size": 16632
5760
},
5861
"META-INF/BNDLTOOL.RSA": {
5962
"Size": 1213
6063
},
6164
"META-INF/BNDLTOOL.SF": {
62-
"Size": 2794
65+
"Size": 2914
6366
},
6467
"META-INF/MANIFEST.MF": {
65-
"Size": 2667
68+
"Size": 2787
6669
},
6770
"res/drawable-hdpi-v4/icon.png": {
68-
"Size": 4762
71+
"Size": 2178
6972
},
7073
"res/drawable-mdpi-v4/icon.png": {
71-
"Size": 2200
74+
"Size": 1490
7275
},
7376
"res/drawable-xhdpi-v4/icon.png": {
74-
"Size": 7462
77+
"Size": 3098
7578
},
7679
"res/drawable-xxhdpi-v4/icon.png": {
77-
"Size": 13092
80+
"Size": 4674
7881
},
7982
"res/drawable-xxxhdpi-v4/icon.png": {
80-
"Size": 20118
83+
"Size": 6832
8184
},
8285
"res/layout/main.xml": {
8386
"Size": 544
@@ -89,5 +92,5 @@
8992
"Size": 1904
9093
}
9194
},
92-
"PackageSize": 2590859
95+
"PackageSize": 2603241
9396
}

0 commit comments

Comments
 (0)