Avoid intermediate FullNugetVersion file

Use the same mechanism as in aspnetcore, windowsdesktop and
runtime to retrieve the non stable product version in Publishing.props
and update the Artifact items with that version.

Author: ViktorHofer

eng/Publishing.props

@@ -26,4 +26,23 @@
   <ItemGroup>
     <Artifact Update="$(ArtifactsShippingPackagesDir)dotnet-sdk-pgo-*" Visibility="External" />
   </ItemGroup>
+
+  <Target Name="GetNonStableProductVersion">
+    <!-- Retrieve the non-stable product version. -->
+    <MSBuild Projects="$(RepoRoot)src/Layout/redist/redist.csproj"
+             Targets="ReturnProductVersion">
+      <Output TaskParameter="TargetOutputs" PropertyName="NonStableProductVersion" />
+    </MSBuild>
+  </Target>
+
+  <Target Name="AddRelativeBlobPathToBlobArtifacts"
+          DependsOnTargets="GetNonStableProductVersion"
+          BeforeTargets="PublishToAzureDevOpsArtifacts"
+          AfterTargets="GenerateChecksumsFromArtifacts">
+    <ItemGroup>
+      <Artifact Condition="'%(Artifact.PublishFlatContainer)' == 'true' and '%(Artifact.RelativeBlobPath)' == ''"
+                RelativeBlobPath="Sdk/$(NonStableProductVersion)/%(Filename)%(Extension)" />
+    </ItemGroup>
+  </Target>
+
 </Project>

eng/Signing.props

@@ -1,7 +1,6 @@
 <Project>
 
   <PropertyGroup>
-    <RelativeBlobPathParent>Sdk/$([System.IO.File]::ReadAllText('$(ArtifactsTmpDir)FullNugetVersion.version').Trim())</RelativeBlobPathParent>
     <PublishBinariesAndBadge Condition="'$(PublishBinariesAndBadge)' == ''">true</PublishBinariesAndBadge>
   </PropertyGroup>
 
@@ -115,8 +114,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Artifact Include="@(SdkArtifact)"
-              RelativeBlobPath="$(RelativeBlobPathParent)/%(Filename)%(Extension)">
+    <Artifact Include="@(SdkArtifact)">
       <ChecksumPath Condition="$([System.String]::Copy('%(Filename)%(Extension)').EndsWith('.wixpack.zip')) != 'true'">%(FullPath).sha512</ChecksumPath>
     </Artifact>
   </ItemGroup>

src/Installer/redist-installer/Directory.Build.targets

@@ -28,14 +28,6 @@
     <ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>dotnet-sdk$(PgoTerm)-$(Version)-$(ProductMonikerRid)</ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
   </PropertyGroup>
 
-  <!-- This is a hack to make the full nuget version available during the publishing step -->
-  <Target Name="GenerateFullNugetVersionFile"
-          BeforeTargets="Build">
-    <WriteLinesToFile File="$(ArtifactsTmpDir)FullNugetVersion.version"
-                      Lines="$(FullNugetVersion)"
-                      Overwrite="true" />
-  </Target>
-
   <Import Project="$(RepoRoot)src\Tasks\sdk-tasks\sdk-tasks.InTree.targets" />
 
   <Import Project="targets\RestoreLayout.targets" />

src/Layout/redist/redist.csproj

@@ -103,4 +103,6 @@
     </ItemGroup>
   </Target>
 
+  <Target Name="ReturnProductVersion" Returns="$(FullNugetVersion)" />
+
 </Project>