Generate VS.Redist package for ANCM (dotnet#39140)

* Generate VS.Redist package for ANCM * Fixup * Add package for IISExpress * Rename nuspecs * Fix target order
duc-tv · Oct 10, 2022 · c6b66c4 · c6b66c4
1 parent 8eab24b
commit c6b66c4
Show file tree

Hide file tree

Showing 8 changed files with 95 additions and 5 deletions.
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.nuspec b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.nuspec
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+    <metadata>
+        <id>VS.Redist.Common.AspNetCore.AspNetCoreModuleV2IISExpress.$MAJOR$.$MINOR$</id>
+        <version>1.0.0</version>
+        <title>VS.Redist.Common.AspNetCore.AspNetCoreModuleV2IISExpress.$MAJOR$.$MINOR$</title>
+        <authors>Microsoft</authors>
+        <owners>Microsoft</owners>
+        <license type="expression">$PackageLicenseExpression$</license>
+        <projectUrl>https://github.com/dotnet/aspnetcore</projectUrl>
+        <icon>$PackageIcon$</icon>
+        <requireLicenseAcceptance>true</requireLicenseAcceptance>
+        <description>$MAJOR$.$MINOR$ ASP.NET Core Module IIS Express Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
+        <copyright>© Microsoft Corporation. All rights reserved.</copyright>
+        <serviceable>true</serviceable>
+    </metadata>
+    <files>
+        <file src="$ASPNETCORE_RUNTIME_MSI$" />
+        <file src="$ASPNETCORE_CAB_FILE$" />
+        <file src="$PackageIconFullPath$" target="$PackageIcon$" />
+    </files>
+</package>
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj
@@ -14,6 +14,7 @@
     <TempPlatform Condition="'$(Platform)' == 'x64'">x64</TempPlatform>
     <TempPlatform Condition="'$(Platform)' == 'x86'">Win32</TempPlatform>
     <TempPlatform Condition="'$(Platform)' == 'arm64'">ARM64</TempPlatform>
+    <ToolsetInstallerNuspecFile>$(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec</ToolsetInstallerNuspecFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -70,5 +71,27 @@
 
   <PropertyGroup>
     <PackageFileName>ancm_iis_express_$(Platform)_en_v2_$(PackageVersion)$(TargetExt)</PackageFileName>
+    <ProductNameShort>ASP.NET Core Module IIS Express V2</ProductNameShort>
   </PropertyGroup>
+
+  <Target Name="CreateANCMIISExpressNugetPackage" DependsOnTargets="CopyToArtifactsDirectory" BeforeTargets="Build">
+    <PropertyGroup>
+      <MsiFullPath>$(InstallersOutputPath)$(PackageFileName)</MsiFullPath>
+    </PropertyGroup>
+
+    <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
+                      '$(ProductNameShort)' ^
+                      '$(MsiFullPath)' ^
+                      '$(CabFullPath)' ^
+                      '$(ToolsetInstallerNuspecFile)' ^
+                      '$(ArtifactsNonShippingPackagesDir)' ^
+                      '$(Platform)' ^
+                      '$(_GeneratedPackageVersion)' ^
+                      '$(RepoRoot)' ^
+                      '$(AspNetCoreMajorVersion)' ^
+                      '$(AspNetCoreMinorVersion)' ^
+                      '$(PackageIcon)' ^
+                      '$(PackageIconFullPath)' ^
+                      '$(PackageLicenseExpression)' " />
+  </Target>
 </Project>
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.nuspec b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.nuspec
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+    <metadata>
+        <id>VS.Redist.Common.AspNetCore.AspNetCoreModuleV2.$MAJOR$.$MINOR$</id>
+        <version>1.0.0</version>
+        <title>VS.Redist.Common.AspNetCore.AspNetCoreModuleV2.$MAJOR$.$MINOR$</title>
+        <authors>Microsoft</authors>
+        <owners>Microsoft</owners>
+        <license type="expression">$PackageLicenseExpression$</license>
+        <projectUrl>https://github.com/dotnet/aspnetcore</projectUrl>
+        <icon>$PackageIcon$</icon>
+        <requireLicenseAcceptance>true</requireLicenseAcceptance>
+        <description>$MAJOR$.$MINOR$ ASP.NET Core Module Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
+        <copyright>© Microsoft Corporation. All rights reserved.</copyright>
+        <serviceable>true</serviceable>
+    </metadata>
+    <files>
+        <file src="$ASPNETCORE_RUNTIME_MSI$" />
+        <file src="$ASPNETCORE_CAB_FILE$" />
+        <file src="$PackageIconFullPath$" target="$PackageIcon$" />
+    </files>
+</package>
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj
@@ -11,6 +11,7 @@
     <GenerateRandomNamespaceGuid>true</GenerateRandomNamespaceGuid>
     <SchemaVersion>2.0</SchemaVersion>
     <DisableGuidGeneration>true</DisableGuidGeneration>
+    <ToolsetInstallerNuspecFile>$(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec</ToolsetInstallerNuspecFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -57,5 +58,27 @@
 
   <PropertyGroup>
     <PackageFileName>aspnetcoremodule_$(Platform)_en_v2_$(PackageVersion)$(TargetExt)</PackageFileName>
+    <ProductNameShort>ASP.NET Core Module V2</ProductNameShort>
   </PropertyGroup>
+
+  <Target Name="CreateANCMNugetPackage" DependsOnTargets="CopyToArtifactsDirectory" BeforeTargets="Build">
+    <PropertyGroup>
+      <MsiFullPath>$(InstallersOutputPath)$(PackageFileName)</MsiFullPath>
+    </PropertyGroup>
+
+    <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
+                      '$(ProductNameShort)' ^
+                      '$(MsiFullPath)' ^
+                      '$(CabFullPath)' ^
+                      '$(ToolsetInstallerNuspecFile)' ^
+                      '$(ArtifactsNonShippingPackagesDir)' ^
+                      '$(Platform)' ^
+                      '$(_GeneratedPackageVersion)' ^
+                      '$(RepoRoot)' ^
+                      '$(AspNetCoreMajorVersion)' ^
+                      '$(AspNetCoreMinorVersion)' ^
+                      '$(PackageIcon)' ^
+                      '$(PackageIconFullPath)' ^
+                      '$(PackageLicenseExpression)' " />
+  </Target>
 </Project>
diff --git a/...edFramework/SharedFrameworkPackage.nuspec → ...ws/SharedFramework/SharedFramework.nuspec b/...edFramework/SharedFrameworkPackage.nuspec → ...ws/SharedFramework/SharedFramework.nuspec
@@ -10,7 +10,7 @@
         <projectUrl>https://github.com/dotnet/aspnetcore</projectUrl>
         <icon>$PackageIcon$</icon>
         <requireLicenseAcceptance>true</requireLicenseAcceptance>
-        <description>$MAJOR$.$MINOR$ ASP.NET Core TargetingPack ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
+        <description>$MAJOR$.$MINOR$ ASP.NET Core Shared Framework ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
         <copyright>© Microsoft Corporation. All rights reserved.</copyright>
         <serviceable>true</serviceable>
     </metadata>

diff --git a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj
@@ -21,7 +21,7 @@
     <DefineConstants>$(DefineConstants);AspNetCoreSharedFrameworkSource=$(HarvestSource)</DefineConstants>
     <NamespaceGuid>$(SharedFrameworkNamespaceGuid)</NamespaceGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <ToolsetInstallerNuspecFile>$(RepoRoot)\src\Installers\Windows\SharedFramework\SharedFrameworkPackage.nuspec</ToolsetInstallerNuspecFile>
+    <ToolsetInstallerNuspecFile>$(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec</ToolsetInstallerNuspecFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -86,7 +86,7 @@
     <DefineConstants>$(DefineConstants);ProductName=$(ProductName)</DefineConstants>
   </PropertyGroup>
 
-  <Target Name="CreateSharedFrameworkNugetPackage" AfterTargets="CopyToArtifactsDirectory;Build">
+  <Target Name="CreateSharedFrameworkNugetPackage" DependsOnTargets="CopyToArtifactsDirectory" BeforeTargets="Build">
     <PropertyGroup>
       <MsiFullPath>$(InstallersOutputPath)$(PackageFileName)</MsiFullPath>
     </PropertyGroup>

diff --git a/...TargetingPack/TargetingPackPackage.nuspec → ...indows/TargetingPack/TargetingPack.nuspec b/...TargetingPack/TargetingPackPackage.nuspec → ...indows/TargetingPack/TargetingPack.nuspec
diff --git a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj
@@ -20,7 +20,7 @@
     <DefineConstants>$(DefineConstants);AspNetCoreTargetingPackSource=$(HarvestSource)</DefineConstants>
     <NamespaceGuid>DDBB771F-963F-47D3-8510-9ABD04DBE1D1</NamespaceGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <ToolsetInstallerNuspecFile>$(RepoRoot)\src\Installers\Windows\TargetingPack\TargetingPackPackage.nuspec</ToolsetInstallerNuspecFile>
+    <ToolsetInstallerNuspecFile>$(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec</ToolsetInstallerNuspecFile>
     <PackageVersion>$(TargetingPackVersionPrefix)</PackageVersion>
     <BundleVersion>$(TargetingPackVersionPrefix)</BundleVersion>
   </PropertyGroup>
@@ -80,7 +80,7 @@
     <DefineConstants>$(DefineConstants);ProductName=$(ProductName)</DefineConstants>
   </PropertyGroup>
 
-   <Target Name="CreateTargetingPackNugetPackage" AfterTargets="CopyToArtifactsDirectory;Build">
+   <Target Name="CreateTargetingPackNugetPackage" DependsOnTargets="CopyToArtifactsDirectory" BeforeTargets="Build">
     <PropertyGroup>
       <MsiFullPath>$(InstallersOutputPath)$(PackageFileName)</MsiFullPath>
     </PropertyGroup>