[One .NET] Create Host OS specific SDK packs #5245

pjcollins · 2020-10-28T18:57:59Z

The Microsoft.Android.Sdk pack has been broken up into three Host OS
packs. Depending on the operating system used during the build, one or
more of the following packs will now be created:

Microsoft.Android.Sdk.linux-x64
Microsoft.Android.Sdk.osx-x64
Microsoft.Android.Sdk.windows-x64

This is still mostly missing Linux support, which can be addressed in
a future PR that adds a linux build job to our commercial pipeline.

I've moved around a few ItemGroups that were used to determine
what ends up in our ref and runtime packs. These were previously
declared in a shared targets file as the assembly content did not differ
between the ref and runtime packs, but now that we are producing
reference assemblies for certain projects we can move the item
declarations into the project files that consume them.

Some duplicate .props/.targets imports have also been cleaned up
throughout build-tools/create-packs/*.

build-tools/create-packs/Microsoft.Android.Sdk.proj

build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/ReplaceFileContents.cs

build-tools/create-dotnet-pkg/create-dotnet-pkg.csproj

build-tools/create-packs/Directory.Build.targets

radekdoulik

ILLink related changes LGTM

pjcollins · 2020-11-03T16:24:11Z

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

+      "version": "@SDK_PACK_VERSION@",
+      "alias-to": {
+        "osx-x64": "Microsoft.Android.Sdk.osx-x64",
+        "windows-x64": "Microsoft.Android.Sdk.windows-x64"


We'll need to change this back to win-x64 once dotnet/sdk#14393 lands.

jonathanpeppers · 2020-11-03T16:34:29Z

build-tools/create-packs/Microsoft.NET.Workload.Android.proj

@@ -9,15 +9,14 @@ workload manifest pack containing information about the various Microsoft.Androi
 <Project Sdk="Microsoft.Build.NoTargets">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>


Just an FYI, it seems like it doesn't matter what $(TargetFramework) is set to for a Microsoft.Build.NoTargets project?

https://github.com/microsoft/MSBuildSdks/tree/master/src/NoTargets

$(TargetFramework) just has to be valid and not blank... Maybe there is a way we could this value from a Directory.Build.targets at some point? Then we wouldn't need it in these files.

I think this is only used when packing, but we ignore it mostly since we set explicit paths for everything in the packs... We can try to centralize it in the future and reduce the warnings coming from our pack invocations at the same time.

jonathanpeppers · 2020-11-03T16:40:08Z

build-tools/create-packs/Microsoft.Android.Ref.proj

+      <!-- NOTE: we don't have a reference assembly for Java.Interop.dll yet -->
+      <_AndroidRefPackAssemblies Include="$(_MonoAndroidNETOutputDir)Java.Interop.dll" />


You might check if we have this file now since we bumped Java.Interop:

dotnet/java-interop@6cde087

I think we may need to copy it from external/Java.Interop/bin/$(Configuration)-netcoreapp3.1/ref/Java.Interop.dll, it doesn't look like it's automatically copied to the Mono.Android output dir. Maybe there is some msbuild property that controls ref assembly copying for project references that I can find.

I updated this file to use the external JI path, I couldn't find a built in way to copy this over to the Mono.Android netcore output directory.

jonpryor · 2020-11-03T21:15:49Z

This is still mostly missing Linux support, which can be addressed in
a future PR that adds a linux build job to our commercial pipeline.

Another benefit to the frequently suggested but never implemented suggestion of moving the proprietary bits out of the "normal" packages is that we won't need a Linux commercial build, as it can use the same proprietary bits as macOS/Windows! (hint hint?)

jonpryor · 2020-11-03T21:30:45Z

build-tools/create-dotnet-pkg/create-dotnet-pkg.csproj

@@ -34,7 +34,7 @@
      <_FilesToCopy Include="$(DotNetPreviewPath)\sdk\$(DotNetPreviewVersionFull)\EnableWorkloadResolver.sentinel" />
      <_FilesToCopy Include="$(DotNetPreviewPath)\sdk-manifests\$(DotNetPreviewVersionBand)\Microsoft.NET.Workload.Android\**\*" />
      <_FilesToCopy Include="$(DotNetPreviewPath)\packs\Microsoft.Android.Ref\**\*" />
-      <_FilesToCopy Include="$(DotNetPreviewPath)\packs\Microsoft.Android.Sdk\**\*" />
+      <_FilesToCopy Include="$(DotNetPreviewPath)\packs\Microsoft.Android.Sdk.osx-x64\**\*" />


This reminds me of a previous conversation around how "safe" it is to use **\* globs, as it could possibly pull in files that we don't expect ("build cruft", files unexpectedly copied from the system mono, etc.).

Should this instead be a more "constrained" glob expression and/or specific files? See e.g. #2733 (comment)

This wildcard is safe, as all the content in this path was extracted from Microsoft.Android.Sdk.osx-x64.$(Version).nupkg. All of the content being added to the SDK .nupkg file is explicitly defined through https://github.com/xamarin/xamarin-android/blob/master/build-tools/installers/create-installers.targets and https://github.com/xamarin/xamarin-android/blob/master/build-tools/create-packs/Microsoft.Android.Sdk.proj#L71.

This PR did fix one instance of us accidentally including extra build output in our packs by changing the output directory for Microsoft.Android.Sdk.ILLink.

The Microsoft.Android.Sdk pack has been broken up into three Host OS packs. Depending on the operating system used during the build, one or more of the following packs will now be created: * Microsoft.Android.Sdk.linux-x64 * Microsoft.Android.Sdk.osx-x64 * Microsoft.Android.Sdk.win-x64 This is still mostly missing Linux support, which can be addressed in a future PR that adds a linux build step to our commercial pipeline.

jonpryor · 2020-11-03T22:11:35Z

Commit message?

The `Microsoft.Android.Sdk` pack has been broken up into three Host OS
packs.  Depending on the operating system used during the build, one
or more of the following packs will now be created:

  * `Microsoft.Android.Sdk.linux-x64`
  * `Microsoft.Android.Sdk.osx-x64`
  * `Microsoft.Android.Sdk.windows-x64`

This is still mostly missing Linux support, which can be addressed in
a future PR that adds a linux build step to our commercial pipeline.

TODO:

Once we bump to a `dotnet` install which contains
[dotnet/sdk#14393][0], we'll need to replace mentions of
`windows-x64` with `win-x64`.

[0]: https://github.com/dotnet/sdk/pull/14393

pjcollins force-pushed the host-os-sdks branch 6 times, most recently from 2490fb4 to 31c0771 Compare November 2, 2020 17:40

pjcollins requested a review from jonathanpeppers November 2, 2020 17:46

pjcollins commented Nov 2, 2020

View reviewed changes

build-tools/create-packs/Microsoft.Android.Sdk.proj Show resolved Hide resolved

pjcollins marked this pull request as ready for review November 2, 2020 17:52

pjcollins requested review from dellis1972 and jonpryor as code owners November 2, 2020 17:52

pjcollins requested a review from radekdoulik November 2, 2020 17:52

jonathanpeppers reviewed Nov 2, 2020

View reviewed changes

build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/ReplaceFileContents.cs Show resolved Hide resolved

build-tools/create-dotnet-pkg/create-dotnet-pkg.csproj Show resolved Hide resolved

build-tools/create-packs/Directory.Build.targets Show resolved Hide resolved

radekdoulik approved these changes Nov 3, 2020

View reviewed changes

pjcollins commented Nov 3, 2020

View reviewed changes

jonathanpeppers reviewed Nov 3, 2020

View reviewed changes

jonathanpeppers mentioned this pull request Nov 3, 2020

[docs] update instructions for using .NET 6 builds #5260

Merged

jonpryor reviewed Nov 3, 2020

View reviewed changes

pjcollins force-pushed the host-os-sdks branch from 450e496 to 5885d5a Compare November 3, 2020 21:55

jonathanpeppers approved these changes Nov 4, 2020

View reviewed changes

dellis1972 approved these changes Nov 4, 2020

View reviewed changes

pjcollins merged commit 011a771 into dotnet:master Nov 5, 2020

pjcollins deleted the host-os-sdks branch November 5, 2020 17:12

github-actions bot locked and limited conversation to collaborators Jan 24, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[One .NET] Create Host OS specific SDK packs #5245

[One .NET] Create Host OS specific SDK packs #5245

pjcollins commented Oct 28, 2020 •

edited

Loading

radekdoulik left a comment

pjcollins Nov 3, 2020 •

edited

Loading

jonathanpeppers Nov 3, 2020

pjcollins Nov 3, 2020

jonathanpeppers Nov 3, 2020

pjcollins Nov 3, 2020

pjcollins Nov 3, 2020

jonpryor commented Nov 3, 2020

jonpryor Nov 3, 2020

pjcollins Nov 3, 2020

jonpryor commented Nov 3, 2020 •

edited

Loading

		<!-- NOTE: we don't have a reference assembly for Java.Interop.dll yet -->
		<_AndroidRefPackAssemblies Include="$(_MonoAndroidNETOutputDir)Java.Interop.dll" />

[One .NET] Create Host OS specific SDK packs #5245

[One .NET] Create Host OS specific SDK packs #5245

Conversation

pjcollins commented Oct 28, 2020 • edited Loading

radekdoulik left a comment

Choose a reason for hiding this comment

pjcollins Nov 3, 2020 • edited Loading

Choose a reason for hiding this comment

jonathanpeppers Nov 3, 2020

Choose a reason for hiding this comment

pjcollins Nov 3, 2020

Choose a reason for hiding this comment

jonathanpeppers Nov 3, 2020

Choose a reason for hiding this comment

pjcollins Nov 3, 2020

Choose a reason for hiding this comment

pjcollins Nov 3, 2020

Choose a reason for hiding this comment

jonpryor commented Nov 3, 2020

jonpryor Nov 3, 2020

Choose a reason for hiding this comment

pjcollins Nov 3, 2020

Choose a reason for hiding this comment

jonpryor commented Nov 3, 2020 • edited Loading

pjcollins commented Oct 28, 2020 •

edited

Loading

pjcollins Nov 3, 2020 •

edited

Loading

jonpryor commented Nov 3, 2020 •

edited

Loading