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 <jonathan.peppers@microsoft.com>
dotnet · Dec 16, 2022 · 23fe98b · 23fe98b
1 parent c893add
commit 23fe98b
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 87 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -1,20 +1,20 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-alpha.1.22602.5">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-alpha.1.22611.1">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>243326d8d19c03876ba6a037fcddfb7ebe8b0b4d</Sha>
+      <Sha>167a4ed5b457e404bd6eadb4b0fd307000aefd57</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22564.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.100-1.22609.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/linker</Uri>
-      <Sha>13b8d6d68a07a47e52e13705313bc32d5540edf5</Sha>
+      <Sha>27ce03227f4822aaff660ec9bac6fe6c20d001d2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.22559.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.22605.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8</Sha>
+      <Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100" Version="8.0.0-alpha.1.22554.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100" Version="8.0.0-alpha.1.22558.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>b6656f5b78cd25f984355f973e65da3d844ac6d1</Sha>
+      <Sha>96351a7e97093d88eb097b4a489f949ebf8a901b</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -1,12 +1,12 @@
 <Project>
   <!--Package versions-->
   <PropertyGroup>
-    <MicrosoftDotnetSdkInternalPackageVersion>8.0.100-alpha.1.22602.5</MicrosoftDotnetSdkInternalPackageVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22564.1</MicrosoftNETILLinkTasksPackageVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.22559.2</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>8.0.100-alpha.1.22611.1</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>8.0.100-1.22609.1</MicrosoftNETILLinkTasksPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.22605.1</MicrosoftNETCoreAppRefPackageVersion>
     <MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
     <MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
-    <MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>8.0.0-alpha.1.22554.1</MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>
+    <MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>8.0.0-alpha.1.22558.2</MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>
     <MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptennet7Manifest80100Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
     <MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
   </PropertyGroup>

diff --git a/...in.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.ILLink.targets b/...in.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.ILLink.targets
@@ -97,6 +97,12 @@ This file contains the .NET 5-specific targets to customize ILLink
     </ItemGroup>
   </Target>
 
+  <Target Name="_FixRootAssembly" AfterTargets="PrepareForILLink">
+    <ItemGroup>
+      <TrimmerRootAssembly Update="@(TrimmerRootAssembly)" Condition=" '%(RootMode)' == 'EntryPoint' " RootMode="Library" />
+    </ItemGroup>
+  </Target>
+
   <Target Name="_LinkAssemblies"
       DependsOnTargets="_ResolveAssemblies;_CreatePackageWorkspace;$(_BeforeLinkAssemblies);_GenerateJniMarshalMethods;_LinkAssembliesNoShrink"
   />

diff --git a/...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc b/...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc
@@ -5,79 +5,82 @@
       "Size": 3032
     },
     "assemblies/Java.Interop.dll": {
-      "Size": 58990
+      "Size": 58924
     },
     "assemblies/Mono.Android.dll": {
-      "Size": 87490
+      "Size": 87710
     },
     "assemblies/Mono.Android.Runtime.dll": {
-      "Size": 5860
+      "Size": 5924
     },
     "assemblies/rc.bin": {
       "Size": 1182
     },
     "assemblies/System.Console.dll": {
-      "Size": 6627
+      "Size": 6593
     },
     "assemblies/System.Linq.dll": {
-      "Size": 9252
+      "Size": 9253
     },
     "assemblies/System.Private.CoreLib.dll": {
-      "Size": 470830
+      "Size": 484001
     },
     "assemblies/System.Runtime.dll": {
-      "Size": 2626
+      "Size": 2629
     },
     "assemblies/System.Runtime.InteropServices.dll": {
-      "Size": 2267
+      "Size": 2269
     },
     "assemblies/UnnamedProject.dll": {
-      "Size": 3629
+      "Size": 3628
     },
     "classes.dex": {
       "Size": 18968
     },
+    "lib/arm64-v8a/libmono-component-marshal-ilgen.so": {
+      "Size": 93552
+    },
     "lib/arm64-v8a/libmonodroid.so": {
-      "Size": 434632
+      "Size": 434704
     },
     "lib/arm64-v8a/libmonosgen-2.0.so": {
-      "Size": 3076080
+      "Size": 3064488
     },
     "lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
       "Size": 723840
     },
     "lib/arm64-v8a/libSystem.Native.so": {
-      "Size": 94136
+      "Size": 94312
     },
     "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
-      "Size": 149552
+      "Size": 150584
     },
     "lib/arm64-v8a/libxamarin-app.so": {
-      "Size": 16128
+      "Size": 16632
     },
     "META-INF/BNDLTOOL.RSA": {
       "Size": 1213
     },
     "META-INF/BNDLTOOL.SF": {
-      "Size": 2794
+      "Size": 2914
     },
     "META-INF/MANIFEST.MF": {
-      "Size": 2667
+      "Size": 2787
     },
     "res/drawable-hdpi-v4/icon.png": {
-      "Size": 4762
+      "Size": 2178
     },
     "res/drawable-mdpi-v4/icon.png": {
-      "Size": 2200
+      "Size": 1490
     },
     "res/drawable-xhdpi-v4/icon.png": {
-      "Size": 7462
+      "Size": 3098
     },
     "res/drawable-xxhdpi-v4/icon.png": {
-      "Size": 13092
+      "Size": 4674
     },
     "res/drawable-xxxhdpi-v4/icon.png": {
-      "Size": 20118
+      "Size": 6832
     },
     "res/layout/main.xml": {
       "Size": 544
@@ -89,5 +92,5 @@
       "Size": 1904
     }
   },
-  "PackageSize": 2590859
+  "PackageSize": 2603241
 }