Skip to content

Commit

Permalink
Merge pull request #18376 from unoplatform/mergify/bp/release/stable/…
Browse files Browse the repository at this point in the history
…5.4/pr-17974

Adjust devserver inclusion when WinExe is selected (backport #17974)
  • Loading branch information
jeromelaban authored Oct 3, 2024
2 parents c614b6a + 022bc72 commit 06f6c00
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/Uno.Sdk/targets/Uno.Common.targets
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<_IsUnoSingleProjectAndLegacy Condition=" $(SingleProject) == 'true' OR $(UnoSingleProject) == 'true' ">true</_IsUnoSingleProjectAndLegacy>

<_ImplicitRestoreOutputType>$([MSBuild]::ValueOrDefault('$(OutputType)', 'Library'))</_ImplicitRestoreOutputType>
<IsUnoHead Condition="$(_ImplicitRestoreOutputType) == 'Exe'">true</IsUnoHead>
<IsUnoHead Condition=" '$(_ImplicitRestoreOutputType)' == 'WinExe' OR '$(_ImplicitRestoreOutputType)' == 'Exe' ">true</IsUnoHead>
<_InitialOutputType>$([MSBuild]::ValueOrDefault('$(OutputType)', 'Library'))</_InitialOutputType>
<_InitialOutputType Condition="$(TargetFramework) == '' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == '' ">Library</_InitialOutputType>
<_IsStandaloneWasmHead>false</_IsStandaloneWasmHead>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<_UnoProjectSystemPackageReference Include="Uno.Resizetizer" ProjectSystem="true" PrivateAssets="all" />
</ItemGroup>

<ItemGroup Condition="$(_ImplicitRestoreOutputType) == 'Exe'">
<ItemGroup Condition=" '$(_ImplicitRestoreOutputType)' == 'WinExe' OR '$(_ImplicitRestoreOutputType)' == 'Exe' ">
<_UnoProjectSystemPackageReference Include="Uno.WinUI.DevServer" ProjectSystem="true" Condition="$(Optimize) != 'true'" />
<_UnoProjectSystemPackageReference Include="Uno.WinUI.DevServer" ProjectSystem="true" Exclude="all" Condition="$(Optimize) == 'true'" />
</ItemGroup>
Expand Down

0 comments on commit 06f6c00

Please sign in to comment.