Skip to content

Commit 0dd7ec1

Browse files
committed
Adjust the conditions for adding the installer targets to work better with how the build is structured in CI.
1 parent c080f41 commit 0dd7ec1

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
3535
</PropertyGroup>
3636

37-
<PropertyGroup Condition="'$(BuildInstallers)' == 'true'">
37+
<PropertyGroup Condition="'$(BuildInstallers)' == 'true' or '$(TargetOsName)' == 'win'">
38+
<GenerateInstallers Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</GenerateInstallers>
3839
<BuildDebPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64'">true</BuildDebPackage>
3940
<BuildRpmPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildRpmPackage>
4041
<UseArcadeRpmTooling>true</UseArcadeRpmTooling>
@@ -43,7 +44,7 @@
4344

4445
<ItemGroup>
4546
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Archives" Version="$(MicrosoftDotNetBuildTasksArchivesVersion)" />
46-
<PackageReference Condition="'$(BuildInstallers)' == 'true' and '$(DotNetBuildSourceOnly)' != 'true'" Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersVersion)" />
47+
<PackageReference Condition="'$(GenerateInstallers)' == 'true'" Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersVersion)" />
4748
<LinuxPackageDependency Include="dotnet-targeting-pack-$(DotnetTargetingPackDependencyMajorMinorVersion)" Version="$(DotnetTargetingPackDependencyVersion)" />
4849
</ItemGroup>
4950

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@
4444
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
4545
</PropertyGroup>
4646

47-
<PropertyGroup Condition="'$(BuildInstallers)' == 'true'">
47+
<PropertyGroup Condition="'$(BuildInstallers)' == 'true' or '$(TargetOsName)' == 'win'">
48+
<GenerateInstallers Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</GenerateInstallers>
4849
<BuildDebPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64'">true</BuildDebPackage>
4950
<BuildRpmPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildRpmPackage>
5051
<UseArcadeRpmTooling>true</UseArcadeRpmTooling>
@@ -57,7 +58,7 @@
5758
</Reference>
5859
</ItemGroup>
5960
<ItemGroup>
60-
<PackageReference Condition="'$(BuildInstallers)' == 'true' and '$(DotNetBuildSourceOnly)' != 'true'" Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersVersion)" />
61+
<PackageReference Condition="'$(GenerateInstallers)' == 'true'" Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersVersion)" />
6162
<LinuxPackageDependency Include="dotnet-runtime-$(DotnetRuntimeDependencyMajorMinorVersion)" Version="$(DotnetRuntimeDependencyVersion)" />
6263
</ItemGroup>
6364

0 commit comments

Comments
 (0)