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.

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

[ci] Add support to net7.0 for multi-targeting in VS #7311

Merged
merged 3 commits into from
Aug 30, 2022
Merged

Conversation

pjcollins
Copy link
Member

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-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.net7 to allow it to be imported by the .NET 8
workload manifest when the time comes.

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.net7` to allow it to be imported by the .NET 8
workload manifest when the time comes.
@pjcollins pjcollins marked this pull request as ready for review August 29, 2022 15:39
Copy link
Member

@jonathanpeppers jonathanpeppers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good, if CI is green. It seems like the main NuGet.config might need the dotnet6 feed, we'll see.

@pjcollins
Copy link
Member Author

It seems like the main NuGet.config might need the dotnet6 feed, we'll see.

I think we can get away with only adding this to certain tests since it is already included in the workload install command used for test environment provisioning.

There are some ILLink related failures on the latest run that seem interesting though, rerunning a couple of jobs to see if they pop up again...

@pjcollins
Copy link
Member Author

Looks like the test job specific re-runs passed, I'm going to merge so we can get a build and we can look out for any repeat failures in main.

@pjcollins pjcollins merged commit ffc0610 into main Aug 30, 2022
@pjcollins pjcollins deleted the multidrop7 branch August 30, 2022 12:23
pjcollins added a commit that referenced this pull request Aug 30, 2022
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.net7` to allow it to be imported by the .NET 8
workload manifest when the time comes.
grendello added a commit to grendello/xamarin-android that referenced this pull request Aug 31, 2022
* main:
  [ci] Split up signing for files to be notarized (dotnet#7321)
  [ci] Add support to net7.0 for multi-targeting in VS (dotnet#7311)
  [ci] Skip classic tests on .NET release branches (dotnet#7312)
  [tests] Use `$(AndroidSdkPlatformToolsVersion)`=33.0.3 (dotnet#7320)
  Bump to xamarin/java.interop/main@4f813cb2 (dotnet#7308)
  Bump to mono/mono.posix@d8994ca, dotnet/android-libzipsharp@98e9173 (dotnet#7309)
grendello added a commit to grendello/xamarin-android that referenced this pull request Aug 31, 2022
* mm-runtime:
  [ci] Split up signing for files to be notarized (dotnet#7321)
  [ci] Add support to net7.0 for multi-targeting in VS (dotnet#7311)
  [ci] Skip classic tests on .NET release branches (dotnet#7312)
  [tests] Use `$(AndroidSdkPlatformToolsVersion)`=33.0.3 (dotnet#7320)
  Bump to xamarin/java.interop/main@4f813cb2 (dotnet#7308)
  Bump to mono/mono.posix@d8994ca, dotnet/android-libzipsharp@98e9173 (dotnet#7309)
@github-actions github-actions bot locked and limited conversation to collaborators Jan 24, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants