Skip to content

Commit 863cfc5

Browse files
dotnet-maestro[bot]jonathanpeppers
dotnet-maestro[bot]
and
jonathanpeppers
authored
Bump to dotnet/installer@2d1a4de 7.0.100-rc.2.22426.5 (dotnet#7314)
Changes: dotnet/installer@84d26a0...2d1a4de Changes: dotnet/linker@6252a21...313671b Changes: dotnet/runtime@f52d8c5...ef077d0 Changes: dotnet/emsdk@7b2cd1e...2160932 Updates: * Microsoft.Dotnet.Sdk.Internal: from 7.0.100-rc.2.22419.24 to 7.0.100-rc.2.22426.5 * Microsoft.NET.ILLink.Tasks: from 7.0.100-1.22415.4 to 7.0.100-1.22423.4 * Microsoft.NETCore.App.Ref: from 7.0.0-rc.1.22411.12 to 7.0.0-rc.1.22422.12 * Microsoft.NET.Workload.Emscripten.Manifest-7.0.100: from 7.0.0-rc.1.22368.1 to 7.0.0-rc.1.22411.1 ~~ Other Changes ~~ * Updates `.apkdesc` and other tests for app size regressions * TODO file an issue about these, needs further investigation Co-authored-by: Jonathan Peppers <[email protected]>
1 parent a0377cd commit 863cfc5

File tree

5 files changed

+118
-68
lines changed

5 files changed

+118
-68
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-rc.2.22419.24">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rc.2.22426.5">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>84d26a070704dc4eb7870f15d44880228bb82cb8</Sha>
5+
<Sha>2d1a4de6b2da59647a9538bf9cc4e252847e6231</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22415.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
7+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22423.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
88
<Uri>https://github.com/dotnet/linker</Uri>
9-
<Sha>6252a2194dd32911db2c0669fc818555687d5570</Sha>
9+
<Sha>313671b195b1b36d56a8888a9a0e12edaac52c57</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.1.22411.12" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.1.22422.12" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
13+
<Sha>ef077d0b58ffddcf54fa73bd85dace6b999b8992</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-rc.1.22368.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
15+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-rc.1.22411.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>7b2cd1ee7169143248a7da9fd749caf22affa624</Sha>
17+
<Sha>216093204c415b6e37dfadfcbcf183881b443636</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-rc.2.22419.24</MicrosoftDotnetSdkInternalPackageVersion>
5-
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22415.4</MicrosoftNETILLinkTasksPackageVersion>
6-
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.1.22411.12</MicrosoftNETCoreAppRefPackageVersion>
4+
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rc.2.22426.5</MicrosoftDotnetSdkInternalPackageVersion>
5+
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22423.4</MicrosoftNETILLinkTasksPackageVersion>
6+
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.1.22422.12</MicrosoftNETCoreAppRefPackageVersion>
77
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
88
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
9-
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-rc.1.22368.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
9+
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-rc.1.22411.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
1010
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenManifest70100Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
1111
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
1212
</PropertyGroup>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,14 @@ public void CheckIncludedAssemblies ([Values (false, true)] bool usesAssemblySto
9393
"System.Runtime.dll",
9494
"System.Linq.dll",
9595
"UnnamedProject.dll",
96+
//NOTE: appeared in .NET 7.0.100-rc.1.22423.7
97+
"System.Diagnostics.Tracing.dll",
98+
"System.Memory.dll",
99+
"System.Runtime.InteropServices.dll",
100+
"System.Threading.Thread.dll",
101+
"System.Threading.ThreadPool.dll",
102+
"System.Threading.dll",
103+
"System.Transactions.Local.dll",
96104
} :
97105
new [] {
98106
"Java.Interop.dll",

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

Lines changed: 32 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,40 +5,61 @@
55
"Size": 3032
66
},
77
"assemblies/Java.Interop.dll": {
8-
"Size": 58665
8+
"Size": 59092
99
},
1010
"assemblies/Mono.Android.dll": {
11-
"Size": 87971
11+
"Size": 88614
1212
},
1313
"assemblies/rc.bin": {
1414
"Size": 1182
1515
},
1616
"assemblies/System.Console.dll": {
1717
"Size": 6404
1818
},
19+
"assemblies/System.Diagnostics.Tracing.dll": {
20+
"Size": 2085
21+
},
1922
"assemblies/System.Linq.dll": {
2023
"Size": 9092
2124
},
25+
"assemblies/System.Memory.dll": {
26+
"Size": 3384
27+
},
2228
"assemblies/System.Private.CoreLib.dll": {
23-
"Size": 462335
29+
"Size": 533637
2430
},
2531
"assemblies/System.Runtime.dll": {
26-
"Size": 2375
32+
"Size": 3496
33+
},
34+
"assemblies/System.Runtime.InteropServices.dll": {
35+
"Size": 3738
36+
},
37+
"assemblies/System.Threading.dll": {
38+
"Size": 5482
39+
},
40+
"assemblies/System.Threading.Thread.dll": {
41+
"Size": 1977
42+
},
43+
"assemblies/System.Threading.ThreadPool.dll": {
44+
"Size": 2007
45+
},
46+
"assemblies/System.Transactions.Local.dll": {
47+
"Size": 62995
2748
},
2849
"assemblies/UnnamedProject.dll": {
2950
"Size": 3560
3051
},
3152
"classes.dex": {
32-
"Size": 360744
53+
"Size": 360720
3354
},
3455
"lib/arm64-v8a/libmono-component-marshal-ilgen.so": {
3556
"Size": 96832
3657
},
3758
"lib/arm64-v8a/libmonodroid.so": {
38-
"Size": 425336
59+
"Size": 425416
3960
},
4061
"lib/arm64-v8a/libmonosgen-2.0.so": {
41-
"Size": 3052320
62+
"Size": 3052824
4263
},
4364
"lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
4465
"Size": 723840
@@ -50,16 +71,16 @@
5071
"Size": 148696
5172
},
5273
"lib/arm64-v8a/libxamarin-app.so": {
53-
"Size": 9784
74+
"Size": 10512
5475
},
5576
"META-INF/BNDLTOOL.RSA": {
5677
"Size": 1213
5778
},
5879
"META-INF/BNDLTOOL.SF": {
59-
"Size": 2690
80+
"Size": 3459
6081
},
6182
"META-INF/MANIFEST.MF": {
62-
"Size": 2563
83+
"Size": 3332
6384
},
6485
"res/drawable-hdpi-v4/icon.png": {
6586
"Size": 4762
@@ -86,5 +107,5 @@
86107
"Size": 1904
87108
}
88109
},
89-
"PackageSize": 2664509
110+
"PackageSize": 2820744
90111
}

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

