From 6ce7b4ec97ba314cbfcf00401f25ffd654cc7884 Mon Sep 17 00:00:00 2001
From: Joshua Larkin <70237359+j0shuams@users.noreply.github.com>
Date: Mon, 24 May 2021 14:02:13 -0700
Subject: [PATCH] change name

---
 nuget/Microsoft.Windows.CsWinRT.nuspec        |  2 +-
 nuget/Microsoft.Windows.CsWinRT.targets       | 27 +++++++++----------
 src/Directory.Build.props                     |  4 +--
 .../CecilExtensions.cs                        |  0
 .../FolderAssemblyResolver.cs                 |  0
 .../GuidPatcher.cs                            |  0
 .../IIDOptimizer.csproj}                      |  0
 .../{GuidPatch => IIDOptimizer}/Program.cs    |  4 +--
 .../SignatureEmitter.cs                       |  0
 .../SignatureGenerator.cs                     |  0
 src/Tests/AuthoringTest/AuthoringTest.csproj  |  2 +-
 .../DiagnosticTests/DiagnosticTests.csproj    |  2 +-
 src/Tests/UnitTest/UnitTest.csproj            |  2 +-
 src/build.cmd                                 |  2 +-
 src/cswinrt.sln                               |  2 +-
 15 files changed, 22 insertions(+), 25 deletions(-)
 rename src/Perf/{GuidPatch => IIDOptimizer}/CecilExtensions.cs (100%)
 rename src/Perf/{GuidPatch => IIDOptimizer}/FolderAssemblyResolver.cs (100%)
 rename src/Perf/{GuidPatch => IIDOptimizer}/GuidPatcher.cs (100%)
 rename src/Perf/{GuidPatch/GuidPatch.csproj => IIDOptimizer/IIDOptimizer.csproj} (100%)
 rename src/Perf/{GuidPatch => IIDOptimizer}/Program.cs (87%)
 rename src/Perf/{GuidPatch => IIDOptimizer}/SignatureEmitter.cs (100%)
 rename src/Perf/{GuidPatch => IIDOptimizer}/SignatureGenerator.cs (100%)

diff --git a/nuget/Microsoft.Windows.CsWinRT.nuspec b/nuget/Microsoft.Windows.CsWinRT.nuspec
index ece678b30..a6308d9f3 100644
--- a/nuget/Microsoft.Windows.CsWinRT.nuspec
+++ b/nuget/Microsoft.Windows.CsWinRT.nuspec
@@ -34,6 +34,6 @@
     <file src="$winrt_host_arm$" target ="runtimes\win-arm\native"/>
     <file src="$winrt_host_arm64$" target ="runtimes\win-arm64\native"/>
     <file src="$winrt_shim$" target ="lib\net5.0\"/>
-    <file src="$guid_patch$" target ="build\tools\GuidPatch"/>
+    <file src="$guid_patch$" target ="build\tools\IIDOptimizer"/>
   </files>
 </package>
diff --git a/nuget/Microsoft.Windows.CsWinRT.targets b/nuget/Microsoft.Windows.CsWinRT.targets
index 4e2697f35..1aab5764b 100644
--- a/nuget/Microsoft.Windows.CsWinRT.targets
+++ b/nuget/Microsoft.Windows.CsWinRT.targets
@@ -148,34 +148,31 @@ $(CsWinRTFilters)
   </Target>
 
   <!-- Call The GuidPatch tool on the projection .dll -->
-  <Target Name="CsWinRTInvokeGuidPatcher" Condition="'$(CsWinRTGuidPatchOptOut)' != 'true'" AfterTargets="Compile" BeforeTargets="Link">
+  <Target Name="CsWinRTInvokeGuidPatcher" Condition="'$(CsWinRTIIDOptimizerOptOut)' != 'true'" AfterTargets="Compile" BeforeTargets="Link">
 
-    <!-- You can use a Directory.Build.props file to set two properties as the path to the patcher and the winrt.runtime used
-          - CsWinRTGuidPatchPath
-          - CsWinRTGuidPatchRuntimeDll
-    -->
-    <Message Text="CsWinRTGuidPatchPath = $(CsWinRTGuidPatchPath)"/>
-    <Message Text="CsWinRTGuidPatchRuntimePath = $(CsWinRTGuidPatchRuntimePath)"/>
+    <!-- todo: cut in final commi, for debugging only  -->
+    <Message Text="CsWinRTIIDOptimizerPath = $(CsWinRTIIDOptimizerPath)"/>
+    <Message Text="CsWinRTIIDOptimizerRuntimePath = $(CsWinRTIIDOptimizerRuntimePath)"/>
 
