Merge branch 'cb/windows-manifest'

Windows update.

* cb/windows-manifest:
mingw: embed a manifest to trick UAC into Doing The Right Thing

diff --git a/compat/win32/git.manifest b/compat/win32/git.manifest
new file mode 100644 (file)
index 0000000..771e3cc
--- /dev/null
+++ b/compat/win32/git.manifest
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+       <assemblyIdentity type="win32" name="Git" version="0.0.0.1" />
+       <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+               <security>
+                       <requestedPrivileges>
+                               <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 -->
+                       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+               </application>
+       </compatibility>
+</assembly>

diff --git a/git.rc b/git.rc
index 49002e0d541f1ab080efd8b9b4732f52db89e984..cc3fdc6cc6cb83b084eebe2ad49f3c78c981789b 100644 (file)
--- a/git.rc
+++ b/git.rc
@@ -20,3 +20,5 @@ BEGIN
     VALUE "Translation", 0x409, 1200
   END
 END
+
+1 RT_MANIFEST "compat/win32/git.manifest"