From 7625fcd11a8696fd4e18cf119f75473d5b8edcec Mon Sep 17 00:00:00 2001
From: Jared Irwin <jrairwin@sympatico.ca>
Date: Tue, 28 Jul 2026 17:53:17 -0400
Subject: [PATCH 1/2] Add base

---
 .../package/TerminalControl.nuspec            | 46 +++++++++++++++++++
 .../Microsoft.Windows.Terminal.Control.props  |  9 ++++
 ...Microsoft.Windows.Terminal.Control.targets | 21 +++++++++
 .../Microsoft.Windows.Terminal.Control.props  |  4 ++
 ...Microsoft.Windows.Terminal.Control.targets |  8 ++++
 5 files changed, 88 insertions(+)
 create mode 100644 src/cascadia/TerminalControl/package/TerminalControl.nuspec
 create mode 100644 src/cascadia/TerminalControl/package/managed/Microsoft.Windows.Terminal.Control.props
 create mode 100644 src/cascadia/TerminalControl/package/managed/Microsoft.Windows.Terminal.Control.targets
 create mode 100644 src/cascadia/TerminalControl/package/native/Microsoft.Windows.Terminal.Control.props
 create mode 100644 src/cascadia/TerminalControl/package/native/Microsoft.Windows.Terminal.Control.targets

