Fix up SetupVSNugetPackages merge

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

diff --git a/src/installer/pkg/packaging/Directory.Build.props b/src/installer/pkg/packaging/Directory.Build.props
index 41742da..1c4cb5f 100644 (file)
--- a/src/installer/pkg/packaging/Directory.Build.props
+++ b/src/installer/pkg/packaging/Directory.Build.props
@@ -19,13 +19,4 @@
     <NetHostPublishRoot>$(IntermediateOutputRootPath)nethost/</NetHostPublishRoot>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <TargetingPackInstallerFile>$(AssetOutputPath)dotnet-targeting-pack-$(ProductMoniker)$(InstallerExtension)</TargetingPackInstallerFile>
-    <AppHostPackInstallerFile>$(AssetOutputPath)dotnet-apphost-pack-$(ProductMoniker)$(InstallerExtension)</AppHostPackInstallerFile>
-    <NetStandardProductBandVersion>2.1</NetStandardProductBandVersion>
-    <NetStandardProductMoniker>$(NetStandardProductBandVersion).$(PatchVersion)$(ProductVersionSuffix)-$(PackageTargetRid)</NetStandardProductMoniker>
-    <NetStandardTargetingPackInstallerFile>$(AssetOutputPath)netstandard-targeting-pack-$(NetStandardProductMoniker)$(InstallerExtension)</NetStandardTargetingPackInstallerFile>
-    <WindowsDesktopSharedFrameworkInstallerFile>$(AssetOutputPath)windowsdesktop-runtime-$(ProductMoniker)$(InstallerExtension)</WindowsDesktopSharedFrameworkInstallerFile>
-    <WindowsDesktopTargetingPackInstallerFile>$(AssetOutputPath)windowsdesktop-targeting-pack-$(ProductMoniker)$(InstallerExtension)</WindowsDesktopTargetingPackInstallerFile>
-  </PropertyGroup>
 </Project>

diff --git a/src/installer/pkg/packaging/installers.proj b/src/installer/pkg/packaging/installers.proj
index fb76b2e..a728bba 100644 (file)
--- a/src/installer/pkg/packaging/installers.proj
+++ b/src/installer/pkg/packaging/installers.proj
@@ -226,63 +226,64 @@
                       '$(BinDir)'" />
   </Target>
   