-    <!-- We condition on CsWinRTGuidPatchPath and CsWinRTGuidPatchRuntimeDll in case we are doing a local (CsWinRT repo) build -->
+    <!-- We condition on CsWinRTIIDOptimizerPath and CsWinRTIIDOptimizerRuntimeDll in case we are doing a local (CsWinRT repo) build -->
     <PropertyGroup>
-      <CsWinRTGuidPatchExePath Condition="'$(CsWinRTGuidPatchPath)' != ''">$(CsWinRTGuidPatchPath)</CsWinRTGuidPatchExePath>
-      <CsWinRTGuidPatchRuntimeDll Condition="'$(CsWinRTGuidPatchRuntimePath)' != ''">$(CsWinRTGuidPatchRuntimePath)</CsWinRTGuidPatchRuntimeDll> 
+      <CsWinRTIIDOptimizerExePath Condition="'$(CsWinRTIIDOptimizerPath)' != ''">$(CsWinRTIIDOptimizerPath)</CsWinRTIIDOptimizerExePath>
+      <CsWinRTIIDOptimizerRuntimeDll Condition="'$(CsWinRTIIDOptimizerRuntimePath)' != ''">$(CsWinRTIIDOptimizerRuntimePath)</CsWinRTIIDOptimizerRuntimeDll> 
 
-      <CsWinRTGuidPatchExePath Condition="'$(CsWinRTGuidPatchPath)' == ''">$(CsWinRTPath)build\tools\GuidPatch\</CsWinRTGuidPatchExePath>
-      <CsWinRTGuidPatchRuntimeDll Condition="'$(CsWinRTGuidPatchRuntimePath)' == ''">$(CsWinRTPath)lib\net5.0\</CsWinRTGuidPatchRuntimeDll> 
+      <CsWinRTIIDOptimizerExePath Condition="'$(CsWinRTIIDOptimizerPath)' == ''">$(CsWinRTPath)build\tools\GuidPatch\</CsWinRTIIDOptimizerExePath>
+      <CsWinRTIIDOptimizerRuntimeDll Condition="'$(CsWinRTIIDOptimizerRuntimePath)' == ''">$(CsWinRTPath)lib\net5.0\</CsWinRTIIDOptimizerRuntimeDll> 
 
       <!-- Below "BuildProjectOutputGroupKeyOutput" is using the obj folder, reconsider... -->
-      <CsWinRTGuidPatchInput Condition="'$(CsWinRTGuidPatchInput)' == ''">@(BuiltProjectOutputGroupKeyOutput->'%(Identity)')</CsWinRTGuidPatchInput>
+      <CsWinRTIIDOptimizerInput Condition="'$(CsWinRTIIDOptimizerInput)' == ''">@(BuiltProjectOutputGroupKeyOutput->'%(Identity)')</CsWinRTIIDOptimizerInput>
     </PropertyGroup>
     
-    <Exec Command="$(CsWinRTGuidPatchExePath)GuidPatch.exe $(CsWinRTGuidPatchInput) $(CsWinRTGuidPatchRuntimeDll)" 
+    <Exec Command="$(CsWinRTIIDOptimizerExePath)IIDOptimizer.exe $(CsWinRTIIDOptimizerInput) $(CsWinRTIIDOptimizerRuntimeDll)" 
           ConsoleToMsBuild="true">
       <Output TaskParameter="ConsoleOutput" PropertyName="CsWinRTGuidPatchOutput" />
     </Exec>
     
     <ItemGroup>