diff --git a/src/cascadia/TerminalControl/package/TerminalControl.nuspec b/src/cascadia/TerminalControl/package/TerminalControl.nuspec
new file mode 100644
index 00000000000..fd50b020733
--- /dev/null
+++ b/src/cascadia/TerminalControl/package/TerminalControl.nuspec
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package>
+  <metadata>
+    <id>Microsoft.Windows.Terminal.Control</id>
+    <version>0.0.1</version>
+    <authors>Microsoft</authors>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <license type="expression">MIT</license>
+    <projectUrl>https://github.com/microsoft/terminal</projectUrl>
+    <description>This package allows applications to host Windows Terminal sessions. It should work on all versions of Windows 10.0.17763.0 and above.</description>
+    <copyright>© Microsoft Corporation</copyright>
+    <dependencies />
+  </metadata>
+  <files>
+    <file src="managed/Microsoft.Windows.Terminal.Control.props" target="build" />
+    <file src="managed/Microsoft.Windows.Terminal.Control.targets" target="build" />
+    <file src="native/Microsoft.Windows.Terminal.Control.props" target="build/native" />
+    <file src="native/Microsoft.Windows.Terminal.Control.targets" target="build/native" />
+
+    <file src="../../../../bin/x64/Release/Microsoft.Terminal.Control/Microsoft.Terminal.Control.winmd" target="metadata" />
+    <file src="../../../../bin/x64/Release/Microsoft.Terminal.UI/Microsoft.Terminal.UI.winmd" target="metadata" />
+    <file src="../../../../bin/x64/Release/TerminalConnection/Microsoft.Terminal.TerminalConnection.winmd" target="metadata" />
+    <file src="../../../../bin/x64/Release/TerminalCore/Microsoft.Terminal.Core.winmd" target="metadata" />
+
+    <file src="../../../../bin/Win32/Release/Microsoft.Terminal.Control/Microsoft.Terminal.Control.dll" target="runtimes/win-x86/native" />
+    <file src="../../../../bin/Win32/Release/Microsoft.Terminal.Control.Lib/Microsoft.Terminal.Control.pri" target="runtimes/win-x86/native" />
+    <file src="../../../../bin/Win32/Release/Microsoft.Terminal.UI/Microsoft.Terminal.UI.dll" target="runtimes/win-x86/native" />
+    <file src="../../../../bin/Win32/Release/Microsoft.Terminal.UI/Microsoft.Terminal.UI.pri" target="runtimes/win-x86/native" />
+    <file src="../../../../bin/Win32/Release/TerminalConnection/TerminalConnection.dll" target="runtimes/win-x86/native" />
+    <file src="../../../../bin/Win32/Release/TerminalConnection/Microsoft.Terminal.TerminalConnection.pri" target="runtimes/win-x86/native" />
+    
+    <file src="../../../../bin/x64/Release/Microsoft.Terminal.Control/Microsoft.Terminal.Control.dll" target="runtimes/win-x64/native" />
+    <file src="../../../../bin/x64/Release/Microsoft.Terminal.Control.Lib/Microsoft.Terminal.Control.pri" target="runtimes/win-x64/native" />
+    <file src="../../../../bin/x64/Release/Microsoft.Terminal.UI/Microsoft.Terminal.UI.dll" target="runtimes/win-x64/native" />
+    <file src="../../../../bin/x64/Release/Microsoft.Terminal.UI/Microsoft.Terminal.UI.pri" target="runtimes/win-x64/native" />
+    <file src="../../../../bin/x64/Release/TerminalConnection/TerminalConnection.dll" target="runtimes/win-x64/native" />
+    <file src="../../../../bin/x64/Release/TerminalConnection/Microsoft.Terminal.TerminalConnection.pri" target="runtimes/win-x64/native" />
+    
+    <file src="../../../../bin/ARM64/Release/Microsoft.Terminal.Control/Microsoft.Terminal.Control.dll" target="runtimes/win-arm64/native" />
+    <file src="../../../../bin/ARM64/Release/Microsoft.Terminal.Control.Lib/Microsoft.Terminal.Control.pri" target="runtimes/win-arm64/native" />
+    <file src="../../../../bin/ARM64/Release/Microsoft.Terminal.UI/Microsoft.Terminal.UI.dll" target="runtimes/win-arm64/native" />
+    <file src="../../../../bin/ARM64/Release/Microsoft.Terminal.UI/Microsoft.Terminal.UI.pri" target="runtimes/win-arm64/native" />
+    <file src="../../../../bin/ARM64/Release/TerminalConnection/TerminalConnection.dll" target="runtimes/win-arm64/native" />
+    <file src="../../../../bin/ARM64/Release/TerminalConnection/Microsoft.Terminal.TerminalConnection.pri" target="runtimes/win-arm64/native" />
+  </files>
+</package>
diff --git a/src/cascadia/TerminalControl/package/managed/Microsoft.Windows.Terminal.Control.props b/src/cascadia/TerminalControl/package/managed/Microsoft.Windows.Terminal.Control.props
new file mode 100644
index 00000000000..8781612c092
--- /dev/null
+++ b/src/cascadia/TerminalControl/package/managed/Microsoft.Windows.Terminal.Control.props
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <!-- C# uses normalizes PlatformTarget, whereas C++ does not normalize Platform -->
+    <TerminalNativePlatform Condition="'$(TerminalNativePlatform)'==''">$(PlatformTarget)</TerminalNativePlatform>
+    <TerminalNativePlatform Condition="'$(TerminalNativePlatform)'==''">$(Platform)</TerminalNativePlatform>
+    <TerminalNativePlatform Condition="'$(TerminalNativePlatform)'=='Win32'">x86</TerminalNativePlatform>
+  </PropertyGroup>
+</Project>
diff --git a/src/cascadia/TerminalControl/package/managed/Microsoft.Windows.Terminal.Control.targets b/src/cascadia/TerminalControl/package/managed/Microsoft.Windows.Terminal.Control.targets
new file mode 100644
index 00000000000..a395f36e1b4
--- /dev/null
+++ b/src/cascadia/TerminalControl/package/managed/Microsoft.Windows.Terminal.Control.targets
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <ItemGroup>
+        <Reference Include="$(MSBuildThisFileDirectory)..\metadata\Microsoft.Terminal.Core.winmd">
+            <WinMDFile>true</WinMDFile>
+            <Implementation>TerminalConnection.dll</Implementation>
+        </Reference>
+        <Reference Include="$(MSBuildThisFileDirectory)..\metadata\Microsoft.Terminal.TerminalConnection.winmd">
+            <WinMDFile>true</WinMDFile>
+            <Implementation>TerminalConnection.dll</Implementation>
+        </Reference>
+        <Reference Include="$(MSBuildThisFileDirectory)..\metadata\Microsoft.Terminal.UI.winmd">
+            <WinMDFile>true</WinMDFile>
+            <Implementation>Microsoft.Terminal.UI.dll</Implementation>
+        </Reference>
+        <Reference Include="$(MSBuildThisFileDirectory)..\metadata\Microsoft.Terminal.Control.winmd">
+            <WinMDFile>true</WinMDFile>
+            <Implementation>Microsoft.Terminal.Control.dll</Implementation>
+        </Reference>
+    </ItemGroup>
+</Project>
diff --git a/src/cascadia/TerminalControl/package/native/Microsoft.Windows.Terminal.Control.props b/src/cascadia/TerminalControl/package/native/Microsoft.Windows.Terminal.Control.props
new file mode 100644
index 00000000000..b1d80eec856
--- /dev/null
+++ b/src/cascadia/TerminalControl/package/native/Microsoft.Windows.Terminal.Control.props
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildThisFileDirectory)..\Microsoft.Windows.Terminal.Control.props" />
+</Project>
diff --git a/src/cascadia/TerminalControl/package/native/Microsoft.Windows.Terminal.Control.targets b/src/cascadia/TerminalControl/package/native/Microsoft.Windows.Terminal.Control.targets
new file mode 100644
index 00000000000..e8b440cbb3f
--- /dev/null
+++ b/src/cascadia/TerminalControl/package/native/Microsoft.Windows.Terminal.Control.targets
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildThisFileDirectory)..\Microsoft.Windows.Terminal.Control.targets" />
+  <ItemGroup>
+    <ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-$(TerminalNativePlatform)\native\*.dll" />
+    <ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-$(TerminalNativePlatform)\native\*.pri" />
+  </ItemGroup>
+</Project>

