Skip to content

Commit 164e799

Browse files
dotnet-maestro[bot]jonathanpeppers
dotnet-maestro[bot]
and
jonathanpeppers
authored
Bump to dotnet/installer@9962c6a 8.0.100-alpha.1.23063.11 (#7677)
Changes: dotnet/installer@1c4be07...9962c6a Changes: dotnet/linker@2db841f...4b3f78c Changes: dotnet/runtime@1a37caf...5da4a9e Changes: dotnet/emsdk@96351a7...66b9845 Changes: https://github.com/xamarin/monodroid/compare/c0c933b...2b9c9d0 Updates: * Microsoft.Dotnet.Sdk.Internal: from 8.0.100-alpha.1.22622.3 to 8.0.100-alpha.1.23063.11 * Microsoft.NET.ILLink.Tasks: from 8.0.100-1.22612.2 to 8.0.100-1.23055.2 * Microsoft.NETCore.App.Ref: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23058.2 * Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100: from 8.0.0-alpha.1.22558.2 to 8.0.0-alpha.1.22620.1 Other changes: * Update `.apkdesc` files for app size changes. * Bump to xamarin/monodroid/main@2b9c9d0 Changes: https://github.com/xamarin/monodroid/compare/c0c933b...2b9c9d0 Fixes usage of `dotnet` and `$(DotNetPreviewTool)`. * Update `WorkloadManifest.in.json` to include .NET 7 packs. I do not understand how this worked at all before. * Use `dotnet7` feed in `dotnet6` MSBuild tests Avoids the build warning: warning NU1603: UnnamedProject depends on Microsoft.NET.ILLink.Tasks (>= 7.0.100-1.22579.2) but Microsoft.NET.ILLink.Tasks 7.0.100-1.22579.2 was not found. An approximate best match of Microsoft.NET.ILLink.Tasks 7.0.100-1.22579.3 was resolved. Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
1 parent 7dbbe17 commit 164e799

File tree

7 files changed

+97
-93
lines changed

7 files changed

+97
-93
lines changed

‎.external‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
xamarin/monodroid:main@c0c933b7a5286c0babecb165c0676c32f5e44092
1+
xamarin/monodroid:main@2b9c9d01820c8df4541157f6b6116852eba73350
22
mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 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.22622.3">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-alpha.1.23063.11">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>1c4be07c6ff156c7bcb2e5a34b7d3037deb6e52d</Sha>
5+
<Sha>9962c6a686a31ba1e7c20983a810ba7989c3fc0c</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.100-1.22612.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
7+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.100-1.23055.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
88
<Uri>https://github.com/dotnet/linker</Uri>
9-
<Sha>2db841fc5f6bc7592b66ffe3bd0e1c888d022f93</Sha>
9+
<Sha>4b3f78cbc7284b4198652a695e9fe0267133728e</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.22605.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.23058.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
13+
<Sha>5da4a9e919dcee35f831ab69b6e475baaf798875</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100" Version="8.0.0-alpha.1.22558.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
15+
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100" Version="8.0.0-alpha.1.22620.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>96351a7e97093d88eb097b4a489f949ebf8a901b</Sha>
17+
<Sha>66b984594a008151bdb14dc60589373e3d44be83</Sha>
1818
</Dependency>
1919
</ProductDependencies>
2020
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-alpha.1.22622.3</MicrosoftDotnetSdkInternalPackageVersion>
5-
<MicrosoftNETILLinkTasksPackageVersion>8.0.100-1.22612.2</MicrosoftNETILLinkTasksPackageVersion>
6-
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.22605.1</MicrosoftNETCoreAppRefPackageVersion>
4+
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-alpha.1.23063.11</MicrosoftDotnetSdkInternalPackageVersion>
5+
<MicrosoftNETILLinkTasksPackageVersion>8.0.100-1.23055.2</MicrosoftNETILLinkTasksPackageVersion>
6+
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.23058.2</MicrosoftNETCoreAppRefPackageVersion>
77
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
88
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
9-
<MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>8.0.0-alpha.1.22558.2</MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>
9+
<MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>8.0.0-alpha.1.22620.1</MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>
1010
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptennet7Manifest80100Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
1111
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
1212
</PropertyGroup>

‎src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
"extends" : [
1919
"microsoft-net-runtime-android-net6",
2020
"microsoft-net-runtime-android-aot-net6",
21+
"microsoft-net-runtime-android-net7",
22+
"microsoft-net-runtime-android-aot-net7",
2123
"microsoft-net-runtime-android",
2224
"microsoft-net-runtime-android-aot"
2325
]

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetStandard.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ public void AddNuGetSourcesForOlderTargetFrameworks (string targetFramework = nu
4545
ExtraNuGetConfigSources = new List<string> {
4646
"https://api.nuget.org/v3/index.json",
4747
"https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json",
48+
// NOTE: .NET 6 currently uses .NET 7 linker
49+
"https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json",
4850
};
4951
} else if (targetFramework.IndexOf ("net7.0", StringComparison.OrdinalIgnoreCase) != -1) {
5052
ExtraNuGetConfigSources = new List<string> {

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,37 @@
55
"Size": 3032
66
},
77
"assemblies/_Microsoft.Android.Resource.Designer.dll": {
8-
"Size": 1028
8+
"Size": 1024
99
},
1010
"assemblies/Java.Interop.dll": {
11-
"Size": 58926
11+
"Size": 58916
1212
},
1313
"assemblies/Mono.Android.dll": {
14-
"Size": 87074
14+
"Size": 87170
1515
},
1616
"assemblies/Mono.Android.Runtime.dll": {
17-
"Size": 5833
17+
"Size": 5931
1818
},
1919
"assemblies/rc.bin": {
2020
"Size": 1182
2121
},
2222
"assemblies/System.Console.dll": {
23-
"Size": 6593
23+
"Size": 6586
2424
},
2525
"assemblies/System.Linq.dll": {
26-
"Size": 9253
26+
"Size": 9252
2727
},
2828
"assemblies/System.Private.CoreLib.dll": {
29-
"Size": 483854
29+
"Size": 517260
3030
},
3131
"assemblies/System.Runtime.dll": {
32-
"Size": 2608
32+
"Size": 2611
3333
},
3434
"assemblies/System.Runtime.InteropServices.dll": {
35-
"Size": 2269
35+
"Size": 2265
3636
},
3737
"assemblies/UnnamedProject.dll": {
38-
"Size": 3276
38+
"Size": 3257
3939
},
4040
"classes.dex": {
4141
"Size": 19020
@@ -47,19 +47,19 @@
4747
"Size": 434704
4848
},
4949
"lib/arm64-v8a/libmonosgen-2.0.so": {
50-
"Size": 3064488
50+
"Size": 3089272
5151
},
5252
"lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
5353
"Size": 723840
5454
},
5555
"lib/arm64-v8a/libSystem.Native.so": {
56-
"Size": 94312
56+
"Size": 94328
5757
},
5858
"lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
59-
"Size": 150584
59+
"Size": 152960
6060
},
6161
"lib/arm64-v8a/libxamarin-app.so": {
62-
"Size": 16728
62+
"Size": 16760
6363
},
6464
"META-INF/BNDLTOOL.RSA": {
6565
"Size": 1213
@@ -95,5 +95,5 @@
9595
"Size": 1904
9696
}
9797
},
98-
"PackageSize": 2603338
98+
"PackageSize": 2648394
9999
}

0 commit comments

Comments
 (0)