-  <Target Name="SetupVSNugetPackages">
-      <PropertyGroup>
-        <NuSpecFile>$(MSBuildThisFileDirectory)windows/vscomponents/VS.Redist.Common.Component.nuspec</NuSpecFile>
-        <GenerateNupkgPowershellScript>$(MSBuildThisFileDirectory)windows/vscomponents/generatenupkg.ps1</GenerateNupkgPowershellScript>
-        <ProjectUrl>https://github.com/dotnet/core-setup</ProjectUrl>
-      </PropertyGroup>
-
-      <ItemGroup>
-        <SdkMsiComponent Include="HostFxrMsiNupkg">
-          <MsiInstallerFile>$(HostFxrInstallerFile)</MsiInstallerFile>
-          <ComponentId>VS.Redist.Common.NetCore.HostFXR.$(TargetArchitecture).$(NETCoreAppFrameworkVersion)</ComponentId>
-          <ComponentVersion>$(SharedFrameworkNugetVersion)</ComponentVersion>
-          <ComponentFriendlyName>$(NETCoreAppFrameworkVersion) .NET Core HostFX Resolver</ComponentFriendlyName>
-        </SdkMsiComponent>
-        <SdkMsiComponent Include="AppHostPackMsiNupkg">
-          <MsiInstallerFile>$(AppHostPackInstallerFile)</MsiInstallerFile>
-          <ComponentId>VS.Redist.Common.NetCore.AppHostPack.$(TargetArchitecture).$(NETCoreAppFrameworkVersion)</ComponentId>
-          <ComponentVersion>$(SharedFrameworkNugetVersion)</ComponentVersion>
-          <ComponentFriendlyName>$(NETCoreAppFrameworkVersion) .NET Core AppHost Pack</ComponentFriendlyName>
-        </SdkMsiComponent>
-        <SdkMsiComponent Include="SharedFrameworkMsiNupkg">
-          <MsiInstallerFile>$(SharedFrameworkInstallerFile)</MsiInstallerFile>
-          <ComponentId>VS.Redist.Common.NetCore.SharedFramework.$(TargetArchitecture).$(NETCoreAppFrameworkVersion)</ComponentId>
-          <ComponentVersion>$(SharedFrameworkNugetVersion)</ComponentVersion>
-          <ComponentFriendlyName>$(NETCoreAppFrameworkVersion) .NET Core SharedFramework</ComponentFriendlyName>
-        </SdkMsiComponent>
-        <SdkMsiComponent Include="SharedHostMsiNupkg">
-          <MsiInstallerFile>$(SharedHostInstallerFile)</MsiInstallerFile>
-          <ComponentId>VS.Redist.Common.NetCore.SharedHost.$(TargetArchitecture).$(NETCoreAppFrameworkVersion)</ComponentId>
-          <ComponentVersion>$(SharedFrameworkNugetVersion)</ComponentVersion>
-          <ComponentFriendlyName>$(NETCoreAppFrameworkVersion) .NET Core SharedHost</ComponentFriendlyName>
-        </SdkMsiComponent>
-        <SdkMsiComponent Include="NetStandardTargetingPackMsiNupkg">
-          <MsiInstallerFile>$(NetStandardTargetingPackInstallerFile)</MsiInstallerFile>
-          <ComponentId>VS.Redist.Common.NetStandard.TargetingPack.$(TargetArchitecture).$(NetStandardProductBandVersion)</ComponentId>
-          <ComponentVersion>$(NetStandardProductBandVersion).$(PatchVersion)$(ProductVersionSuffix)</ComponentVersion>
-          <ComponentFriendlyName>$(NetStandardProductBandVersion) .NET Standard TargetingPack</ComponentFriendlyName>
-        </SdkMsiComponent>
-        <SdkMsiComponent Include="NetCoreTargetingPackMsiNupkg">
-          <MsiInstallerFile>$(TargetingPackInstallerFile)</MsiInstallerFile>
-          <ComponentId>VS.Redist.Common.NetCore.TargetingPack.$(TargetArchitecture).$(NETCoreAppFrameworkVersion)</ComponentId>
-          <ComponentVersion>$(SharedFrameworkNugetVersion)</ComponentVersion>
-          <ComponentFriendlyName>$(NETCoreAppFrameworkVersion) .NET Core TargetingPack</ComponentFriendlyName>
-        </SdkMsiComponent>
-        <SdkMsiComponent Include="WindowsDesktopMsiNupkg">
-          <MsiInstallerFile>$(WindowsDesktopSharedFrameworkInstallerFile)</MsiInstallerFile>
-          <ComponentId>VS.Redist.Common.WindowsDesktop.SharedFramework.$(TargetArchitecture).$(NETCoreAppFrameworkVersion)</ComponentId>
-          <ComponentVersion>$(SharedFrameworkNugetVersion)</ComponentVersion>
-          <ComponentFriendlyName>$(NETCoreAppFrameworkVersion) WindowsDesktop SharedFramework</ComponentFriendlyName>
-        </SdkMsiComponent>
-        <SdkMsiComponent Include="WindowsDesktopTargetingPackMsiNupkg">
-          <MsiInstallerFile>$(WindowsDesktopTargetingPackInstallerFile)</MsiInstallerFile>
-          <ComponentId>VS.Redist.Common.WindowsDesktop.TargetingPack.$(TargetArchitecture).$(NETCoreAppFrameworkVersion)</ComponentId>
-          <ComponentVersion>$(SharedFrameworkNugetVersion)</ComponentVersion>
-          <ComponentFriendlyName>$(NETCoreAppFrameworkVersion) WindowsDesktop TargetingPack</ComponentFriendlyName>
-        </SdkMsiComponent>
-      </ItemGroup>
-    </Target>
+  <Target Name="SetupVSNugetPackages"
+          DependsOnTargets="GetInstallerLocations">
+    <PropertyGroup>
+      <NuSpecFile>$(MSBuildThisFileDirectory)windows/vscomponents/VS.Redist.Common.Component.nuspec</NuSpecFile>
+      <GenerateNupkgPowershellScript>$(MSBuildThisFileDirectory)windows/vscomponents/generatenupkg.ps1</GenerateNupkgPowershellScript>
+      <ProjectUrl>https://github.com/dotnet/core-setup</ProjectUrl>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <SdkMsiComponent Include="HostFxrMsiNupkg">
+        <MsiInstallerFile>$(HostFxrInstallerFile)</MsiInstallerFile>
+        <ComponentId>VS.Redist.Common.NetCore.HostFXR.$(TargetArchitecture).$(NETCoreAppFrameworkVersion)</ComponentId>
+        <ComponentVersion>$(SharedFrameworkNugetVersion)</ComponentVersion>
+        <ComponentFriendlyName>$(NETCoreAppFrameworkVersion) .NET Core HostFX Resolver</ComponentFriendlyName>
+      </SdkMsiComponent>
+      <SdkMsiComponent Include="AppHostPackMsiNupkg">
+        <MsiInstallerFile>$(AppHostPackInstallerFile)</MsiInstallerFile>
+        <ComponentId>VS.Redist.Common.NetCore.AppHostPack.$(TargetArchitecture).$(NETCoreAppFrameworkVersion)</ComponentId>
+        <ComponentVersion>$(SharedFrameworkNugetVersion)</ComponentVersion>
+        <ComponentFriendlyName>$(NETCoreAppFrameworkVersion) .NET Core AppHost Pack</ComponentFriendlyName>
+      </SdkMsiComponent>
+      <SdkMsiComponent Include="SharedFrameworkMsiNupkg">
+        <MsiInstallerFile>$(SharedFrameworkInstallerFile)</MsiInstallerFile>
+        <ComponentId>VS.Redist.Common.NetCore.SharedFramework.$(TargetArchitecture).$(NETCoreAppFrameworkVersion)</ComponentId>
+        <ComponentVersion>$(SharedFrameworkNugetVersion)</ComponentVersion>
+        <ComponentFriendlyName>$(NETCoreAppFrameworkVersion) .NET Core SharedFramework</ComponentFriendlyName>
+      </SdkMsiComponent>
+      <SdkMsiComponent Include="SharedHostMsiNupkg">
+        <MsiInstallerFile>$(SharedHostInstallerFile)</MsiInstallerFile>
+        <ComponentId>VS.Redist.Common.NetCore.SharedHost.$(TargetArchitecture).$(NETCoreAppFrameworkVersion)</ComponentId>
+        <ComponentVersion>$(SharedFrameworkNugetVersion)</ComponentVersion>
+        <ComponentFriendlyName>$(NETCoreAppFrameworkVersion) .NET Core SharedHost</ComponentFriendlyName>
+      </SdkMsiComponent>
+      <SdkMsiComponent Include="NetStandardTargetingPackMsiNupkg">
+        <MsiInstallerFile>$(NetStandardTargetingPackInstallerFile)</MsiInstallerFile>
+        <ComponentId>VS.Redist.Common.NetStandard.TargetingPack.$(TargetArchitecture).$(NetStandardProductBandVersion)</ComponentId>
+        <ComponentVersion>$(NetStandardProductBandVersion).$(PatchVersion)$(ProductVersionSuffix)</ComponentVersion>
+        <ComponentFriendlyName>$(NetStandardProductBandVersion) .NET Standard TargetingPack</ComponentFriendlyName>
+      </SdkMsiComponent>
+      <SdkMsiComponent Include="NetCoreTargetingPackMsiNupkg">
+        <MsiInstallerFile>$(TargetingPackInstallerFile)</MsiInstallerFile>
+        <ComponentId>VS.Redist.Common.NetCore.TargetingPack.$(TargetArchitecture).$(NETCoreAppFrameworkVersion)</ComponentId>
+        <ComponentVersion>$(SharedFrameworkNugetVersion)</ComponentVersion>
+        <ComponentFriendlyName>$(NETCoreAppFrameworkVersion) .NET Core TargetingPack</ComponentFriendlyName>
+      </SdkMsiComponent>
+      <SdkMsiComponent Include="WindowsDesktopMsiNupkg">
+        <MsiInstallerFile>$(WindowsDesktopSharedFrameworkInstallerFile)</MsiInstallerFile>
+        <ComponentId>VS.Redist.Common.WindowsDesktop.SharedFramework.$(TargetArchitecture).$(NETCoreAppFrameworkVersion)</ComponentId>
+        <ComponentVersion>$(SharedFrameworkNugetVersion)</ComponentVersion>
+        <ComponentFriendlyName>$(NETCoreAppFrameworkVersion) WindowsDesktop SharedFramework</ComponentFriendlyName>
+      </SdkMsiComponent>
+      <SdkMsiComponent Include="WindowsDesktopTargetingPackMsiNupkg">
+        <MsiInstallerFile>$(WindowsDesktopTargetingPackInstallerFile)</MsiInstallerFile>
+        <ComponentId>VS.Redist.Common.WindowsDesktop.TargetingPack.$(TargetArchitecture).$(NETCoreAppFrameworkVersion)</ComponentId>
+        <ComponentVersion>$(SharedFrameworkNugetVersion)</ComponentVersion>
+        <ComponentFriendlyName>$(NETCoreAppFrameworkVersion) WindowsDesktop TargetingPack</ComponentFriendlyName>
+      </SdkMsiComponent>
+    </ItemGroup>
+  </Target>
 
   </Project>