From 82846aa52d5a5c88e6966874fe57f3189a127161 Mon Sep 17 00:00:00 2001
From: Jared Irwin <jrairwin@sympatico.ca>
Date: Thu, 30 Jul 2026 19:00:10 -0400
Subject: [PATCH 2/2] Make it not error for C#

---
 .../package/TerminalControl.nuspec               |  8 ++++----
 .../Microsoft.Windows.Terminal.Control.targets   | 16 ----------------
 .../Microsoft.Windows.Terminal.Control.targets   | 16 ++++++++++++++++
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/cascadia/TerminalControl/package/TerminalControl.nuspec b/src/cascadia/TerminalControl/package/TerminalControl.nuspec
index fd50b020733..4fa8ed84b0d 100644
--- a/src/cascadia/TerminalControl/package/TerminalControl.nuspec
+++ b/src/cascadia/TerminalControl/package/TerminalControl.nuspec
@@ -17,10 +17,10 @@
     <file src="native/Microsoft.Windows.Terminal.Control.props" target="build/native" />
     <file src="native/Microsoft.Windows.Terminal.Control.targets" target="build/native" />
 
-    <file src="../../../../bin/x64/Release/Microsoft.Terminal.Control/Microsoft.Terminal.Control.winmd" target="metadata" />
-    <file src="../../../../bin/x64/Release/Microsoft.Terminal.UI/Microsoft.Terminal.UI.winmd" target="metadata" />
-    <file src="../../../../bin/x64/Release/TerminalConnection/Microsoft.Terminal.TerminalConnection.winmd" target="metadata" />
-    <file src="../../../../bin/x64/Release/TerminalCore/Microsoft.Terminal.Core.winmd" target="metadata" />
+    <file src="../../../../bin/x64/Release/Microsoft.Terminal.Control/Microsoft.Terminal.Control.winmd" target="lib\uap10.0" />
+    <file src="../../../../bin/x64/Release/Microsoft.Terminal.UI/Microsoft.Terminal.UI.winmd" target="lib\uap10.0" />
+    <file src="../../../../bin/x64/Release/TerminalConnection/Microsoft.Terminal.TerminalConnection.winmd" target="lib\uap10.0" />
+    <file src="../../../../bin/x64/Release/TerminalCore/Microsoft.Terminal.Core.winmd" target="lib\uap10.0" />
 
     <file src="../../../../bin/Win32/Release/Microsoft.Terminal.Control/Microsoft.Terminal.Control.dll" target="runtimes/win-x86/native" />
     <file src="../../../../bin/Win32/Release/Microsoft.Terminal.Control.Lib/Microsoft.Terminal.Control.pri" target="runtimes/win-x86/native" />
