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

[main] Update dependencies from dotnet/installer #7677

Merged
merged 11 commits into from
Jan 19, 2023
Merged

[main] Update dependencies from dotnet/installer #7677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
625e043
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Jan 9, 2023
5afbead
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Jan 10, 2023
9fe9083
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Jan 16, 2023
c155b8f
Testing https://github.com/xamarin/monodroid/pull/1283
jonathanpeppers Jan 17, 2023
e4ba422
Update .external
jonathanpeppers Jan 17, 2023
aa919de
Update .external
jonathanpeppers Jan 17, 2023
b1983ea
Update .external
jonathanpeppers Jan 18, 2023
86a2d60
Update .apkdesc files
jonathanpeppers Jan 18, 2023
52ae286
Bump to xamarin/monodroid/main@2b9c9d0
jonathanpeppers Jan 18, 2023
738c374
Update WorkloadManifest.in.json
jonathanpeppers Jan 18, 2023
e48cee0
Use dotnet7 feed in dotnet6 MSBuild tests
jonathanpeppers Jan 18, 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
2 changes: 1 addition & 1 deletion .external
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
xamarin/monodroid:main@c0c933b7a5286c0babecb165c0676c32f5e44092
xamarin/monodroid:main@2b9c9d01820c8df4541157f6b6116852eba73350
mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d
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,20 +1,20 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-alpha.1.22622.3">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-alpha.1.23063.11">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>1c4be07c6ff156c7bcb2e5a34b7d3037deb6e52d</Sha>
<Sha>9962c6a686a31ba1e7c20983a810ba7989c3fc0c</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.100-1.22612.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.100-1.23055.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>2db841fc5f6bc7592b66ffe3bd0e1c888d022f93</Sha>
<Sha>4b3f78cbc7284b4198652a695e9fe0267133728e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.22605.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.23058.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
<Sha>5da4a9e919dcee35f831ab69b6e475baaf798875</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100" Version="8.0.0-alpha.1.22558.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100" Version="8.0.0-alpha.1.22620.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>96351a7e97093d88eb097b4a489f949ebf8a901b</Sha>
<Sha>66b984594a008151bdb14dc60589373e3d44be83</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
8 changes: 4 additions & 4 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>8.0.100-alpha.1.22622.3</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.100-1.22612.2</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.22605.1</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-alpha.1.23063.11</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.100-1.23055.2</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.23058.2</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>8.0.0-alpha.1.22558.2</MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>
<MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>8.0.0-alpha.1.22620.1</MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptennet7Manifest80100Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
</PropertyGroup>
Expand Down
2 changes: 2 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
"extends" : [
"microsoft-net-runtime-android-net6",
"microsoft-net-runtime-android-aot-net6",
"microsoft-net-runtime-android-net7",
"microsoft-net-runtime-android-aot-net7",
"microsoft-net-runtime-android",
"microsoft-net-runtime-android-aot"
]
Expand Down
2 changes: 2 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetStandard.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ public void AddNuGetSourcesForOlderTargetFrameworks (string targetFramework = nu
ExtraNuGetConfigSources = new List<string> {
"https://api.nuget.org/v3/index.json",
"https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json",
// NOTE: .NET 6 currently uses .NET 7 linker
"https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json",
};
} else if (targetFramework.IndexOf ("net7.0", StringComparison.OrdinalIgnoreCase) != -1) {
ExtraNuGetConfigSources = new List<string> {
Expand Down
30 changes: 15 additions & 15 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,37 +5,37 @@
"Size": 3032
},
"assemblies/_Microsoft.Android.Resource.Designer.dll": {
"Size": 1028
"Size": 1024
},
"assemblies/Java.Interop.dll": {
"Size": 58926
"Size": 58916
},
"assemblies/Mono.Android.dll": {
"Size": 87074
"Size": 87170
},
"assemblies/Mono.Android.Runtime.dll": {
"Size": 5833
"Size": 5931
},
"assemblies/rc.bin": {
"Size": 1182
},
"assemblies/System.Console.dll": {
"Size": 6593
"Size": 6586
},
"assemblies/System.Linq.dll": {
"Size": 9253
"Size": 9252
},
"assemblies/System.Private.CoreLib.dll": {
"Size": 483854
"Size": 517260
},
"assemblies/System.Runtime.dll": {
"Size": 2608
"Size": 2611
},
"assemblies/System.Runtime.InteropServices.dll": {
"Size": 2269
"Size": 2265
},
"assemblies/UnnamedProject.dll": {
"Size": 3276
"Size": 3257
},
"classes.dex": {
"Size": 19020
Expand All @@ -47,19 +47,19 @@
"Size": 434704
},
"lib/arm64-v8a/libmonosgen-2.0.so": {
"Size": 3064488
"Size": 3089272
},
"lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
"Size": 723840
},
"lib/arm64-v8a/libSystem.Native.so": {
"Size": 94312
"Size": 94328
},
"lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
"Size": 150584
"Size": 152960
},
"lib/arm64-v8a/libxamarin-app.so": {
"Size": 16728
"Size": 16760
},
"META-INF/BNDLTOOL.RSA": {
"Size": 1213
Expand Down Expand Up @@ -95,5 +95,5 @@
"Size": 1904
}
},
"PackageSize": 2603338
"PackageSize": 2648394
}
Loading