-      <CsWinRTGuidPatchedFiles Include="$(MSBuildProjectDirectory)\obj\GuidPatcherOutput\*.dll" />
+      <CsWinRTGuidPatchedFiles Include="$(MSBuildProjectDirectory)\obj\IIDOptimizer\*.dll" />
     </ItemGroup>
     
     <!--  Replace the .dll in the output folder with the optimized version we just made -->
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 5761008cf..6043c4aee 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -27,8 +27,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <CsWinRTGuidPatchPath>$(MSBuildThisFileDirectory)Perf\GuidPatch\bin\$(Platform)\$(Configuration)\net5.0\</CsWinRTGuidPatchPath>
-    <CsWinRTGuidPatchRuntimePath>$(MSBuildThisFileDirectory)WinRT.Runtime\bin\$(Configuration)\net5.0\</CsWinRTGuidPatchRuntimePath>
+    <CsWinRTIIDOptimizerPath>$(MSBuildThisFileDirectory)Perf\IIDOptimizer\bin\$(Configuration)\net5.0\</CsWinRTIIDOptimizerPath>
+    <CsWinRTIIDOptimizerRuntimePath>$(MSBuildThisFileDirectory)WinRT.Runtime\bin\$(Configuration)\net5.0\</CsWinRTIIDOptimizerRuntimePath>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Perf/GuidPatch/CecilExtensions.cs b/src/Perf/IIDOptimizer/CecilExtensions.cs
similarity index 100%
rename from src/Perf/GuidPatch/CecilExtensions.cs
rename to src/Perf/IIDOptimizer/CecilExtensions.cs
diff --git a/src/Perf/GuidPatch/FolderAssemblyResolver.cs b/src/Perf/IIDOptimizer/FolderAssemblyResolver.cs
similarity index 100%
rename from src/Perf/GuidPatch/FolderAssemblyResolver.cs
rename to src/Perf/IIDOptimizer/FolderAssemblyResolver.cs
diff --git a/src/Perf/GuidPatch/GuidPatcher.cs b/src/Perf/IIDOptimizer/GuidPatcher.cs
similarity index 100%
rename from src/Perf/GuidPatch/GuidPatcher.cs
rename to src/Perf/IIDOptimizer/GuidPatcher.cs
diff --git a/src/Perf/GuidPatch/GuidPatch.csproj b/src/Perf/IIDOptimizer/IIDOptimizer.csproj
similarity index 100%
rename from src/Perf/GuidPatch/GuidPatch.csproj
rename to src/Perf/IIDOptimizer/IIDOptimizer.csproj
diff --git a/src/Perf/GuidPatch/Program.cs b/src/Perf/IIDOptimizer/Program.cs
similarity index 87%
rename from src/Perf/GuidPatch/Program.cs
rename to src/Perf/IIDOptimizer/Program.cs
index 8b128e284..0e1eb9b9e 100644
--- a/src/Perf/GuidPatch/Program.cs
+++ b/src/Perf/IIDOptimizer/Program.cs
@@ -27,8 +27,8 @@ static void Main(string[] args)
                         resolver,
                         winRTRuntimeAssembly);
                     int numPatches = guidPatcher.ProcessAssembly();
-                    Directory.CreateDirectory("obj\\GuidPatcherOutput");
-                    guidPatcher.SaveAssembly("obj\\GuidPatcherOutput");
+                    Directory.CreateDirectory("obj\\IIDOptimizer");
+                    guidPatcher.SaveAssembly("obj\\IIDOptimizer");
                     Console.WriteLine($"{numPatches} IID calculations/fetches patched");
                 }
                 catch (AssemblyResolutionException)
diff --git a/src/Perf/GuidPatch/SignatureEmitter.cs b/src/Perf/IIDOptimizer/SignatureEmitter.cs
similarity index 100%
rename from src/Perf/GuidPatch/SignatureEmitter.cs
rename to src/Perf/IIDOptimizer/SignatureEmitter.cs
diff --git a/src/Perf/GuidPatch/SignatureGenerator.cs b/src/Perf/IIDOptimizer/SignatureGenerator.cs
similarity index 100%
rename from src/Perf/GuidPatch/SignatureGenerator.cs
rename to src/Perf/IIDOptimizer/SignatureGenerator.cs
diff --git a/src/Tests/AuthoringTest/AuthoringTest.csproj b/src/Tests/AuthoringTest/AuthoringTest.csproj
index 15b74ec74..5463316af 100644
--- a/src/Tests/AuthoringTest/AuthoringTest.csproj
+++ b/src/Tests/AuthoringTest/AuthoringTest.csproj
@@ -7,7 +7,7 @@
     <!-- Enable to diagnose generation issues -->
     <!-- <CsWinRTEnableLogging>true</CsWinRTEnableLogging> -->
     <!-- <CsWinRTKeepGeneratedSources>true</CsWinRTKeepGeneratedSources> -->
