Skip to content

Commit 109e866

Browse files
committed
Convert Shared Framework msi to use the Installer shared tooling.
1 parent 00a9473 commit 109e866

File tree

8 files changed

+7
-291
lines changed

8 files changed

+7
-291
lines changed

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@
239239
<PublicBaseURL Condition="'$(PublicBaseURL)' == ''">https://dotnetbuilds.azureedge.net/public/</PublicBaseURL>
240240
<InternalBaseURL>https://dotnetbuilds.azureedge.net/internal/</InternalBaseURL>
241241
<!-- Allow overriding where installers are pulled in from previously completed jobs in Unified Build scenarios. -->
242-
<CrossArchitectureInstallerBasePath Condition="'$(CrossArchitectureInstallerBasePath)' == ''">$(InstallersOutputPath)</CrossArchitectureInstallerBasePath>
242+
<CrossArchitectureInstallerBasePath Condition="'$(CrossArchitectureInstallerBasePath)' == ''">$(ArtifactsShippingPackagesDir)</CrossArchitectureInstallerBasePath>
243243
</PropertyGroup>
244244

245245
<!-- Try various places to find the runtime. It's either released (use official version),

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,13 @@
2424
<InstallerName>$(RuntimeInstallerBaseName)</InstallerName>
2525
<GenerateInstallers>true</GenerateInstallers>
2626
<ProductBrandPrefix>Microsoft ASP.NET Core</ProductBrandPrefix>
27+
<VSInsertionShortComponentName>AspNetCore.SharedFramework</VSInsertionShortComponentName>
2728
<PackageDescription>$(SharedFxDescription)</PackageDescription>
2829
<InstallerPackageDescription>$(SharedFxDescription)</InstallerPackageDescription>
2930
<LicenseFile>$(RepoRoot)LICENSE.txt</LicenseFile>
3031
<MajorVersion>$(AspNetCoreMajorVersion)</MajorVersion>
3132
<MinorVersion>$(AspNetCoreMinorVersion)</MinorVersion>
33+
<PatchVersion>$(AspNetCorePatchVersion)</PatchVersion>
3234

3335
<!-- 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 -->
3436
<DotnetRuntimeDependencyVersion>$(MicrosoftNETCoreAppRefVersion)</DotnetRuntimeDependencyVersion>
@@ -46,6 +48,7 @@
4648
<BuildDebPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64'">true</BuildDebPackage>
4749
<BuildRpmPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildRpmPackage>
4850
<UseArcadeRpmTooling>true</UseArcadeRpmTooling>
51+
<GenerateVSInsertionPackages>true</GenerateVSInsertionPackages>
4952
</PropertyGroup>
5053

5154
<ItemGroup>
@@ -54,7 +57,7 @@
5457
</Reference>
5558
</ItemGroup>
5659
<ItemGroup>
57-
<PackageReference Condition="('$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64') and '$(DotNetBuildSourceOnly)' != 'true'" Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersVersion)" />
60+
<PackageReference Condition="'$(BuildInstallers)' == 'true' and '$(DotNetBuildSourceOnly)' != 'true'" Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersVersion)" />
5861
<LinuxPackageDependency Include="dotnet-runtime-$(DotnetRuntimeDependencyMajorMinorVersion)" Version="$(DotnetRuntimeDependencyVersion)" />
5962
</ItemGroup>
6063

src/Installers/Windows/SharedFramework/DependencyProvider.wxs

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

src/Installers/Windows/SharedFramework/Product.wxs

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

src/Installers/Windows/SharedFramework/SharedFramework.nuspec

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

src/Installers/Windows/SharedFramework/SharedFramework.wixproj

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

src/Installers/Windows/SharedFramework/Strings.wxl

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

src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@
3434
</ItemGroup>
3535

3636
<ItemGroup>
37-
<ProjectReference Include="..\SharedFramework\SharedFramework.wixproj" SetPlatform="Platform=$(Platform)">
38-
<Name>SharedFramework</Name>
39-
<Project>{5244BC49-2568-4701-80A6-EAB8950AB5FA}</Project>
37+
<ProjectReference Include="$(RepoRoot)src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj">
4038
<Private>True</Private>
4139
<DoNotHarvest>True</DoNotHarvest>
4240
</ProjectReference>
@@ -69,7 +67,7 @@
6967
<DefineConstants>$(DefineConstants);BundleRegManufacturer=$(BundleRegManufacturer)</DefineConstants>
7068
<DefineConstants>$(DefineConstants);BundleRegFamily=$(BundleRegFamily)</DefineConstants>
7169
<DefineConstants>$(DefineConstants);BundleRegName=$(BundleRegName)</DefineConstants>
72-
<DefineConstants>$(DefineConstants);InstallersOutputPath=$(InstallersOutputPath)</DefineConstants>
70+
<DefineConstants>$(DefineConstants);InstallersOutputPath=$(ArtifactsShippingPackagesDir)</DefineConstants>
7371
<DefineConstants>$(DefineConstants);SharedFxRedistInstaller=$(RuntimeInstallerBaseName)-$(PackageVersion)-win-$(Platform).msi</DefineConstants>
7472
</PropertyGroup>
7573

0 commit comments

Comments
 (0)