Skip to content
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.

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

[main] Update dependencies from dotnet/installer #8176

Merged
merged 19 commits into from
Jul 20, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
0277fcc
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Jul 10, 2023
4d098d8
Update .apkdesc files
jonathanpeppers Jul 10, 2023
5ef90a8
[tests] ignore `BuildAotApplicationAndÜmläüts` on Windows
jonathanpeppers Jul 10, 2023
bce52f1
[tests] ignore `BuildAotApplicationWithNdkAndBundleAndÜmläüts`
jonathanpeppers Jul 11, 2023
c235d60
[tests] ignore `NoSymbolsArgShouldReduceAppSize`
jonathanpeppers Jul 11, 2023
981f8c2
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Jul 17, 2023
97519f1
Try `UseDotNet@2` instead
jonathanpeppers Jul 17, 2023
3d439ea
Merge branch 'main' into darc-main-33fa432d-4d4a-4d5d-9e54-6af849b9f4e5
jonathanpeppers Jul 17, 2023
5e49c42
Revert "Try `UseDotNet@2` instead"
jonathanpeppers Jul 17, 2023
f9454bd
Try clearing `$DOTNET_ROOT`
jonathanpeppers Jul 17, 2023
6823d27
Set $DOTNET_ROOT instead
jonathanpeppers Jul 17, 2023
9655bc6
Set `$DOTNET_ROOT` more places
jonathanpeppers Jul 17, 2023
eddb0e0
p.StartInfo
jonathanpeppers Jul 17, 2023
e168e38
Set $env:DOTNET_ROOT
jonathanpeppers Jul 17, 2023
d950ac1
Update .apkdesc files
jonathanpeppers Jul 18, 2023
10a969a
[tests] ignore `CheckWhetherLibcAndLibmAreReferencedInAOTLibraries`
jonathanpeppers Jul 18, 2023
36e84a0
[tests] disable failing tests under LLVM
jonathanpeppers Jul 19, 2023
37cacd9
Set $(ExcludeCategories) in correct project
jonathanpeppers Jul 19, 2023
ecf8c5a
Bump to xamarin/java.interop/main@62efc0980
jonathanpeppers Jul 19, 2023
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
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.7.23330.16">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.7.23360.1">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>28d4a6b4bed1515bdbe491c9e0c8ef7aa3a24497</Sha>
<Sha>62ef57f1140e7fa71cf452542b263e7999cac168</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.7.23329.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.7.23359.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>3e87528325b09f884b0a09a8c4ef79393abfd0db</Sha>
<Sha>31106939ba524a7e6df8225cf8d0fedefba92b9f</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.7.23329.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.7.23359.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>3e87528325b09f884b0a09a8c4ef79393abfd0db</Sha>
<Sha>31106939ba524a7e6df8225cf8d0fedefba92b9f</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-preview.7.23326.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-preview.7.23330.16</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.7.23329.8</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.7.23329.8</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-preview.7.23360.1</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.7.23359.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.7.23359.1</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.7.23326.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,64 +2,64 @@
"Comment": null,
"Entries": {
"AndroidManifest.xml": {
"Size": 3032
"Size": 3036
},
"assemblies/_Microsoft.Android.Resource.Designer.dll": {
"Size": 1024
},
"assemblies/Java.Interop.dll": {
"Size": 58703
"Size": 58980
},
"assemblies/Mono.Android.dll": {
"Size": 86588
"Size": 88193
},
"assemblies/Mono.Android.Runtime.dll": {
"Size": 5798
"Size": 5579
},
"assemblies/rc.bin": {
"Size": 1235
"Size": 1302
},
"assemblies/System.Console.dll": {
"Size": 6442
"Size": 6450
},
"assemblies/System.Linq.dll": {
"Size": 9123
"Size": 9249
},
"assemblies/System.Private.CoreLib.dll": {
"Size": 536436
"Size": 537383
},
"assemblies/System.Runtime.dll": {
"Size": 2623
"Size": 2630
},
"assemblies/System.Runtime.InteropServices.dll": {
"Size": 3752
"Size": 3767
},
"assemblies/UnnamedProject.dll": {
"Size": 3349
"Size": 2931
},
"classes.dex": {
"Size": 19748
"Size": 19716
},
"lib/arm64-v8a/libmono-component-marshal-ilgen.so": {
"Size": 93552
"Size": 97096
},
"lib/arm64-v8a/libmonodroid.so": {
"Size": 380832
"Size": 380704
},
"lib/arm64-v8a/libmonosgen-2.0.so": {
"Size": 3160360
"Size": 3179120
},
"lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
"Size": 723560
},
"lib/arm64-v8a/libSystem.Native.so": {
"Size": 94392
"Size": 93856
},
"lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
"Size": 154904
},
"lib/arm64-v8a/libxamarin-app.so": {
"Size": 16624
"Size": 16672
},
"META-INF/BNDLTOOL.RSA": {
"Size": 1213
Expand Down Expand Up @@ -95,5 +95,5 @@
"Size": 1904
}
},
"PackageSize": 2685258
"PackageSize": 2701642
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"Comment": null,
"Entries": {
"AndroidManifest.xml": {
"Size": 3568
"Size": 3572
},
"assemblies/_Microsoft.Android.Resource.Designer.dll": {
"Size": 2102
Expand All @@ -11,121 +11,121 @@
"Size": 7313
},
"assemblies/Java.Interop.dll": {
"Size": 66911
"Size": 66897
},
"assemblies/Mono.Android.dll": {
"Size": 469830
"Size": 469913
},
"assemblies/Mono.Android.Runtime.dll": {
"Size": 5818
"Size": 5579
},
"assemblies/mscorlib.dll": {
"Size": 3866
},
"assemblies/netstandard.dll": {
"Size": 5578
"Size": 5580
},
"assemblies/rc.bin": {
"Size": 1235
"Size": 1302
},
"assemblies/System.Collections.Concurrent.dll": {
"Size": 11561
"Size": 11559
},
"assemblies/System.Collections.dll": {
"Size": 15445
"Size": 15448
},
"assemblies/System.Collections.NonGeneric.dll": {
"Size": 7501
"Size": 7504
},
"assemblies/System.ComponentModel.dll": {
"Size": 1974
"Size": 1976
},
"assemblies/System.ComponentModel.Primitives.dll": {
"Size": 2596
"Size": 2598
},
"assemblies/System.ComponentModel.TypeConverter.dll": {
"Size": 6083
"Size": 6085
},
"assemblies/System.Console.dll": {
"Size": 6612
"Size": 6616
},
"assemblies/System.Core.dll": {
"Size": 1992
},
"assemblies/System.Diagnostics.TraceSource.dll": {
"Size": 6589
"Size": 6593
},
"assemblies/System.dll": {
"Size": 2347
"Size": 2348
},
"assemblies/System.Drawing.dll": {
"Size": 1938
"Size": 1940
},
"assemblies/System.Drawing.Primitives.dll": {
"Size": 12004
"Size": 12015
},
"assemblies/System.IO.Compression.Brotli.dll": {
"Size": 11221
"Size": 11228
},
"assemblies/System.IO.Compression.dll": {
"Size": 15897
"Size": 15906
},
"assemblies/System.IO.IsolatedStorage.dll": {
"Size": 9913
"Size": 9915
},
"assemblies/System.Linq.dll": {
"Size": 19490
"Size": 19598
},
"assemblies/System.Linq.Expressions.dll": {
"Size": 164335
"Size": 164343
},
"assemblies/System.Net.Http.dll": {
"Size": 65557
"Size": 65677
},
"assemblies/System.Net.Primitives.dll": {
"Size": 22482
"Size": 22479
},
"assemblies/System.Net.Requests.dll": {
"Size": 3632
},
"assemblies/System.ObjectModel.dll": {
"Size": 8159
"Size": 8163
},
"assemblies/System.Private.CoreLib.dll": {
"Size": 834340
"Size": 834376
},
"assemblies/System.Private.DataContractSerialization.dll": {
"Size": 192404
"Size": 192934
},
"assemblies/System.Private.Uri.dll": {
"Size": 42947
"Size": 43517
},
"assemblies/System.Private.Xml.dll": {
"Size": 215908
"Size": 215824
},
"assemblies/System.Private.Xml.Linq.dll": {
"Size": 16681
"Size": 16687
},
"assemblies/System.Runtime.dll": {
"Size": 2775
"Size": 2756
},
"assemblies/System.Runtime.InteropServices.dll": {
"Size": 3768
"Size": 3767
},
"assemblies/System.Runtime.Serialization.dll": {
"Size": 1867
"Size": 1868
},
"assemblies/System.Runtime.Serialization.Formatters.dll": {
"Size": 2518
"Size": 2520
},
"assemblies/System.Runtime.Serialization.Primitives.dll": {
"Size": 3802
"Size": 3804
},
"assemblies/System.Security.Cryptography.dll": {
"Size": 8065
"Size": 8138
},
"assemblies/System.Text.RegularExpressions.dll": {
"Size": 158997
"Size": 158855
},
"assemblies/System.Xml.dll": {
"Size": 1760
Expand All @@ -134,7 +134,7 @@
"Size": 1778
},
"assemblies/UnnamedProject.dll": {
"Size": 5290
"Size": 4987
},
"assemblies/Xamarin.AndroidX.Activity.dll": {
"Size": 5942
Expand Down Expand Up @@ -206,25 +206,25 @@
"Size": 3117140
},
"lib/arm64-v8a/libmono-component-marshal-ilgen.so": {
"Size": 93552
"Size": 97096
},
"lib/arm64-v8a/libmonodroid.so": {
"Size": 380704
},
"lib/arm64-v8a/libmonosgen-2.0.so": {
"Size": 3169800
"Size": 3179120
},
"lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
"Size": 723560
},
"lib/arm64-v8a/libSystem.Native.so": {
"Size": 94392
"Size": 93856
},
"lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
"Size": 154904
},
"lib/arm64-v8a/libxamarin-app.so": {
"Size": 333744
"Size": 333784
},
"META-INF/android.support.design_material.version": {
"Size": 12
Expand Down Expand Up @@ -1913,5 +1913,5 @@
"Size": 325240
}
},
"PackageSize": 7900078
"PackageSize": 7912366
}