Skip to content

Commit 31fe82b

Browse files
dotnet-maestro[bot]agockejonathanpeppers
authored
Bump to dotnet/installer@dbdda95 7.0.100-preview.7.22370.3 (#7181)
Changes: dotnet/installer@d2fff6d...dbdda95 Changes: dotnet/linker@ef2d0f2...33a76b8 Changes: dotnet/runtime@206dccb...db5d4df Changes: dotnet/emsdk@40e7c62...7d27778 Updates: * Microsoft.Dotnet.Sdk.Internal: from 7.0.100-preview.7.22362.31 to 7.0.100-preview.7.22370.3 * Microsoft.NET.ILLink.Tasks: from 7.0.100-1.22354.1 to 7.0.100-1.22362.1 * Microsoft.NETCore.App.Ref: from 7.0.0-preview.6.22356.1 to 7.0.0-preview.7.22369.4 * Microsoft.NET.Workload.Emscripten.Manifest-7.0.100: from 7.0.0-preview.7.22330.1 to 7.0.0-preview.7.22361.2 ~~ Set `$(TrimMode)` `partial` by default (#7132) ~~ Companion to dotnet/linker#2856 * Update src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets * Remove usages of `%(TrimMode)` for `$(AndroidLinkMode)` of `Full` * Update .apkdesc files ~~ Set `$(LangVersion)` to 10 in Mono.Android.csproj ~~ There appears to be a C# 11 IL size regression in: dotnet/roslyn#62832 We can use C# 10 for now to avoid this. * Fixed `Mono.Android.dll` size in `.apkdesc` files Co-authored-by: Andy Gocke <andy@commentout.net> Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
1 parent 3387f5e commit 31fe82b

File tree

7 files changed

+72
-74
lines changed

7 files changed

+72
-74
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="7.0.100-preview.7.22362.31">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-preview.7.22370.3">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>d2fff6df585efa03cbe883b4fb6ce41be8d61342</Sha>
5+
<Sha>dbdda951424aa9b4d299d60f161f040af56d9886</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22354.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
7+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22362.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
88
<Uri>https://github.com/dotnet/linker</Uri>
9-
<Sha>ef2d0f25b72469b55925251a79f12bcbf98644bf</Sha>
9+
<Sha>33a76b856466b96dd3d179e599a7fc0118389641</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.6.22356.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.7.22369.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>206dccb7945aaa3f26599fbe742de9022ca7ef91</Sha>
13+
<Sha>db5d4dfd16d2b56fd557b44d7b9e172372b43454</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-preview.7.22330.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
15+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-preview.7.22361.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>40e7c6226711ec616ee07e725563eda708630fe1</Sha>
17+
<Sha>7d277787570614a3dd99e1d6022375d9ae43e6af</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>7.0.100-preview.7.22362.31</MicrosoftDotnetSdkInternalPackageVersion>
5-
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22354.1</MicrosoftNETILLinkTasksPackageVersion>
6-
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.6.22356.1</MicrosoftNETCoreAppRefPackageVersion>
4+
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-preview.7.22370.3</MicrosoftDotnetSdkInternalPackageVersion>
5+
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22362.1</MicrosoftNETILLinkTasksPackageVersion>
6+
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.7.22369.4</MicrosoftNETCoreAppRefPackageVersion>
77
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
88
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
9-
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-preview.7.22330.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
9+
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-preview.7.22361.2</MicrosoftNETWorkloadEmscriptenManifest70100Version>
1010
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenManifest70100Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
1111
</PropertyGroup>
1212
<PropertyGroup>

‎src/Mono.Android/Mono.Android.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
<Nullable>enable</Nullable>
2323
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
2424
<EnableSingleFileAnalyzer>true</EnableSingleFileAnalyzer>
25+
<!-- Avoids the size increase for C# delegates -->
26+
<LangVersion>10</LangVersion>
2527
</PropertyGroup>
2628

2729
<PropertyGroup Condition=" '$(TargetFramework)' == 'monoandroid10' ">

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@
6464
<PublishTrimmed Condition=" '$(PublishTrimmed)' == '' and '$(Configuration)' == 'Release' and '$(AndroidLinkMode)' != 'None' ">true</PublishTrimmed>
6565
<AndroidLinkMode Condition=" '$(AndroidLinkMode)' == '' and '$(PublishTrimmed)' == 'true' ">SdkOnly</AndroidLinkMode>
6666
<AndroidLinkMode Condition=" '$(AndroidLinkMode)' == '' ">None</AndroidLinkMode>
67-
<TrimmerDefaultAction Condition=" '$(TrimmerDefaultAction)' == '' and '$(AndroidLinkMode)' == 'Full' ">link</TrimmerDefaultAction>
67+
<!-- For compat with user code not marked trimmable, only trim opt-in by default. -->
68+
<TrimMode Condition=" '$(TrimMode)' == '' and '$(AndroidLinkMode)' == 'Full' ">link</TrimMode>
69+
<TrimMode Condition="'$(TrimMode)' == ''">partial</TrimMode>
6870
<SuppressTrimAnalysisWarnings Condition=" '$(SuppressTrimAnalysisWarnings)' == '' ">true</SuppressTrimAnalysisWarnings>
6971
<!-- Prefer $(RuntimeIdentifiers) plural -->
7072
<RuntimeIdentifiers Condition=" '$(RuntimeIdentifier)' == '' And '$(RuntimeIdentifiers)' == '' ">android-arm;android-arm64;android-x86;android-x64</RuntimeIdentifiers>

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ This file contains the .NET 5-specific targets to customize ILLink
2828
Condition="'$(VSAndroidDesigner)' != ''"
2929
Value="$(VSAndroidDesigner)"
3030
Trim="true" />
31-
<!-- Mark all assemblies to be linked for AndroidLinkMode=Full -->
32-
<ResolvedFileToPublish
33-
Update="@(ResolvedFileToPublish)"
34-
Condition=" '$(AndroidLinkMode)' == 'Full' and '%(ResolvedFileToPublish.Extension)' == '.dll' and '%(ResolvedFileToPublish.AssetType)' != 'native' "
35-
TrimMode="link"
36-
/>
3731
<!-- TODO: remove setting the trim mode here, once the support packages are updated to NET6 and compatability packages not needed -->
3832
<ResolvedFileToPublish
3933
Condition=" '$(AndroidLinkMode)' == 'SdkOnly' and ( $([System.String]::Copy(%(Filename)).StartsWith ('Xamarin.AndroidX.')) or $([System.String]::Copy(%(Filename)).StartsWith ('Xamarin.Android.Support.')) or $([System.String]::Copy(%(Filename)).StartsWith ('Xamarin.Google.')) or $([System.String]::Copy(%(Filename)).StartsWith ('Xamarin.GooglePlayServices.')) ) ">

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,28 @@
55
"Size": 3032
66
},
77
"assemblies/Java.Interop.dll": {
8-
"Size": 59419
8+
"Size": 59536
99
},
1010
"assemblies/Mono.Android.dll": {
11-
"Size": 89327
11+
"Size": 89397
1212
},
1313
"assemblies/rc.bin": {
1414
"Size": 1083
1515
},
1616
"assemblies/System.Console.dll": {
17-
"Size": 6484
17+
"Size": 6492
1818
},
1919
"assemblies/System.Linq.dll": {
20-
"Size": 9980
20+
"Size": 9973
2121
},
2222
"assemblies/System.Private.CoreLib.dll": {
23-
"Size": 532428
23+
"Size": 533387
2424
},
2525
"assemblies/System.Runtime.dll": {
26-
"Size": 2417
26+
"Size": 2416
2727
},
2828
"assemblies/UnnamedProject.dll": {
29-
"Size": 3560
29+
"Size": 3601
3030
},
3131
"classes.dex": {
3232
"Size": 360744
@@ -35,19 +35,19 @@
3535
"Size": 512520
3636
},
3737
"lib/arm64-v8a/libmonosgen-2.0.so": {
38-
"Size": 3083112
38+
"Size": 3084536
3939
},
4040
"lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
4141
"Size": 723840
4242
},
4343
"lib/arm64-v8a/libSystem.Native.so": {
44-
"Size": 87768
44+
"Size": 92800
4545
},
4646
"lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
47-
"Size": 146128
47+
"Size": 148696
4848
},
4949
"lib/arm64-v8a/libxamarin-app.so": {
50-
"Size": 9528
50+
"Size": 9552
5151
},
5252
"META-INF/BNDLTOOL.RSA": {
5353
"Size": 1213
@@ -83,5 +83,5 @@
8383
"Size": 1904
8484
}
8585
},
86-
"PackageSize": 2738143
86+
"PackageSize": 2742239
8787
}

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

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -8,121 +8,121 @@
88
"Size": 7114
99
},
1010
"assemblies/Java.Interop.dll": {
11-
"Size": 66763
11+
"Size": 66879
1212
},
1313
"assemblies/Mono.Android.dll": {
14-
"Size": 447517
14+
"Size": 447679
1515
},
1616
"assemblies/mscorlib.dll": {
17-
"Size": 3899
17+
"Size": 3888
1818
},
1919
"assemblies/netstandard.dll": {
20-
"Size": 5621
20+
"Size": 5610
2121
},
2222
"assemblies/rc.bin": {
2323
"Size": 1083
2424
},
2525
"assemblies/System.Collections.Concurrent.dll": {
26-
"Size": 10861
26+
"Size": 10855
2727
},
2828
"assemblies/System.Collections.dll": {
29-
"Size": 16170
29+
"Size": 16165
3030
},
3131
"assemblies/System.Collections.NonGeneric.dll": {
32-
"Size": 7955
32+
"Size": 7949
3333
},
3434
"assemblies/System.ComponentModel.dll": {
35-
"Size": 2021
35+
"Size": 2013
3636
},
3737
"assemblies/System.ComponentModel.Primitives.dll": {
38-
"Size": 2636
38+
"Size": 2628
3939
},
4040
"assemblies/System.ComponentModel.TypeConverter.dll": {
41-
"Size": 6114
41+
"Size": 6106
4242
},
4343
"assemblies/System.Console.dll": {
44-
"Size": 6683
44+
"Size": 7375
4545
},
4646
"assemblies/System.Core.dll": {
47-
"Size": 2063
47+
"Size": 2052
4848
},
4949
"assemblies/System.Diagnostics.TraceSource.dll": {
50-
"Size": 6579
50+
"Size": 6576
5151
},
5252
"assemblies/System.dll": {
53-
"Size": 2417
53+
"Size": 2406
5454
},
5555
"assemblies/System.Drawing.dll": {
56-
"Size": 2103
56+
"Size": 2093
5757
},
5858
"assemblies/System.Drawing.Primitives.dll": {
59-
"Size": 12188
59+
"Size": 12187
6060
},
6161
"assemblies/System.IO.Compression.dll": {
62-
"Size": 16867
62+
"Size": 16857
6363
},
6464
"assemblies/System.IO.IsolatedStorage.dll": {
65-
"Size": 10055
65+
"Size": 10056
6666
},
6767
"assemblies/System.Linq.dll": {
68-
"Size": 19806
68+
"Size": 20029
6969
},
7070
"assemblies/System.Linq.Expressions.dll": {
71-
"Size": 177416
71+
"Size": 177417
7272
},
7373
"assemblies/System.Net.Http.dll": {
74-
"Size": 66486
74+
"Size": 66469
7575
},
7676
"assemblies/System.Net.Primitives.dll": {
77-
"Size": 22061
77+
"Size": 22055
7878
},
7979
"assemblies/System.Net.Requests.dll": {
80-
"Size": 3675
80+
"Size": 3665
8181
},
8282
"assemblies/System.ObjectModel.dll": {
83-
"Size": 8552
83+
"Size": 8545
8484
},
8585
"assemblies/System.Private.CoreLib.dll": {
86-
"Size": 815279
86+
"Size": 823756
8787
},
8888
"assemblies/System.Private.DataContractSerialization.dll": {
89-
"Size": 185005
89+
"Size": 184961
9090
},
9191
"assemblies/System.Private.Uri.dll": {
92-
"Size": 42683
92+
"Size": 42651
9393
},
9494
"assemblies/System.Private.Xml.dll": {
95-
"Size": 216493
95+
"Size": 216481
9696
},
9797
"assemblies/System.Private.Xml.Linq.dll": {
98-
"Size": 16709
98+
"Size": 16712
9999
},
100100
"assemblies/System.Runtime.dll": {
101-
"Size": 2613
101+
"Size": 2606
102102
},
103103
"assemblies/System.Runtime.Serialization.dll": {
104-
"Size": 2027
104+
"Size": 2016
105105
},
106106
"assemblies/System.Runtime.Serialization.Formatters.dll": {
107-
"Size": 2564
107+
"Size": 2554
108108
},
109109
"assemblies/System.Runtime.Serialization.Primitives.dll": {
110-
"Size": 3840
110+
"Size": 3833
111111
},
112112
"assemblies/System.Security.Cryptography.dll": {
113-
"Size": 7799
113+
"Size": 7795
114114
},
115115
"assemblies/System.Text.RegularExpressions.dll": {
116-
"Size": 152582
116+
"Size": 154177
117117
},
118118
"assemblies/System.Xml.dll": {
119-
"Size": 1918
119+
"Size": 1907
120120
},
121121
"assemblies/System.Xml.Linq.dll": {
122-
"Size": 1939
122+
"Size": 1928
123123
},
124124
"assemblies/UnnamedProject.dll": {
125-
"Size": 117250
125+
"Size": 117277
126126
},
127127
"assemblies/Xamarin.AndroidX.Activity.dll": {
128128
"Size": 5941
@@ -197,19 +197,19 @@
197197
"Size": 512520
198198
},
199199
"lib/arm64-v8a/libmonosgen-2.0.so": {
200-
"Size": 3083112
200+
"Size": 3084536
201201
},
202202
"lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
203203
"Size": 723840
204204
},
205205
"lib/arm64-v8a/libSystem.Native.so": {
206-
"Size": 87768
206+
"Size": 92800
207207
},
208208
"lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
209-
"Size": 146128
209+
"Size": 148696
210210
},
211211
"lib/arm64-v8a/libxamarin-app.so": {
212-
"Size": 98952
212+
"Size": 98976
213213
},
214214
"META-INF/android.support.design_material.version": {
215215
"Size": 12
@@ -1964,5 +1964,5 @@
19641964
"Size": 341228
19651965
}
19661966
},
1967-
"PackageSize": 8073625
1967+
"PackageSize": 8085913
19681968
}

0 commit comments

Comments
 (0)