diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.nuspec b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.nuspec
new file mode 100644
index 0000000000000000000000000000000000000000..deafcb88f55a9e30644e3c09e9f2f882e0bee326
--- /dev/null
+++ 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>
\ No newline at end of file
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj
index 04f70e784cb054f0b030677733d7489eb54e3880..890d869d7072353b8abe80e0b4fa8de289d08069 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj
@@ -13,6 +13,7 @@
<SchemaVersion>2.0</SchemaVersion>
<TempPlatform Condition="'$(Platform)' == 'x64'">x64</TempPlatform>
<TempPlatform Condition="'$(Platform)' == 'x86'">Win32</TempPlatform>
+ <ToolsetInstallerNuspecFile>$(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec</ToolsetInstallerNuspecFile>
</PropertyGroup>
<ItemGroup>
@@ -68,5 +69,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
new file mode 100644
index 0000000000000000000000000000000000000000..5eedd79158acc7a7c73b2f90a790d91386a9240b
--- /dev/null
+++ 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
index ecc897c78b3ddaa1a97713cac3c16d887b4d95b4..d32603bb6435651341565281cf276237e5d47fb5 100644
--- 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>
@@ -56,5 +57,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/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec b/src/Installers/Windows/SharedFramework/SharedFramework.nuspec
similarity index 85%
rename from src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec
rename to src/Installers/Windows/SharedFramework/SharedFramework.nuspec
index 95435d143a8d0afba3254ec28bf5a47f4a9b10dc..99a350d5462c7a080770fda7321bf0c0a6f8ca48 100644
--- a/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec
+++ b/src/Installers/Windows/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
index becd904b5ea65c68223bd74ea0e296bf1c634aa4..7d0aefe322946d75b81689c4d9b27315ccbe4577 100644
--- 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/src/Installers/Windows/TargetingPack/TargetingPackPackage.nuspec b/src/Installers/Windows/TargetingPack/TargetingPack.nuspec
similarity index 100%
rename from src/Installers/Windows/TargetingPack/TargetingPackPackage.nuspec
rename to src/Installers/Windows/TargetingPack/TargetingPack.nuspec
diff --git a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj
index dc20b17662f0a04f6bf6e3efd6a8b2a8a215425a..4823d1c89f335b577ebe22b4f9a8c5b15e7448c7 100644
--- 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>