Skip to content

Commit 61767a0

Browse files
dotnet-maestro[bot]jonathanpeppers
dotnet-maestro[bot]
and
jonathanpeppers
authored
Bump to dotnet/installer@e3ab0b5 8.0.100-preview.2.23123.10 (#7813)
Changes: dotnet/installer@f05478b...e3ab0b5 Changes: dotnet/runtime@fe4760c...ff7c19f Changes: dotnet/emsdk@fd5a0d1...d7ff0aa Updates: * Microsoft.Dotnet.Sdk.Internal: from 8.0.100-preview.2.23107.13 to 8.0.100-preview.2.23123.10 * Microsoft.NET.ILLink.Tasks: from 8.0.0-preview.2.23106.6 to 8.0.0-preview.2.23123.4 * Microsoft.NETCore.App.Ref: from 8.0.0-preview.2.23106.6 to 8.0.0-preview.2.23123.4 * Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100-preview.2: from 8.0.0-preview.2.23081.1 to 8.0.0-preview.2.23113.1 ~~ Other changes ~~ * Revert "[Microsoft.Android.Sdk.ILLink] target `net7.0` temporarily (#7803)" This reverts commit 7ba7dd4. We should be able to build ILLink steps for `net8.0` going forward. * Add `@(PackageReference)` to `Mono.Cecil` Context: https://github.com/dotnet/runtime/blob/fb13c2cf6eaf69b53773e94674772f217fa39416/src/coreclr/tools/aot/Mono.Linker.Tests/Mono.Linker.Tests.csproj#L22 `Microsoft.NET.ILLink` no longer has an implicit dependency on `Mono.Cecil`. * Update BuildReleaseArm64XFormsDotNet.apkdesc Fixes the failure: apkdiff: File 'assemblies/System.Collections.Concurrent.dll' has changed by 1,032 bytes (8.93 %). This exceeds the threshold of 5.00 % Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
1 parent 8dc9261 commit 61767a0

File tree

4 files changed

+71
-70
lines changed

4 files changed

+71
-70
lines changed

‎eng/Version.Details.xml‎

Lines changed: 9 additions & 9 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="8.0.100-alpha.1.23080.11">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.2.23123.10">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>dec120944450abb58bc07a2fcdae2f4383bfd6bf</Sha>
5+
<Sha>e3ab0b5b8c29d8d882ab1bfe6a5a99a703622c7e</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.100-1.23067.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
8-
<Uri>https://github.com/dotnet/linker</Uri>
9-
<Sha>c790896f128957acd2999208f44f09ae1e826c8c</Sha>
7+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.2.23123.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
8+
<Uri>https://github.com/dotnet/runtime</Uri>
9+
<Sha>ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.23080.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.2.23123.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>9529803ae29c2804880c6bd8ca710b8c037cb498</Sha>
13+
<Sha>ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100-alpha.1" Version="8.0.0-alpha.1.23077.4" CoherentParentDependency="Microsoft.NETCore.App.Ref">
15+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100-preview.2" Version="8.0.0-preview.2.23113.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>0fe864fc71191ff4ee18e59ef0af2929ca367a11</Sha>
17+
<Sha>d7ff0aa47c680be543905cc1410e2f62b54dfefe</Sha>
1818
</Dependency>
1919
</ProductDependencies>
2020
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-alpha.1.23080.11</MicrosoftDotnetSdkInternalPackageVersion>
5-
<MicrosoftNETILLinkTasksPackageVersion>8.0.100-1.23067.1</MicrosoftNETILLinkTasksPackageVersion>
6-
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.23080.2</MicrosoftNETCoreAppRefPackageVersion>
4+
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-preview.2.23123.10</MicrosoftDotnetSdkInternalPackageVersion>
5+
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.2.23123.4</MicrosoftNETILLinkTasksPackageVersion>
6+
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.2.23123.4</MicrosoftNETCoreAppRefPackageVersion>
77
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
88
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
9-
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100alpha1Version>8.0.0-alpha.1.23077.4</MicrosoftNETWorkloadEmscriptenCurrentManifest80100alpha1Version>
10-
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100alpha1Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
9+
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview2Version>8.0.0-preview.2.23113.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview2Version>
10+
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview2Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
1111
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
1212
</PropertyGroup>
1313
<PropertyGroup>

‎src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\Configuration.props" />
33
<PropertyGroup>
4-
<TargetFramework>$(DotNetStableTargetFramework)</TargetFramework>
4+
<TargetFramework>$(DotNetTargetFramework)</TargetFramework>
55
<DefineConstants>ILLINK</DefineConstants>
66
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
77
<OutputPath>$(MicrosoftAndroidSdkOutDir)</OutputPath>
88
</PropertyGroup>
99
<ItemGroup>
10+
<PackageReference Include="Mono.Cecil" Version="$(MonoCecilVersion)" />
1011
<PackageReference Include="Microsoft.NET.ILLink" Version="$(MicrosoftNETILLinkTasksPackageVersion)" />
1112
<ProjectReference Include="..\..\external\Java.Interop\src\Java.Interop.Export\Java.Interop.Export.csproj" />
1213
<ProjectReference Include="..\Xamarin.Android.Build.Tasks\Xamarin.Android.Build.Tasks.csproj" ReferenceOutputAssembly="False" />

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

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -5,136 +5,136 @@
55
"Size": 3568
66
},
77
"assemblies/_Microsoft.Android.Resource.Designer.dll": {
8-
"Size": 1942
8+
"Size": 1940
99
},
1010
"assemblies/FormsViewGroup.dll": {
1111
"Size": 7313
1212
},
1313
"assemblies/Java.Interop.dll": {
14-
"Size": 66786
14+
"Size": 66563
1515
},
1616
"assemblies/Mono.Android.dll": {
17-
"Size": 444703
17+
"Size": 444617
1818
},
1919
"assemblies/Mono.Android.Runtime.dll": {
20-
"Size": 5895
20+
"Size": 5897
2121
},
2222
"assemblies/mscorlib.dll": {
23-
"Size": 3857
23+
"Size": 3866
2424
},
2525
"assemblies/netstandard.dll": {
26-
"Size": 5567
26+
"Size": 5579
2727
},
2828
"assemblies/rc.bin": {
2929
"Size": 1182
3030
},
3131
"assemblies/System.Collections.Concurrent.dll": {
32-
"Size": 10529
32+
"Size": 11561
3333
},
3434
"assemblies/System.Collections.dll": {
35-
"Size": 15258
35+
"Size": 15271
3636
},
3737
"assemblies/System.Collections.NonGeneric.dll": {
38-
"Size": 7487
38+
"Size": 7499
3939
},
4040
"assemblies/System.ComponentModel.dll": {
41-
"Size": 1964
41+
"Size": 1973
4242
},
4343
"assemblies/System.ComponentModel.Primitives.dll": {
44-
"Size": 2579
44+
"Size": 2595
4545
},
4646
"assemblies/System.ComponentModel.TypeConverter.dll": {
47-
"Size": 6069
47+
"Size": 6081
4848
},
4949
"assemblies/System.Console.dll": {
50-
"Size": 6610
50+
"Size": 6623
5151
},
5252
"assemblies/System.Core.dll": {
53-
"Size": 1982
53+
"Size": 1992
5454
},
5555
"assemblies/System.Diagnostics.TraceSource.dll": {
56-
"Size": 6580
56+
"Size": 6591
5757
},
5858
"assemblies/System.dll": {
59-
"Size": 2338
59+
"Size": 2347
6060
},
6161
"assemblies/System.Drawing.dll": {
62-
"Size": 2023
62+
"Size": 2032
6363
},
6464
"assemblies/System.Drawing.Primitives.dll": {
65-
"Size": 11996
65+
"Size": 12010
6666
},
6767
"assemblies/System.IO.Compression.dll": {
68-
"Size": 16847
68+
"Size": 16858
6969
},
7070
"assemblies/System.IO.IsolatedStorage.dll": {
71-
"Size": 9957
71+
"Size": 10011
7272
},
7373
"assemblies/System.Linq.dll": {
74-
"Size": 19441
74+
"Size": 19453
7575
},
7676
"assemblies/System.Linq.Expressions.dll": {
77-
"Size": 164128
77+
"Size": 164141
7878
},
7979
"assemblies/System.Net.Http.dll": {
80-
"Size": 65982
80+
"Size": 66153
8181
},
8282
"assemblies/System.Net.Primitives.dll": {
83-
"Size": 22441
83+
"Size": 22487
8484
},
8585
"assemblies/System.Net.Requests.dll": {
86-
"Size": 3620
86+
"Size": 3630
8787
},
8888
"assemblies/System.ObjectModel.dll": {
89-
"Size": 8144
89+
"Size": 8154
9090
},
9191
"assemblies/System.Private.CoreLib.dll": {
92-
"Size": 808708
92+
"Size": 814216
9393
},
9494
"assemblies/System.Private.DataContractSerialization.dll": {
95-
"Size": 192356
95+
"Size": 192370
9696
},
9797
"assemblies/System.Private.Uri.dll": {
98-
"Size": 42878
98+
"Size": 42897
9999
},
100100
"assemblies/System.Private.Xml.dll": {
101-
"Size": 216193
101+
"Size": 216180
102102
},
103103
"assemblies/System.Private.Xml.Linq.dll": {
104-
"Size": 16662
104+
"Size": 16673
105105
},
106106
"assemblies/System.Runtime.dll": {
107-
"Size": 2763
107+
"Size": 2774
108108
},
109109
"assemblies/System.Runtime.InteropServices.dll": {
110-
"Size": 3753
110+
"Size": 3760
111111
},
112112
"assemblies/System.Runtime.Serialization.dll": {
113-
"Size": 1943
113+
"Size": 1950
114114
},
115115
"assemblies/System.Runtime.Serialization.Formatters.dll": {
116-
"Size": 2509
116+
"Size": 2517
117117
},
118118
"assemblies/System.Runtime.Serialization.Primitives.dll": {
119-
"Size": 3791
119+
"Size": 3802
120120
},
121121
"assemblies/System.Security.Cryptography.dll": {
122-
"Size": 7766
122+
"Size": 7781
123123
},
124124
"assemblies/System.Text.RegularExpressions.dll": {
125-
"Size": 156677
125+
"Size": 157123
126126
},
127127
"assemblies/System.Xml.dll": {
128-
"Size": 1833
128+
"Size": 1839
129129
},
130130
"assemblies/System.Xml.Linq.dll": {
131-
"Size": 1856
131+
"Size": 1864
132132
},
133133
"assemblies/UnnamedProject.dll": {
134134
"Size": 5294
135135
},
136136
"assemblies/Xamarin.AndroidX.Activity.dll": {
137-
"Size": 5870
137+
"Size": 5867
138138
},
139139
"assemblies/Xamarin.AndroidX.AppCompat.AppCompatResources.dll": {
140140
"Size": 6117
@@ -146,7 +146,7 @@
146146
"Size": 6592
147147
},
148148
"assemblies/Xamarin.AndroidX.CoordinatorLayout.dll": {
149-
"Size": 16404
149+
"Size": 16408
150150
},
151151
"assemblies/Xamarin.AndroidX.Core.dll": {
152152
"Size": 96738
@@ -158,16 +158,16 @@
158158
"Size": 39951
159159
},
160160
"assemblies/Xamarin.AndroidX.Legacy.Support.Core.UI.dll": {
161-
"Size": 5923
161+
"Size": 5924
162162
},
163163
"assemblies/Xamarin.AndroidX.Lifecycle.Common.dll": {
164164
"Size": 6391
165165
},
166166
"assemblies/Xamarin.AndroidX.Lifecycle.LiveData.Core.dll": {
167-
"Size": 6459
167+
"Size": 6462
168168
},
169169
"assemblies/Xamarin.AndroidX.Lifecycle.ViewModel.dll": {
170-
"Size": 3067
170+
"Size": 3068
171171
},
172172
"assemblies/Xamarin.AndroidX.Loader.dll": {
173173
"Size": 12473
@@ -176,7 +176,7 @@
176176
"Size": 84804
177177
},
178178
"assemblies/Xamarin.AndroidX.SavedState.dll": {
179-
"Size": 4866
179+
"Size": 4870
180180
},
181181
"assemblies/Xamarin.AndroidX.SwipeRefreshLayout.dll": {
182182
"Size": 10389
@@ -188,10 +188,10 @@
188188
"Size": 528450
189189
},
190190
"assemblies/Xamarin.Forms.Platform.Android.dll": {
191-
"Size": 337828
191+
"Size": 337831
192192
},
193193
"assemblies/Xamarin.Forms.Platform.dll": {
194-
"Size": 11084
194+
"Size": 11080
195195
},
196196
"assemblies/Xamarin.Forms.Xaml.dll": {
197197
"Size": 60774
@@ -200,28 +200,28 @@
200200
"Size": 40158
201201
},
202202
"classes.dex": {
203-
"Size": 3141008
203+
"Size": 3127152
204204
},
205205
"lib/arm64-v8a/libmono-component-marshal-ilgen.so": {
206206
"Size": 93552
207207
},
208208
"lib/arm64-v8a/libmonodroid.so": {
209-
"Size": 379320
209+
"Size": 379152
210210
},
211211
"lib/arm64-v8a/libmonosgen-2.0.so": {
212-
"Size": 3090760
212+
"Size": 3106808
213213
},
214214
"lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
215215
"Size": 723840
216216
},
217217
"lib/arm64-v8a/libSystem.Native.so": {
218-
"Size": 94328
218+
"Size": 94280
219219
},
220220
"lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
221-
"Size": 155056
221+
"Size": 154904
222222
},
223223
"lib/arm64-v8a/libxamarin-app.so": {
224-
"Size": 333720
224+
"Size": 333760
225225
},
226226
"META-INF/android.support.design_material.version": {
227227
"Size": 12
@@ -1976,5 +1976,5 @@
19761976
"Size": 341228
19771977
}
19781978
},
1979-
"PackageSize": 7828228
1979+
"PackageSize": 7820036
19801980
}

0 commit comments

Comments
 (0)