From 2d163cf066aa088c43066f6f0fa6773faeede051 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 25 Jun 2019 16:24:59 -0700 Subject: [PATCH 01/10] Build packages for VS insertion of 2.1 shared framework --- .../Windows/GenerateNugetPackageWithMsi.ps1 | 31 +++++++++++++++++++ .../SharedFramework/SharedFramework.wixproj | 19 ++++++++++++ .../SharedFrameworkPackage.nuspec | 19 ++++++++++++ src/Installers/Windows/Wix.props | 1 + 4 files changed, 70 insertions(+) create mode 100644 src/Installers/Windows/GenerateNugetPackageWithMsi.ps1 create mode 100644 src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec diff --git a/src/Installers/Windows/GenerateNugetPackageWithMsi.ps1 b/src/Installers/Windows/GenerateNugetPackageWithMsi.ps1 new file mode 100644 index 000000000000..fbb380eb207a --- /dev/null +++ b/src/Installers/Windows/GenerateNugetPackageWithMsi.ps1 @@ -0,0 +1,31 @@ +# Copyright (c) .NET Foundation and contributors. All rights reserved. +# Licensed under the MIT license. See LICENSE file in the project root for full license information. + +param( + [Parameter(Mandatory=$true)][string]$Name, + [Parameter(Mandatory=$true)][string]$MsiPath, + [Parameter(Mandatory=$false)][string]$CabPath, + [Parameter(Mandatory=$true)][string]$NuspecFile, + [Parameter(Mandatory=$true)][string]$OutputDirectory, + [Parameter(Mandatory=$true)][string]$Architecture, + [Parameter(Mandatory=$true)][string]$PackageVersion, + [Parameter(Mandatory=$true)][string]$RepoRoot, + [Parameter(Mandatory=$true)][string]$MajorVersion, + [Parameter(Mandatory=$true)][string]$MinorVersion +) + +$NuGetDir = Join-Path $RepoRoot "artifacts\Tools\nuget\$Name\$Architecture" +$NuGetExe = Join-Path $NuGetDir "nuget.exe" + +if (-not (Test-Path $NuGetDir)) { + New-Item -ItemType Directory -Force -Path $NuGetDir | Out-Null +} + +if (-not (Test-Path $NuGetExe)) { + # Using 3.5.0 to workaround https://github.com/NuGet/Home/issues/5016 + Write-Output "Downloading nuget.exe to $NuGetExe" + wget https://dist.nuget.org/win-x86-commandline/v3.5.0/nuget.exe -OutFile $NuGetExe +} + +& $NuGetExe pack $NuspecFile -Version $PackageVersion -OutputDirectory $OutputDirectory -NoDefaultExcludes -NoPackageAnalysis -Properties ASPNETCORE_RUNTIME_MSI=$MsiPath`;ASPNETCORE_CAB_FILE=$CabPath`;ARCH=$Architecture`;MAJOR=MajorVersion`;MINOR=MinorVersion`; +Exit $LastExitCode \ No newline at end of file diff --git a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj index 5dd1ce6809e2..0c9c03a86a70 100644 --- a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj +++ b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj @@ -17,6 +17,7 @@ $(SharedFrameworkHarvestRootPath)\$(Platform)\ $(DefineConstants);AspNetCoreSharedFrameworkSource=$(HarvestSource) $(SharedFrameworkNamespaceGuid) + $(RepoRoot)\src\Installers\Windows\SharedFramework\SharedFrameworkPackage.nuspec @@ -47,5 +48,23 @@ + + + $(InstallersOutputPath)$(PackageFileName) + $(InstallersOutputPath)$(Cabinet) + + + + diff --git a/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec b/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec new file mode 100644 index 000000000000..62d039eededb --- /dev/null +++ b/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec @@ -0,0 +1,19 @@ + + + + VS.Redist.Common.AspNetCore.SharedFramework.$ARCH$.$MAJOR$.$MINOR$ + 1.0.0 + VS.Redist.Common.AspNetCore.SharedFramework.$ARCH$.$MAJOR$.$MINOR$ + Microsoft + Microsoft + https://www.microsoft.com/net/dotnet_library_license.htm + https://github.com/aspnet/aspnetcore + true + $MAJOR$.$MINOR$ ASP.NET Core TargetingPack ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption + © Microsoft Corporation. All rights reserved. + + + + + + diff --git a/src/Installers/Windows/Wix.props b/src/Installers/Windows/Wix.props index f2737edad203..daf12779ed69 100644 --- a/src/Installers/Windows/Wix.props +++ b/src/Installers/Windows/Wix.props @@ -32,6 +32,7 @@ $(DefineConstants);MajorVersion=$(AspNetCoreMajorVersion) $(DefineConstants);MinorVersion=$(AspNetCoreMinorVersion) $(DefineConstants);PackageVersion=$(PackageVersion) + $(RepoRoot)\src\Installers\Windows\GenerateNugetPackageWithMsi.ps1 From 5d1177c46383ae6842451a158031458c1b95aeb6 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 26 Jun 2019 09:48:24 -0700 Subject: [PATCH 02/10] Update script --- src/Installers/Windows/GenerateNugetPackageWithMsi.ps1 | 2 +- .../Windows/SharedFramework/SharedFramework.wixproj | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Installers/Windows/GenerateNugetPackageWithMsi.ps1 b/src/Installers/Windows/GenerateNugetPackageWithMsi.ps1 index fbb380eb207a..af3734688891 100644 --- a/src/Installers/Windows/GenerateNugetPackageWithMsi.ps1 +++ b/src/Installers/Windows/GenerateNugetPackageWithMsi.ps1 @@ -14,7 +14,7 @@ param( [Parameter(Mandatory=$true)][string]$MinorVersion ) -$NuGetDir = Join-Path $RepoRoot "artifacts\Tools\nuget\$Name\$Architecture" +$NuGetDir = Join-Path $RepoRoot "obj\Tools\nuget\$Name\$Architecture" $NuGetExe = Join-Path $NuGetDir "nuget.exe" if (-not (Test-Path $NuGetDir)) { diff --git a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj index 0c9c03a86a70..a15244194c7b 100644 --- a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj +++ b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj @@ -18,6 +18,7 @@ $(DefineConstants);AspNetCoreSharedFrameworkSource=$(HarvestSource) $(SharedFrameworkNamespaceGuid) $(RepoRoot)\src\Installers\Windows\SharedFramework\SharedFrameworkPackage.nuspec + artifacts/bin/$(Configuration)/installers/ @@ -58,10 +59,10 @@ '$(MsiFullPath)' ^ '$(CabFullPath)' ^ '$(ToolsetInstallerNuspecFile)' ^ - '$(ArtifactsNonShippingPackagesDir)' ^ + '$(InstallersOutputPath)' ^ '$(Platform)' ^ '$(PackageVersion)' ^ - '$(RepoRoot)' ^ + '$(RepositoryRoot)' ^ '$(AspNetCoreMajorVersion)' ^ '$(AspNetCoreMinorVersion)'" /> From 4f1acae56fbd5bf9d45512454b2abdab8e55da22 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 26 Jun 2019 10:46:41 -0700 Subject: [PATCH 03/10] Nits --- .../Windows/SharedFramework/SharedFramework.wixproj | 7 ++++--- src/Installers/Windows/Wix.props | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj index a15244194c7b..2f7c91e4a5ad 100644 --- a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj +++ b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj @@ -17,8 +17,8 @@ $(SharedFrameworkHarvestRootPath)\$(Platform)\ $(DefineConstants);AspNetCoreSharedFrameworkSource=$(HarvestSource) $(SharedFrameworkNamespaceGuid) - $(RepoRoot)\src\Installers\Windows\SharedFramework\SharedFrameworkPackage.nuspec - artifacts/bin/$(Configuration)/installers/ + $(RepositoryRoot)\src\Installers\Windows\SharedFramework\SharedFrameworkPackage.nuspec + $(RepositoryRoot)artifacts/bin/$(Configuration)/installers/ @@ -51,7 +51,8 @@ - $(InstallersOutputPath)$(PackageFileName) + + $(InstallersOutputPath)\en-US\$(TargetFileName) $(InstallersOutputPath)$(Cabinet) - $(InstallersOutputPath)\en-US\$(TargetFileName) + $(InstallersOutputPath)$(TargetFileName) $(InstallersOutputPath)$(Cabinet) - $(InstallersOutputPath)$(TargetFileName) + $(InstallersOutputPath)en-US/$(TargetFileName) $(InstallersOutputPath)$(Cabinet) Date: Wed, 26 Jun 2019 13:03:03 -0700 Subject: [PATCH 07/10] nit --- src/Installers/Windows/GenerateNugetPackageWithMsi.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Installers/Windows/GenerateNugetPackageWithMsi.ps1 b/src/Installers/Windows/GenerateNugetPackageWithMsi.ps1 index af3734688891..1b86aed1c447 100644 --- a/src/Installers/Windows/GenerateNugetPackageWithMsi.ps1 +++ b/src/Installers/Windows/GenerateNugetPackageWithMsi.ps1 @@ -27,5 +27,5 @@ if (-not (Test-Path $NuGetExe)) { wget https://dist.nuget.org/win-x86-commandline/v3.5.0/nuget.exe -OutFile $NuGetExe } -& $NuGetExe pack $NuspecFile -Version $PackageVersion -OutputDirectory $OutputDirectory -NoDefaultExcludes -NoPackageAnalysis -Properties ASPNETCORE_RUNTIME_MSI=$MsiPath`;ASPNETCORE_CAB_FILE=$CabPath`;ARCH=$Architecture`;MAJOR=MajorVersion`;MINOR=MinorVersion`; +& $NuGetExe pack $NuspecFile -Version $PackageVersion -OutputDirectory $OutputDirectory -NoDefaultExcludes -NoPackageAnalysis -Properties ASPNETCORE_RUNTIME_MSI=$MsiPath`;ASPNETCORE_CAB_FILE=$CabPath`;ARCH=$Architecture`;MAJOR=$MajorVersion`;MINOR=$MinorVersion`; Exit $LastExitCode \ No newline at end of file From 8dfc4c6626a8ef485044a368fb2581ee5ee3b3a3 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 9 Jul 2019 10:54:25 -0700 Subject: [PATCH 08/10] Update SharedFramework.wixproj --- src/Installers/Windows/SharedFramework/SharedFramework.wixproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj index 1cfe5214de11..0abe1a324287 100644 --- a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj +++ b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj @@ -51,7 +51,6 @@ - $(InstallersOutputPath)en-US/$(TargetFileName) $(InstallersOutputPath)en-US/$(Cabinet) From 74d3cf60725099abf36f4c6d07e679c0070776f4 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 10 Jul 2019 10:16:29 -0700 Subject: [PATCH 09/10] Update src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec Co-Authored-By: Andrew Stanton-Nurse --- .../Windows/SharedFramework/SharedFrameworkPackage.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec b/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec index 62d039eededb..907ede8f2f89 100644 --- a/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec +++ b/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec @@ -1,7 +1,7 @@ - VS.Redist.Common.AspNetCore.SharedFramework.$ARCH$.$MAJOR$.$MINOR$ + VS.Redist.Common.AspNetCore.SharedFramework.$ARCH$.$MAJOR$.$MINOR$ 1.0.0 VS.Redist.Common.AspNetCore.SharedFramework.$ARCH$.$MAJOR$.$MINOR$ Microsoft From 2409bef3ccbad362f32b993155153b6c67bdd661 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 10 Jul 2019 10:16:36 -0700 Subject: [PATCH 10/10] Update src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec Co-Authored-By: Andrew Stanton-Nurse --- .../Windows/SharedFramework/SharedFrameworkPackage.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec b/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec index 907ede8f2f89..b5b8c43d9e97 100644 --- a/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec +++ b/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec @@ -3,7 +3,7 @@ VS.Redist.Common.AspNetCore.SharedFramework.$ARCH$.$MAJOR$.$MINOR$ 1.0.0 - VS.Redist.Common.AspNetCore.SharedFramework.$ARCH$.$MAJOR$.$MINOR$ + VS.Redist.Common.AspNetCore.SharedFramework.$ARCH$.$MAJOR$.$MINOR$ Microsoft Microsoft https://www.microsoft.com/net/dotnet_library_license.htm