Skip to content

Commit a4a1c58

Browse files
dotnet-maestro[bot]jonathanpeppers
dotnet-maestro[bot]
and
jonathanpeppers
authored
[main] Update dependencies from dotnet/installer (#7127)
Changes: dotnet/installer@970be08...cf6da7b Changes: dotnet/linker@618eb72...5460697 Changes: dotnet/runtime@5c5e66e...ddc4f95 Changes: dotnet/emsdk@ea10b4e...3fbbd97 Updates: * Microsoft.Dotnet.Sdk.Internal: from 7.0.100-preview.6.22316.8 to 7.0.100-preview.7.22327.1 * Microsoft.NET.ILLink.Tasks: from 7.0.100-1.22310.2 to 7.0.100-1.22323.2 * Microsoft.NETCore.App.Ref: from 7.0.0-preview.6.22312.1 to 7.0.0-preview.6.22322.7 * Microsoft.NET.Workload.Emscripten.Manifest-7.0.100: from 7.0.0-preview.6.22281.1 to 7.0.0-preview.6.22320.1 * Update `.apkdesc` files for Xamarin.Forms sample There appears to be a new System.Xml.Linq facade with: [assembly: TypeForwardedTo(typeof(XAttribute))] [assembly: TypeForwardedTo(typeof(XElement))] * Temporarily ignore `BuildBasicApplicationReleaseProfiledAot(true)` Should eventually be fixed by: dotnet/runtime#71411 Co-authored-by: Jonathan Peppers <[email protected]>
1 parent 2d6dcb7 commit a4a1c58

File tree

4 files changed

+61
-54
lines changed

4 files changed

+61
-54
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.6.22316.8">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-preview.7.22327.1">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>970be08e7ce46452911c8638ec7d4a3c0b6bd534</Sha>
5+
<Sha>cf6da7b13ae36b6ab042582b165c56d99424141b</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22310.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
7+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22323.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
88
<Uri>https://github.com/dotnet/linker</Uri>
9-
<Sha>618eb724e7320fd2e4a2b6e8f7e0a22195a9e633</Sha>
9+
<Sha>5460697bd57aff56666dd70cd64b5b6b00f417eb</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.6.22312.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.6.22322.7" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>5c5e66e6c067f8a82d514598575011cd21655ffb</Sha>
13+
<Sha>ddc4f95432facf2deebfa85bad7143469dca0129</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-preview.6.22281.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
15+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-preview.6.22320.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>ea10b4e5534de1806cc2e84ddd3b00eabcab962f</Sha>
17+
<Sha>3fbbd97b47b5a71d7cf3ca2e197b0b93feaf975d</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.6.22316.8</MicrosoftDotnetSdkInternalPackageVersion>
5-
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22310.2</MicrosoftNETILLinkTasksPackageVersion>
6-
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.6.22312.1</MicrosoftNETCoreAppRefPackageVersion>
4+
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-preview.7.22327.1</MicrosoftDotnetSdkInternalPackageVersion>
5+
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22323.2</MicrosoftNETILLinkTasksPackageVersion>
6+
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.6.22322.7</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.6.22281.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
9+
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-preview.6.22320.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
1010
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenManifest70100Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
1111
</PropertyGroup>
1212
<PropertyGroup>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ void AssertProfiledAotBuildMessages(ProjectBuilder b)
6060
[Test, Category ("SmokeTests"), Category ("ProfiledAOT")]
6161
public void BuildBasicApplicationReleaseProfiledAot ([Values (true, false)] bool enableLLVM)
6262
{
63+
if (Builder.UseDotNet && enableLLVM) {
64+
Assert.Ignore("https://github.com/dotnet/runtime/pull/71411");
65+
}
66+
6367
var proj = new XamarinAndroidApplicationProject () {
6468
IsRelease = true,
6569
AndroidEnableProfiledAot = true,

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

Lines changed: 45 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
"Size": 7114
99
},
1010
"assemblies/Java.Interop.dll": {
11-
"Size": 66738
11+
"Size": 66744
1212
},
1313
"assemblies/Mono.Android.dll": {
14-
"Size": 444811
14+
"Size": 444898
1515
},
1616
"assemblies/mscorlib.dll": {
17-
"Size": 3891
17+
"Size": 3892
1818
},
1919
"assemblies/netstandard.dll": {
20-
"Size": 5602
20+
"Size": 5616
2121
},
2222
"assemblies/rc.bin": {
2323
"Size": 1083
@@ -29,97 +29,100 @@
2929
"Size": 16153
3030
},
3131
"assemblies/System.Collections.NonGeneric.dll": {
32-
"Size": 7932
32+
"Size": 7929
3333
},
3434
"assemblies/System.ComponentModel.dll": {
35-
"Size": 2014
35+
"Size": 2016
3636
},
3737
"assemblies/System.ComponentModel.Primitives.dll": {
38-
"Size": 2627
38+
"Size": 2629
3939
},
4040
"assemblies/System.ComponentModel.TypeConverter.dll": {
41-
"Size": 6106
41+
"Size": 6108
4242
},
4343
"assemblies/System.Console.dll": {
44-
"Size": 6677
44+
"Size": 6672
4545
},
4646
"assemblies/System.Core.dll": {
47-
"Size": 2055
47+
"Size": 2058
4848
},
4949
"assemblies/System.Diagnostics.TraceSource.dll": {
5050
"Size": 6573
5151
},
5252
"assemblies/System.dll": {
53-
"Size": 2409
53+
"Size": 2413
5454
},
5555
"assemblies/System.Drawing.dll": {
56-
"Size": 2093
56+
"Size": 2099
5757
},
5858
"assemblies/System.Drawing.Primitives.dll": {
59-
"Size": 12123
59+
"Size": 12181
6060
},
6161
"assemblies/System.IO.Compression.dll": {
62-
"Size": 16741
62+
"Size": 16860
6363
},
6464
"assemblies/System.IO.IsolatedStorage.dll": {
65-
"Size": 10045
65+
"Size": 10048
6666
},
6767
"assemblies/System.Linq.dll": {
68-
"Size": 19801
68+
"Size": 19800
6969
},
7070
"assemblies/System.Linq.Expressions.dll": {
71-
"Size": 177473
71+
"Size": 177345
7272
},
7373
"assemblies/System.Net.Http.dll": {
74-
"Size": 65645
74+
"Size": 66439
7575
},
7676
"assemblies/System.Net.Primitives.dll": {
77-
"Size": 22070
77+
"Size": 22050
7878
},
7979
"assemblies/System.Net.Requests.dll": {
80-
"Size": 3660
80+
"Size": 3668
8181
},
8282
"assemblies/System.ObjectModel.dll": {
83-
"Size": 8540
83+
"Size": 8541
8484
},
8585
"assemblies/System.Private.CoreLib.dll": {
86-
"Size": 800901
86+
"Size": 811095
8787
},
8888
"assemblies/System.Private.DataContractSerialization.dll": {
89-
"Size": 185328
89+
"Size": 185028
9090
},
9191
"assemblies/System.Private.Uri.dll": {
92-
"Size": 42655
92+
"Size": 42690
9393
},
9494
"assemblies/System.Private.Xml.dll": {
95-
"Size": 216473
95+
"Size": 216506
9696
},
9797
"assemblies/System.Private.Xml.Linq.dll": {
98-
"Size": 16698
98+
"Size": 16694
9999
},
100100
"assemblies/System.Runtime.dll": {
101-
"Size": 2603
101+
"Size": 2610
102102
},
103103
"assemblies/System.Runtime.Serialization.dll": {
104-
"Size": 2020
104+
"Size": 2023
105105
},
106106
"assemblies/System.Runtime.Serialization.Formatters.dll": {
107-
"Size": 2551
107+
"Size": 2559
108108
},
109109
"assemblies/System.Runtime.Serialization.Primitives.dll": {
110110
"Size": 3834
111111
},
112112
"assemblies/System.Security.Cryptography.dll": {
113-
"Size": 7751
113+
"Size": 7790
114114
},
115115
"assemblies/System.Text.RegularExpressions.dll": {
116-
"Size": 159573
116+
"Size": 152548
117117
},
118118
"assemblies/System.Xml.dll": {
119-
"Size": 1910
119+
"Size": 1914
120+
},
121+
"assemblies/System.Xml.Linq.dll": {
122+
"Size": 1934
120123
},
121124
"assemblies/UnnamedProject.dll": {
122-
"Size": 117243
125+
"Size": 117249
123126
},
124127
"assemblies/Xamarin.AndroidX.Activity.dll": {
125128
"Size": 5941
@@ -191,22 +194,22 @@
191194
"Size": 3460156
192195
},
193196
"lib/arm64-v8a/libmonodroid.so": {
194-
"Size": 512552
197+
"Size": 512520
195198
},
196199
"lib/arm64-v8a/libmonosgen-2.0.so": {
197-
"Size": 4667768
200+
"Size": 4693640
198201
},
199202
"lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
200203
"Size": 767264
201204
},
202205
"lib/arm64-v8a/libSystem.Native.so": {
203-
"Size": 90168
206+
"Size": 90616
204207
},
205208
"lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
206-
"Size": 146816
209+
"Size": 146624
207210
},
208211
"lib/arm64-v8a/libxamarin-app.so": {
209-
"Size": 98592
212+
"Size": 98736
210213
},
211214
"META-INF/android.support.design_material.version": {
212215
"Size": 12
@@ -320,13 +323,13 @@
320323
"Size": 1213
321324
},
322325
"META-INF/BNDLTOOL.SF": {
323-
"Size": 78757
326+
"Size": 78859
324327
},
325328
"META-INF/com.google.android.material_material.version": {
326329
"Size": 10
327330
},
328331
"META-INF/MANIFEST.MF": {
329-
"Size": 78630
332+
"Size": 78732
330333
},
331334
"META-INF/proguard/androidx-annotations.pro": {
332335
"Size": 339
@@ -773,7 +776,7 @@
773776
"Size": 470
774777
},
775778
"res/drawable-hdpi-v4/icon.png": {
776-
"Size": 4791
779+
"Size": 4762
777780
},
778781
"res/drawable-hdpi-v4/notification_bg_low_normal.9.png": {
779782
"Size": 212
@@ -1961,5 +1964,5 @@
19611964
"Size": 341228
19621965
}
19631966
},
1964-
"PackageSize": 8347981
1967+
"PackageSize": 8360345
19651968
}

0 commit comments

Comments
 (0)