From 09e16c978aa6f11500e7a81949f3156d26404dd8 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 6 May 2021 14:43:54 -0500 Subject: [PATCH] Bump to Xamarin ci.main workload manifests Context: https://github.com/dotnet/designs/pull/188/files#diff-8fcaa29d8e6f00b34b3cb1830d93f33e75f04424780a66a3c658c7021048e74fR125 Context: https://github.com/xamarin/xamarin-android/pull/5898 Context: https://github.com/xamarin/xamarin-macios/pull/11436 The Xamarin workload manifest packages have been renamed to have a `$(PackageId)` of: Microsoft.NET.Sdk.[platform].Manifest-6.0.100 The `dotnet` directory on disk is expected to contain: dotnet\sdk-manifests\6.0.100\Microsoft.NET.Sdk.[platform]\ WorkloadManifest.json WorkloadManifest.targets I manually tested `.\build.cmd -pack -publish` which produced `artifacts\**\dotnet-sdk-6.0.100-dev-win-x64.exe`. After installing it, I can see the "advertising manifest" feature seems to be working: > dotnet workload install microsoft-android-sdk-full --configfile NuGet.config Updated advertising manifest microsoft.net.sdk.android. Updated advertising manifest microsoft.net.sdk.ios. Updated advertising manifest microsoft.net.sdk.maccatalyst. Updated advertising manifest microsoft.net.sdk.macos. Updated advertising manifest microsoft.net.sdk.tvos. Failed to update the advertising manifest microsoft.net.workload.blazorwebassembly: microsoft.net.workload.blazorwebassembly.manifest-6.0.100 is not found in NuGet feeds https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json, https://pkgs.dev.azure.com/azure-public/vside/_packaging/xamarin-impl/nuget/v3/index.json, https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json", Installing pack Microsoft.Android.Sdk version 11.0.200-ci.main.256... Writing workload pack installation record for Microsoft.Android.Sdk version 11.0.200-ci.main.256... Installing pack Microsoft.Android.Sdk.BundleTool version 11.0.200-ci.main.256... Writing workload pack installation record for Microsoft.Android.Sdk.BundleTool version 11.0.200-ci.main.256... Installing pack Microsoft.Android.Ref version 11.0.200-ci.main.256... Writing workload pack installation record for Microsoft.Android.Ref version 11.0.200-ci.main.256... Installing pack Microsoft.Android.Templates version 11.0.200-ci.main.256... Writing workload pack installation record for Microsoft.Android.Templates version 11.0.200-ci.main.256... Garbage collecting for SDK feature bands 6.0.100... Successfully installed workload(s) microsoft-android-sdk-full. Then I'm able to build and run an Android application using the installed workload: > dotnet build HelloAndroid -t:Run ... Build succeeded. 0 Warning(s) 0 Error(s) Time Elapsed 00:00:21.76 --- eng/Versions.props | 10 +++++----- src/redist/targets/BundledManifests.targets | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 0f84d42ed..df9422d7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,11 +149,11 @@ - 11.0.200-preview.4.245 - 14.5.100-preview.4.633 - 14.5.100-preview.4.633 - 11.3.100-preview.4.633 - 14.5.100-preview.4.633 + 11.0.200-ci.main.256 + 14.5.100-ci.main.723 + 14.5.100-ci.main.723 + 11.3.100-ci.main.723 + 14.5.100-ci.main.723 $(MicrosoftAspNetCoreAppRuntimePackageVersion) diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index c7037bf83..4d54f7a52 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -1,11 +1,11 @@ - - - - - + + + + +