Skip to content

Commit 102982b

Browse files
dotnet-maestro[bot]jonathanpeppers
dotnet-maestro[bot]
and
jonathanpeppers
authored
Bump to dotnet/installer@f3da421 7.0.100-rc.2.22417.1 (#7255)
Fixes: #7256 Changes: dotnet/installer@716bd17...f3da421 Changes: dotnet/linker@f09bacf...6252a21 Changes: dotnet/runtime@26a71c6...f52d8c5 Updates: * Microsoft.Dotnet.Sdk.Internal: from 7.0.100-rc.1.22409.23 to 7.0.100-rc.2.22417.1 * Microsoft.NET.ILLink.Tasks: from 7.0.100-1.22377.1 to 7.0.100-1.22415.4 * Microsoft.NETCore.App.Ref: from 7.0.0-rc.1.22403.8 to 7.0.0-rc.1.22411.12 ~~ Other Changes ~~ * Revert `export DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER=true`, as the original issue is fixed. * [illink] enable serialization discovery for the linker Context: dotnet/linker#2929 Context: https://github.com/dotnet/linker/blob/6e8e139a484f74c524c821c7a4a08287d77257a4/src/ILLink.Tasks/build/Microsoft.NET.ILLink.targets#L227-L229 Fixes: #7256 Serialization heuristics in the .NET 7 linker is now opt-in. We now need to pass a new flag to the linker by default: <_ExtraTrimmerArgs>--enable-serialization-discovery $(_ExtraTrimmerArgs)</_ExtraTrimmerArgs> * Update `.apkdesc` files for the new `marshal-ilgen` Mono component * [tests] ignore `WarnAboutAppDomains(true)` Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
1 parent 4873dfa commit 102982b

8 files changed

Lines changed: 82 additions & 76 deletions

File tree

‎Makefile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ endif
3838

3939
export NO_SUDO ?= false
4040

41-
# Workaround: https://github.com/dotnet/sdk/issues/26965
42-
export DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER = true
43-
4441
ifneq ($(NO_SUDO),false)
4542
_PREPARE_ARGS += --auto-provisioning-uses-sudo=false
4643
endif

‎build-tools/automation/yaml-templates/variables.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ variables:
3535
value: net7.0
3636
- name: DotNetStableTargetFramework
3737
value: net6.0
38-
# Workaround: https://github.com/dotnet/sdk/issues/26965
39-
- name: DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER
40-
value: true
4138
# Workaround: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1585820
4239
- name: _WriteTelemetryProperties
4340
value: false

‎eng/Version.Details.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rc.1.22409.23">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rc.2.22417.1">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>716bd17882e62abb008911461ea4ff5a75c26788</Sha>
5+
<Sha>f3da421a6e81382d6d2b25b236697f33e210092c</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22377.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
7+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22415.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
88
<Uri>https://github.com/dotnet/linker</Uri>
9-
<Sha>f09bacf09ef10b61cf9f19825f8782171a816dab</Sha>
9+
<Sha>6252a2194dd32911db2c0669fc818555687d5570</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.1.22403.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.1.22411.12" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>26a71c61fbda229f151afb14e274604b4926df5c</Sha>
13+
<Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
1414
</Dependency>
1515
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-rc.1.22368.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rc.1.22409.23</MicrosoftDotnetSdkInternalPackageVersion>
5-
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22377.1</MicrosoftNETILLinkTasksPackageVersion>
6-
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.1.22403.8</MicrosoftNETCoreAppRefPackageVersion>
4+
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rc.2.22417.1</MicrosoftDotnetSdkInternalPackageVersion>
5+
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22415.4</MicrosoftNETILLinkTasksPackageVersion>
6+
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.1.22411.12</MicrosoftNETCoreAppRefPackageVersion>
77
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
88
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
99
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-rc.1.22368.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ This file contains the .NET 5-specific targets to customize ILLink
1515
DependsOnTargets="GetReferenceAssemblyPaths;_CreatePropertiesCache">
1616
<PropertyGroup>
1717
<TrimmerRemoveSymbols Condition=" '$(AndroidIncludeDebugSymbols)' != 'true' ">true</TrimmerRemoveSymbols>
18+
<_ExtraTrimmerArgs Condition=" '$(_EnableSerializationDiscovery)' != 'false' ">--enable-serialization-discovery $(_ExtraTrimmerArgs)</_ExtraTrimmerArgs>
1819
<!--
1920
Used for the <ILLink DumpDependencies="$(_TrimmerDumpDependencies)" /> value:
2021
https://github.com/dotnet/sdk/blob/a5393731b5b7b225692fff121f747fbbc9e8b140/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ILLink.targets#L150

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,11 @@ public void PreserveCustomHttpClientHandlers ()
182182
[Test]
183183
public void WarnAboutAppDomains ([Values (true, false)] bool isRelease)
184184
{
185+
if (isRelease) {
186+
// NOTE: trimmer warnings are hidden by default in .NET 7 rc1
187+
Assert.Ignore("https://github.com/dotnet/linker/issues/2982");
188+
}
189+
185190
var path = Path.Combine (Root, "temp", TestName);
186191
var lib = new XamarinAndroidLibraryProject {
187192
IsRelease = isRelease,

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

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,61 +5,64 @@
55
"Size": 3032
66
},
77
"assemblies/Java.Interop.dll": {
8-
"Size": 58756
8+
"Size": 58665
99
},
1010
"assemblies/Mono.Android.dll": {
11-
"Size": 87933
11+
"Size": 87971
1212
},
1313
"assemblies/rc.bin": {
14-
"Size": 1129
14+
"Size": 1182
1515
},
1616
"assemblies/System.Console.dll": {
17-
"Size": 6401
17+
"Size": 6404
1818
},
1919
"assemblies/System.Linq.dll": {
20-
"Size": 9083
20+
"Size": 9092
2121
},
2222
"assemblies/System.Private.CoreLib.dll": {
23-
"Size": 473290
23+
"Size": 462335
2424
},
2525
"assemblies/System.Runtime.dll": {
26-
"Size": 2379
26+
"Size": 2375
2727
},
2828
"assemblies/UnnamedProject.dll": {
29-
"Size": 3597
29+
"Size": 3560
3030
},
3131
"classes.dex": {
3232
"Size": 360744
3333
},
34+
"lib/arm64-v8a/libmono-component-marshal-ilgen.so": {
35+
"Size": 96832
36+
},
3437
"lib/arm64-v8a/libmonodroid.so": {
3538
"Size": 425336
3639
},
3740
"lib/arm64-v8a/libmonosgen-2.0.so": {
38-
"Size": 3084552
41+
"Size": 3052320
3942
},
4043
"lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
4144
"Size": 723840
4245
},
4346
"lib/arm64-v8a/libSystem.Native.so": {
44-
"Size": 92800
47+
"Size": 93032
4548
},
4649
"lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
4750
"Size": 148696
4851
},
4952
"lib/arm64-v8a/libxamarin-app.so": {
50-
"Size": 9488
53+
"Size": 9784
5154
},
5255
"META-INF/BNDLTOOL.RSA": {
5356
"Size": 1213
5457
},
5558
"META-INF/BNDLTOOL.SF": {
56-
"Size": 2570
59+
"Size": 2690
5760
},
5861
"META-INF/MANIFEST.MF": {
59-
"Size": 2443
62+
"Size": 2563
6063
},
6164
"res/drawable-hdpi-v4/icon.png": {
62-
"Size": 4791
65+
"Size": 4762
6366
},
6467
"res/drawable-mdpi-v4/icon.png": {
6568
"Size": 2200
@@ -83,5 +86,5 @@
8386
"Size": 1904
8487
}
8588
},
86-
"PackageSize": 2648031
89+
"PackageSize": 2664509
8790
}

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

