Use AssetOutputPath for anything that isn't a nupkg

Commit migrated from https://github.com/dotnet/core-setup/commit/0db3ba1d6a82edd337a99ad3948fafcd465b8047

diff --git a/src/installer/pkg/packaging/dir.proj b/src/installer/pkg/packaging/dir.proj
index 9512c66..6c3f2b2 100644 (file)
--- a/src/installer/pkg/packaging/dir.proj
+++ b/src/installer/pkg/packaging/dir.proj
@@ -141,10 +141,10 @@
     <Exec Command="tar -C $(SharedFrameworkPublishSymbolsDir) -czf $(AssetOutputPath)$(SharedFrameworkSymbolsCompressedFile) ."
           IgnoreExitCode="true"
           IgnoreStandardErrorWarningFormat="true" />
-    <Error Condition="!Exists('$(AssetOutputPath)$(CombinedCompressedFile)')" Message="Unable to create $(PackageOutputPath)$(CombinedCompressedFile)" />
-    <Error Condition="!Exists('$(AssetOutputPath)$(HostFxrCompressedFile)')" Message="Unable to create $(PackageOutputPath)$(HostFxrCompressedFile)" />
-    <Error Condition="!Exists('$(AssetOutputPath)$(SharedFrameworkCompressedFile)')" Message="Unable to create $(PackageOutputPath)$(SharedFrameworkCompressedFile)" />
-    <Error Condition="!Exists('$(AssetOutputPath)$(SharedFrameworkSymbolsCompressedFile)')" Message="Unable to create $(PackageOutputPath)$(SharedFrameworkSymbolsCompressedFile)" />
+    <Error Condition="!Exists('$(AssetOutputPath)$(CombinedCompressedFile)')" Message="Unable to create $(AssetOutputPath)$(CombinedCompressedFile)" />
+    <Error Condition="!Exists('$(AssetOutputPath)$(HostFxrCompressedFile)')" Message="Unable to create $(AssetOutputPath)$(HostFxrCompressedFile)" />
+    <Error Condition="!Exists('$(AssetOutputPath)$(SharedFrameworkCompressedFile)')" Message="Unable to create $(AssetOutputPath)$(SharedFrameworkCompressedFile)" />
+    <Error Condition="!Exists('$(AssetOutputPath)$(SharedFrameworkSymbolsCompressedFile)')" Message="Unable to create $(AssetOutputPath)$(SharedFrameworkSymbolsCompressedFile)" />
   </Target>
 
   <Import Project="windows\package.targets" />

diff --git a/src/installer/publish/dir.props b/src/installer/publish/dir.props
index 33f1de5..96a3f88 100644 (file)
--- a/src/installer/publish/dir.props
+++ b/src/installer/publish/dir.props
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <CompressedFile Include="$(PackageOutputPath)**/*$(CompressedFileExtension)">
+    <CompressedFile Include="$(AssetOutputPath)**/*$(CompressedFileExtension)">
       <RelativeBlobPath>$(BinariesRelativePath)</RelativeBlobPath>
     </CompressedFile>
     <RuntimePackageFile Include="$(PackageOutputPath)**/runtime.*.nupkg" >
@@ -35,10 +35,10 @@
     <RidAgnosticPackageFile Include="$(PackageOutputPath)**/*.nupkg" Exclude="@(RuntimePackageFile)" >
       <RelativeBlobPath>$(BinariesRelativePath)</RelativeBlobPath>
     </RidAgnosticPackageFile>
-    <InstallerFile Include="$(PackageOutputPath)**/*$(InstallerExtension)" Condition="'$(InstallerExtension)' != ''" >
+    <InstallerFile Include="$(AssetOutputPath)**/*$(InstallerExtension)" Condition="'$(InstallerExtension)' != ''" >
       <RelativeBlobPath>$(InstallersRelativePath)</RelativeBlobPath>
     </InstallerFile>
-    <InstallerFile Include="$(PackageOutputPath)**/*$(CombinedInstallerExtension)" Condition="'$(CombinedInstallerExtension)' != ''">
+    <InstallerFile Include="$(AssetOutputPath)**/*$(CombinedInstallerExtension)" Condition="'$(CombinedInstallerExtension)' != ''">
       <RelativeBlobPath>$(InstallersRelativePath)</RelativeBlobPath>
     </InstallerFile>
   </ItemGroup>

diff --git a/src/installer/publish/dir.targets b/src/installer/publish/dir.targets
index 702132e..0683561 100644 (file)
--- a/src/installer/publish/dir.targets
+++ b/src/installer/publish/dir.targets
@@ -27,7 +27,7 @@
 
   <Target Name="GatherPublishToAzureChecksums" DependsOnTargets="CreateChecksums" >
     <ItemGroup>
-      <ChecksumItems Include="$(PackageOutputPath)**/*$(ChecksumExtension)" />
+      <ChecksumItems Include="$(AssetOutputPath)**/*$(ChecksumExtension)" />
       <Project Include="publish.proj">
         <PublishTarget>UploadChecksumsToAzure</PublishTarget>
         <AdditionalProperties>%(Project.AdditionalProperties);ItemsToPublish=@(ChecksumItems);RelativeBlobPath=$(ChecksumsRelativePath)</AdditionalProperties>
@@ -91,7 +91,7 @@
       </DebInstallerFile>
 
       <DebInstallerFile>
-        <UploadJsonFilename>$(PackageOutputPath)%(PackageName)_package_upload.json</UploadJsonFilename>
+        <UploadJsonFilename>$(AssetOutputPath)%(PackageName)_package_upload.json</UploadJsonFilename>
       </DebInstallerFile>
     </ItemGroup>