From 3d63bfb60688f683f9239af017d0aec7b971e822 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 21 Dec 2021 10:29:52 -0800 Subject: [PATCH 1/5] Generate VS.Redist package for ANCM --- .../ANCMV2/AncmV2.wixproj | 23 +++++++++++++++++++ .../ANCMV2/AncmV2Package.nuspec | 22 ++++++++++++++++++ .../SharedFrameworkPackage.nuspec | 2 +- 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2Package.nuspec diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj index ecc897c78b3d..6dd57fdc3f18 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj @@ -11,6 +11,7 @@ true 2.0 true + $(RepoRoot)\src\Installers\Windows\AspNetCoreModule-Setup\ANCMV2\AncmV2Package.nuspec @@ -56,5 +57,27 @@ aspnetcoremodule_$(Platform)_en_v2_$(PackageVersion)$(TargetExt) + ASP.NET Core Module V2 + + + + $(InstallersOutputPath)$(PackageFileName) + + + + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2Package.nuspec b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2Package.nuspec new file mode 100644 index 000000000000..5eedd79158ac --- /dev/null +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2Package.nuspec @@ -0,0 +1,22 @@ + + + + VS.Redist.Common.AspNetCore.AspNetCoreModuleV2.$MAJOR$.$MINOR$ + 1.0.0 + VS.Redist.Common.AspNetCore.AspNetCoreModuleV2.$MAJOR$.$MINOR$ + Microsoft + Microsoft + $PackageLicenseExpression$ + https://github.com/dotnet/aspnetcore + $PackageIcon$ + true + $MAJOR$.$MINOR$ ASP.NET Core Module Windows Installer MSI as a .nupkg for internal Visual Studio build consumption + © Microsoft Corporation. All rights reserved. + true + + + + + + + diff --git a/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec b/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec index 95435d143a8d..99a350d5462c 100644 --- a/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec +++ b/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec @@ -10,7 +10,7 @@ https://github.com/dotnet/aspnetcore $PackageIcon$ true - $MAJOR$.$MINOR$ ASP.NET Core TargetingPack ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption + $MAJOR$.$MINOR$ ASP.NET Core Shared Framework ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption © Microsoft Corporation. All rights reserved. true From 06f85e4d927c3c7581eeeb24574bfcd3b450df9c Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 21 Dec 2021 10:33:55 -0800 Subject: [PATCH 2/5] Fixup --- .../Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj index 6dd57fdc3f18..752d98fb2df4 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj @@ -60,7 +60,7 @@ ASP.NET Core Module V2 - + $(InstallersOutputPath)$(PackageFileName) From 49b274f65df73b3ce12e813e8caa1caada7bcdb3 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 27 Sep 2022 09:56:35 -0700 Subject: [PATCH 3/5] Add package for IISExpress --- .../ANCMIISExpressV2Package.nuspec | 22 ++++++++++++++++++ .../ANCMIISExpressV2/AncmIISExpressV2.wixproj | 23 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ANCMIISExpressV2Package.nuspec diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ANCMIISExpressV2Package.nuspec b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ANCMIISExpressV2Package.nuspec new file mode 100644 index 000000000000..deafcb88f55a --- /dev/null +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ANCMIISExpressV2Package.nuspec @@ -0,0 +1,22 @@ + + + + VS.Redist.Common.AspNetCore.AspNetCoreModuleV2IISExpress.$MAJOR$.$MINOR$ + 1.0.0 + VS.Redist.Common.AspNetCore.AspNetCoreModuleV2IISExpress.$MAJOR$.$MINOR$ + Microsoft + Microsoft + $PackageLicenseExpression$ + https://github.com/dotnet/aspnetcore + $PackageIcon$ + true + $MAJOR$.$MINOR$ ASP.NET Core Module IIS Express Windows Installer MSI as a .nupkg for internal Visual Studio build consumption + © Microsoft Corporation. All rights reserved. + true + + + + + + + \ 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 fc9de94854d8..422bf679a075 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj @@ -14,6 +14,7 @@ x64 Win32 ARM64 + $(RepoRoot)\src\Installers\Windows\AspNetCoreModule-Setup\ANCMIISExpressV2\ANCMIISExpressV2Package.nuspec @@ -70,5 +71,27 @@ ancm_iis_express_$(Platform)_en_v2_$(PackageVersion)$(TargetExt) + ASP.NET Core Module IIS Express V2 + + + + $(InstallersOutputPath)$(PackageFileName) + + + + From a73c85aaed8f460aa2d0eb223298fecf50172fbc Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 27 Sep 2022 12:08:13 -0700 Subject: [PATCH 4/5] Rename nuspecs --- .../{ANCMIISExpressV2Package.nuspec => AncmIISExpressV2.nuspec} | 0 .../ANCMIISExpressV2/AncmIISExpressV2.wixproj | 2 +- .../ANCMV2/{AncmV2Package.nuspec => AncmV2.nuspec} | 0 .../Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj | 2 +- .../{SharedFrameworkPackage.nuspec => SharedFramework.nuspec} | 0 src/Installers/Windows/SharedFramework/SharedFramework.wixproj | 2 +- .../{TargetingPackPackage.nuspec => TargetingPack.nuspec} | 0 src/Installers/Windows/TargetingPack/TargetingPack.wixproj | 2 +- 8 files changed, 4 insertions(+), 4 deletions(-) rename src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/{ANCMIISExpressV2Package.nuspec => AncmIISExpressV2.nuspec} (100%) rename src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/{AncmV2Package.nuspec => AncmV2.nuspec} (100%) rename src/Installers/Windows/SharedFramework/{SharedFrameworkPackage.nuspec => SharedFramework.nuspec} (100%) rename src/Installers/Windows/TargetingPack/{TargetingPackPackage.nuspec => TargetingPack.nuspec} (100%) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ANCMIISExpressV2Package.nuspec b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.nuspec similarity index 100% rename from src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ANCMIISExpressV2Package.nuspec rename to src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.nuspec diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj index 422bf679a075..d8f5b0d1bba9 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj @@ -14,7 +14,7 @@ x64 Win32 ARM64 - $(RepoRoot)\src\Installers\Windows\AspNetCoreModule-Setup\ANCMIISExpressV2\ANCMIISExpressV2Package.nuspec + $(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2Package.nuspec b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.nuspec similarity index 100% rename from src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2Package.nuspec rename to src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.nuspec diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj index f4ae0e14a074..9f40cad14153 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj @@ -11,7 +11,7 @@ true 2.0 true - $(RepoRoot)\src\Installers\Windows\AspNetCoreModule-Setup\ANCMV2\AncmV2Package.nuspec + $(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec diff --git a/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec b/src/Installers/Windows/SharedFramework/SharedFramework.nuspec similarity index 100% rename from src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec rename to src/Installers/Windows/SharedFramework/SharedFramework.nuspec diff --git a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj index becd904b5ea6..70961137148b 100644 --- a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj +++ b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj @@ -21,7 +21,7 @@ $(DefineConstants);AspNetCoreSharedFrameworkSource=$(HarvestSource) $(SharedFrameworkNamespaceGuid) 2.0 - $(RepoRoot)\src\Installers\Windows\SharedFramework\SharedFrameworkPackage.nuspec + $(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec 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 dc20b17662f0..aa646376362c 100644 --- a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj +++ b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj @@ -20,7 +20,7 @@ $(DefineConstants);AspNetCoreTargetingPackSource=$(HarvestSource) DDBB771F-963F-47D3-8510-9ABD04DBE1D1 2.0 - $(RepoRoot)\src\Installers\Windows\TargetingPack\TargetingPackPackage.nuspec + $(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec $(TargetingPackVersionPrefix) $(TargetingPackVersionPrefix) From 3c2a22761fac12af193d4655c3ca4e46aa256889 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 4 Oct 2022 12:43:32 -0700 Subject: [PATCH 5/5] Fix target order --- .../ANCMIISExpressV2/AncmIISExpressV2.wixproj | 2 +- .../Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj | 2 +- src/Installers/Windows/SharedFramework/SharedFramework.wixproj | 2 +- src/Installers/Windows/TargetingPack/TargetingPack.wixproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj index d8f5b0d1bba9..60e782886a35 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj @@ -74,7 +74,7 @@ ASP.NET Core Module IIS Express V2 - + $(InstallersOutputPath)$(PackageFileName) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj index 9f40cad14153..bfae51ff3fa7 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj @@ -61,7 +61,7 @@ ASP.NET Core Module V2 - + $(InstallersOutputPath)$(PackageFileName) diff --git a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj index 70961137148b..7d0aefe32294 100644 --- a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj +++ b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj @@ -86,7 +86,7 @@ $(DefineConstants);ProductName=$(ProductName) - + $(InstallersOutputPath)$(PackageFileName) diff --git a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj index aa646376362c..4823d1c89f33 100644 --- a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj +++ b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj @@ -80,7 +80,7 @@ $(DefineConstants);ProductName=$(ProductName) - + $(InstallersOutputPath)$(PackageFileName)