Skip to content

Commit

Permalink
Bump to dotnet/installer@e3ab0b5 8.0.100-preview.2.23123.10 (#7813)
Browse files Browse the repository at this point in the history
Changes: dotnet/installer@f05478b...e3ab0b5
Changes: dotnet/runtime@fe4760c...ff7c19f
Changes: dotnet/emsdk@fd5a0d1...d7ff0aa

Updates:

* Microsoft.Dotnet.Sdk.Internal: from 8.0.100-preview.2.23107.13 to 8.0.100-preview.2.23123.10
* Microsoft.NET.ILLink.Tasks: from 8.0.0-preview.2.23106.6 to 8.0.0-preview.2.23123.4
* Microsoft.NETCore.App.Ref: from 8.0.0-preview.2.23106.6 to 8.0.0-preview.2.23123.4
* Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100-preview.2: from 8.0.0-preview.2.23081.1 to 8.0.0-preview.2.23113.1

~~ Other changes ~~

* Revert "[Microsoft.Android.Sdk.ILLink] target `net7.0` temporarily (#7803)"

This reverts commit 7ba7dd4.

We should be able to build ILLink steps for `net8.0` going forward.

* Add `@(PackageReference)` to `Mono.Cecil`

Context: https://github.com/dotnet/runtime/blob/fb13c2cf6eaf69b53773e94674772f217fa39416/src/coreclr/tools/aot/Mono.Linker.Tests/Mono.Linker.Tests.csproj#L22

`Microsoft.NET.ILLink` no longer has an implicit dependency on `Mono.Cecil`.

* Update BuildReleaseArm64XFormsDotNet.apkdesc

Fixes the failure:

    apkdiff: File 'assemblies/System.Collections.Concurrent.dll' has changed by 1,032 bytes (8.93 %). This exceeds the threshold of 5.00 %

Co-authored-by: Jonathan Peppers <[email protected]>
  • Loading branch information
dotnet-maestro[bot] and jonathanpeppers authored Feb 27, 2023
1 parent 8dc9261 commit 61767a0
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 70 deletions.
18 changes: 9 additions & 9 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-alpha.1.23080.11">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.2.23123.10">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>dec120944450abb58bc07a2fcdae2f4383bfd6bf</Sha>
<Sha>e3ab0b5b8c29d8d882ab1bfe6a5a99a703622c7e</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.100-1.23067.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>c790896f128957acd2999208f44f09ae1e826c8c</Sha>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.2.23123.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.23080.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.2.23123.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9529803ae29c2804880c6bd8ca710b8c037cb498</Sha>
<Sha>ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100-alpha.1" Version="8.0.0-alpha.1.23077.4" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100-preview.2" Version="8.0.0-preview.2.23113.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>0fe864fc71191ff4ee18e59ef0af2929ca367a11</Sha>
<Sha>d7ff0aa47c680be543905cc1410e2f62b54dfefe</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
10 changes: 5 additions & 5 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-alpha.1.23080.11</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.100-1.23067.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.23080.2</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-preview.2.23123.10</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.2.23123.4</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.2.23123.4</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100alpha1Version>8.0.0-alpha.1.23077.4</MicrosoftNETWorkloadEmscriptenCurrentManifest80100alpha1Version>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100alpha1Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview2Version>8.0.0-preview.2.23113.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview2Version>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview2Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\Configuration.props" />
<PropertyGroup>
<TargetFramework>$(DotNetStableTargetFramework)</TargetFramework>
<TargetFramework>$(DotNetTargetFramework)</TargetFramework>
<DefineConstants>ILLINK</DefineConstants>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>$(MicrosoftAndroidSdkOutDir)</OutputPath>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Mono.Cecil" Version="$(MonoCecilVersion)" />
<PackageReference Include="Microsoft.NET.ILLink" Version="$(MicrosoftNETILLinkTasksPackageVersion)" />
<ProjectReference Include="..\..\external\Java.Interop\src\Java.Interop.Export\Java.Interop.Export.csproj" />
<ProjectReference Include="..\Xamarin.Android.Build.Tasks\Xamarin.Android.Build.Tasks.csproj" ReferenceOutputAssembly="False" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,136 +5,136 @@
"Size": 3568
},
"assemblies/_Microsoft.Android.Resource.Designer.dll": {
"Size": 1942
"Size": 1940
},
"assemblies/FormsViewGroup.dll": {
"Size": 7313
},
"assemblies/Java.Interop.dll": {
"Size": 66786
"Size": 66563
},
"assemblies/Mono.Android.dll": {
"Size": 444703
"Size": 444617
},
"assemblies/Mono.Android.Runtime.dll": {
"Size": 5895
"Size": 5897
},
"assemblies/mscorlib.dll": {
"Size": 3857
"Size": 3866
},
"assemblies/netstandard.dll": {
"Size": 5567
"Size": 5579
},
"assemblies/rc.bin": {
"Size": 1182
},
"assemblies/System.Collections.Concurrent.dll": {
"Size": 10529
"Size": 11561
},
"assemblies/System.Collections.dll": {
"Size": 15258
"Size": 15271
},
"assemblies/System.Collections.NonGeneric.dll": {
"Size": 7487
"Size": 7499
},
"assemblies/System.ComponentModel.dll": {
"Size": 1964
"Size": 1973
},
"assemblies/System.ComponentModel.Primitives.dll": {
"Size": 2579
"Size": 2595
},
"assemblies/System.ComponentModel.TypeConverter.dll": {
"Size": 6069
"Size": 6081
},
"assemblies/System.Console.dll": {
"Size": 6610
"Size": 6623
},
"assemblies/System.Core.dll": {
"Size": 1982
"Size": 1992
},
"assemblies/System.Diagnostics.TraceSource.dll": {
"Size": 6580
"Size": 6591
},
"assemblies/System.dll": {
"Size": 2338
"Size": 2347
},
"assemblies/System.Drawing.dll": {
"Size": 2023
"Size": 2032
},
"assemblies/System.Drawing.Primitives.dll": {
"Size": 11996
"Size": 12010
},
"assemblies/System.IO.Compression.dll": {
"Size": 16847
"Size": 16858
},
"assemblies/System.IO.IsolatedStorage.dll": {
"Size": 9957
"Size": 10011
},
"assemblies/System.Linq.dll": {
"Size": 19441
"Size": 19453
},
"assemblies/System.Linq.Expressions.dll": {
"Size": 164128
"Size": 164141
},
"assemblies/System.Net.Http.dll": {
"Size": 65982
"Size": 66153
},
"assemblies/System.Net.Primitives.dll": {
"Size": 22441
"Size": 22487
},
"assemblies/System.Net.Requests.dll": {
"Size": 3620
"Size": 3630
},
"assemblies/System.ObjectModel.dll": {
"Size": 8144
"Size": 8154
},
"assemblies/System.Private.CoreLib.dll": {
"Size": 808708
"Size": 814216
},
"assemblies/System.Private.DataContractSerialization.dll": {
"Size": 192356
"Size": 192370
},
"assemblies/System.Private.Uri.dll": {
"Size": 42878
"Size": 42897
},
"assemblies/System.Private.Xml.dll": {
"Size": 216193
"Size": 216180
},
"assemblies/System.Private.Xml.Linq.dll": {
"Size": 16662
"Size": 16673
},
"assemblies/System.Runtime.dll": {
"Size": 2763
"Size": 2774
},
"assemblies/System.Runtime.InteropServices.dll": {
"Size": 3753
"Size": 3760
},
"assemblies/System.Runtime.Serialization.dll": {
"Size": 1943
"Size": 1950
},
"assemblies/System.Runtime.Serialization.Formatters.dll": {
"Size": 2509
"Size": 2517
},
"assemblies/System.Runtime.Serialization.Primitives.dll": {
"Size": 3791
"Size": 3802
},
"assemblies/System.Security.Cryptography.dll": {
"Size": 7766
"Size": 7781
},
"assemblies/System.Text.RegularExpressions.dll": {
"Size": 156677
"Size": 157123
},
"assemblies/System.Xml.dll": {
"Size": 1833
"Size": 1839
},
"assemblies/System.Xml.Linq.dll": {
"Size": 1856
"Size": 1864
},
"assemblies/UnnamedProject.dll": {
"Size": 5294
},
"assemblies/Xamarin.AndroidX.Activity.dll": {
"Size": 5870
"Size": 5867
},
"assemblies/Xamarin.AndroidX.AppCompat.AppCompatResources.dll": {
"Size": 6117
Expand All @@ -146,7 +146,7 @@
"Size": 6592
},
"assemblies/Xamarin.AndroidX.CoordinatorLayout.dll": {
"Size": 16404
"Size": 16408
},
"assemblies/Xamarin.AndroidX.Core.dll": {
"Size": 96738
Expand All @@ -158,16 +158,16 @@
"Size": 39951
},
"assemblies/Xamarin.AndroidX.Legacy.Support.Core.UI.dll": {
"Size": 5923
"Size": 5924
},
"assemblies/Xamarin.AndroidX.Lifecycle.Common.dll": {
"Size": 6391
},
"assemblies/Xamarin.AndroidX.Lifecycle.LiveData.Core.dll": {
"Size": 6459
"Size": 6462
},
"assemblies/Xamarin.AndroidX.Lifecycle.ViewModel.dll": {
"Size": 3067
"Size": 3068
},
"assemblies/Xamarin.AndroidX.Loader.dll": {
"Size": 12473
Expand All @@ -176,7 +176,7 @@
"Size": 84804
},
"assemblies/Xamarin.AndroidX.SavedState.dll": {
"Size": 4866
"Size": 4870
},
"assemblies/Xamarin.AndroidX.SwipeRefreshLayout.dll": {
"Size": 10389
Expand All @@ -188,10 +188,10 @@
"Size": 528450
},
"assemblies/Xamarin.Forms.Platform.Android.dll": {
"Size": 337828
"Size": 337831
},
"assemblies/Xamarin.Forms.Platform.dll": {
"Size": 11084
"Size": 11080
},
"assemblies/Xamarin.Forms.Xaml.dll": {
"Size": 60774
Expand All @@ -200,28 +200,28 @@
"Size": 40158
},
"classes.dex": {
"Size": 3141008
"Size": 3127152
},
"lib/arm64-v8a/libmono-component-marshal-ilgen.so": {
"Size": 93552
},
"lib/arm64-v8a/libmonodroid.so": {
"Size": 379320
"Size": 379152
},
"lib/arm64-v8a/libmonosgen-2.0.so": {
"Size": 3090760
"Size": 3106808
},
"lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
"Size": 723840
},
"lib/arm64-v8a/libSystem.Native.so": {
"Size": 94328
"Size": 94280
},
"lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
"Size": 155056
"Size": 154904
},
"lib/arm64-v8a/libxamarin-app.so": {
"Size": 333720
"Size": 333760
},
"META-INF/android.support.design_material.version": {
"Size": 12
Expand Down Expand Up @@ -1976,5 +1976,5 @@
"Size": 341228
}
},
"PackageSize": 7828228
"PackageSize": 7820036
}

0 comments on commit 61767a0

Please sign in to comment.