diff --git a/src/cascadia/TerminalControl/package/managed/Microsoft.Windows.Terminal.Control.targets b/src/cascadia/TerminalControl/package/managed/Microsoft.Windows.Terminal.Control.targets
index a395f36e1b4..f2f998e137a 100644
--- a/src/cascadia/TerminalControl/package/managed/Microsoft.Windows.Terminal.Control.targets
+++ b/src/cascadia/TerminalControl/package/managed/Microsoft.Windows.Terminal.Control.targets
@@ -1,21 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <ItemGroup>
-        <Reference Include="$(MSBuildThisFileDirectory)..\metadata\Microsoft.Terminal.Core.winmd">
-            <WinMDFile>true</WinMDFile>
-            <Implementation>TerminalConnection.dll</Implementation>
-        </Reference>
-        <Reference Include="$(MSBuildThisFileDirectory)..\metadata\Microsoft.Terminal.TerminalConnection.winmd">
-            <WinMDFile>true</WinMDFile>
-            <Implementation>TerminalConnection.dll</Implementation>
-        </Reference>
-        <Reference Include="$(MSBuildThisFileDirectory)..\metadata\Microsoft.Terminal.UI.winmd">
-            <WinMDFile>true</WinMDFile>
-            <Implementation>Microsoft.Terminal.UI.dll</Implementation>
-        </Reference>
-        <Reference Include="$(MSBuildThisFileDirectory)..\metadata\Microsoft.Terminal.Control.winmd">
-            <WinMDFile>true</WinMDFile>
-            <Implementation>Microsoft.Terminal.Control.dll</Implementation>
-        </Reference>
     </ItemGroup>
 </Project>
diff --git a/src/cascadia/TerminalControl/package/native/Microsoft.Windows.Terminal.Control.targets b/src/cascadia/TerminalControl/package/native/Microsoft.Windows.Terminal.Control.targets
index e8b440cbb3f..05ea156f79d 100644
--- a/src/cascadia/TerminalControl/package/native/Microsoft.Windows.Terminal.Control.targets
+++ b/src/cascadia/TerminalControl/package/native/Microsoft.Windows.Terminal.Control.targets
@@ -2,6 +2,22 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildThisFileDirectory)..\Microsoft.Windows.Terminal.Control.targets" />
   <ItemGroup>
+    <Reference Include="$(MSBuildThisFileDirectory)..\..\lib\uap10.0\Microsoft.Terminal.Core.winmd">
+        <WinMDFile>true</WinMDFile>
+        <Implementation>TerminalConnection.dll</Implementation>
+    </Reference>
+    <Reference Include="$(MSBuildThisFileDirectory)..\..\lib\uap10.0\Microsoft.Terminal.TerminalConnection.winmd">
+        <WinMDFile>true</WinMDFile>
+        <Implementation>TerminalConnection.dll</Implementation>
+    </Reference>
+    <Reference Include="$(MSBuildThisFileDirectory)..\..\lib\uap10.0\Microsoft.Terminal.UI.winmd">
+        <WinMDFile>true</WinMDFile>
+        <Implementation>Microsoft.Terminal.UI.dll</Implementation>
+    </Reference>
+    <Reference Include="$(MSBuildThisFileDirectory)..\..\lib\uap10.0\Microsoft.Terminal.Control.winmd">
+        <WinMDFile>true</WinMDFile>
+        <Implementation>Microsoft.Terminal.Control.dll</Implementation>
+    </Reference>
     <ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-$(TerminalNativePlatform)\native\*.dll" />
     <ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-$(TerminalNativePlatform)\native\*.pri" />
   </ItemGroup>