Skip to content

[release/7.0.1xx] Update dependencies from dotnet/installer #7390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonathanpeppers merged 5 commits into from
Sep 19, 2022
Merged

[release/7.0.1xx] Update dependencies from dotnet/installer #7390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a192561
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Sep 16, 2022
4cc46d5
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Sep 17, 2022
45ed060
Update PackagingTest.cs
jonathanpeppers Sep 19, 2022
bf52faf
Update .apkdesc files
jonathanpeppers Sep 19, 2022
7a3af53
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Sep 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rc.2.22459.2">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rtm.22468.5">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>11f6b8f7129e34d5317f47ccbc110b2b11c05749</Sha>
<Sha>0c5c5d3bc4d21cfeb345781e69a33b30e124334d</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22452.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>5f9bfd94d9c687207872ae03f751ea19704381c0</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.2.22451.11" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rtm.22465.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>6d10e4c8bcd9f96ccd73748ff827561afa09af57</Sha>
<Sha>ee6cde5defb8d697d4a28602d072a3784890728f</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0-rc.2.22430.5" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0-rc.2.22459.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>8d8d2122b16c81df4b158fe43995f958e8fe115e</Sha>
<Sha>76e6b338e87093ddc9b3b650f027706aba65d388</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.0-rc.2.22430.5" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.0-rc.2.22459.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>8d8d2122b16c81df4b158fe43995f958e8fe115e</Sha>
<Sha>76e6b338e87093ddc9b3b650f027706aba65d388</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rc.2.22459.2</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rtm.22468.5</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22452.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.2.22451.11</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-rtm.22465.3</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.0-rc.2.22430.5</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>
<MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.0-rc.2.22459.3</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
</PropertyGroup>
Expand Down
8 changes: 0 additions & 8 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,6 @@ public void CheckIncludedAssemblies ([Values (false, true)] bool usesAssemblySto
"System.Runtime.InteropServices.dll",
"System.Linq.dll",
"UnnamedProject.dll",
//NOTE: appeared in .NET 7.0.100-rc.1.22423.7
"System.Diagnostics.Tracing.dll",
"System.Memory.dll",
"System.Runtime.InteropServices.dll",
"System.Threading.Thread.dll",
"System.Threading.ThreadPool.dll",
"System.Threading.dll",
"System.Transactions.Local.dll",
} :
new [] {
"Java.Interop.dll",
Expand Down
48 changes: 15 additions & 33 deletions ...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,58 +5,40 @@
"Size": 3032
},
"assemblies/Java.Interop.dll": {
"Size": 59188
"Size": 58888
},
"assemblies/Mono.Android.dll": {
"Size": 88549
"Size": 88068
},
"assemblies/rc.bin": {
"Size": 1182
},
"assemblies/System.Console.dll": {
"Size": 6408
},
"assemblies/System.Diagnostics.Tracing.dll": {
"Size": 2089
"Size": 6591
},
"assemblies/System.Linq.dll": {
"Size": 9096
},
"assemblies/System.Memory.dll": {
"Size": 3388
"Size": 9250
},
"assemblies/System.Private.CoreLib.dll": {
"Size": 533485
"Size": 462205
},
"assemblies/System.Runtime.dll": {
"Size": 3498
"Size": 2373
},
"assemblies/System.Runtime.InteropServices.dll": {
"Size": 3770
},
"assemblies/System.Threading.dll": {
"Size": 5486
},
"assemblies/System.Threading.Thread.dll": {
"Size": 1978
},
"assemblies/System.Threading.ThreadPool.dll": {
"Size": 2008
},
"assemblies/System.Transactions.Local.dll": {
"Size": 62998
"Size": 2262
},
"assemblies/UnnamedProject.dll": {
"Size": 3560
"Size": 3561
},
"classes.dex": {
"Size": 360720
"Size": 368288
},
"lib/arm64-v8a/libmonodroid.so": {
"Size": 425416
"Size": 425432
},
"lib/arm64-v8a/libmonosgen-2.0.so": {
"Size": 3073392
"Size": 3073360
},
"lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
"Size": 723840
Expand All @@ -68,16 +50,16 @@
"Size": 148696
},
"lib/arm64-v8a/libxamarin-app.so": {
"Size": 10216
"Size": 9640
},
"META-INF/BNDLTOOL.RSA": {
"Size": 1213
},
"META-INF/BNDLTOOL.SF": {
"Size": 3339
"Size": 2687
},
"META-INF/MANIFEST.MF": {
"Size": 3212
"Size": 2560
},
"res/drawable-hdpi-v4/icon.png": {
"Size": 4762
Expand All @@ -104,5 +86,5 @@
"Size": 1904
}
},
"PackageSize": 2791978
"PackageSize": 2639930
}
110 changes: 46 additions & 64 deletions ...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,139 +8,121 @@
"Size": 7114
},
"assemblies/Java.Interop.dll": {
"Size": 66767
"Size": 66755
},
"assemblies/Mono.Android.dll": {
"Size": 442556
"Size": 445298
},
"assemblies/mscorlib.dll": {
"Size": 3859
"Size": 3855
},
"assemblies/netstandard.dll": {
"Size": 5573
"Size": 5571
},
"assemblies/rc.bin": {
"Size": 1182
},
"assemblies/System.Collections.Concurrent.dll": {
"Size": 10484
"Size": 10639
},
"assemblies/System.Collections.dll": {
"Size": 15299
"Size": 15470
},
"assemblies/System.Collections.NonGeneric.dll": {
"Size": 7434
"Size": 7426
},
"assemblies/System.ComponentModel.dll": {
"Size": 1940
"Size": 1933
},
"assemblies/System.ComponentModel.Primitives.dll": {
"Size": 2554
"Size": 2545
},
"assemblies/System.ComponentModel.TypeConverter.dll": {
"Size": 6032
"Size": 6192
},
"assemblies/System.Console.dll": {
"Size": 7268
"Size": 7428
},
"assemblies/System.Core.dll": {
"Size": 1986
"Size": 1980
},
"assemblies/System.Diagnostics.TraceSource.dll": {
"Size": 6551
},
"assemblies/System.Diagnostics.Tracing.dll": {
"Size": 2089
"Size": 6542
},
"assemblies/System.dll": {
"Size": 2341
"Size": 2336
},
"assemblies/System.Drawing.dll": {
"Size": 2026
"Size": 2022
},
"assemblies/System.Drawing.Primitives.dll": {
"Size": 11973
"Size": 12153
},
"assemblies/System.IO.Compression.dll": {
"Size": 16675
"Size": 16789
},
"assemblies/System.IO.IsolatedStorage.dll": {
"Size": 9988
"Size": 10143
},
"assemblies/System.Linq.dll": {
"Size": 19139
"Size": 19315
},
"assemblies/System.Linq.Expressions.dll": {
"Size": 163894
},
"assemblies/System.Memory.dll": {
"Size": 3388
"Size": 164040
},
"assemblies/System.Net.Http.dll": {
"Size": 66840
"Size": 66998
},
"assemblies/System.Net.Primitives.dll": {
"Size": 21879
"Size": 22006
},
"assemblies/System.Net.Requests.dll": {
"Size": 3602
"Size": 3738
},
"assemblies/System.ObjectModel.dll": {
"Size": 8106
"Size": 8157
},
"assemblies/System.Private.CoreLib.dll": {
"Size": 786299
"Size": 770540
},
"assemblies/System.Private.DataContractSerialization.dll": {
"Size": 192243
"Size": 192415
},
"assemblies/System.Private.Uri.dll": {
"Size": 42217
"Size": 42367
},
"assemblies/System.Private.Xml.dll": {
"Size": 215338
"Size": 215474
},
"assemblies/System.Private.Xml.Linq.dll": {
"Size": 16635
"Size": 16796
},
"assemblies/System.Runtime.dll": {
"Size": 3647
"Size": 2575
},
"assemblies/System.Runtime.InteropServices.dll": {
"Size": 3770
"Size": 2262
},
"assemblies/System.Runtime.Serialization.dll": {
"Size": 1950
"Size": 1946
},
"assemblies/System.Runtime.Serialization.Formatters.dll": {
"Size": 2480
"Size": 2677
},
"assemblies/System.Runtime.Serialization.Primitives.dll": {
"Size": 3759
"Size": 3754
},
"assemblies/System.Security.Cryptography.dll": {
"Size": 7783
"Size": 7946
},
"assemblies/System.Text.RegularExpressions.dll": {
"Size": 154181
},
"assemblies/System.Threading.dll": {
"Size": 5486
},
"assemblies/System.Threading.Thread.dll": {
"Size": 1978
},
"assemblies/System.Threading.ThreadPool.dll": {
"Size": 2008
},
"assemblies/System.Transactions.Local.dll": {
"Size": 62998
"Size": 154202
},
"assemblies/System.Xml.dll": {
"Size": 1838
"Size": 1834
},
"assemblies/System.Xml.Linq.dll": {
"Size": 1860
"Size": 1853
},
"assemblies/UnnamedProject.dll": {
"Size": 117252
Expand All @@ -161,7 +143,7 @@
"Size": 16407
},
"assemblies/Xamarin.AndroidX.Core.dll": {
"Size": 96515
"Size": 96539
},
"assemblies/Xamarin.AndroidX.DrawerLayout.dll": {
"Size": 14065
Expand Down Expand Up @@ -212,13 +194,13 @@
"Size": 39911
},
"classes.dex": {
"Size": 3473196
"Size": 3480644
},
"lib/arm64-v8a/libmonodroid.so": {
"Size": 425416
"Size": 425432
},
"lib/arm64-v8a/libmonosgen-2.0.so": {
"Size": 3073392
"Size": 3073360
},
"lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
"Size": 723840
Expand All @@ -230,7 +212,7 @@
"Size": 148696
},
"lib/arm64-v8a/libxamarin-app.so": {
"Size": 99640
"Size": 99232
},
"META-INF/android.support.design_material.version": {
"Size": 12
Expand Down Expand Up @@ -344,13 +326,13 @@
"Size": 1213
},
"META-INF/BNDLTOOL.SF": {
"Size": 79628
"Size": 78976
},
"META-INF/com.google.android.material_material.version": {
"Size": 10
},
"META-INF/MANIFEST.MF": {
"Size": 79501
"Size": 78849
},
"META-INF/proguard/androidx-annotations.pro": {
"Size": 339
Expand Down Expand Up @@ -1985,5 +1967,5 @@
"Size": 341228
}
},
"PackageSize": 8078308
"PackageSize": 7987700
}