Lines changed: 49 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -8,121 +8,121 @@
88
"Size": 7114
99
},
1010
"assemblies/Java.Interop.dll": {
11-
"Size": 66630
11+
"Size": 66533
1212
},
1313
"assemblies/Mono.Android.dll": {
14-
"Size": 441986
14+
"Size": 441958
1515
},
1616
"assemblies/mscorlib.dll": {
17-
"Size": 3849
17+
"Size": 3857
1818
},
1919
"assemblies/netstandard.dll": {
20-
"Size": 5565
20+
"Size": 5570
2121
},
2222
"assemblies/rc.bin": {
23-
"Size": 1129
23+
"Size": 1182
2424
},
2525
"assemblies/System.Collections.Concurrent.dll": {
26-
"Size": 10477
26+
"Size": 10479
2727
},
2828
"assemblies/System.Collections.dll": {
29-
"Size": 15298
29+
"Size": 15299
3030
},
3131
"assemblies/System.Collections.NonGeneric.dll": {
32-
"Size": 7426
32+
"Size": 7429
3333
},
3434
"assemblies/System.ComponentModel.dll": {
35-
"Size": 1930
35+
"Size": 1939
3636
},
3737
"assemblies/System.ComponentModel.Primitives.dll": {
38-
"Size": 2541
38+
"Size": 2551
3939
},
4040
"assemblies/System.ComponentModel.TypeConverter.dll": {
41-
"Size": 6022
41+
"Size": 6030
4242
},
4343
"assemblies/System.Console.dll": {
44-
"Size": 7290
44+
"Size": 7294
4545
},
4646
"assemblies/System.Core.dll": {
47-
"Size": 1973
47+
"Size": 1983
4848
},
4949
"assemblies/System.Diagnostics.TraceSource.dll": {
50-
"Size": 6512
50+
"Size": 6549
5151
},
5252
"assemblies/System.dll": {
53-
"Size": 2331
53+
"Size": 2340
5454
},
5555
"assemblies/System.Drawing.dll": {
56-
"Size": 2016
56+
"Size": 2024
5757
},
5858
"assemblies/System.Drawing.Primitives.dll": {
59-
"Size": 11967
59+
"Size": 11963
6060
},
6161
"assemblies/System.IO.Compression.dll": {
62-
"Size": 16804
62+
"Size": 16658
6363
},
6464
"assemblies/System.IO.IsolatedStorage.dll": {
65-
"Size": 9985
65+
"Size": 9991
6666
},
6767
"assemblies/System.Linq.dll": {
68-
"Size": 19131
68+
"Size": 19133
6969
},
7070
"assemblies/System.Linq.Expressions.dll": {
71-
"Size": 163892
71+
"Size": 163893
7272
},
7373
"assemblies/System.Net.Http.dll": {
74-
"Size": 66008
74+
"Size": 65957
7575
},
7676
"assemblies/System.Net.Primitives.dll": {
77-
"Size": 21947
77+
"Size": 21873
7878
},
7979
"assemblies/System.Net.Requests.dll": {
80-
"Size": 3593
80+
"Size": 3599
8181
},
8282
"assemblies/System.ObjectModel.dll": {
83-
"Size": 8095
83+
"Size": 8103
8484
},
8585
"assemblies/System.Private.CoreLib.dll": {
86-
"Size": 808082
86+
"Size": 769737
8787
},
8888
"assemblies/System.Private.DataContractSerialization.dll": {
89-
"Size": 184896
89+
"Size": 184912
9090
},
9191
"assemblies/System.Private.Uri.dll": {
92-
"Size": 42577
92+
"Size": 42214
9393
},
9494
"assemblies/System.Private.Xml.dll": {
95-
"Size": 215501
95+
"Size": 215291
9696
},
9797
"assemblies/System.Private.Xml.Linq.dll": {
98-
"Size": 16627
98+
"Size": 16633
9999
},
100100
"assemblies/System.Runtime.dll": {
101-
"Size": 2573
101+
"Size": 2578
102102
},
103103
"assemblies/System.Runtime.Serialization.dll": {
104-
"Size": 1939
104+
"Size": 1948
105105
},
106106
"assemblies/System.Runtime.Serialization.Formatters.dll": {
107-
"Size": 2473
107+
"Size": 2477
108108
},
109109
"assemblies/System.Runtime.Serialization.Primitives.dll": {
110-
"Size": 3751
110+
"Size": 3756
111111
},
112112
"assemblies/System.Security.Cryptography.dll": {
113-
"Size": 7741
113+
"Size": 7785
114114
},
115115
"assemblies/System.Text.RegularExpressions.dll": {
116-
"Size": 153702
116+
"Size": 153833
117117
},
118118
"assemblies/System.Xml.dll": {
119-
"Size": 1827
119+
"Size": 1836
120120
},
121121
"assemblies/System.Xml.Linq.dll": {
122-
"Size": 1846
122+
"Size": 1857
123123
},
124124
"assemblies/UnnamedProject.dll": {
125-
"Size": 117278
125+
"Size": 117251
126126
},
127127
"assemblies/Xamarin.AndroidX.Activity.dll": {
128128
"Size": 5872
@@ -193,23 +193,26 @@
193193
"classes.dex": {
194194
"Size": 3473216
195195
},
196+
"lib/arm64-v8a/libmono-component-marshal-ilgen.so": {
197+
"Size": 96832
198+
},
196199
"lib/arm64-v8a/libmonodroid.so": {
197200
"Size": 425336
198201
},
199202
"lib/arm64-v8a/libmonosgen-2.0.so": {
200-
"Size": 3084552
203+
"Size": 3052320
201204
},
202205
"lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
203206
"Size": 723840
204207
},
205208
"lib/arm64-v8a/libSystem.Native.so": {
206-
"Size": 92800
209+
"Size": 93032
207210
},
208211
"lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
209212
"Size": 148696
210213
},
211214
"lib/arm64-v8a/libxamarin-app.so": {
212-
"Size": 98912
215+
"Size": 99208
213216
},
214217
"META-INF/android.support.design_material.version": {
215218
"Size": 12
@@ -323,13 +326,13 @@
323326
"Size": 1213
324327
},
325328
"META-INF/BNDLTOOL.SF": {
326-
"Size": 78859
329+
"Size": 78979
327330
},
328331
"META-INF/com.google.android.material_material.version": {
329332
"Size": 10
330333
},
331334
"META-INF/MANIFEST.MF": {
332-
"Size": 78732
335+
"Size": 78852
333336
},
334337
"META-INF/proguard/androidx-annotations.pro": {
335338
"Size": 339
@@ -776,7 +779,7 @@
776779
"Size": 470
777780
},
778781
"res/drawable-hdpi-v4/icon.png": {
779-
"Size": 4791
782+
"Size": 4762
780783
},
781784
"res/drawable-hdpi-v4/notification_bg_low_normal.9.png": {
782785
"Size": 212
@@ -1964,5 +1967,5 @@
19641967
"Size": 341228
19651968
}
19661969
},
1967-
"PackageSize": 8008089
1970+
"PackageSize": 7995895
19681971
}

0 commit comments

Comments
 (0)