diff --git a/MultiTarget/UseUnoWinUI.ps1 b/MultiTarget/UseUnoWinUI.ps1
index 0174224a..7b419a43 100644
--- a/MultiTarget/UseUnoWinUI.ps1
+++ b/MultiTarget/UseUnoWinUI.ps1
@@ -1,38 +1,23 @@
Param (
[Parameter(HelpMessage = "The WinUI version to use when building an Uno head.", Mandatory = $true)]
[ValidateSet('2', '3')]
- [string]$winUIMajorVersion,
-
- [Parameter(HelpMessage = "Disables suppressing changes to the affected files in git, allowing changes to be committed.")]
- [switch]$allowGitChanges = $false
+ [string]$winUIMajorVersion
)
-# Suppress git warning "core.useBuiltinFSMonitor will be deprecated soon; use core.fsmonitor instead"
-& git config advice.useCoreFSMonitorConfig false;
-
-function SupressOrAllowChanges([string] $filePath) {
- if ($allowGitChanges.IsPresent) {
- git update-index --no-assume-unchanged $filePath
- }
- else {
- git update-index --assume-unchanged $filePath
- }
-}
-
function ApplyWinUISwap([string] $filePath) {
- SupressOrAllowChanges $filePath;
-
$fileContents = Get-Content -Path $filePath;
if ($winUIMajorVersion -eq "3") {
$fileContents = $fileContents -replace '2', '3';
$fileContents = $fileContents -replace 'Uwp', 'WinUI';
+ $fileContents = $fileContents -replace 'Uwp', 'WinUI';
$fileContents = $fileContents -replace 'Uno.UI', 'Uno.WinUI';
}
if ($winUIMajorVersion -eq "2") {
$fileContents = $fileContents -replace '3', '2';
$fileContents = $fileContents -replace 'WinUI', 'Uwp';
+ $fileContents = $fileContents -replace 'WinUI', 'Uwp';
$fileContents = $fileContents -replace 'Uno.WinUI', 'Uno.UI';
}
@@ -40,17 +25,10 @@ function ApplyWinUISwap([string] $filePath) {
Write-Output "Updated $(Resolve-Path -Relative $filePath)"
}
-Write-Output "Switching to WinUI $winUIMajorVersion";
+Write-Output "Switching Uno to WinUI $winUIMajorVersion";
ApplyWinUISwap $PSScriptRoot/../ProjectHeads/App.Head.Uno.props
ApplyWinUISwap $PSScriptRoot/PackageReferences/Uno.props
ApplyWinUISwap $PSScriptRoot/WinUI.TargetVersion.props
-if ($allowGitChanges.IsPresent) {
- Write-Warning "Changes to the default Uno package settings in Labs can now be committed.`r`nRun this command again without -allowGitChanges to disable committing further changes.";
-}
-else {
- Write-Output "Changes to the default Uno package settings in Labs are now suppressed.`r`nTo switch branches, run `"git reset --hard`" with a clean working tree.";
-}
-
-Write-Output "Done, switched to WinUI $winUIMajorVersion"
\ No newline at end of file
+Write-Output "Done. Please close and regenerate your solution. Do not commit these changes to the tooling repository."
\ No newline at end of file
diff --git a/ProjectHeads/App.Head.Uno.UI.Dependencies.props b/ProjectHeads/App.Head.Uno.UI.Dependencies.props
index addd0543..960a1391 100644
--- a/ProjectHeads/App.Head.Uno.UI.Dependencies.props
+++ b/ProjectHeads/App.Head.Uno.UI.Dependencies.props
@@ -1,11 +1,10 @@
-
-
-
-
-
+
+
+
+
diff --git a/ProjectHeads/App.Head.Uno.WinUI.Dependencies.props b/ProjectHeads/App.Head.Uno.WinUI.Dependencies.props
index b7adf481..0d911d78 100644
--- a/ProjectHeads/App.Head.Uno.WinUI.Dependencies.props
+++ b/ProjectHeads/App.Head.Uno.WinUI.Dependencies.props
@@ -1,9 +1,8 @@
-
-
-
-
-
+
+
+
+
diff --git a/ProjectHeads/App.Head.Uno.props b/ProjectHeads/App.Head.Uno.props
index c24bdac6..dd40b927 100644
--- a/ProjectHeads/App.Head.Uno.props
+++ b/ProjectHeads/App.Head.Uno.props
@@ -1,12 +1,16 @@
-
-
-
+
+ Uwp
+
-
-
+
+
+
+
+
+
diff --git a/ProjectHeads/App.Head.Uwp.Dependencies.props b/ProjectHeads/App.Head.Uwp.Dependencies.props
index 6a58a487..0ab4698d 100644
--- a/ProjectHeads/App.Head.Uwp.Dependencies.props
+++ b/ProjectHeads/App.Head.Uwp.Dependencies.props
@@ -1,10 +1,9 @@
-
-
-
-
-
-
+
+
+
+
+
diff --git a/ProjectHeads/App.Head.Uwp.props b/ProjectHeads/App.Head.Uwp.props
index 807b4eb7..3a79f60b 100644
--- a/ProjectHeads/App.Head.Uwp.props
+++ b/ProjectHeads/App.Head.Uwp.props
@@ -3,9 +3,10 @@
$(UwpTargetFramework)
+ Uwp
-
+
diff --git a/ProjectHeads/App.Head.WinAppSdk.Dependencies.props b/ProjectHeads/App.Head.WinAppSdk.Dependencies.props
index cbb98ffa..154d4526 100644
--- a/ProjectHeads/App.Head.WinAppSdk.Dependencies.props
+++ b/ProjectHeads/App.Head.WinAppSdk.Dependencies.props
@@ -1,9 +1,8 @@
-
-
-
-
-
+
+
+
+
diff --git a/ProjectHeads/App.Head.WinAppSdk.props b/ProjectHeads/App.Head.WinAppSdk.props
index ebf8e8fa..cd101a86 100644
--- a/ProjectHeads/App.Head.WinAppSdk.props
+++ b/ProjectHeads/App.Head.WinAppSdk.props
@@ -1,4 +1,8 @@
+
+ WinUI
+
+
diff --git a/ProjectHeads/App.Head.props b/ProjectHeads/App.Head.props
index 7a8c59d2..af5b586f 100644
--- a/ProjectHeads/App.Head.props
+++ b/ProjectHeads/App.Head.props
@@ -22,6 +22,20 @@
true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -50,7 +64,7 @@
-
+