-    <CsWinRTGuidPatchOptOut>true</CsWinRTGuidPatchOptOut>
+    <CsWinRTIIDOptimizerOptOut>true</CsWinRTIIDOptimizerOptOut>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Tests/DiagnosticTests/DiagnosticTests.csproj b/src/Tests/DiagnosticTests/DiagnosticTests.csproj
index af58aa1cc..e7af4f914 100644
--- a/src/Tests/DiagnosticTests/DiagnosticTests.csproj
+++ b/src/Tests/DiagnosticTests/DiagnosticTests.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net5.0-windows10.0.19041.0</TargetFramework>
     <IsPackable>false</IsPackable>
-    <CsWinRTGuidPatchOptOut>true</CsWinRTGuidPatchOptOut>
+    <CsWinRTIIDOptimizerOptOut>true</CsWinRTIIDOptimizerOptOut>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Tests/UnitTest/UnitTest.csproj b/src/Tests/UnitTest/UnitTest.csproj
index b39ff05df..a00ffb573 100644
--- a/src/Tests/UnitTest/UnitTest.csproj
+++ b/src/Tests/UnitTest/UnitTest.csproj
@@ -9,7 +9,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <SimulateCsWinRTNugetReference>true</SimulateCsWinRTNugetReference>
     <CsWinRTEnabled>false</CsWinRTEnabled>
-    <CsWinRTGuidPatchOptOut>true</CsWinRTGuidPatchOptOut>
+    <CsWinRTIIDOptimizerOptOut>true</CsWinRTIIDOptimizerOptOut>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/build.cmd b/src/build.cmd
index 1795869d9..d9ca387da 100644
--- a/src/build.cmd
+++ b/src/build.cmd
@@ -185,7 +185,7 @@ set net5_runtime=%this_dir%WinRT.Runtime\bin\%cswinrt_configuration%\net5.0\WinR
 set source_generator=%this_dir%Authoring\WinRT.SourceGenerator\bin\%cswinrt_configuration%\netstandard2.0\WinRT.SourceGenerator.dll
 set winrt_host_%cswinrt_platform%=%this_dir%_build\%cswinrt_platform%\%cswinrt_configuration%\WinRT.Host\bin\WinRT.Host.dll
 set winrt_shim=%this_dir%Authoring\WinRT.Host.Shim\bin\%cswinrt_configuration%\net5.0\WinRT.Host.Shim.dll
-set guid_patch=%this_dir%Perf\GuidPatch\bin\%cswinrt_platform%\%cswinrt_configuration%\net5.0\*.*
+set guid_patch=%this_dir%Perf\IIDOptimizer\bin\%cswinrt_configuration%\net5.0\*.*
 echo Creating nuget package
 call :exec %nuget_dir%\nuget pack %this_dir%..\nuget\Microsoft.Windows.CsWinRT.nuspec -Properties cswinrt_exe=%cswinrt_exe%;netstandard2_runtime=%netstandard2_runtime%;net5_runtime=%net5_runtime%;source_generator=%source_generator%;cswinrt_nuget_version=%cswinrt_version_string%;winrt_host_x86=%winrt_host_x86%;winrt_host_x64=%winrt_host_x64%;winrt_host_arm=%winrt_host_arm%;winrt_host_arm64=%winrt_host_arm64%;winrt_shim=%winrt_shim%;guid_patch=%guid_patch% -OutputDirectory %cswinrt_bin_dir% -NonInteractive -Verbosity Detailed -NoPackageAnalysis
 goto :eof
diff --git a/src/cswinrt.sln b/src/cswinrt.sln
index 0f0219794..57e0e2f1f 100644
--- a/src/cswinrt.sln
+++ b/src/cswinrt.sln
@@ -101,7 +101,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AuthoringWinUITest", "Tests
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Perf", "Perf", "{539DBDEF-3B49-4503-9BD3-7EB83C2179CB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GuidPatch", "Perf\GuidPatch\GuidPatch.csproj", "{AE3B0611-2FBB-42AB-A245-B4E79868A5F9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIDOptimizer", "Perf\IIDOptimizer\IIDOptimizer.csproj", "{AE3B0611-2FBB-42AB-A245-B4E79868A5F9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution