Undo change

Author: MartinZikmund

MultiTarget/UseUnoWinUI.ps1

@@ -11,12 +11,14 @@ function ApplyWinUISwap([string] $filePath) {
         $fileContents = $fileContents -replace '<WinUIMajorVersion>2</WinUIMajorVersion>', '<WinUIMajorVersion>3</WinUIMajorVersion>';
         $fileContents = $fileContents -replace '<PackageIdVariant>Uwp</PackageIdVariant>', '<PackageIdVariant>WinUI</PackageIdVariant>';
         $fileContents = $fileContents -replace '<DependencyVariant>Uwp</DependencyVariant>', '<DependencyVariant>WinUI</DependencyVariant>';
+        $fileContents = $fileContents -replace 'Uno.UI', 'Uno.WinUI';
     }
 
     if ($winUIMajorVersion -eq "2") {
         $fileContents = $fileContents -replace '<WinUIMajorVersion>3</WinUIMajorVersion>', '<WinUIMajorVersion>2</WinUIMajorVersion>';
         $fileContents = $fileContents -replace '<PackageIdVariant>WinUI</PackageIdVariant>', '<PackageIdVariant>Uwp</PackageIdVariant>';
         $fileContents = $fileContents -replace '<DependencyVariant>WinUI</DependencyVariant>', '<DependencyVariant>Uwp</DependencyVariant>';
+        $fileContents = $fileContents -replace 'Uno.WinUI', 'Uno.UI';
     }
 
     Set-Content -Force -Path $filePath -Value $fileContents;

ProjectHeads/App.Head.Uno.props

@@ -28,6 +28,5 @@
       This import must be inside THIS file to allow swapping between Uno.UI and Uno.WinUI via pwsh.
       Changes to this file are suppressed by git when switching to avoid changing the default for all users.
   -->
-  <Import Project="$(MSBuildThisFileDirectory)\App.Head.Uno.WinUI.Dependencies.props" Condition="'$(WinUIMajorVersion)' != '2'" />
-  <Import Project="$(MSBuildThisFileDirectory)\App.Head.Uno.UI.Dependencies.props" Condition="'$(WinUIMajorVersion)' == '2'" />
+  <Import Project="$(MSBuildThisFileDirectory)\App.Head.Uno.WinUI.Dependencies.props" />
 </Project>