Skip to content

Commit a7217cb

Browse files
dotnet-maestro[bot]jonathanpeppers
dotnet-maestro[bot]
and
jonathanpeppers
authored
Bump to dotnet/installer@a3acdcf 7.0.100-preview.5.22273.1 (#7025)
Changes: dotnet/installer@a84c4c0...a3acdcf Changes: dotnet/linker@5a8de69...b047935 Changes: dotnet/runtime@f4c60fd...621cd59 Updates: * Microsoft.Dotnet.Sdk.Internal: from 7.0.100-preview.5.22267.11 to 7.0.100-preview.5.22273.1 * Microsoft.NET.ILLink.Tasks: from 7.0.100-1.22266.1 to 7.0.100-1.22270.1 * Microsoft.NETCore.App.Ref: from 7.0.0-preview.5.22266.11 to 7.0.0-preview.5.22271.4 Other changes: * Revert workarounds for dotnet/linker#2759 and dotnet/linker#2799 * Update `.apkdesc` files Co-authored-by: Jonathan Peppers <[email protected]>
1 parent 9a33210 commit a7217cb

File tree

7 files changed

+71
-75
lines changed

7 files changed

+71
-75
lines changed

‎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-preview.5.22267.11">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-preview.5.22273.1">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>a84c4c0a874f07ebc72878cc68f922892b3d763b</Sha>
5+
<Sha>a3acdcf34ec0a29a4ffb5a98515d4387cfc66b00</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22266.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
7+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22270.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
88
<Uri>https://github.com/dotnet/linker</Uri>
9-
<Sha>5a8de69d4d1ee764852f1a87cccf58c4b640f809</Sha>
9+
<Sha>b0479355a71752de103a2aac89af5cdcdb0455ad</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.5.22266.11" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.5.22271.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>f4c60fd235fa8db19567ea7048cabec11ce9ce36</Sha>
13+
<Sha>621cd59436cb29cab4b1162409ae0947c4bd780d</Sha>
1414
</Dependency>
1515
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-preview.5.22252.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-preview.5.22267.11</MicrosoftDotnetSdkInternalPackageVersion>
5-
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22266.1</MicrosoftNETILLinkTasksPackageVersion>
6-
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.5.22266.11</MicrosoftNETCoreAppRefPackageVersion>
4+
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-preview.5.22273.1</MicrosoftDotnetSdkInternalPackageVersion>
5+
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22270.1</MicrosoftNETILLinkTasksPackageVersion>
6+
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.5.22271.4</MicrosoftNETCoreAppRefPackageVersion>
77
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
88
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
99
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-preview.5.22252.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@
8989
<EventSourceSupport Condition="'$(EventSourceSupport)' == ''">false</EventSourceSupport>
9090
<UseSystemResourceKeys Condition="'$(UseSystemResourceKeys)' == '' and '$(PublishTrimmed)' == 'true'">true</UseSystemResourceKeys>
9191
<HttpActivityPropagationSupport Condition="'$(HttpActivityPropagationSupport)' == ''">false</HttpActivityPropagationSupport>
92-
<!-- TODO: should default to false when we get a fix for: https://github.com/dotnet/linker/issues/2759 -->
93-
<InvariantGlobalization Condition="'$(InvariantGlobalization)' == ''">true</InvariantGlobalization>
92+
<InvariantGlobalization Condition="'$(InvariantGlobalization)' == ''">false</InvariantGlobalization>
9493
<StartupHookSupport Condition="'$(StartupHookSupport)' == ''">false</StartupHookSupport>
9594
<UseNativeHttpHandler Condition="'$(UseNativeHttpHandler)' == ''">true</UseNativeHttpHandler>
9695
<_AggressiveAttributeTrimming Condition="'$(_AggressiveAttributeTrimming)' == ''">true</_AggressiveAttributeTrimming>

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

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,58 +5,58 @@
55
"Size": 3032
66
},
77
"assemblies/Java.Interop.dll": {
8-
"Size": 60751
8+
"Size": 60736
99
},
1010
"assemblies/Mono.Android.dll": {
11-
"Size": 153019
11+
"Size": 152435
1212
},
1313
"assemblies/rc.bin": {
14-
"Size": 1131
14+
"Size": 1083
1515
},
1616
"assemblies/System.Collections.Concurrent.dll": {
17-
"Size": 8764
17+
"Size": 8757
1818
},
1919
"assemblies/System.Collections.dll": {
20-
"Size": 4201
20+
"Size": 4196
2121
},
2222
"assemblies/System.Collections.NonGeneric.dll": {
23-
"Size": 6239
23+
"Size": 6232
2424
},
2525
"assemblies/System.Console.dll": {
26-
"Size": 6507
26+
"Size": 6502
2727
},
2828
"assemblies/System.IO.Compression.dll": {
29-
"Size": 16164
29+
"Size": 16259
3030
},
3131
"assemblies/System.Linq.dll": {
32-
"Size": 10189
32+
"Size": 10183
3333
},
3434
"assemblies/System.Net.Http.dll": {
35-
"Size": 65063
35+
"Size": 65104
3636
},
3737
"assemblies/System.Net.Primitives.dll": {
38-
"Size": 21261
38+
"Size": 21115
3939
},
4040
"assemblies/System.Net.Requests.dll": {
41-
"Size": 3521
41+
"Size": 3515
4242
},
4343
"assemblies/System.Private.CoreLib.dll": {
44-
"Size": 573152
44+
"Size": 613751
4545
},
4646
"assemblies/System.Private.Uri.dll": {
47-
"Size": 37760
47+
"Size": 37595
4848
},
4949
"assemblies/System.Private.Xml.dll": {
50-
"Size": 140763
50+
"Size": 140804
5151
},
5252
"assemblies/System.Runtime.dll": {
53-
"Size": 2412
53+
"Size": 2405
5454
},
5555
"assemblies/System.Security.Cryptography.dll": {
56-
"Size": 7437
56+
"Size": 7391
5757
},
5858
"assemblies/System.Text.RegularExpressions.dll": {
59-
"Size": 9596
59+
"Size": 9591
6060
},
6161
"assemblies/UnnamedProject.dll": {
6262
"Size": 3560
@@ -68,7 +68,7 @@
6868
"Size": 484512
6969
},
7070
"lib/arm64-v8a/libmonosgen-2.0.so": {
71-
"Size": 4667280
71+
"Size": 4667768
7272
},
7373
"lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
7474
"Size": 767264
@@ -80,7 +80,7 @@
8080
"Size": 146816
8181
},
8282
"lib/arm64-v8a/libxamarin-app.so": {
83-
"Size": 15904
83+
"Size": 15944
8484
},
8585
"META-INF/BNDLTOOL.RSA": {
8686
"Size": 1213
@@ -116,5 +116,5 @@
116116
"Size": 1904
117117
}
118118
},
119-
"PackageSize": 3451764
119+
"PackageSize": 3492724
120120
}

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

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -8,115 +8,115 @@
88
"Size": 7114
99
},
1010
"assemblies/Java.Interop.dll": {
11-
"Size": 66821
11+
"Size": 66806
1212
},
1313
"assemblies/Mono.Android.dll": {
14-
"Size": 448188
14+
"Size": 447633
1515
},
1616
"assemblies/mscorlib.dll": {
17-
"Size": 3892
17+
"Size": 3888
1818
},
1919
"assemblies/netstandard.dll": {
20-
"Size": 5603
20+
"Size": 5601
2121
},
2222
"assemblies/rc.bin": {
23-
"Size": 1131
23+
"Size": 1083
2424
},
2525
"assemblies/System.Collections.Concurrent.dll": {
26-
"Size": 10779
26+
"Size": 10772
2727
},
2828
"assemblies/System.Collections.dll": {
29-
"Size": 16156
29+
"Size": 16149
3030
},
3131
"assemblies/System.Collections.NonGeneric.dll": {
32-
"Size": 7933
32+
"Size": 7926
3333
},
3434
"assemblies/System.ComponentModel.dll": {
35-
"Size": 2016
35+
"Size": 2010
3636
},
3737
"assemblies/System.ComponentModel.Primitives.dll": {
38-
"Size": 2629
38+
"Size": 2623
3939
},
4040
"assemblies/System.ComponentModel.TypeConverter.dll": {
41-
"Size": 6106
41+
"Size": 6101
4242
},
4343
"assemblies/System.Console.dll": {
44-
"Size": 6678
44+
"Size": 6673
4545
},
4646
"assemblies/System.Core.dll": {
47-
"Size": 2057
47+
"Size": 2052
4848
},
4949
"assemblies/System.Diagnostics.TraceSource.dll": {
50-
"Size": 6575
50+
"Size": 6569
5151
},
5252
"assemblies/System.dll": {
53-
"Size": 2412
53+
"Size": 2407
5454
},
5555
"assemblies/System.Drawing.dll": {
56-
"Size": 2095
56+
"Size": 2088
5757
},
5858
"assemblies/System.Drawing.Primitives.dll": {
59-
"Size": 12127
59+
"Size": 12120
6060
},
6161
"assemblies/System.IO.Compression.dll": {
62-
"Size": 16646
62+
"Size": 16734
6363
},
6464
"assemblies/System.IO.IsolatedStorage.dll": {
65-
"Size": 10050
65+
"Size": 10043
6666
},
6767
"assemblies/System.Linq.dll": {
68-
"Size": 19780
68+
"Size": 19792
6969
},
7070
"assemblies/System.Linq.Expressions.dll": {
71-
"Size": 177472
71+
"Size": 177468
7272
},
7373
"assemblies/System.Net.Http.dll": {
74-
"Size": 65605
74+
"Size": 65646
7575
},
7676
"assemblies/System.Net.Primitives.dll": {
77-
"Size": 22202
77+
"Size": 22062
7878
},
7979
"assemblies/System.Net.Requests.dll": {
80-
"Size": 3663
80+
"Size": 3657
8181
},
8282
"assemblies/System.ObjectModel.dll": {
83-
"Size": 8542
83+
"Size": 8537
8484
},
8585
"assemblies/System.Private.CoreLib.dll": {
86-
"Size": 731431
86+
"Size": 800853
8787
},
8888
"assemblies/System.Private.DataContractSerialization.dll": {
89-
"Size": 185437
89+
"Size": 185392
9090
},
9191
"assemblies/System.Private.Uri.dll": {
92-
"Size": 42820
92+
"Size": 42654
9393
},
9494
"assemblies/System.Private.Xml.dll": {
95-
"Size": 221792
95+
"Size": 221849
9696
},
9797
"assemblies/System.Private.Xml.Linq.dll": {
98-
"Size": 16697
98+
"Size": 16692
9999
},
100100
"assemblies/System.Runtime.dll": {
101-
"Size": 2602
101+
"Size": 2598
102102
},
103103
"assemblies/System.Runtime.Serialization.dll": {
104-
"Size": 2022
104+
"Size": 2016
105105
},
106106
"assemblies/System.Runtime.Serialization.Formatters.dll": {
107-
"Size": 2552
107+
"Size": 2546
108108
},
109109
"assemblies/System.Runtime.Serialization.Primitives.dll": {
110-
"Size": 3834
110+
"Size": 3829
111111
},
112112
"assemblies/System.Security.Cryptography.dll": {
113-
"Size": 7795
113+
"Size": 7748
114114
},
115115
"assemblies/System.Text.RegularExpressions.dll": {
116-
"Size": 158381
116+
"Size": 159574
117117
},
118118
"assemblies/System.Xml.dll": {
119-
"Size": 1912
119+
"Size": 1906
120120
},
121121
"assemblies/UnnamedProject.dll": {
122122
"Size": 117250
@@ -194,7 +194,7 @@
194194
"Size": 484512
195195
},
196196
"lib/arm64-v8a/libmonosgen-2.0.so": {
197-
"Size": 4667280
197+
"Size": 4667768
198198
},
199199
"lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
200200
"Size": 767264
@@ -206,7 +206,7 @@
206206
"Size": 146816
207207
},
208208
"lib/arm64-v8a/libxamarin-app.so": {
209-
"Size": 98440
209+
"Size": 98480
210210
},
211211
"META-INF/android.support.design_material.version": {
212212
"Size": 12
@@ -1961,5 +1961,5 @@
19611961
"Size": 341228
19621962
}
19631963
},
1964-
"PackageSize": 8278349
1964+
"PackageSize": 8347981
19651965
}

