Skip to content

Commit 01f48cd

Browse files
github-actions[bot]wtgodbe
github-actions[bot]
and
wtgodbe
authored
[release/7.0] Generate VS.Redist package for ANCM (#44369)
* Generate VS.Redist package for ANCM * Fixup * Add package for IISExpress * Rename nuspecs * Fix target order Co-authored-by: Will Godbe <[email protected]>
1 parent 9553bfb commit 01f48cd

File tree

8 files changed

+95
-5
lines changed

8 files changed

+95
-5
lines changed

‎src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.nuspec

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
3+
<metadata>
4+
<id>VS.Redist.Common.AspNetCore.AspNetCoreModuleV2IISExpress.$MAJOR$.$MINOR$</id>
5+
<version>1.0.0</version>
6+
<title>VS.Redist.Common.AspNetCore.AspNetCoreModuleV2IISExpress.$MAJOR$.$MINOR$</title>
7+
<authors>Microsoft</authors>
8+
<owners>Microsoft</owners>
9+
<license type="expression">$PackageLicenseExpression$</license>
10+
<projectUrl>https://github.com/dotnet/aspnetcore</projectUrl>
11+
<icon>$PackageIcon$</icon>
12+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
13+
<description>$MAJOR$.$MINOR$ ASP.NET Core Module IIS Express Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
14+
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
15+
<serviceable>true</serviceable>
16+
</metadata>
17+
<files>
18+
<file src="$ASPNETCORE_RUNTIME_MSI$" />
19+
<file src="$ASPNETCORE_CAB_FILE$" />
20+
<file src="$PackageIconFullPath$" target="$PackageIcon$" />
21+
</files>
22+
</package>

‎src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<TempPlatform Condition="'$(Platform)' == 'x64'">x64</TempPlatform>
1515
<TempPlatform Condition="'$(Platform)' == 'x86'">Win32</TempPlatform>
1616
<TempPlatform Condition="'$(Platform)' == 'arm64'">ARM64</TempPlatform>
17+
<ToolsetInstallerNuspecFile>$(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec</ToolsetInstallerNuspecFile>
1718
</PropertyGroup>
1819

1920
<ItemGroup>
@@ -70,5 +71,27 @@
7071

7172
<PropertyGroup>
7273
<PackageFileName>ancm_iis_express_$(Platform)_en_v2_$(PackageVersion)$(TargetExt)</PackageFileName>
74+
<ProductNameShort>ASP.NET Core Module IIS Express V2</ProductNameShort>
7375
</PropertyGroup>
76+
77+
<Target Name="CreateANCMIISExpressNugetPackage" DependsOnTargets="CopyToArtifactsDirectory" BeforeTargets="Build">
78+
<PropertyGroup>
79+
<MsiFullPath>$(InstallersOutputPath)$(PackageFileName)</MsiFullPath>
80+
</PropertyGroup>
81+
82+
<Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
83+
'$(ProductNameShort)' ^
84+
'$(MsiFullPath)' ^
85+
'$(CabFullPath)' ^
86+
'$(ToolsetInstallerNuspecFile)' ^
87+
'$(ArtifactsNonShippingPackagesDir)' ^
88+
'$(Platform)' ^
89+
'$(_GeneratedPackageVersion)' ^
90+
'$(RepoRoot)' ^
91+
'$(AspNetCoreMajorVersion)' ^
92+
'$(AspNetCoreMinorVersion)' ^
93+
'$(PackageIcon)' ^
94+
'$(PackageIconFullPath)' ^
95+
'$(PackageLicenseExpression)' " />
96+
</Target>
7497
</Project>

‎src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.nuspec

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
3+
<metadata>
4+
<id>VS.Redist.Common.AspNetCore.AspNetCoreModuleV2.$MAJOR$.$MINOR$</id>
5+
<version>1.0.0</version>
6+
<title>VS.Redist.Common.AspNetCore.AspNetCoreModuleV2.$MAJOR$.$MINOR$</title>
7+
<authors>Microsoft</authors>
8+
<owners>Microsoft</owners>
9+
<license type="expression">$PackageLicenseExpression$</license>
10+
<projectUrl>https://github.com/dotnet/aspnetcore</projectUrl>
11+
<icon>$PackageIcon$</icon>
12+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
13+
<description>$MAJOR$.$MINOR$ ASP.NET Core Module Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
14+
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
15+
<serviceable>true</serviceable>
16+
</metadata>
17+
<files>
18+
<file src="$ASPNETCORE_RUNTIME_MSI$" />
19+
<file src="$ASPNETCORE_CAB_FILE$" />
20+
<file src="$PackageIconFullPath$" target="$PackageIcon$" />
21+
</files>
22+
</package>

‎src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<GenerateRandomNamespaceGuid>true</GenerateRandomNamespaceGuid>
1212
<SchemaVersion>2.0</SchemaVersion>
1313
<DisableGuidGeneration>true</DisableGuidGeneration>
14+
<ToolsetInstallerNuspecFile>$(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec</ToolsetInstallerNuspecFile>
1415
</PropertyGroup>
1516

1617
<ItemGroup>
@@ -57,5 +58,27 @@
5758

5859
<PropertyGroup>
5960
<PackageFileName>aspnetcoremodule_$(Platform)_en_v2_$(PackageVersion)$(TargetExt)</PackageFileName>
61+
<ProductNameShort>ASP.NET Core Module V2</ProductNameShort>
6062
</PropertyGroup>
63+
64+
<Target Name="CreateANCMNugetPackage" DependsOnTargets="CopyToArtifactsDirectory" BeforeTargets="Build">
65+
<PropertyGroup>
66+
<MsiFullPath>$(InstallersOutputPath)$(PackageFileName)</MsiFullPath>
67+
</PropertyGroup>
68+
69+
<Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
70+
'$(ProductNameShort)' ^
71+
'$(MsiFullPath)' ^
72+
'$(CabFullPath)' ^
73+
'$(ToolsetInstallerNuspecFile)' ^
74+
'$(ArtifactsNonShippingPackagesDir)' ^
75+
'$(Platform)' ^
76+
'$(_GeneratedPackageVersion)' ^
77+
'$(RepoRoot)' ^
78+
'$(AspNetCoreMajorVersion)' ^
79+
'$(AspNetCoreMinorVersion)' ^
80+
'$(PackageIcon)' ^
81+
'$(PackageIconFullPath)' ^
82+
'$(PackageLicenseExpression)' " />
83+
</Target>
6184
</Project>

‎src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec renamed to ‎src/Installers/Windows/SharedFramework/SharedFramework.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<projectUrl>https://github.com/dotnet/aspnetcore</projectUrl>
1111
<icon>$PackageIcon$</icon>
1212
<requireLicenseAcceptance>true</requireLicenseAcceptance>
13-
<description>$MAJOR$.$MINOR$ ASP.NET Core TargetingPack ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
13+
<description>$MAJOR$.$MINOR$ ASP.NET Core Shared Framework ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
1414
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
1515
<serviceable>true</serviceable>
1616
</metadata>

‎src/Installers/Windows/SharedFramework/SharedFramework.wixproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<DefineConstants>$(DefineConstants);AspNetCoreSharedFrameworkSource=$(HarvestSource)</DefineConstants>
2222
<NamespaceGuid>$(SharedFrameworkNamespaceGuid)</NamespaceGuid>
2323
<SchemaVersion>2.0</SchemaVersion>
24-
<ToolsetInstallerNuspecFile>$(RepoRoot)\src\Installers\Windows\SharedFramework\SharedFrameworkPackage.nuspec</ToolsetInstallerNuspecFile>
24+
<ToolsetInstallerNuspecFile>$(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec</ToolsetInstallerNuspecFile>
2525
</PropertyGroup>
2626

2727
<ItemGroup>
@@ -86,7 +86,7 @@
8686
<DefineConstants>$(DefineConstants);ProductName=$(ProductName)</DefineConstants>
8787
</PropertyGroup>
8888

89-
<Target Name="CreateSharedFrameworkNugetPackage" AfterTargets="CopyToArtifactsDirectory;Build">
89+
<Target Name="CreateSharedFrameworkNugetPackage" DependsOnTargets="CopyToArtifactsDirectory" BeforeTargets="Build">
9090
<PropertyGroup>
9191
<MsiFullPath>$(InstallersOutputPath)$(PackageFileName)</MsiFullPath>
9292
</PropertyGroup>

‎src/Installers/Windows/TargetingPack/TargetingPackPackage.nuspec renamed to ‎src/Installers/Windows/TargetingPack/TargetingPack.nuspec

File renamed without changes.

‎src/Installers/Windows/TargetingPack/TargetingPack.wixproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<DefineConstants>$(DefineConstants);AspNetCoreTargetingPackSource=$(HarvestSource)</DefineConstants>
2121
<NamespaceGuid>DDBB771F-963F-47D3-8510-9ABD04DBE1D1</NamespaceGuid>
2222
<SchemaVersion>2.0</SchemaVersion>
23-
<ToolsetInstallerNuspecFile>$(RepoRoot)\src\Installers\Windows\TargetingPack\TargetingPackPackage.nuspec</ToolsetInstallerNuspecFile>
23+
<ToolsetInstallerNuspecFile>$(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec</ToolsetInstallerNuspecFile>
2424
<PackageVersion>$(TargetingPackVersionPrefix)</PackageVersion>
2525
<BundleVersion>$(TargetingPackVersionPrefix)</BundleVersion>
2626
</PropertyGroup>
@@ -80,7 +80,7 @@
8080
<DefineConstants>$(DefineConstants);ProductName=$(ProductName)</DefineConstants>
8181
</PropertyGroup>
8282

83-
<Target Name="CreateTargetingPackNugetPackage" AfterTargets="CopyToArtifactsDirectory;Build">
83+
<Target Name="CreateTargetingPackNugetPackage" DependsOnTargets="CopyToArtifactsDirectory" BeforeTargets="Build">
8484
<PropertyGroup>
8585
<MsiFullPath>$(InstallersOutputPath)$(PackageFileName)</MsiFullPath>
8686
</PropertyGroup>

0 commit comments

Comments
 (0)