Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release/7.0] Generate VS.Redist package for ANCM #44369

Merged
merged 5 commits into from
Oct 11, 2022
Merged

[release/7.0] Generate VS.Redist package for ANCM #44369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
854c471
Generate VS.Redist package for ANCM
wtgodbe Dec 21, 2021
240d078
Fixup
wtgodbe Dec 21, 2021
dd7b849
Add package for IISExpress
wtgodbe Sep 27, 2022
b49ad39
Rename nuspecs
wtgodbe Sep 27, 2022
ecf9b98
Fix target order
wtgodbe Oct 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
23 changes: 23 additions & 0 deletions src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
22 changes: 22 additions & 0 deletions src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
23 changes: 23 additions & 0 deletions src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<GenerateRandomNamespaceGuid>true</GenerateRandomNamespaceGuid>
<SchemaVersion>2.0</SchemaVersion>
<DisableGuidGeneration>true</DisableGuidGeneration>
<ToolsetInstallerNuspecFile>$(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec</ToolsetInstallerNuspecFile>
</PropertyGroup>

<ItemGroup>
Expand Down Expand Up @@ -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>
2 changes: 1 addition & 1 deletion ...edFramework/SharedFrameworkPackage.nuspec → ...ws/SharedFramework/SharedFramework.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/Installers/Windows/SharedFramework/SharedFramework.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
0 ...TargetingPack/TargetingPackPackage.nuspec → ...indows/TargetingPack/TargetingPack.nuspec
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions src/Installers/Windows/TargetingPack/TargetingPack.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down