‎tests/Mono.Android-Tests/System.Net/ProxyTest.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ public class ProxyTest {
1111

1212
// https://bugzilla.xamarin.com/show_bug.cgi?id=14968
1313
[Test]
14-
[Category("DotNetIgnore")] // TODO: InvalidProgramException, see: https://github.com/dotnet/linker/issues/2799
1514
public void QuoteInvalidQuoteUrlsShouldWork ()
1615
{
1716
string url = "http://example.com/?query&foo|bar";

‎tests/Mono.Android-Tests/System.Net/SslTest.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ bool ShouldIgnoreException (WebException wex)
2727

2828
// https://xamarin.desk.com/agent/case/35534
2929
[Test]
30-
[Category("DotNetIgnore")] // TODO: InvalidProgramException, see: https://github.com/dotnet/linker/issues/2799
3130
public void SslWithinTasksShouldWork ()
3231
{
3332
var cb = ServicePointManager.ServerCertificateValidationCallback;
@@ -70,7 +69,6 @@ public void SslWithinTasksShouldWork ()
7069
}
7170

7271
[Test]
73-
[Category("DotNetIgnore")] // TODO: InvalidProgramException, see: https://github.com/dotnet/linker/issues/2799
7472
public void HttpsShouldWork ()
7573
{
7674
RunIgnoringWebException (DoHttpsShouldWork);

0 commit comments

Comments
 (0)