From b3601ab8d3de50d93e40bb7ed8c8687aee6302fb Mon Sep 17 00:00:00 2001
From: Mike Griese <migrie@microsoft.com>
Date: Tue, 5 Jan 2021 08:43:51 -0600
Subject: [PATCH] some project cleanup

---
 .../CommandlineArgs/AppCommandlineArgs.h      |  1 +
 .../CommandlineArgs/CommandlineArgs.vcxproj   |  8 ----
 .../CommandlineArgs/PlaceholderType.cpp       | 10 -----
 .../CommandlineArgs/PlaceholderType.h         | 37 -------------------
 .../CommandlineArgs/PlaceholderType.idl       | 21 -----------
 .../TerminalApp/TerminalAppLib.vcxproj        |  6 ++-
 src/cascadia/TerminalApp/pch.h                |  2 -
 7 files changed, 6 insertions(+), 79 deletions(-)
 delete mode 100644 src/cascadia/CommandlineArgs/PlaceholderType.cpp
 delete mode 100644 src/cascadia/CommandlineArgs/PlaceholderType.h
 delete mode 100644 src/cascadia/CommandlineArgs/PlaceholderType.idl

diff --git a/src/cascadia/CommandlineArgs/AppCommandlineArgs.h b/src/cascadia/CommandlineArgs/AppCommandlineArgs.h
index 984a2b123d6..c33b1f7bded 100644
--- a/src/cascadia/CommandlineArgs/AppCommandlineArgs.h
+++ b/src/cascadia/CommandlineArgs/AppCommandlineArgs.h
@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 #pragma once
 
+#include <CLI11/CLI11.hpp>
 #include "Commandline.h"
 
 #ifdef UNIT_TESTING
diff --git a/src/cascadia/CommandlineArgs/CommandlineArgs.vcxproj b/src/cascadia/CommandlineArgs/CommandlineArgs.vcxproj
index f276aa6deba..a6f3a93d532 100644
--- a/src/cascadia/CommandlineArgs/CommandlineArgs.vcxproj
+++ b/src/cascadia/CommandlineArgs/CommandlineArgs.vcxproj
@@ -27,9 +27,6 @@
     <ClInclude Include="AppCommandlineArgs.h" />
     <ClInclude Include="Commandline.h" />
     <ClInclude Include="pch.h" />
-    <ClInclude Include="PlaceholderType.h">
-      <DependentUpon>PlaceholderType.idl</DependentUpon>
-    </ClInclude>
   </ItemGroup>
   <!-- ========================= Cpp Files ======================== -->
   <ItemGroup>
@@ -38,14 +35,9 @@
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="PlaceholderType.cpp">
-      <DependentUpon>PlaceholderType.idl</DependentUpon>
-    </ClCompile>
-    <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
   </ItemGroup>
   <!-- ========================= idl Files ======================== -->
   <ItemGroup>
-    <Midl Include="PlaceholderType.idl" />
   </ItemGroup>
   <!-- ========================= Misc Files ======================== -->
   <ItemGroup>
diff --git a/src/cascadia/CommandlineArgs/PlaceholderType.cpp b/src/cascadia/CommandlineArgs/PlaceholderType.cpp
deleted file mode 100644
index b5fd6b490dd..00000000000
--- a/src/cascadia/CommandlineArgs/PlaceholderType.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "PlaceholderType.h"
-#include "PlaceholderType.g.cpp"
-
-namespace winrt::Microsoft::Terminal::CommandlineArgs::implementation
-{
-}
diff --git a/src/cascadia/CommandlineArgs/PlaceholderType.h b/src/cascadia/CommandlineArgs/PlaceholderType.h
deleted file mode 100644
index c99a8b47974..00000000000
--- a/src/cascadia/CommandlineArgs/PlaceholderType.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation
-Licensed under the MIT license.
-
-Module Name:
-- PlaceholderType.h
-
-Abstract:
-- This class is just here to make our .wapproj play nicely with this project. If
-  we don't define any winrt types, then we won't generate a .winmd, and the
-  .wapproj will become _very_ mad at this project. So we'll use this placeholder
-  class just to trick cppwinrt into generating a winmd for us. If we ever _do_
-  add a real winrt type to this project, this can be removed.
-
-Author(s):
-- Mike Griese - May 2020
-
---*/
-#pragma once
-
-#include <conattrs.hpp>
-#include "PlaceholderType.g.h"
-#include "../../cascadia/inc/cppwinrt_utils.h"
-
-namespace winrt::Microsoft::Terminal::CommandlineArgs::implementation
-{
-    struct PlaceholderType : PlaceholderTypeT<PlaceholderType>
-    {
-        PlaceholderType() = default;
-        GETSET_PROPERTY(int32_t, Placeholder, 42);
-    };
-}
-
-namespace winrt::Microsoft::Terminal::CommandlineArgs::factory_implementation
-{
-    BASIC_FACTORY(PlaceholderType);
-}
diff --git a/src/cascadia/CommandlineArgs/PlaceholderType.idl b/src/cascadia/CommandlineArgs/PlaceholderType.idl
deleted file mode 100644
index 6a8818176db..00000000000
--- a/src/cascadia/CommandlineArgs/PlaceholderType.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-// This class is just here to make our .wapproj play nicely with this project.
-// If we don't define any winrt types, then we won't generate a .winmd, and the
-// .wapproj will become _very_ mad at this project. So we'll use this
-// placeholder class just to trick cppwinrt into generating a winmd for us. If
-// we ever _do_ add a real winrt type to this project, this can be removed.
-
-namespace Microsoft.Terminal.CommandlineArgs
-{
-    [default_interface] runtimeclass PlaceholderType {
-        PlaceholderType();
-        Int32 Placeholder
-        {
-            get;
-            set;
-        };
-    };
-
-}
diff --git a/src/cascadia/TerminalApp/TerminalAppLib.vcxproj b/src/cascadia/TerminalApp/TerminalAppLib.vcxproj
index 86d1f08cd6f..d8f964f3489 100644
--- a/src/cascadia/TerminalApp/TerminalAppLib.vcxproj
+++ b/src/cascadia/TerminalApp/TerminalAppLib.vcxproj
@@ -25,7 +25,8 @@
 
     <ClCompile>
       <!-- For CLI11: It uses dynamic_cast to cast types around, which depends
-      on being compiled with RTTI (/GR). -->
+      on being compiled with RTTI (/GR). We need this in this project, because
+      we're including the CLI11 header via the CommandlineArgs project. -->
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
     </ClCompile>
   </ItemDefinitionGroup>
@@ -287,6 +288,9 @@
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\CommandlineArgs\CommandlineArgs.vcxproj" >
       <Private>true</Private>
       <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+      <!-- Make sure to set ReferenceOutputAssembly=false, or we'll try and
+      MDMERGE with MUX from the CommandlineArgs output, and get duplicate type
+      errors everywhere. -->
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\WinRTUtils\WinRTUtils.vcxproj">
diff --git a/src/cascadia/TerminalApp/pch.h b/src/cascadia/TerminalApp/pch.h
index ccebea35414..aba4e6853a1 100644
--- a/src/cascadia/TerminalApp/pch.h
+++ b/src/cascadia/TerminalApp/pch.h
@@ -76,7 +76,5 @@ TRACELOGGING_DECLARE_PROVIDER(g_hTerminalAppProvider);
 
 #include <winrt/Windows.UI.Popups.h>
 
-#include <CLI11/CLI11.hpp>
-
 // Manually include til after we include Windows.Foundation to give it winrt superpowers
 #include "til.h"