[ci] Add support to net6.0 for multi-targeting in VS #7261
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pjcollins
force-pushed
the
multitarget-drops
branch
2 times, most recently
from
e797a57 to
b2026e3
Compare
pjcollins
changed the title
Context: xamarin/yaml-templates#180 Context: xamarin/yaml-templates#195 Context: xamarin/yaml-templates#199 Updates the build to use the latest MSI generation template. The v3 template uses the latest changes from arcade which include a large refactoring, support for multi-targeting, and support for workload pack group MSIs. The build will now produce two different VS Drop artifacts. The MSI and VSMAN files generated for SDK packs have been split out into a new `vsdrop-multitarget-signed` artifact, allowing us to include multiple versions of the SDK packs in VS. The `Microsoft.Android.Sdk` pack has been renamed to `Microsoft.Android.Sdk.net6` to match the pack alias that is referenced in the .NET 7 manifest.
pjcollins
force-pushed
the
multitarget-drops
branch
from
b2026e3 to
4cf5fc1
Compare
pjcollins
requested review from
dellis1972,
jonathanpeppers and
jonpryor
as code owners
src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json
Show resolved
Hide resolved
jonathanpeppers
added a commit
to xamarin/Xamarin.Legacy.Sdk
that referenced
this pull request
Aug 25, 2022
Context: dotnet/android#7261 (comment) To make .NET 6 builds work from a .NET 7 SDK, we are changing: Microsoft.Android.Sdk To: Microsoft.Android.Sdk.net6 Microsoft.Android.Sdk.net7 To deal with this in Xamarin.Legacy.Sdk, by default it will check for: $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '6.0')) $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '7.0')) To get the old behavior, you can set: <UseMicrosoftAndroidSdk>true</UseMicrosoftAndroidSdk> Or to explicitly select, you can set one of: <UseMicrosoftAndroidSdkNet6>true</UseMicrosoftAndroidSdkNet6> <UseMicrosoftAndroidSdkNet7>true</UseMicrosoftAndroidSdkNet7>
jonathanpeppers
added a commit
to xamarin/Xamarin.Legacy.Sdk
that referenced
this pull request
Aug 25, 2022
Context: dotnet/android#7261 (comment) To make .NET 6 builds work from a .NET 7 SDK, we are changing: Microsoft.Android.Sdk To: Microsoft.Android.Sdk.net6 Microsoft.Android.Sdk.net7 To deal with this in Xamarin.Legacy.Sdk, by default it will check for: <!-- if we are not .NET 7 use .NET 6, so legacy or net6.0 will import !$([MSBuild]::VersionEquals($(TargetFrameworkVersion), '7.0')) --> <Import Sdk="Microsoft.Android.Sdk.net6" ... /> <!-- import .NET 7 if we are .NET 7 $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '7.0')) --> <Import Sdk="Microsoft.Android.Sdk.net7" ... /> To get the old behavior, you can set: <UseMicrosoftAndroidSdk>true</UseMicrosoftAndroidSdk> Or to explicitly select, you can set one of: <UseMicrosoftAndroidSdkNet6>true</UseMicrosoftAndroidSdkNet6> <UseMicrosoftAndroidSdkNet7>true</UseMicrosoftAndroidSdkNet7> In a future change, we can make .NET 7 the default, but likely only after it is released GA.
jonathanpeppers
added a commit
to xamarin/Xamarin.Legacy.Sdk
that referenced
this pull request
Aug 25, 2022
Context: dotnet/android#7261 (comment) To make .NET 6 builds work from a .NET 7 SDK, we are changing: Microsoft.Android.Sdk To: Microsoft.Android.Sdk.net6 Microsoft.Android.Sdk.net7 To deal with this in Xamarin.Legacy.Sdk, by default it will check for: <!-- if we are not .NET 7 use .NET 6, so legacy or net6.0 will import !$([MSBuild]::VersionEquals($(TargetFrameworkVersion), '7.0')) --> <Import Sdk="Microsoft.Android.Sdk.net6" ... /> <!-- import .NET 7 if we are .NET 7 $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '7.0')) --> <Import Sdk="Microsoft.Android.Sdk.net7" ... /> To get the old behavior, you can set: <UseMicrosoftAndroidSdk>true</UseMicrosoftAndroidSdk> Or to explicitly select, you can set one of: <UseMicrosoftAndroidSdkNet6>true</UseMicrosoftAndroidSdkNet6> <UseMicrosoftAndroidSdkNet7>true</UseMicrosoftAndroidSdkNet7> In a future change, we can make .NET 7 the default, but likely only after it is released GA.
jonathanpeppers
approved these changes
Aug 26, 2022
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Context: https://github.com/xamarin/yaml-templates/pull/180
Context: https://github.com/xamarin/yaml-templates/pull/195
Context: https://github.com/xamarin/yaml-templates/pull/199
Updates the build to use the latest MSI generation template. The v3
template uses the latest changes from arcade which include a large
refactoring, support for multi-targeting, and support for workload pack
group MSIs.
The build will now produce two different VS Drop artifacts. The MSI and
VSMAN files generated for SDK packs have been split out into a new
vsdrop-multitarget-signedartifact, allowing us to include multipleversions of the SDK packs in VS.
The
Microsoft.Android.Sdkpack has been renamed toMicrosoft.Android.Sdk.net6to match the pack alias that is referencedin the .NET 7 manifest.