Skip to content

Commit 5400522

Browse files
jonathanpeppersjonathanpeppers
authored
[One .NET] workload is now Microsoft.NET.Sdk.Android.Manifest-6.0.100 (#5898)
Context: https://github.com/dotnet/designs/pull/188/files#diff-8fcaa29d8e6f00b34b3cb1830d93f33e75f04424780a66a3c658c7021048e74fR125 Context: https://github.com/NuGet/NuGet.Client/blob/c529bd75d247430ed19b1713041de0b5b240ef0d/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.targets#L220-L281 The `$(PackageId)` of our workload `.nupkg` needs to be: Microsoft.NET.Sdk.Android.Manifest-6.0.100 While the `$(PackageVersion)` remains the same as before. The layout on disk will change to: dotnet\sdk-manifests\6.0.100\Microsoft.NET.Sdk.Android\ WorkloadManifest.json WorkloadManifest.targets Note that `.Manifest` and `-6.0.100` are not in the folder name on disk. The generated filename will be e.g. Microsoft.NET.Sdk.Android.Manifest-6.0.100.11.0.200-ci.microsoft-net-sdk-android-manifest.255.nupkg We could find no way to "visually separate" the ".NET version band" of `6.0.100` from the Microsoft.NET.Sdk.Android version of `11.0.200`. Additionally, update `version` in `WorkloadManifest.json` so it contains the proper version for our workload. This used to not be possible because `version` was a `long`, but it now is a `string` where we can put our version.
1 parent 3840ecc commit 5400522

9 files changed

Lines changed: 28 additions & 27 deletions

File tree

‎build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/GenerateWixFile.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public override bool Execute ()
9393
packWriter.WriteAttributeString ("Id", "DOTNETVERSIONBAND");
9494
packWriter.WriteAttributeString ("Name", version_band);
9595
packWriter.WriteAttributeString ("FileSource", sdk_manifests);
96-
var workload = Path.Combine (sdk_manifests, "Microsoft.NET.Workload.Android");
96+
var workload = Path.Combine (sdk_manifests, "Microsoft.NET.Sdk.Android");
9797
if (Directory.Exists (workload)) {
9898
RecurseDirectory (sdk_manifests, packWriter, componentWriter, workload);
9999
} else {

‎build-tools/create-dotnet-msi/create-dotnet-msi.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
<Target Name="_Properties">
4747
<PropertyGroup>
48-
<License Condition=" '$(License)' == '' ">$(DotNetPreviewPath)sdk-manifests\$(DotNetPreviewVersionBand)\Microsoft.NET.Workload.Android\LICENSE</License>
48+
<License Condition=" '$(License)' == '' ">$(DotNetPreviewPath)sdk-manifests\$(DotNetPreviewVersionBand)\Microsoft.NET.Sdk.Android\LICENSE</License>
4949
<_LicenseDestination>$(IntermediateOutputPath)LICENSE.rtf</_LicenseDestination>
5050
<_WixFile>$(IntermediateOutputPath)Microsoft.NET.Workload.Android.wix</_WixFile>
5151
<_WixObj>$(IntermediateOutputPath)Microsoft.NET.Workload.Android.wixobj</_WixObj>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434
<Target Name="_FinalizePayload"
3535
DependsOnTargets="GetXAVersionInfo">
3636
<PropertyGroup>
37-
<License Condition=" '$(License)' == '' ">$(DotNetPreviewPath)sdk-manifests\$(DotNetPreviewVersionBand)\Microsoft.NET.Workload.Android\LICENSE</License>
37+
<License Condition=" '$(License)' == '' ">$(DotNetPreviewPath)sdk-manifests\$(DotNetPreviewVersionBand)\Microsoft.NET.Sdk.Android\LICENSE</License>
3838
<DotNetPayloadDir>$(PayloadDir)\usr\local\share\dotnet\</DotNetPayloadDir>
3939
</PropertyGroup>
4040
<ItemGroup>
4141
<_FilesToCopy Include="$(DotNetPreviewPath)\sdk\$(MicrosoftDotnetSdkInternalPackageVersion)\EnableWorkloadResolver.sentinel" />
42-
<_FilesToCopy Include="$(DotNetPreviewPath)\sdk-manifests\$(DotNetPreviewVersionBand)\Microsoft.NET.Workload.Android\**\*" />
42+
<_FilesToCopy Include="$(DotNetPreviewPath)\sdk-manifests\$(DotNetPreviewVersionBand)\Microsoft.NET.Sdk.Android\**\*" />
4343
<_FilesToCopy Include="$(DotNetPreviewPath)\packs\Microsoft.Android.Ref\**\*" />
4444
<_FilesToCopy Include="$(DotNetPreviewPath)\packs\Microsoft.Android.Sdk.Darwin\**\*" />
4545
<_FilesToCopy Include="$(DotNetPreviewPath)\packs\Microsoft.Android.Sdk.BundleTool\**\*" />

‎build-tools/create-packs/Directory.Build.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@
1414
<NoWarn>$(NoWarn);NU5128;NU5131</NoWarn>
1515
</PropertyGroup>
1616

17+
<Import Project="..\..\Configuration.props" />
18+
1719
</Project>

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
<Project>
2-
<Import Project="..\..\Configuration.props" />
3-
42
<ItemGroup>
53
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" PrivateAssets="all" />
64
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" PrivateAssets="all" />
@@ -87,14 +85,14 @@
8785
<Exec Command="dotnet pack @(_GlobalProperties, ' ') -p:HostOS=Darwin &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.proj&quot;" Condition=" '$(HostOS)' == 'Darwin' " />
8886
<Exec Command="dotnet pack @(_GlobalProperties, ' ') -p:HostOS=Windows &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.proj&quot;" Condition=" '$(HostOS)' != 'Linux' " /> <!-- Windows pack should be built both Windows and macOS -->
8987
<Exec Command="dotnet pack @(_GlobalProperties, ' ') &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.BundleTool.proj&quot;" />
90-
<Exec Command="dotnet pack @(_GlobalProperties, ' ') &quot;$(MSBuildThisFileDirectory)Microsoft.NET.Workload.Android.proj&quot;" />
88+
<Exec Command="dotnet pack @(_GlobalProperties, ' ') &quot;$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.Android.proj&quot;" />
9189
<Exec Command="dotnet pack @(_GlobalProperties, ' ') &quot;$(XamarinAndroidSourcePath)src\Microsoft.Android.Templates\Microsoft.Android.Templates.csproj&quot;" />
9290
</Target>
9391

9492
<Target Name="ExtractWorkloadPacks"
9593
DependsOnTargets="DeleteExtractedWorkloadPacks" >
9694
<ItemGroup>
97-
<_WLManifest Include="$(XamarinAndroidSourcePath)bin\Build$(Configuration)\nuget-unsigned\Microsoft.NET.Workload.Android.*.nupkg" />
95+
<_WLManifest Include="$(XamarinAndroidSourcePath)bin\Build$(Configuration)\nuget-unsigned\Microsoft.NET.Sdk.Android.Manifest-*.nupkg" />
9896
<_WLPacks Include="$(XamarinAndroidSourcePath)bin\Build$(Configuration)\nuget-unsigned\Microsoft.Android.Sdk.$(HostOS).*.nupkg" />
9997
<_WLPacks Include="$(XamarinAndroidSourcePath)bin\Build$(Configuration)\nuget-unsigned\Microsoft.Android.Sdk.BundleTool.*.nupkg" />
10098
<_WLPacks Include="$(XamarinAndroidSourcePath)bin\Build$(Configuration)\nuget-unsigned\Microsoft.Android.Ref.*.nupkg" />
@@ -103,7 +101,7 @@
103101
<!-- <_WLPacks Include="$(XamarinAndroidSourcePath)bin\Build$(Configuration)\nuget-unsigned\Microsoft.Android.Runtime.*.nupkg" /> -->
104102
</ItemGroup>
105103
<PropertyGroup>
106-
<_WLPackVersion>@(_WLManifest->'%(Filename)'->Replace('Microsoft.NET.Workload.Android.', ''))</_WLPackVersion>
104+
<_WLPackVersion>@(_WLManifest->'%(Filename)'->Replace('Microsoft.NET.Sdk.Android.Manifest-$(DotNetPreviewVersionBand).', ''))</_WLPackVersion>
107105
<_SdkManifestsFolder>$(DotNetPreviewPath)sdk-manifests\$(DotNetPreviewVersionBand)\</_SdkManifestsFolder>
108106
</PropertyGroup>
109107
<Unzip
@@ -115,7 +113,7 @@
115113
<_WLExtractedFiles Include="$(_SdkManifestsFolder)temp\LICENSE" />
116114
<_WLExtractedFiles Include="$(_SdkManifestsFolder)temp\data\*" />
117115
</ItemGroup>
118-
<Move SourceFiles="@(_WLExtractedFiles)" DestinationFolder="$(_SdkManifestsFolder)Microsoft.NET.Workload.Android" />
116+
<Move SourceFiles="@(_WLExtractedFiles)" DestinationFolder="$(_SdkManifestsFolder)Microsoft.NET.Sdk.Android" />
119117
<RemoveDir Directories="$(_SdkManifestsFolder)temp\" />
120118
<Unzip
121119
SourceFiles="@(_WLPacks)"
@@ -126,7 +124,7 @@
126124
<Copy SourceFiles="@(_WLTemplates)" DestinationFiles="@(_WLTemplates->'%(Filename)%(Extension)'->ToLower()->'$(DotNetPreviewPath)template-packs\%(Identity)')" />
127125
<ItemGroup>
128126
<_UnixExecutables Include="$(DotNetPreviewPath)packs\Microsoft.Android.Sdk.*\*\tools\$(HostOS)\**\*.*" />
129-
<_FilesToTouch Include="$(DotNetPreviewPath)sdk-manifests\$(DotNetPreviewVersionBand)\Microsoft.NET.Workload.Android\**" />
127+
<_FilesToTouch Include="$(DotNetPreviewPath)sdk-manifests\$(DotNetPreviewVersionBand)\Microsoft.NET.Sdk.Android\**" />
130128
<_FilesToTouch Include="$(DotNetPreviewPath)packs\$([System.String]::Copy('%(_WLPacks.Filename)').Replace('.$(_WLPackVersion)', ''))\$(_WLPackVersion)\**" />
131129
</ItemGroup>
132130
<Exec
@@ -144,7 +142,7 @@
144142

145143
<Target Name="DeleteExtractedWorkloadPacks" >
146144
<ItemGroup>
147-
<_PackFilesToDelete Include="$(DotNetPreviewPath)sdk-manifests\$(DotNetPreviewVersionBand)\Microsoft.Android.Workload\**\*.*" />
145+
<_PackFilesToDelete Include="$(DotNetPreviewPath)sdk-manifests\$(DotNetPreviewVersionBand)\Microsoft.NET.Sdk.Android\**\*.*" />
148146
<_PackFilesToDelete Include="$(DotNetPreviewPath)sdk-manifests\$(DotNetPreviewVersionBand)\Microsoft.NET.Workload.Android\**\*.*" />
149147
<_PackFilesToDelete Include="$(DotNetPreviewPath)packs\Microsoft.Android*\**\*.*" />
150148
<_PackFilesToDelete Include="$(DotNetPreviewPath)template-packs\Microsoft.Android.Templates.*.nupkg" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
***********************************************************************************************
33
Microsoft.Android.Sdk.proj
44
5-
This project file is used to create the Microsoft.Android.Sdk.$(RID) NuGets, which are the
6-
core workload sdk packs imported by Microsoft.NET.Workload.Android.
5+
This project file is used to create the Microsoft.Android.Sdk.$(HostOS) NuGets, which are the
6+
core workload SDK packs imported by WorkloadManifest.targets.
77
***********************************************************************************************
88
-->
99
<Project Sdk="Microsoft.Build.NoTargets">

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
<!--
22
***********************************************************************************************
3-
Microsoft.NET.Workload.Android.proj
3+
Microsoft.NET.Sdk.Android.proj
44
5-
This project file is used to create the Microsoft.NET.Workload.Android NuGet, which is the
6-
workload manifest pack containing information about the various Microsoft.Android workloads.
5+
This project file is used to create the Microsoft.NET.Sdk.Android
6+
NuGet, which is the workload manifest pack containing information
7+
about the various Microsoft.Android workloads.
78
***********************************************************************************************
89
-->
910
<Project Sdk="Microsoft.Build.NoTargets">
1011

1112
<PropertyGroup>
12-
<PackageId>Microsoft.NET.Workload.Android</PackageId>
13-
<Description>Microsoft.Android workload manifest. Please do not reference directly.</Description>
13+
<PackageId>Microsoft.NET.Sdk.Android.Manifest-$(DotNetPreviewVersionBand)</PackageId>
14+
<Description>Microsoft.NET.Sdk.Android workload manifest. Please do not reference directly.</Description>
1415
</PropertyGroup>
1516

1617
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.ReplaceFileContents" />
@@ -31,13 +32,13 @@ workload manifest pack containing information about the various Microsoft.Androi
3132

3233
<MakeDir Directories="$([System.IO.Path]::GetDirectoryName ($(WorkloadManifestJsonPath)))" />
3334
<ReplaceFileContents
34-
SourceFile="$(XamarinAndroidSourcePath)src\Xamarin.Android.Build.Tasks\Microsoft.NET.Workload.Android\WorkloadManifest.in.json"
35+
SourceFile="$(XamarinAndroidSourcePath)src\Xamarin.Android.Build.Tasks\Microsoft.NET.Sdk.Android\WorkloadManifest.in.json"
3536
DestinationFile="$(WorkloadManifestJsonPath)"
36-
Replacements="@SDK_PACK_VERSION@=$(AndroidPackVersionLong);@REF_PACK_VERSION@=$(AndroidPackVersionLong);@TEMPLATE_PACK_VERSION@=$(AndroidPackVersionLong);">
37+
Replacements="@WORKLOAD_VERSION@=$(AndroidPackVersionLong)">
3738
</ReplaceFileContents>
3839

3940
<ItemGroup>
40-
<_PackageFiles Include="$(XamarinAndroidSourcePath)src\Xamarin.Android.Build.Tasks\Microsoft.NET.Workload.Android\WorkloadManifest.targets" PackagePath="data" />
41+
<_PackageFiles Include="$(XamarinAndroidSourcePath)src\Xamarin.Android.Build.Tasks\Microsoft.NET.Sdk.Android\WorkloadManifest.targets" PackagePath="data" />
4142
<_PackageFiles Include="$(WorkloadManifestJsonPath)" PackagePath="data" />
4243
</ItemGroup>
4344
</Target>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": 6,
2+
"version": "@WORKLOAD_VERSION@",
33
"workloads": {
44
"microsoft-android-sdk-full": {
55
"description": "Android SDK",
@@ -14,7 +14,7 @@
1414
"packs": {
1515
"Microsoft.Android.Sdk": {
1616
"kind": "sdk",
17-
"version": "@SDK_PACK_VERSION@",
17+
"version": "@WORKLOAD_VERSION@",
1818
"alias-to": {
1919
"osx-x64": "Microsoft.Android.Sdk.Darwin",
2020
"osx-arm64": "Microsoft.Android.Sdk.Darwin",
@@ -25,15 +25,15 @@
2525
},
2626
"Microsoft.Android.Sdk.BundleTool": {
2727
"kind": "sdk",
28-
"version": "@SDK_PACK_VERSION@"
28+
"version": "@WORKLOAD_VERSION@"
2929
},
3030
"Microsoft.Android.Ref": {
3131
"kind": "framework",
32-
"version": "@REF_PACK_VERSION@"
32+
"version": "@WORKLOAD_VERSION@"
3333
},
3434
"Microsoft.Android.Templates": {
3535
"kind": "template",
36-
"version": "@TEMPLATE_PACK_VERSION@"
36+
"version": "@WORKLOAD_VERSION@"
3737
}
3838
}
3939
}

src/Xamarin.Android.Build.Tasks/Microsoft.NET.Workload.Android/WorkloadManifest.targets renamed to src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.targets

File renamed without changes.

0 commit comments

Comments
 (0)