Skip to content
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

(GH-629) Separate app.manifest #630

Merged
merged 3 commits into from
Dec 6, 2018
Merged

(GH-629) Separate app.manifest #630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc7bc74
(GH-629) Separate app.manifest
ferventcoder Dec 5, 2018
2012be5
(GH-629) Add manifest file to msi
gep13 Dec 6, 2018
7ec3958
(GH-629) add note on manifest caching
ferventcoder Dec 6, 2018
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
3 changes: 3 additions & 0 deletions Source/ChocolateyGui.Install/Product.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@
<Component Id="ChocolateyGui.exe.config" Guid="6C3AE56F-1AA3-4145-BFA9-345BBCC5C3D1">
<File Id="ChocolateyGui.exe.config" Source="$(var.GuiTargetDir)/ChocolateyGui.exe.config" KeyPath="yes" Checksum="yes" />
</Component>
<Component Id="ChocolateyGui.exe.manifest" Guid="AEA5D8AE-4274-444E-AEB5-988492C6919E">
<File Id="ChocolateyGui.exe.manifest" Source="$(var.GuiTargetDir)/ChocolateyGui.exe.manifest" KeyPath="yes" Checksum="yes" />
</Component>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I figured it was something like that. Thanks for catching that!

</ComponentGroup>
</Fragment>
</Wix>
12 changes: 7 additions & 5 deletions Source/ChocolateyGui/ChocolateyGui.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup>
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<PropertyGroup />
<PropertyGroup>
<BuildToolsFxCopVersion>1.0.1</BuildToolsFxCopVersion>
<TargetFrameworkProfile />
Expand Down Expand Up @@ -71,6 +69,9 @@
<PropertyGroup>
<StartupObject />
</PropertyGroup>
<PropertyGroup>
<NoWin32Manifest>true</NoWin32Manifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="Autofac, Version=4.6.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<HintPath>..\packages\Autofac.4.6.1\lib\net45\Autofac.dll</HintPath>
Expand Down Expand Up @@ -458,9 +459,10 @@
<None Include="app.config">
<SubType>Designer</SubType>
</None>
<None Include="app.manifest">
<Content Include="ChocolateyGui.exe.manifest">
<SubType>Designer</SubType>
</None>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
Expand Down
7 changes: 7 additions & 0 deletions Source/ChocolateyGui/app.manifest → .../ChocolateyGui/ChocolateyGui.exe.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@
The following is an unsupported use case: If you want to utilize File
and Registry Virtualization for backward compatibility then delete
the requestedExecutionLevel node.

NOTE: If you do change this file, make sure that you change the
modification date on ChocolateyGUI.exe that this sits next to.
Windows caches manifests based on path and last modified date. So
you'll need to change the modification date on ChocolateyGUI.exe
for the manifest change to take effect.
Details: https://github.com/chocolatey/choco/issues/1292#issuecomment-304068121
-->
<requestedExecutionLevel level="highestAvailable" uiAccess="false" />
</requestedPrivileges>
Expand Down