From 8bd8ff1972b5aad641d9e17591d5fae35fbb2818 Mon Sep 17 00:00:00 2001
From: John Tur <john-tur@outlook.com>
Date: Tue, 5 Mar 2024 21:29:13 -0500
Subject: [PATCH 1/3] Add native Arm64 support

---
 .../StructuredLogViewer.csproj                |  1 +
 src/StructuredLogViewer/app.manifest          | 30 +++++++++++++++++++
 src/TaskRunner/TaskRunner.csproj              |  1 +
 src/TaskRunner/app.manifest                   | 17 +++++++++++
 4 files changed, 49 insertions(+)
 create mode 100644 src/StructuredLogViewer/app.manifest
 create mode 100644 src/TaskRunner/app.manifest

diff --git a/src/StructuredLogViewer/StructuredLogViewer.csproj b/src/StructuredLogViewer/StructuredLogViewer.csproj
index 771c7d319..e2a7e698f 100644
--- a/src/StructuredLogViewer/StructuredLogViewer.csproj
+++ b/src/StructuredLogViewer/StructuredLogViewer.csproj
@@ -12,6 +12,7 @@
     <Company>Microsoft</Company>
     <Product>MSBuild Structured Log Viewer</Product>
     <AssemblyTitle>MSBuild Structured Log Viewer</AssemblyTitle>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
 
   <ItemGroup Condition="$(TargetFramework) == 'net472'">
diff --git a/src/StructuredLogViewer/app.manifest b/src/StructuredLogViewer/app.manifest
new file mode 100644
index 000000000..5f7bebf3d
--- /dev/null
+++ b/src/StructuredLogViewer/app.manifest
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+    <asmv3:application>
+      <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2024/WindowsSettings">
+        <supportedArchitectures>amd64 arm64</supportedArchitectures>
+      </asmv3:windowsSettings>
+    </asmv3:application>
+
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>
+</assembly>
diff --git a/src/TaskRunner/TaskRunner.csproj b/src/TaskRunner/TaskRunner.csproj
index 2912b7d13..9717a4933 100644
--- a/src/TaskRunner/TaskRunner.csproj
+++ b/src/TaskRunner/TaskRunner.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>net472;net7.0</TargetFrameworks>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
 
   <PropertyGroup Condition="$(TargetFramework) == 'net472'">
diff --git a/src/TaskRunner/app.manifest b/src/TaskRunner/app.manifest
new file mode 100644
index 000000000..44c3db52c
--- /dev/null
+++ b/src/TaskRunner/app.manifest
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+    <asmv3:application>
+      <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2024/WindowsSettings">
+        <supportedArchitectures>amd64 arm64</supportedArchitectures>
+      </asmv3:windowsSettings>
+    </asmv3:application>
+</assembly>

From 21b35672dd28142767ba892762d343b8858c9a6f Mon Sep 17 00:00:00 2001
From: Kirill Osenkov <KirillOsenkov@users.noreply.github.com>
Date: Wed, 6 Mar 2024 18:19:25 -0800
Subject: [PATCH 2/3] Update src/StructuredLogViewer/app.manifest

---
 src/StructuredLogViewer/app.manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/StructuredLogViewer/app.manifest b/src/StructuredLogViewer/app.manifest
index 5f7bebf3d..972ed5ed5 100644
--- a/src/StructuredLogViewer/app.manifest
+++ b/src/StructuredLogViewer/app.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <assemblyIdentity version="1.0.0.0" name="MSBuildStructuredLog.StructuredLogViewer" />
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">

From d63a0fbae27c771c039d7767bba52a17616b2809 Mon Sep 17 00:00:00 2001
From: Kirill Osenkov <KirillOsenkov@users.noreply.github.com>
Date: Wed, 6 Mar 2024 18:19:53 -0800
Subject: [PATCH 3/3] Update src/TaskRunner/app.manifest

---
 src/TaskRunner/app.manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TaskRunner/app.manifest b/src/TaskRunner/app.manifest
index 44c3db52c..818db8782 100644
--- a/src/TaskRunner/app.manifest
+++ b/src/TaskRunner/app.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <assemblyIdentity version="1.0.0.0" name="MSBuildStructuredLog.TaskRunner" />
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">