Skip to content

[ClickOnce] Include content from None group for ClickOnce publishing #9211

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

Merged
merged 2 commits into from
Sep 12, 2023
Merged

[ClickOnce] Include content from None group for ClickOnce publishing #9211

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b194b8c
Include content from None group for ClickOnce publishing
sujitnayak Sep 8, 2023
c85fafe
c/r
sujitnayak Sep 9, 2023
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
6 changes: 5 additions & 1 deletion src/Tasks/Microsoft.Common.CurrentVersion.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4422,7 +4422,11 @@ Copyright (C) Microsoft Corporation. All rights reserved.
<_ClickOnceRuntimeCopyLocalItems Include="@(NativeCopyLocalItems)"
Condition="'%(NativeCopyLocalItems.CopyLocal)' == 'true'" />
<_ClickOnceRuntimeCopyLocalItems Remove="@(_DeploymentReferencePaths)" />
<_ClickOnceFiles Include="@(ContentWithTargetPath);@(_DeploymentManifestIconFile);@(AppConfigWithTargetPath);@(NetCoreRuntimeJsonFilesForClickOnce);@(_ClickOnceRuntimeCopyLocalItems)"/>

<!-- Include items from None itemgroup for publishing -->
<_ClickOnceNoneItems Include="@(_NoneWithTargetPath->'%(FullPath)')" Condition="'%(_NoneWithTargetPath.CopyToOutputDirectory)'=='Always' or '%(_NoneWithTargetPath.CopyToOutputDirectory)'=='PreserveNewest'"/>

<_ClickOnceFiles Include="@(ContentWithTargetPath);@(_DeploymentManifestIconFile);@(AppConfigWithTargetPath);@(NetCoreRuntimeJsonFilesForClickOnce);@(_ClickOnceRuntimeCopyLocalItems);@(_ClickOnceNoneItems)"/>
</ItemGroup>

<!-- For single file publish, we need to include the SF bundle EXE, application icon file and files excluded from the bundle EXE in the clickonce manifest -->
Expand Down