Mirrors/velopack
1
0
Fork 0
mirror of https://github.com/velopack/velopack.git synced 2025-10-25 15:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix assembly manifests

Browse Source
This commit is contained in:
Caelan Sayler
2021-12-09 14:52:42 +00:00
parent 10087b9f6b
commit 6593f2397a
6 changed files with 56 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Setup/RuntimeInfo.cpp
View File

@@ -189,7 +189,7 @@ bool IsDotNetCoreInstalled(wstring searchString)
// note, dotnet cli will only return x64 results.
//auto runtimes = exec("dotnet --list-runtimes");
auto runtimes = exec("dotnet --info");
return runtimes.find(searchString) != std::string::npos;
return runtimes.find(searchString) != std::wstring::npos;
}
bool IsRuntimeInstalled(const RUNTIMEINFO* runtime)

2
src/Setup/SplashWnd.cpp
View File

@@ -94,7 +94,7 @@ unsigned int __stdcall CSplashWnd::SplashThreadProc(void* lpParameter)
wndcls.hCursor = LoadCursor(NULL, IDC_APPSTARTING);
wndcls.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
wndcls.lpszClassName = L"SplashWnd";
wndcls.hIcon = LoadIcon(wndcls.hInstance, MAKEINTRESOURCE(IDI_APPLICATION));
wndcls.hIcon = LoadIcon(wndcls.hInstance, IDI_APPLICATION);
if (!RegisterClass(&wndcls)) {
if (GetLastError() != 0x00000582) // already registered)

2
src/Setup/compat.manifest
View File

@@ -9,6 +9,8 @@
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
<!-- Windows 8.1 -->
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
<!-- Windows 10 and Windows 11 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
</application>
</compatibility>
</assembly>

1
src/SquirrelCli/SquirrelCli.csproj
View File

@@ -5,6 +5,7 @@
<OutputType>Exe</OutputType>
<LangVersion>9</LangVersion>
<AssemblyName>Squirrel</AssemblyName>
<ApplicationManifest>app.manifest</ApplicationManifest>
<ApplicationIcon>..\..\squirrel.ico</ApplicationIcon>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
<SignAssembly>True</SignAssembly>

47
src/SquirrelCli/app.manifest Normal file
View File

@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
<!-- App should run at same integrity level as calling process, and; -->
<!-- Does not need to manipulate windows belonging to higher-integrity-level processes -->
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
</requestedPrivileges>
</security>
</trustInfo>
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!-- Windows Vista -->
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />
<!-- Windows 7 -->
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
<!-- Windows 8 -->
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
<!-- Windows 8.1 -->
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
<!-- Windows 10 and Windows 11-->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
</application>
</compatibility>
<!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
<dependency>
<dependentAssembly>
<assemblyIdentity
type="win32"
name="Microsoft.Windows.Common-Controls"
version="6.0.0.0"
processorArchitecture="*"
publicKeyToken="6595b64144ccf1df"
language="*"
/>
</dependentAssembly>
</dependency>
</assembly>

6
src/Update/app.manifest
View File

@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
<assemblyIdentity version="1.2.0.0" name="Squirrel.app"/>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
<!-- App should run at same integrity level as calling process, and; -->
<!-- Does not need to manipulate windows belonging to higher-integrity-level processes -->
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
</requestedPrivileges>
</security>
@@ -23,7 +25,7 @@
<!-- Windows 8.1 -->
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
<!-- Windows 10 -->
<!-- Windows 10 and Windows 11-->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
</application>
</compatibility>