Update mono workload id and version to match the workload spec (#52468)

The id of the package we produce will be Microsoft.NET.Workload.Mono.ToolChain.Manifest-<sdk-band>

diff --git a/eng/Versions.props b/eng/Versions.props
index 7d7d309..ae34e9f 100644 (file)
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -6,6 +6,7 @@
     <MajorVersion>6</MajorVersion>
     <MinorVersion>0</MinorVersion>
     <PatchVersion>0</PatchVersion>
+    <SdkBandVersion>6.0.100</SdkBandVersion>
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
     <PreReleaseVersionIteration>5</PreReleaseVersionIteration>
     <!-- Set assembly version to align with major and minor version,

diff --git a/src/installer/prepare-artifacts.proj b/src/installer/prepare-artifacts.proj
index f9651cb..54226e5 100644 (file)
--- a/src/installer/prepare-artifacts.proj
+++ b/src/installer/prepare-artifacts.proj
@@ -218,7 +218,7 @@
       -->
       <RidAgnosticNupkgToPublishFile
         Include="
-          $(DownloadDirectory)**\Microsoft.NET.Sdk.Mono.Toolchain.Manifest.*.nupkg;
+          $(DownloadDirectory)**\Microsoft.NET.Workload.Mono.Toolchain.Manifest-*.nupkg;
           $(DownloadDirectory)*\$(PublishRidAgnosticPackagesFromPlatform)\**\*.nupkg;
           $(DownloadDirectory)*\*AllConfigurations\**\*.nupkg"
         Exclude="@(RuntimeNupkgFile);@(DownloadedSymbolNupkgFile)" />

diff --git a/src/mono/nuget/Directory.Build.props b/src/mono/nuget/Directory.Build.props
index 2d21287..e4a7e0f 100644 (file)
--- a/src/mono/nuget/Directory.Build.props
+++ b/src/mono/nuget/Directory.Build.props
@@ -14,7 +14,7 @@
     <SkipIndexCheck>true</SkipIndexCheck>
     
     <!-- Central place to set the versions of all nuget packages produced in the repo -->
-    <PackageVersion Condition="'$(PackageVersion)' == ''">6.0.0</PackageVersion>
+    <PackageVersion Condition="'$(ProductVersion)' == ''">6.0.0</PackageVersion>
     <StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
   </PropertyGroup>
 

diff --git a/src/mono/nuget/Microsoft.NET.Sdk.Mono.Toolchain.Manifest/Microsoft.NET.Sdk.Mono.Toolchain.Manifest.pkgproj b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/Microsoft.NET.Workload.Mono.Toolchain.Manifest.pkgproj
similarity index 71%
rename from src/mono/nuget/Microsoft.NET.Sdk.Mono.Toolchain.Manifest/Microsoft.NET.Sdk.Mono.Toolchain.Manifest.pkgproj
rename to src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/Microsoft.NET.Workload.Mono.Toolchain.Manifest.pkgproj
index 5844003..0f6c403 100644 (file)
--- a/src/mono/nuget/Microsoft.NET.Sdk.Mono.Toolchain.Manifest/Microsoft.NET.Sdk.Mono.Toolchain.Manifest.pkgproj
+++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/Microsoft.NET.Workload.Mono.Toolchain.Manifest.pkgproj
@@ -6,12 +6,29 @@
   </PropertyGroup>
 
   <Target Name="_PrepareForPack" BeforeTargets="GetPackageFiles" Returns="@(PackageFile)">
+    <!-- Override the id to include the sdk band as per the workload installer spec -->
+    <PropertyGroup>
+      <Id>Microsoft.NET.Workload.Mono.ToolChain.Manifest-$(SdkBandVersion)</Id>
+    </PropertyGroup>
+
     <PropertyGroup>
       <WorkloadManifestPath>$(IntermediateOutputPath)WorkloadManifest.json</WorkloadManifestPath>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageFile Include="$(WorkloadManifestPath)" TargetPath="data" />
+      <PackageFile Include="WorkloadManifest.targets" TargetPath="data" />
+    </ItemGroup>
+  </Target>
+
+  <!-- Running this target ensures we have the fully evaluated PackageVersion -->
+  <Target Name="_WriteManifestValues" AfterTargets="CalculatePackageVersion">
+    <PropertyGroup>
       <PackagePathVersion>PackageVersion=$(PackageVersion);</PackagePathVersion>
     </PropertyGroup>
 
     <ItemGroup>
+      <_WorkloadManifestValues Include="WorkloadVersion" Value="$(PackageVersion)" />
       <_WorkloadManifestValues Include="PackageVersion" Value="$(PackageVersion)" />
       <_WorkloadManifestValues Include="EmscriptenVersion" Value="$(MicrosoftNETRuntimeEmscriptenVersion)" />
     </ItemGroup>
@@ -20,11 +37,6 @@
       TemplateFile="WorkloadManifest.json.in"
       Properties="@(_WorkloadManifestValues)"
       OutputPath="$(WorkloadManifestPath)" />
-
-    <ItemGroup>
-      <PackageFile Include="$(WorkloadManifestPath)" TargetPath="data" />
-      <PackageFile Include="WorkloadManifest.targets" TargetPath="data" />
-    </ItemGroup>
   </Target>
 
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />

diff --git a/src/mono/nuget/Microsoft.NET.Sdk.Mono.Toolchain.Manifest/WorkloadManifest.json.in b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.json.in
similarity index 99%
rename from src/mono/nuget/Microsoft.NET.Sdk.Mono.Toolchain.Manifest/WorkloadManifest.json.in
rename to src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.json.in
index 6c5d0c6..dc2f8c8 100644 (file)
--- a/src/mono/nuget/Microsoft.NET.Sdk.Mono.Toolchain.Manifest/WorkloadManifest.json.in
+++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.json.in
@@ -1,5 +1,5 @@
 {
-  "version": 1,
+  "version": "${WorkloadVersion}",
   "workloads": {
     "microsoft-net-runtime-browser-native": {
       "description": "Browser Runtime native performance tools",

diff --git a/src/mono/nuget/Microsoft.NET.Sdk.Mono.Toolchain.Manifest/WorkloadManifest.targets b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.targets
similarity index 100%
rename from src/mono/nuget/Microsoft.NET.Sdk.Mono.Toolchain.Manifest/WorkloadManifest.targets
rename to src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.targets

diff --git a/src/mono/nuget/mono-packages.proj b/src/mono/nuget/mono-packages.proj
index a8ff040..49a81da 100644 (file)
--- a/src/mono/nuget/mono-packages.proj
+++ b/src/mono/nuget/mono-packages.proj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetsMobile)' == 'true'">
-    <ProjectReference Include="Microsoft.NET.Sdk.Mono.Toolchain.Manifest\Microsoft.NET.Sdk.Mono.Toolchain.Manifest.pkgproj" />
+    <ProjectReference Include="Microsoft.NET.Workload.Mono.Toolchain.Manifest\Microsoft.NET.Workload.Mono.Toolchain.Manifest.pkgproj" />
     <ProjectReference Include="Microsoft.NET.Runtime.MonoAOTCompiler.Task\Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj" />
     <ProjectReference Include="Microsoft.NET.Runtime.RuntimeConfigParser.Task\Microsoft.NET.Runtime.RuntimeConfigParser.Task.pkgproj" />
   </ItemGroup>