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.

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

Jump to bottom

[main] Update dependencies from dotnet/sdk #9031

Merged
merged 12 commits into from
Jun 25, 2024
Merged

[main] Update dependencies from dotnet/sdk #9031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
67ac94e
Update dependencies from https://github.com/dotnet/sdk build 20240613.50
dotnet-maestro[bot] Jun 14, 2024
24b3b44
Update dependencies from https://github.com/dotnet/sdk build 20240616.4
dotnet-maestro[bot] Jun 17, 2024
784d320
Update dependencies from https://github.com/dotnet/sdk build 20240620.8
dotnet-maestro[bot] Jun 20, 2024
8c99ee0
Set $(NuGetAudit) to `false` in tests
jonathanpeppers Jun 21, 2024
f115c97
Update BuildReleaseArm64XFormsDotNet.apkdesc
jonathanpeppers Jun 21, 2024
de5d4c1
Update BuildReleaseArm64SimpleDotNet.apkdesc
jonathanpeppers Jun 21, 2024
7b89115
Merge branch 'main' into darc-main-ea0bd7ef-213e-4822-9a9f-7e04603adb2f
jonathanpeppers Jun 21, 2024
a2586cf
Update dependencies from https://github.com/dotnet/sdk build 20240623.5
dotnet-maestro[bot] Jun 24, 2024
7917d12
Revert "Set $(NuGetAudit) to `false` in tests"
jonathanpeppers Jun 25, 2024
9b90768
Merge branch 'main' into darc-main-ea0bd7ef-213e-4822-9a9f-7e04603adb2f
jonathanpeppers Jun 25, 2024
b74d0fe
Bump NuGet Packages Microsoft.AspNetCore.Components.WebView to 8.0.*
dellis1972 Jun 25, 2024
75ea248
Ignore test
jonathanpeppers Jun 25, 2024
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
22 changes: 11 additions & 11 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="VS.Tools.Net.Core.SDK.Resolver" Version="9.0.100-preview.5.24262.2">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>1741345c6399ae203d8f259fb12fb873dac5129d</Sha>
<Dependency Name="VS.Tools.Net.Core.SDK.Resolver" Version="9.0.100-preview.7.24323.5">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>ea9243f9cb36e56aba4cf6364a4d53a5c2d458fb</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.5.24256.1" CoherentParentDependency="VS.Tools.Net.Core.SDK.Resolver">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.6.24319.11" CoherentParentDependency="VS.Tools.Net.Core.SDK.Resolver">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>84b33395057737db3ea342a5151feb6b90c1b6f6</Sha>
<Sha>117cfccdd71abc164e6b933ca7602b509a1365dd</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.5.24256.1" CoherentParentDependency="VS.Tools.Net.Core.SDK.Resolver">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.6.24319.11" CoherentParentDependency="VS.Tools.Net.Core.SDK.Resolver">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>84b33395057737db3ea342a5151feb6b90c1b6f6</Sha>
<Sha>117cfccdd71abc164e6b933ca7602b509a1365dd</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.5.24223.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.6.24317.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>53288f87c588907e8ff01f129786820fe998573c</Sha>
<Sha>9880d891ddfddee1b1182c149468a43b89c090a0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.24230.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.24313.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
<Uri>https://github.com/dotnet/cecil</Uri>
<Sha>7a4a59f9f66baf6711a6ce2de01d3b2c62ed72d8</Sha>
<Sha>d145726036eb9c09a0e3cf03c4f70effd3b31cd7</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
10 changes: 5 additions & 5 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
<!--Package versions-->
<PropertyGroup>
<!-- NOTE: $(VSToolsNetCoreSDKResolverPackageVersion) may be temporary -->
<VSToolsNetCoreSDKResolverPackageVersion>9.0.100-preview.5.24262.2</VSToolsNetCoreSDKResolverPackageVersion>
<VSToolsNetCoreSDKResolverPackageVersion>9.0.100-preview.7.24323.5</VSToolsNetCoreSDKResolverPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>$(VSToolsNetCoreSDKResolverPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.5.24256.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.5.24256.1</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.6.24319.11</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.6.24319.11</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>8.0.0-beta.24225.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-preview.5.24223.2</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-preview.6.24317.2</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.24230.1</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.24313.1</MicrosoftDotNetCecilPackageVersion>
<SystemIOHashingPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemIOHashingPackageVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ public void DotNetBuild (string runtimeIdentifiers, bool isRelease, bool aot, bo
PackageReferences = {
new Package { Id = "Xamarin.AndroidX.AppCompat", Version = "1.3.1.1" },
// Using * here, so we explicitly get newer packages
new Package { Id = "Microsoft.AspNetCore.Components.WebView", Version = "6.0.0-*" },
new Package { Id = "Microsoft.Extensions.FileProviders.Embedded", Version = "6.0.0-*" },
new Package { Id = "Microsoft.JSInterop", Version = "6.0.0-*" },
new Package { Id = "System.Text.Json", Version = "6.0.0-*" },
new Package { Id = "Microsoft.AspNetCore.Components.WebView", Version = "8.0.*" },
new Package { Id = "Microsoft.Extensions.FileProviders.Embedded", Version = "8.0.*" },
new Package { Id = "Microsoft.JSInterop", Version = "8.0.*" },
new Package { Id = "System.Text.Json", Version = "8.0.*" },
},
Sources = {
new BuildItem ("EmbeddedResource", "Foo.resx") {
Expand Down
32 changes: 16 additions & 16 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,49 +5,49 @@
"Size": 3036
},
"classes.dex": {
"Size": 19476
"Size": 22488
},
"lib/arm64-v8a/lib__Microsoft.Android.Resource.Designer.dll.so": {
"Size": 1027
},
"lib/arm64-v8a/lib_Java.Interop.dll.so": {
"Size": 64655
"Size": 64653
},
"lib/arm64-v8a/lib_Mono.Android.dll.so": {
"Size": 92217
"Size": 92659
},
"lib/arm64-v8a/lib_Mono.Android.Runtime.dll.so": {
"Size": 5320
"Size": 5394
},
"lib/arm64-v8a/lib_System.Console.dll.so": {
"Size": 6541
"Size": 6512
},
"lib/arm64-v8a/lib_System.Linq.dll.so": {
"Size": 8524
"Size": 8489
},
"lib/arm64-v8a/lib_System.Private.CoreLib.dll.so": {
"Size": 571267
"Size": 575506
},
"lib/arm64-v8a/lib_System.Runtime.dll.so": {
"Size": 2544
"Size": 2554
},
"lib/arm64-v8a/lib_System.Runtime.InteropServices.dll.so": {
"Size": 4020
"Size": 3999
},
"lib/arm64-v8a/lib_UnnamedProject.dll.so": {
"Size": 2931
"Size": 2934
},
"lib/arm64-v8a/libarc.bin.so": {
"Size": 1586
},
"lib/arm64-v8a/libmono-component-marshal-ilgen.so": {
"Size": 87352
"Size": 87432
},
"lib/arm64-v8a/libmonodroid.so": {
"Size": 492104
},
"lib/arm64-v8a/libmonosgen-2.0.so": {
"Size": 3154304
"Size": 3163208
},
"lib/arm64-v8a/libSystem.Globalization.Native.so": {
"Size": 67248
Expand All @@ -56,13 +56,13 @@
"Size": 723560
},
"lib/arm64-v8a/libSystem.Native.so": {
"Size": 95296
"Size": 95680
},
"lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
"Size": 155568
"Size": 159544
},
"lib/arm64-v8a/libxamarin-app.so": {
"Size": 17952
"Size": 17984
},
"META-INF/BNDLTOOL.RSA": {
"Size": 1223
Expand Down Expand Up @@ -98,5 +98,5 @@
"Size": 1904
}
},
"PackageSize": 2681365
"PackageSize": 2693653
}
Loading
Loading