Lines changed: 66 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -8,121 +8,142 @@
88
"Size": 7114
99
},
1010
"assemblies/Java.Interop.dll": {
11-
"Size": 66533
11+
"Size": 66665
1212
},
1313
"assemblies/Mono.Android.dll": {
14-
"Size": 441958
14+
"Size": 442077
1515
},
1616
"assemblies/mscorlib.dll": {
17-
"Size": 3857
17+
"Size": 3859
1818
},
1919
"assemblies/netstandard.dll": {
20-
"Size": 5570
20+
"Size": 5569
2121
},
2222
"assemblies/rc.bin": {
2323
"Size": 1182
2424
},
2525
"assemblies/System.Collections.Concurrent.dll": {
26-
"Size": 10479
26+
"Size": 10480
2727
},
2828
"assemblies/System.Collections.dll": {
29-
"Size": 15299
29+
"Size": 15300
3030
},
3131
"assemblies/System.Collections.NonGeneric.dll": {
32-
"Size": 7429
32+
"Size": 7427
3333
},
3434
"assemblies/System.ComponentModel.dll": {
35-
"Size": 1939
35+
"Size": 1940
3636
},
3737
"assemblies/System.ComponentModel.Primitives.dll": {
38-
"Size": 2551
38+
"Size": 2552
3939
},
4040
"assemblies/System.ComponentModel.TypeConverter.dll": {
41-
"Size": 6030
41+
"Size": 6031
4242
},
4343
"assemblies/System.Console.dll": {
44-
"Size": 7294
44+
"Size": 7265
4545
},
4646
"assemblies/System.Core.dll": {
47-
"Size": 1983
47+
"Size": 1985
4848
},
4949
"assemblies/System.Diagnostics.TraceSource.dll": {
50-
"Size": 6549
50+
"Size": 6542
51+
},
52+
"assemblies/System.Diagnostics.Tracing.dll": {
53+
"Size": 2085
5154
},
5255
"assemblies/System.dll": {
53-
"Size": 2340
56+
"Size": 2341
5457
},
5558
"assemblies/System.Drawing.dll": {
56-
"Size": 2024
59+
"Size": 2025
5760
},
5861
"assemblies/System.Drawing.Primitives.dll": {
59-
"Size": 11963
62+
"Size": 11967
6063
},
6164
"assemblies/System.IO.Compression.dll": {
62-
"Size": 16658
65+
"Size": 16669
6366
},
6467
"assemblies/System.IO.IsolatedStorage.dll": {
65-
"Size": 9991
68+
"Size": 9989
6669
},
6770
"assemblies/System.Linq.dll": {
68-
"Size": 19133
71+
"Size": 19137
6972
},
7073
"assemblies/System.Linq.Expressions.dll": {
71-
"Size": 163893
74+
"Size": 163885
75+
},
76+
"assemblies/System.Memory.dll": {
77+
"Size": 3384
7278
},
7379
"assemblies/System.Net.Http.dll": {
74-
"Size": 65957
80+
"Size": 66833
7581
},
7682
"assemblies/System.Net.Primitives.dll": {
77-
"Size": 21873
83+
"Size": 21877
7884
},
7985
"assemblies/System.Net.Requests.dll": {
80-
"Size": 3599
86+
"Size": 3601
8187
},
8288
"assemblies/System.ObjectModel.dll": {
83-
"Size": 8103
89+
"Size": 8101
8490
},
8591
"assemblies/System.Private.CoreLib.dll": {
86-
"Size": 769737
92+
"Size": 786590
8793
},
8894
"assemblies/System.Private.DataContractSerialization.dll": {
89-
"Size": 184912
95+
"Size": 192243
9096
},
9197
"assemblies/System.Private.Uri.dll": {
92-
"Size": 42214
98+
"Size": 42215
9399
},
94100
"assemblies/System.Private.Xml.dll": {
95-
"Size": 215291
101+
"Size": 215337
96102
},
97103
"assemblies/System.Private.Xml.Linq.dll": {
98-
"Size": 16633
104+
"Size": 16628
99105
},
100106
"assemblies/System.Runtime.dll": {
101-
"Size": 2578
107+
"Size": 3645
108+
},
109+
"assemblies/System.Runtime.InteropServices.dll": {
110+
"Size": 3738
102111
},
103112
"assemblies/System.Runtime.Serialization.dll": {
104-
"Size": 1948
113+
"Size": 1949
105114
},
106115
"assemblies/System.Runtime.Serialization.Formatters.dll": {
107-
"Size": 2477
116+
"Size": 2479
108117
},
109118
"assemblies/System.Runtime.Serialization.Primitives.dll": {
110-
"Size": 3756
119+
"Size": 3758
111120
},
112121
"assemblies/System.Security.Cryptography.dll": {
113-
"Size": 7785
122+
"Size": 7786
114123
},
115124
"assemblies/System.Text.RegularExpressions.dll": {
116-
"Size": 153833
125+
"Size": 154123
126+
},
127+
"assemblies/System.Threading.dll": {
128+
"Size": 5482
129+
},
130+
"assemblies/System.Threading.Thread.dll": {
131+
"Size": 1977
132+
},
133+
"assemblies/System.Threading.ThreadPool.dll": {
134+
"Size": 2007
135+
},
136+
"assemblies/System.Transactions.Local.dll": {
137+
"Size": 62995
117138
},
118139
"assemblies/System.Xml.dll": {
119-
"Size": 1836
140+
"Size": 1837
120141
},
121142
"assemblies/System.Xml.Linq.dll": {
122-
"Size": 1857
143+
"Size": 1858
123144
},
124145
"assemblies/UnnamedProject.dll": {
125-
"Size": 117251
146+
"Size": 117252
126147
},
127148
"assemblies/Xamarin.AndroidX.Activity.dll": {
128149
"Size": 5872
@@ -191,16 +212,16 @@
191212
"Size": 39911
192213
},
193214
"classes.dex": {
194-
"Size": 3473216
215+
"Size": 3473196
195216
},
196217
"lib/arm64-v8a/libmono-component-marshal-ilgen.so": {
197218
"Size": 96832
198219
},
199220
"lib/arm64-v8a/libmonodroid.so": {
200-
"Size": 425336
221+
"Size": 425416
201222
},
202223
"lib/arm64-v8a/libmonosgen-2.0.so": {
203-
"Size": 3052320
224+
"Size": 3052824
204225
},
205226
"lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
206227
"Size": 723840
@@ -212,7 +233,7 @@
212233
"Size": 148696
213234
},
214235
"lib/arm64-v8a/libxamarin-app.so": {
215-
"Size": 99208
236+
"Size": 99936
216237
},
217238
"META-INF/android.support.design_material.version": {
218239
"Size": 12
@@ -326,13 +347,13 @@
326347
"Size": 1213
327348
},
328349
"META-INF/BNDLTOOL.SF": {
329-
"Size": 78979
350+
"Size": 79748
330351
},
331352
"META-INF/com.google.android.material_material.version": {
332353
"Size": 10
333354
},
334355
"META-INF/MANIFEST.MF": {
335-
"Size": 78852
356+
"Size": 79621
336357
},
337358
"META-INF/proguard/androidx-annotations.pro": {
338359
"Size": 339
@@ -1967,5 +1988,5 @@
19671988
"Size": 341228
19681989
}
19691990
},
1970-
"PackageSize": 7995895
1991+
"PackageSize": 8107074
19711992
}

0 commit comments

Comments
 (0)