Skip to content

Commit 00a9473

Browse files
committed
Use the Installers Arcade package to build the ref pack MSI
1 parent e2a857c commit 00a9473

File tree

7 files changed

+4
-267
lines changed

7 files changed

+4
-267
lines changed

eng/Build.props

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -241,14 +241,6 @@
241241
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\ANCMV2\ANCMV2.wixproj" AdditionalProperties="Platform=x86" />
242242
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\ANCMV2\ANCMV2.wixproj" AdditionalProperties="Platform=arm64" />
243243

244-
<!-- Build the targeting pack installers -->
245-
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\TargetingPack\TargetingPack.wixproj" AdditionalProperties="Platform=x64" />
246-
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\TargetingPack\TargetingPack.wixproj" AdditionalProperties="Platform=x86" />
247-
<!-- This really shouldn't be here, but instead of harvesting from the intermediate/output directories, the targeting pack installer logic
248-
harvests from a zip of the reference assemblies. Producing it in each leg ends up with multiple targeting packs
249-
getting produced and the BAR will reject the build. Centralize building the targeting pack in the x86/x64 leg. -->
250-
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\TargetingPack\TargetingPack.wixproj" AdditionalProperties="Platform=arm64" />
251-
252244
<!-- Build the SharedFramework installers -->
253245
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkBundle\SharedFrameworkBundle.wixproj" AdditionalProperties="Platform=x64" />
254246
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkBundle\SharedFrameworkBundle.wixproj" AdditionalProperties="Platform=x86" />
@@ -268,8 +260,6 @@
268260
<!-- Build the ANCM msis -->
269261
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\ANCMIISExpressV2\AncmIISExpressV2.wixproj" AdditionalProperties="Platform=$(TargetArchitecture)" />
270262
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\ANCMV2\ANCMV2.wixproj" AdditionalProperties="Platform=$(TargetArchitecture)" />
271-
<!-- Build the targeting pack installers -->
272-
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\TargetingPack\TargetingPack.wixproj" AdditionalProperties="Platform=$(TargetArchitecture)" />
273263
<!-- Build the SharedFramework installers -->
274264
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkBundle\SharedFrameworkBundle.wixproj" AdditionalProperties="Platform=$(TargetArchitecture)" />
275265
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFramework\SharedFramework.wixproj" AdditionalProperties="Platform=$(TargetArchitecture)" />

src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<InstallerName>$(TargetingPackInstallerBaseName)</InstallerName>
1414
<GenerateInstallers>true</GenerateInstallers>
1515
<ProductBrandPrefix>Microsoft ASP.NET Core</ProductBrandPrefix>
16+
<VSInsertionShortComponentName>AspNetCore.TargetingPack</VSInsertionShortComponentName>
1617

1718
<IsPackable Condition="'$(OnlyPackPlatformSpecificPackages)' == 'true'">false</IsPackable>
1819

@@ -22,6 +23,7 @@
2223
<LicenseFile>$(RepoRoot)LICENSE.txt</LicenseFile>
2324
<MajorVersion>$(AspNetCoreMajorVersion)</MajorVersion>
2425
<MinorVersion>$(AspNetCoreMinorVersion)</MinorVersion>
26+
<PatchVersion>$(AspNetCorePatchVersion)</PatchVersion>
2527

2628
<!-- Needed some creativity to convert the PackageVersion M.N.P-PreReleaseVersionLabel-Build to the installer version M.N.P~PreReleaseVersionLabel-Build, The conditional handles stabilized builds -->
2729
<DotnetTargetingPackDependencyVersion>$(MicrosoftNETCoreAppRefVersion)</DotnetTargetingPackDependencyVersion>
@@ -36,11 +38,12 @@
3638
<BuildDebPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64'">true</BuildDebPackage>
3739
<BuildRpmPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildRpmPackage>
3840
<UseArcadeRpmTooling>true</UseArcadeRpmTooling>
41+
<GenerateVSInsertionPackages>true</GenerateVSInsertionPackages>
3942
</PropertyGroup>
4043

4144
<ItemGroup>
4245
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Archives" Version="$(MicrosoftDotNetBuildTasksArchivesVersion)" />
43-
<PackageReference Condition="('$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64') and '$(DotNetBuildSourceOnly)' != 'true'" Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersVersion)" />
46+
<PackageReference Condition="'$(BuildInstallers)' == 'true' and '$(DotNetBuildSourceOnly)' != 'true'" Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersVersion)" />
4447
<LinuxPackageDependency Include="dotnet-targeting-pack-$(DotnetTargetingPackDependencyMajorMinorVersion)" Version="$(DotnetTargetingPackDependencyVersion)" />
4548
</ItemGroup>
4649

src/Installers/Windows/TargetingPack/DependencyProvider.wxs

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/Installers/Windows/TargetingPack/Product.wxs

Lines changed: 0 additions & 113 deletions
This file was deleted.

src/Installers/Windows/TargetingPack/Strings.wxl

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/Installers/Windows/TargetingPack/TargetingPack.nuspec

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/Installers/Windows/TargetingPack/TargetingPack.wixproj

Lines changed: 0 additions & 103 deletions
This file was deleted.

0 commit comments

Comments
 (0)