From 2533a3498f98e1d99bfe28a8ee3b4c6fadb162ba Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 19 Jul 2022 17:47:09 -0500 Subject: [PATCH 01/11] Moved project identifiers into a new props file --- common/Labs.ProjectIdentifiers.props | 29 +++++++++++++++++++ common/Scripts/UseUnoWinUI.ps1 | 9 +++--- .../CanvasLayout.Samples.csproj | 1 + .../CanvasLayout.Wasm.csproj | 3 +- ...nityToolkit.Labs.WinUI.CanvasLayout.csproj | 1 + .../SizerBase.Samples.csproj | 1 + .../SizerBase.Wasm/SizerBase.Wasm.csproj | 1 + ...mmunityToolkit.Labs.WinUI.SizerBase.csproj | 1 + .../CommunityToolkit.Labs.Droid.csproj | 1 + .../CommunityToolkit.Labs.Skia.Gtk.csproj | 2 +- ...CommunityToolkit.Labs.Skia.Wpf.Host.csproj | 5 +++- .../CommunityToolkit.Labs.Skia.WPF.csproj | 2 +- .../CommunityToolkit.Labs.Wasm.csproj | 1 + .../CommunityToolkit.Labs.iOS.csproj | 1 + .../CommunityToolkit.Labs.macOS.csproj | 1 + .../ProjectTemplate.Samples.csproj | 1 + .../ProjectTemplate.Wasm.csproj | 1 + ...yToolkit.Labs.WinUI.ProjectTemplate.csproj | 1 + 18 files changed, 54 insertions(+), 8 deletions(-) create mode 100644 common/Labs.ProjectIdentifiers.props diff --git a/common/Labs.ProjectIdentifiers.props b/common/Labs.ProjectIdentifiers.props new file mode 100644 index 000000000..8432a1f49 --- /dev/null +++ b/common/Labs.ProjectIdentifiers.props @@ -0,0 +1,29 @@ + + + true + true + true + + true + true + true + + true + true + true + + true + true + true + + true + true + + true + + $(DefineConstants); + + Uwp + 2 + + diff --git a/common/Scripts/UseUnoWinUI.ps1 b/common/Scripts/UseUnoWinUI.ps1 index c050b0eac..5e785fbd4 100644 --- a/common/Scripts/UseUnoWinUI.ps1 +++ b/common/Scripts/UseUnoWinUI.ps1 @@ -3,7 +3,7 @@ Param ( [ValidateSet('2', '3')] [string]$winUIMajorVersion, - [Parameter(HelpMessage = "Disables suppressing changes to the Labs.Uno.props and Labs.Head.Uno.props files in git, allowing changes to be committed.")] + [Parameter(HelpMessage = "Disables suppressing changes to the affected files in git, allowing changes to be committed.")] [switch]$allowGitChanges = $false ) @@ -40,11 +40,12 @@ function ApplyWinUISwap([string] $filePath) { } Set-Content -Force -Path $filePath -Value $fileContents; + Write-Output "Updated $(Resolve-Path -Relative $filePath)" } - -ApplyWinUISwap $PSScriptRoot/../Labs.Head.Uno.props -ApplyWinUISwap $PSScriptRoot/../Labs.Uno.props +ApplyWinUISwap $PSScriptRoot\..\Labs.Head.Uno.props +ApplyWinUISwap $PSScriptRoot\..\Labs.Uno.props +ApplyWinUISwap $PSScriptRoot\..\Labs.ProjectIdentifiers.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."; diff --git a/labs/CanvasLayout/samples/CanvasLayout.Samples/CanvasLayout.Samples.csproj b/labs/CanvasLayout/samples/CanvasLayout.Samples/CanvasLayout.Samples.csproj index b0398a9fa..d9dadd648 100644 --- a/labs/CanvasLayout/samples/CanvasLayout.Samples/CanvasLayout.Samples.csproj +++ b/labs/CanvasLayout/samples/CanvasLayout.Samples/CanvasLayout.Samples.csproj @@ -1,6 +1,7 @@ + diff --git a/labs/CanvasLayout/samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj b/labs/CanvasLayout/samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj index 977cf256f..3e7180d61 100644 --- a/labs/CanvasLayout/samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj +++ b/labs/CanvasLayout/samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj @@ -1,9 +1,10 @@ - true + + diff --git a/labs/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj b/labs/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj index ca4d3b90d..cceca5957 100644 --- a/labs/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj +++ b/labs/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj @@ -1,6 +1,7 @@ + diff --git a/labs/SizerBase/samples/SizerBase.Samples/SizerBase.Samples.csproj b/labs/SizerBase/samples/SizerBase.Samples/SizerBase.Samples.csproj index 7ae88afbb..5b460836d 100644 --- a/labs/SizerBase/samples/SizerBase.Samples/SizerBase.Samples.csproj +++ b/labs/SizerBase/samples/SizerBase.Samples/SizerBase.Samples.csproj @@ -1,6 +1,7 @@ + diff --git a/labs/SizerBase/samples/SizerBase.Wasm/SizerBase.Wasm.csproj b/labs/SizerBase/samples/SizerBase.Wasm/SizerBase.Wasm.csproj index a9457fd26..707eb4578 100644 --- a/labs/SizerBase/samples/SizerBase.Wasm/SizerBase.Wasm.csproj +++ b/labs/SizerBase/samples/SizerBase.Wasm/SizerBase.Wasm.csproj @@ -4,6 +4,7 @@ true + diff --git a/labs/SizerBase/src/CommunityToolkit.Labs.WinUI.SizerBase.csproj b/labs/SizerBase/src/CommunityToolkit.Labs.WinUI.SizerBase.csproj index c7fb061f2..3b05a0bb0 100644 --- a/labs/SizerBase/src/CommunityToolkit.Labs.WinUI.SizerBase.csproj +++ b/labs/SizerBase/src/CommunityToolkit.Labs.WinUI.SizerBase.csproj @@ -1,6 +1,7 @@ + diff --git a/platforms/CommunityToolkit.Labs.Droid/CommunityToolkit.Labs.Droid.csproj b/platforms/CommunityToolkit.Labs.Droid/CommunityToolkit.Labs.Droid.csproj index 64ec8d6d3..e057c577f 100644 --- a/platforms/CommunityToolkit.Labs.Droid/CommunityToolkit.Labs.Droid.csproj +++ b/platforms/CommunityToolkit.Labs.Droid/CommunityToolkit.Labs.Droid.csproj @@ -8,6 +8,7 @@ true true + diff --git a/platforms/CommunityToolkit.Labs.Skia.Gtk/CommunityToolkit.Labs.Skia.Gtk.csproj b/platforms/CommunityToolkit.Labs.Skia.Gtk/CommunityToolkit.Labs.Skia.Gtk.csproj index 83fc6f3fc..a3e7838ad 100644 --- a/platforms/CommunityToolkit.Labs.Skia.Gtk/CommunityToolkit.Labs.Skia.Gtk.csproj +++ b/platforms/CommunityToolkit.Labs.Skia.Gtk/CommunityToolkit.Labs.Skia.Gtk.csproj @@ -1,13 +1,13 @@ - True False False true + diff --git a/platforms/CommunityToolkit.Labs.Skia.WPF.Host/CommunityToolkit.Labs.Skia.Wpf.Host.csproj b/platforms/CommunityToolkit.Labs.Skia.WPF.Host/CommunityToolkit.Labs.Skia.Wpf.Host.csproj index 30ac604b8..f0395c584 100644 --- a/platforms/CommunityToolkit.Labs.Skia.WPF.Host/CommunityToolkit.Labs.Skia.Wpf.Host.csproj +++ b/platforms/CommunityToolkit.Labs.Skia.WPF.Host/CommunityToolkit.Labs.Skia.Wpf.Host.csproj @@ -1,13 +1,16 @@ - + + False True False False + + diff --git a/platforms/CommunityToolkit.Labs.Skia.WPF/CommunityToolkit.Labs.Skia.WPF.csproj b/platforms/CommunityToolkit.Labs.Skia.WPF/CommunityToolkit.Labs.Skia.WPF.csproj index d49f2079b..a02c481b9 100644 --- a/platforms/CommunityToolkit.Labs.Skia.WPF/CommunityToolkit.Labs.Skia.WPF.csproj +++ b/platforms/CommunityToolkit.Labs.Skia.WPF/CommunityToolkit.Labs.Skia.WPF.csproj @@ -1,7 +1,6 @@ - False True @@ -10,6 +9,7 @@ true $(WpfLibTargetFramework) + diff --git a/platforms/CommunityToolkit.Labs.Wasm/CommunityToolkit.Labs.Wasm.csproj b/platforms/CommunityToolkit.Labs.Wasm/CommunityToolkit.Labs.Wasm.csproj index 913cc5e5e..b9c9136cd 100644 --- a/platforms/CommunityToolkit.Labs.Wasm/CommunityToolkit.Labs.Wasm.csproj +++ b/platforms/CommunityToolkit.Labs.Wasm/CommunityToolkit.Labs.Wasm.csproj @@ -4,6 +4,7 @@ true + diff --git a/platforms/CommunityToolkit.Labs.iOS/CommunityToolkit.Labs.iOS.csproj b/platforms/CommunityToolkit.Labs.iOS/CommunityToolkit.Labs.iOS.csproj index 22ddcf726..1dd75072d 100644 --- a/platforms/CommunityToolkit.Labs.iOS/CommunityToolkit.Labs.iOS.csproj +++ b/platforms/CommunityToolkit.Labs.iOS/CommunityToolkit.Labs.iOS.csproj @@ -8,6 +8,7 @@ true true + diff --git a/platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj b/platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj index 8ad08b623..74cd5fc86 100644 --- a/platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj +++ b/platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj @@ -8,6 +8,7 @@ true true + diff --git a/template/lab/samples/ProjectTemplate.Samples/ProjectTemplate.Samples.csproj b/template/lab/samples/ProjectTemplate.Samples/ProjectTemplate.Samples.csproj index 103c43018..7c3187b97 100644 --- a/template/lab/samples/ProjectTemplate.Samples/ProjectTemplate.Samples.csproj +++ b/template/lab/samples/ProjectTemplate.Samples/ProjectTemplate.Samples.csproj @@ -1,6 +1,7 @@ + diff --git a/template/lab/samples/ProjectTemplate.Wasm/ProjectTemplate.Wasm.csproj b/template/lab/samples/ProjectTemplate.Wasm/ProjectTemplate.Wasm.csproj index 24f79b54f..d54d3db90 100644 --- a/template/lab/samples/ProjectTemplate.Wasm/ProjectTemplate.Wasm.csproj +++ b/template/lab/samples/ProjectTemplate.Wasm/ProjectTemplate.Wasm.csproj @@ -4,6 +4,7 @@ true + diff --git a/template/lab/src/CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj b/template/lab/src/CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj index a467d1cc3..b84b68021 100644 --- a/template/lab/src/CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj +++ b/template/lab/src/CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj @@ -1,6 +1,7 @@ + From dca6cf0ba913337488a7825ba972d72921542c06 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 19 Jul 2022 17:47:44 -0500 Subject: [PATCH 02/11] Moved project identifiers into a new props file --- common/Labs.ProjectIdentifiers.props | 29 +++++++++++++++++++ common/Labs.Uno.props | 28 ------------------ common/Scripts/UseUnoWinUI.ps1 | 9 +++--- .../CanvasLayout.Samples.csproj | 1 + .../CanvasLayout.Wasm.csproj | 3 +- ...nityToolkit.Labs.WinUI.CanvasLayout.csproj | 1 + .../SizerBase.Samples.csproj | 1 + .../SizerBase.Wasm/SizerBase.Wasm.csproj | 1 + ...mmunityToolkit.Labs.WinUI.SizerBase.csproj | 1 + .../CommunityToolkit.Labs.Droid.csproj | 1 + .../CommunityToolkit.Labs.Skia.Gtk.csproj | 2 +- ...CommunityToolkit.Labs.Skia.Wpf.Host.csproj | 5 +++- .../CommunityToolkit.Labs.Skia.WPF.csproj | 2 +- .../CommunityToolkit.Labs.Wasm.csproj | 1 + .../CommunityToolkit.Labs.iOS.csproj | 1 + .../CommunityToolkit.Labs.macOS.csproj | 1 + .../ProjectTemplate.Samples.csproj | 1 + .../ProjectTemplate.Wasm.csproj | 1 + ...yToolkit.Labs.WinUI.ProjectTemplate.csproj | 1 + 19 files changed, 54 insertions(+), 36 deletions(-) create mode 100644 common/Labs.ProjectIdentifiers.props diff --git a/common/Labs.ProjectIdentifiers.props b/common/Labs.ProjectIdentifiers.props new file mode 100644 index 000000000..8432a1f49 --- /dev/null +++ b/common/Labs.ProjectIdentifiers.props @@ -0,0 +1,29 @@ + + + true + true + true + + true + true + true + + true + true + true + + true + true + true + + true + true + + true + + $(DefineConstants); + + Uwp + 2 + + diff --git a/common/Labs.Uno.props b/common/Labs.Uno.props index 9f264530b..27e5361a0 100644 --- a/common/Labs.Uno.props +++ b/common/Labs.Uno.props @@ -1,34 +1,6 @@ - - true - true - true - - true - true - true - - true - true - true - - true - true - true - - true - true - - true - - $(DefineConstants); - - Uwp - 2 - - diff --git a/common/Scripts/UseUnoWinUI.ps1 b/common/Scripts/UseUnoWinUI.ps1 index c050b0eac..5e785fbd4 100644 --- a/common/Scripts/UseUnoWinUI.ps1 +++ b/common/Scripts/UseUnoWinUI.ps1 @@ -3,7 +3,7 @@ Param ( [ValidateSet('2', '3')] [string]$winUIMajorVersion, - [Parameter(HelpMessage = "Disables suppressing changes to the Labs.Uno.props and Labs.Head.Uno.props files in git, allowing changes to be committed.")] + [Parameter(HelpMessage = "Disables suppressing changes to the affected files in git, allowing changes to be committed.")] [switch]$allowGitChanges = $false ) @@ -40,11 +40,12 @@ function ApplyWinUISwap([string] $filePath) { } Set-Content -Force -Path $filePath -Value $fileContents; + Write-Output "Updated $(Resolve-Path -Relative $filePath)" } - -ApplyWinUISwap $PSScriptRoot/../Labs.Head.Uno.props -ApplyWinUISwap $PSScriptRoot/../Labs.Uno.props +ApplyWinUISwap $PSScriptRoot\..\Labs.Head.Uno.props +ApplyWinUISwap $PSScriptRoot\..\Labs.Uno.props +ApplyWinUISwap $PSScriptRoot\..\Labs.ProjectIdentifiers.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."; diff --git a/labs/CanvasLayout/samples/CanvasLayout.Samples/CanvasLayout.Samples.csproj b/labs/CanvasLayout/samples/CanvasLayout.Samples/CanvasLayout.Samples.csproj index b0398a9fa..d9dadd648 100644 --- a/labs/CanvasLayout/samples/CanvasLayout.Samples/CanvasLayout.Samples.csproj +++ b/labs/CanvasLayout/samples/CanvasLayout.Samples/CanvasLayout.Samples.csproj @@ -1,6 +1,7 @@ + diff --git a/labs/CanvasLayout/samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj b/labs/CanvasLayout/samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj index 977cf256f..3e7180d61 100644 --- a/labs/CanvasLayout/samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj +++ b/labs/CanvasLayout/samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj @@ -1,9 +1,10 @@ - true + + diff --git a/labs/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj b/labs/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj index ca4d3b90d..cceca5957 100644 --- a/labs/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj +++ b/labs/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj @@ -1,6 +1,7 @@ + diff --git a/labs/SizerBase/samples/SizerBase.Samples/SizerBase.Samples.csproj b/labs/SizerBase/samples/SizerBase.Samples/SizerBase.Samples.csproj index 7ae88afbb..5b460836d 100644 --- a/labs/SizerBase/samples/SizerBase.Samples/SizerBase.Samples.csproj +++ b/labs/SizerBase/samples/SizerBase.Samples/SizerBase.Samples.csproj @@ -1,6 +1,7 @@ + diff --git a/labs/SizerBase/samples/SizerBase.Wasm/SizerBase.Wasm.csproj b/labs/SizerBase/samples/SizerBase.Wasm/SizerBase.Wasm.csproj index a9457fd26..707eb4578 100644 --- a/labs/SizerBase/samples/SizerBase.Wasm/SizerBase.Wasm.csproj +++ b/labs/SizerBase/samples/SizerBase.Wasm/SizerBase.Wasm.csproj @@ -4,6 +4,7 @@ true + diff --git a/labs/SizerBase/src/CommunityToolkit.Labs.WinUI.SizerBase.csproj b/labs/SizerBase/src/CommunityToolkit.Labs.WinUI.SizerBase.csproj index c7fb061f2..3b05a0bb0 100644 --- a/labs/SizerBase/src/CommunityToolkit.Labs.WinUI.SizerBase.csproj +++ b/labs/SizerBase/src/CommunityToolkit.Labs.WinUI.SizerBase.csproj @@ -1,6 +1,7 @@ + diff --git a/platforms/CommunityToolkit.Labs.Droid/CommunityToolkit.Labs.Droid.csproj b/platforms/CommunityToolkit.Labs.Droid/CommunityToolkit.Labs.Droid.csproj index 64ec8d6d3..e057c577f 100644 --- a/platforms/CommunityToolkit.Labs.Droid/CommunityToolkit.Labs.Droid.csproj +++ b/platforms/CommunityToolkit.Labs.Droid/CommunityToolkit.Labs.Droid.csproj @@ -8,6 +8,7 @@ true true + diff --git a/platforms/CommunityToolkit.Labs.Skia.Gtk/CommunityToolkit.Labs.Skia.Gtk.csproj b/platforms/CommunityToolkit.Labs.Skia.Gtk/CommunityToolkit.Labs.Skia.Gtk.csproj index 83fc6f3fc..a3e7838ad 100644 --- a/platforms/CommunityToolkit.Labs.Skia.Gtk/CommunityToolkit.Labs.Skia.Gtk.csproj +++ b/platforms/CommunityToolkit.Labs.Skia.Gtk/CommunityToolkit.Labs.Skia.Gtk.csproj @@ -1,13 +1,13 @@ - True False False true + diff --git a/platforms/CommunityToolkit.Labs.Skia.WPF.Host/CommunityToolkit.Labs.Skia.Wpf.Host.csproj b/platforms/CommunityToolkit.Labs.Skia.WPF.Host/CommunityToolkit.Labs.Skia.Wpf.Host.csproj index 30ac604b8..f0395c584 100644 --- a/platforms/CommunityToolkit.Labs.Skia.WPF.Host/CommunityToolkit.Labs.Skia.Wpf.Host.csproj +++ b/platforms/CommunityToolkit.Labs.Skia.WPF.Host/CommunityToolkit.Labs.Skia.Wpf.Host.csproj @@ -1,13 +1,16 @@ - + + False True False False + + diff --git a/platforms/CommunityToolkit.Labs.Skia.WPF/CommunityToolkit.Labs.Skia.WPF.csproj b/platforms/CommunityToolkit.Labs.Skia.WPF/CommunityToolkit.Labs.Skia.WPF.csproj index d49f2079b..a02c481b9 100644 --- a/platforms/CommunityToolkit.Labs.Skia.WPF/CommunityToolkit.Labs.Skia.WPF.csproj +++ b/platforms/CommunityToolkit.Labs.Skia.WPF/CommunityToolkit.Labs.Skia.WPF.csproj @@ -1,7 +1,6 @@ - False True @@ -10,6 +9,7 @@ true $(WpfLibTargetFramework) + diff --git a/platforms/CommunityToolkit.Labs.Wasm/CommunityToolkit.Labs.Wasm.csproj b/platforms/CommunityToolkit.Labs.Wasm/CommunityToolkit.Labs.Wasm.csproj index 913cc5e5e..b9c9136cd 100644 --- a/platforms/CommunityToolkit.Labs.Wasm/CommunityToolkit.Labs.Wasm.csproj +++ b/platforms/CommunityToolkit.Labs.Wasm/CommunityToolkit.Labs.Wasm.csproj @@ -4,6 +4,7 @@ true + diff --git a/platforms/CommunityToolkit.Labs.iOS/CommunityToolkit.Labs.iOS.csproj b/platforms/CommunityToolkit.Labs.iOS/CommunityToolkit.Labs.iOS.csproj index 22ddcf726..1dd75072d 100644 --- a/platforms/CommunityToolkit.Labs.iOS/CommunityToolkit.Labs.iOS.csproj +++ b/platforms/CommunityToolkit.Labs.iOS/CommunityToolkit.Labs.iOS.csproj @@ -8,6 +8,7 @@ true true + diff --git a/platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj b/platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj index 8ad08b623..74cd5fc86 100644 --- a/platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj +++ b/platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj @@ -8,6 +8,7 @@ true true + diff --git a/template/lab/samples/ProjectTemplate.Samples/ProjectTemplate.Samples.csproj b/template/lab/samples/ProjectTemplate.Samples/ProjectTemplate.Samples.csproj index 103c43018..7c3187b97 100644 --- a/template/lab/samples/ProjectTemplate.Samples/ProjectTemplate.Samples.csproj +++ b/template/lab/samples/ProjectTemplate.Samples/ProjectTemplate.Samples.csproj @@ -1,6 +1,7 @@ + diff --git a/template/lab/samples/ProjectTemplate.Wasm/ProjectTemplate.Wasm.csproj b/template/lab/samples/ProjectTemplate.Wasm/ProjectTemplate.Wasm.csproj index 24f79b54f..d54d3db90 100644 --- a/template/lab/samples/ProjectTemplate.Wasm/ProjectTemplate.Wasm.csproj +++ b/template/lab/samples/ProjectTemplate.Wasm/ProjectTemplate.Wasm.csproj @@ -4,6 +4,7 @@ true + diff --git a/template/lab/src/CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj b/template/lab/src/CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj index a467d1cc3..b84b68021 100644 --- a/template/lab/src/CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj +++ b/template/lab/src/CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj @@ -1,6 +1,7 @@ + From 1ada0795e18c13e5ab1d89fbd69fef24b4aec465 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 19 Jul 2022 17:49:04 -0500 Subject: [PATCH 03/11] Merge branch 'fix/compilation-conditionals' of https://github.com/CommunityToolkit/Labs-Windows into fix/compilation-conditionals --- common/Scripts/UseUnoWinUI.ps1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/Scripts/UseUnoWinUI.ps1 b/common/Scripts/UseUnoWinUI.ps1 index 5e785fbd4..70ce49fd5 100644 --- a/common/Scripts/UseUnoWinUI.ps1 +++ b/common/Scripts/UseUnoWinUI.ps1 @@ -43,6 +43,8 @@ function ApplyWinUISwap([string] $filePath) { Write-Output "Updated $(Resolve-Path -Relative $filePath)" } +Write-Output "Switching to WinUI $winUIMajorVersion"; + ApplyWinUISwap $PSScriptRoot\..\Labs.Head.Uno.props ApplyWinUISwap $PSScriptRoot\..\Labs.Uno.props ApplyWinUISwap $PSScriptRoot\..\Labs.ProjectIdentifiers.props From 02954d567e06b3e6e1b0481b8c492e590a3e74dd Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 19 Jul 2022 18:08:22 -0500 Subject: [PATCH 04/11] Added WINUI2 and WINUI3 compilation conditionals --- common/Labs.ProjectIdentifiers.props | 2 +- common/Scripts/UseUnoWinUI.ps1 | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/common/Labs.ProjectIdentifiers.props b/common/Labs.ProjectIdentifiers.props index 8432a1f49..79c14401e 100644 --- a/common/Labs.ProjectIdentifiers.props +++ b/common/Labs.ProjectIdentifiers.props @@ -21,7 +21,7 @@ true - $(DefineConstants); + $(DefineConstants);WINUI2; Uwp 2 diff --git a/common/Scripts/UseUnoWinUI.ps1 b/common/Scripts/UseUnoWinUI.ps1 index 70ce49fd5..3ab9cf4c4 100644 --- a/common/Scripts/UseUnoWinUI.ps1 +++ b/common/Scripts/UseUnoWinUI.ps1 @@ -29,14 +29,16 @@ function ApplyWinUISwap([string] $filePath) { $fileContents = $fileContents -replace '2', '3'; $fileContents = $fileContents -replace 'Uwp', 'WinUI'; $fileContents = $fileContents -replace 'Uno.UI', 'Uno.WinUI'; - $fileContents = $fileContents -replace '\$\(DefineConstants\);', '$(DefineConstants);WINAPPSDK;'; + + $fileContents = $fileContents -replace '\$\(DefineConstants\);WINUI2;', '$(DefineConstants);WINUI3;WINAPPSDK;'; } if ($winUIMajorVersion -eq "2") { $fileContents = $fileContents -replace '3', '2'; $fileContents = $fileContents -replace 'WinUI', 'Uwp'; $fileContents = $fileContents -replace 'Uno.WinUI', 'Uno.UI'; - $fileContents = $fileContents -replace 'WINAPPSDK;', ''; + + $fileContents = $fileContents -replace '\$\(DefineConstants\);WINUI3;WINAPPSDK;', '$(DefineConstants);WINUI2;'; } Set-Content -Force -Path $filePath -Value $fileContents; From 1fa4e32211fecf4eb51aba9c6ef195977d6f9ef8 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 19 Jul 2022 18:13:54 -0500 Subject: [PATCH 05/11] Added platform-specific compilation conditionals --- common/Labs.ProjectIdentifiers.props | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/common/Labs.ProjectIdentifiers.props b/common/Labs.ProjectIdentifiers.props index 79c14401e..f598aa78b 100644 --- a/common/Labs.ProjectIdentifiers.props +++ b/common/Labs.ProjectIdentifiers.props @@ -23,6 +23,16 @@ $(DefineConstants);WINUI2; + $(DefineConstants);HAS_UNO; + $(DefineConstants);WINDOWS_UWP;NETFX_CORE; + $(DefineConstants);WINDOWS_WINAPPSDK; + $(DefineConstants);__WASM__;HAS_UNO_WASM; + $(DefineConstants);__ANDROID__; + $(DefineConstants);__IOS__; + $(DefineConstants);__MACOS__; + $(DefineConstants);HAS_UNO_SKIA;WINDOWS_WPF; + $(DefineConstants);HAS_UNO_SKIA;__GTK__; + Uwp 2 From ae9bc9e9dde6c62b64705708e9b33b1a99b9380b Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 19 Jul 2022 18:19:05 -0500 Subject: [PATCH 06/11] Added comment for props modified by script --- common/Labs.ProjectIdentifiers.props | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/common/Labs.ProjectIdentifiers.props b/common/Labs.ProjectIdentifiers.props index f598aa78b..69e790e31 100644 --- a/common/Labs.ProjectIdentifiers.props +++ b/common/Labs.ProjectIdentifiers.props @@ -21,7 +21,11 @@ true + + Uwp + 2 $(DefineConstants);WINUI2; + $(DefineConstants);HAS_UNO; $(DefineConstants);WINDOWS_UWP;NETFX_CORE; @@ -32,8 +36,5 @@ $(DefineConstants);__MACOS__; $(DefineConstants);HAS_UNO_SKIA;WINDOWS_WPF; $(DefineConstants);HAS_UNO_SKIA;__GTK__; - - Uwp - 2 From 3638cdaf6cdc4501f2f0a0ea4e8408a983d300c2 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 19 Jul 2022 18:20:00 -0500 Subject: [PATCH 07/11] Added __SKIA__ compilation conditional --- common/Labs.ProjectIdentifiers.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/Labs.ProjectIdentifiers.props b/common/Labs.ProjectIdentifiers.props index 69e790e31..6cd087d95 100644 --- a/common/Labs.ProjectIdentifiers.props +++ b/common/Labs.ProjectIdentifiers.props @@ -34,7 +34,7 @@ $(DefineConstants);__ANDROID__; $(DefineConstants);__IOS__; $(DefineConstants);__MACOS__; - $(DefineConstants);HAS_UNO_SKIA;WINDOWS_WPF; - $(DefineConstants);HAS_UNO_SKIA;__GTK__; + $(DefineConstants);HAS_UNO_SKIA;__SKIA__;WINDOWS_WPF; + $(DefineConstants);HAS_UNO_SKIA;__SKIA__;__GTK__; From f07b441ac69bfc44f3573ea2393d090b74f1c1f6 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 19 Jul 2022 18:44:13 -0500 Subject: [PATCH 08/11] Added Labs.ProjectIdentifiers.props import --- .../samples/CanvasLayout.Uwp/CanvasLayout.Uwp.csproj | 5 +++++ .../samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj | 2 +- .../CanvasLayout.WinAppSdk/CanvasLayout.WinAppSdk.csproj | 1 + .../CanvasLayout.Tests.Uwp/CanvasLayout.Tests.Uwp.csproj | 1 + .../CanvasLayout.Tests.WinAppSdk.csproj | 1 + labs/SizerBase/samples/SizerBase.Uwp/SizerBase.Uwp.csproj | 5 +++++ .../samples/SizerBase.WinAppSdk/SizerBase.WinAppSdk.csproj | 1 + .../tests/SizerBase.Tests.Uwp/SizerBase.Tests.Uwp.csproj | 1 + .../SizerBase.Tests.WinAppSdk.csproj | 1 + .../CommunityToolkit.Labs.Uwp.csproj | 2 ++ .../CommunityToolkit.Labs.WinAppSdk.csproj | 1 + .../samples/ProjectTemplate.Uwp/ProjectTemplate.Uwp.csproj | 1 + .../ProjectTemplate.WinAppSdk.csproj | 1 + .../ProjectTemplate.Tests.Uwp.csproj | 2 ++ .../ProjectTemplate.Tests.WinAppSdk.csproj | 1 + .../CommunityToolkit.Labs.Tests.Uwp.csproj | 2 ++ .../CommunityToolkit.Labs.Tests.WinAppSdk.csproj | 1 + 17 files changed, 28 insertions(+), 1 deletion(-) diff --git a/labs/CanvasLayout/samples/CanvasLayout.Uwp/CanvasLayout.Uwp.csproj b/labs/CanvasLayout/samples/CanvasLayout.Uwp/CanvasLayout.Uwp.csproj index 407e52f08..0c80d8726 100644 --- a/labs/CanvasLayout/samples/CanvasLayout.Uwp/CanvasLayout.Uwp.csproj +++ b/labs/CanvasLayout/samples/CanvasLayout.Uwp/CanvasLayout.Uwp.csproj @@ -1,15 +1,20 @@  + true + + + + CanvasLayoutExperiment.Samples CanvasLayoutExperiment.Samples.Uwp diff --git a/labs/CanvasLayout/samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj b/labs/CanvasLayout/samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj index 3e7180d61..5d7445cdc 100644 --- a/labs/CanvasLayout/samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj +++ b/labs/CanvasLayout/samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj @@ -1,9 +1,9 @@ + true - diff --git a/labs/CanvasLayout/samples/CanvasLayout.WinAppSdk/CanvasLayout.WinAppSdk.csproj b/labs/CanvasLayout/samples/CanvasLayout.WinAppSdk/CanvasLayout.WinAppSdk.csproj index 3a5f58cad..6b08a211d 100644 --- a/labs/CanvasLayout/samples/CanvasLayout.WinAppSdk/CanvasLayout.WinAppSdk.csproj +++ b/labs/CanvasLayout/samples/CanvasLayout.WinAppSdk/CanvasLayout.WinAppSdk.csproj @@ -4,6 +4,7 @@ true + diff --git a/labs/CanvasLayout/tests/CanvasLayout.Tests.Uwp/CanvasLayout.Tests.Uwp.csproj b/labs/CanvasLayout/tests/CanvasLayout.Tests.Uwp/CanvasLayout.Tests.Uwp.csproj index ffb6d5c2b..177461821 100644 --- a/labs/CanvasLayout/tests/CanvasLayout.Tests.Uwp/CanvasLayout.Tests.Uwp.csproj +++ b/labs/CanvasLayout/tests/CanvasLayout.Tests.Uwp/CanvasLayout.Tests.Uwp.csproj @@ -6,6 +6,7 @@ true + diff --git a/labs/CanvasLayout/tests/CanvasLayout.Tests.WinAppSdk/CanvasLayout.Tests.WinAppSdk.csproj b/labs/CanvasLayout/tests/CanvasLayout.Tests.WinAppSdk/CanvasLayout.Tests.WinAppSdk.csproj index 688b1c0cd..3a7ca4b4f 100644 --- a/labs/CanvasLayout/tests/CanvasLayout.Tests.WinAppSdk/CanvasLayout.Tests.WinAppSdk.csproj +++ b/labs/CanvasLayout/tests/CanvasLayout.Tests.WinAppSdk/CanvasLayout.Tests.WinAppSdk.csproj @@ -4,6 +4,7 @@ true + diff --git a/labs/SizerBase/samples/SizerBase.Uwp/SizerBase.Uwp.csproj b/labs/SizerBase/samples/SizerBase.Uwp/SizerBase.Uwp.csproj index 6349aa85e..dee4638a3 100644 --- a/labs/SizerBase/samples/SizerBase.Uwp/SizerBase.Uwp.csproj +++ b/labs/SizerBase/samples/SizerBase.Uwp/SizerBase.Uwp.csproj @@ -1,15 +1,20 @@  + true + + + + SizerBaseExperiment.Samples SizerBaseExperiment.Samples.Uwp diff --git a/labs/SizerBase/samples/SizerBase.WinAppSdk/SizerBase.WinAppSdk.csproj b/labs/SizerBase/samples/SizerBase.WinAppSdk/SizerBase.WinAppSdk.csproj index 807fdcbf7..ec4aa8b51 100644 --- a/labs/SizerBase/samples/SizerBase.WinAppSdk/SizerBase.WinAppSdk.csproj +++ b/labs/SizerBase/samples/SizerBase.WinAppSdk/SizerBase.WinAppSdk.csproj @@ -4,6 +4,7 @@ true + diff --git a/labs/SizerBase/tests/SizerBase.Tests.Uwp/SizerBase.Tests.Uwp.csproj b/labs/SizerBase/tests/SizerBase.Tests.Uwp/SizerBase.Tests.Uwp.csproj index 7a58e9cb2..ab485e20c 100644 --- a/labs/SizerBase/tests/SizerBase.Tests.Uwp/SizerBase.Tests.Uwp.csproj +++ b/labs/SizerBase/tests/SizerBase.Tests.Uwp/SizerBase.Tests.Uwp.csproj @@ -6,6 +6,7 @@ true + diff --git a/labs/SizerBase/tests/SizerBase.Tests.WinAppSdk/SizerBase.Tests.WinAppSdk.csproj b/labs/SizerBase/tests/SizerBase.Tests.WinAppSdk/SizerBase.Tests.WinAppSdk.csproj index 3d3b7fa0f..eda87fdfc 100644 --- a/labs/SizerBase/tests/SizerBase.Tests.WinAppSdk/SizerBase.Tests.WinAppSdk.csproj +++ b/labs/SizerBase/tests/SizerBase.Tests.WinAppSdk/SizerBase.Tests.WinAppSdk.csproj @@ -4,6 +4,7 @@ true + diff --git a/platforms/CommunityToolkit.Labs.Uwp/CommunityToolkit.Labs.Uwp.csproj b/platforms/CommunityToolkit.Labs.Uwp/CommunityToolkit.Labs.Uwp.csproj index 766e522cf..4807dba81 100644 --- a/platforms/CommunityToolkit.Labs.Uwp/CommunityToolkit.Labs.Uwp.csproj +++ b/platforms/CommunityToolkit.Labs.Uwp/CommunityToolkit.Labs.Uwp.csproj @@ -1,11 +1,13 @@  + true + diff --git a/platforms/CommunityToolkit.Labs.WinAppSdk/CommunityToolkit.Labs.WinAppSdk.csproj b/platforms/CommunityToolkit.Labs.WinAppSdk/CommunityToolkit.Labs.WinAppSdk.csproj index 362e6fd36..62e6a2541 100644 --- a/platforms/CommunityToolkit.Labs.WinAppSdk/CommunityToolkit.Labs.WinAppSdk.csproj +++ b/platforms/CommunityToolkit.Labs.WinAppSdk/CommunityToolkit.Labs.WinAppSdk.csproj @@ -4,6 +4,7 @@ true + diff --git a/template/lab/samples/ProjectTemplate.Uwp/ProjectTemplate.Uwp.csproj b/template/lab/samples/ProjectTemplate.Uwp/ProjectTemplate.Uwp.csproj index 4b1fb3e7d..db16ab18a 100644 --- a/template/lab/samples/ProjectTemplate.Uwp/ProjectTemplate.Uwp.csproj +++ b/template/lab/samples/ProjectTemplate.Uwp/ProjectTemplate.Uwp.csproj @@ -7,6 +7,7 @@ true + diff --git a/template/lab/samples/ProjectTemplate.WinAppSdk/ProjectTemplate.WinAppSdk.csproj b/template/lab/samples/ProjectTemplate.WinAppSdk/ProjectTemplate.WinAppSdk.csproj index 4ecf75251..cd1bf7f24 100644 --- a/template/lab/samples/ProjectTemplate.WinAppSdk/ProjectTemplate.WinAppSdk.csproj +++ b/template/lab/samples/ProjectTemplate.WinAppSdk/ProjectTemplate.WinAppSdk.csproj @@ -4,6 +4,7 @@ true + diff --git a/template/lab/tests/ProjectTemplate.Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj b/template/lab/tests/ProjectTemplate.Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj index 3cb92795e..18a47f530 100644 --- a/template/lab/tests/ProjectTemplate.Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj +++ b/template/lab/tests/ProjectTemplate.Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj @@ -1,11 +1,13 @@  + true + diff --git a/template/lab/tests/ProjectTemplate.Tests.WinAppSdk/ProjectTemplate.Tests.WinAppSdk.csproj b/template/lab/tests/ProjectTemplate.Tests.WinAppSdk/ProjectTemplate.Tests.WinAppSdk.csproj index a4dc416f6..1cb063d8f 100644 --- a/template/lab/tests/ProjectTemplate.Tests.WinAppSdk/ProjectTemplate.Tests.WinAppSdk.csproj +++ b/template/lab/tests/ProjectTemplate.Tests.WinAppSdk/ProjectTemplate.Tests.WinAppSdk.csproj @@ -4,6 +4,7 @@ true + diff --git a/tests/CommunityToolkit.Labs.Tests.Uwp/CommunityToolkit.Labs.Tests.Uwp.csproj b/tests/CommunityToolkit.Labs.Tests.Uwp/CommunityToolkit.Labs.Tests.Uwp.csproj index 6b81ff632..fb9630de6 100644 --- a/tests/CommunityToolkit.Labs.Tests.Uwp/CommunityToolkit.Labs.Tests.Uwp.csproj +++ b/tests/CommunityToolkit.Labs.Tests.Uwp/CommunityToolkit.Labs.Tests.Uwp.csproj @@ -1,11 +1,13 @@  + true + diff --git a/tests/CommunityToolkit.Labs.Tests.WinAppSdk/CommunityToolkit.Labs.Tests.WinAppSdk.csproj b/tests/CommunityToolkit.Labs.Tests.WinAppSdk/CommunityToolkit.Labs.Tests.WinAppSdk.csproj index 37aa373f4..8abbd39fd 100644 --- a/tests/CommunityToolkit.Labs.Tests.WinAppSdk/CommunityToolkit.Labs.Tests.WinAppSdk.csproj +++ b/tests/CommunityToolkit.Labs.Tests.WinAppSdk/CommunityToolkit.Labs.Tests.WinAppSdk.csproj @@ -4,6 +4,7 @@ true + From 4ea96a53efa1bbd0e0e38c669c3c241a440d53f0 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 19 Jul 2022 20:10:20 -0500 Subject: [PATCH 09/11] Fixed ProjectIdentifiers on project heads --- common/Labs.Head.Wasm.props | 10 +++++----- common/Labs.Head.WinAppSdk.props | 2 +- .../CanvasLayout.Uwp/CanvasLayout.Uwp.csproj | 15 ++++++++++++++ .../CanvasLayout.Wasm.csproj | 15 ++++++++++++++ .../CanvasLayout.WinAppSdk.csproj | 15 ++++++++++++++ .../SizerBase.Uwp/SizerBase.Uwp.csproj | 15 ++++++++++++++ .../SizerBase.Wasm/SizerBase.Wasm.csproj | 15 ++++++++++++++ .../SizerBase.WinAppSdk.csproj | 15 ++++++++++++++ .../CommunityToolkit.Labs.Droid.csproj | 16 ++++++++++++++- .../CommunityToolkit.Labs.Skia.Gtk.csproj | 18 ++++++++++++++--- ...CommunityToolkit.Labs.Skia.Wpf.Host.csproj | 20 +++++++++++++++---- .../CommunityToolkit.Labs.Skia.WPF.csproj | 19 ++++++++++++++---- .../CommunityToolkit.Labs.Uwp.csproj | 15 ++++++++++++++ .../CommunityToolkit.Labs.Wasm.csproj | 15 ++++++++++++++ .../CommunityToolkit.Labs.WinAppSdk.csproj | 15 ++++++++++++++ .../CommunityToolkit.Labs.iOS.csproj | 16 ++++++++++++++- .../CommunityToolkit.Labs.macOS.csproj | 16 ++++++++++++++- .../ProjectTemplate.Uwp.csproj | 15 ++++++++++++++ .../ProjectTemplate.Wasm.csproj | 15 ++++++++++++++ .../ProjectTemplate.WinAppSdk.csproj | 15 ++++++++++++++ 20 files changed, 277 insertions(+), 20 deletions(-) diff --git a/common/Labs.Head.Wasm.props b/common/Labs.Head.Wasm.props index ee5041b57..965a3e1f5 100644 --- a/common/Labs.Head.Wasm.props +++ b/common/Labs.Head.Wasm.props @@ -6,11 +6,11 @@ Because of this, this file must be import immediately after defining all other constant values. --> - False - False - False - True - False + false + false + false + true + false diff --git a/common/Labs.Head.WinAppSdk.props b/common/Labs.Head.WinAppSdk.props index b538a11b4..ddd2885d1 100644 --- a/common/Labs.Head.WinAppSdk.props +++ b/common/Labs.Head.WinAppSdk.props @@ -13,7 +13,7 @@ win10-$(Platform).pubxml true true - WINAPPSDK;WINDOWS_WINAPPSDK + $(DefineConstants);WINAPPSDK;WINDOWS_WINAPPSDK; app.manifest diff --git a/labs/CanvasLayout/samples/CanvasLayout.Uwp/CanvasLayout.Uwp.csproj b/labs/CanvasLayout/samples/CanvasLayout.Uwp/CanvasLayout.Uwp.csproj index 0c80d8726..8c7cfd2e7 100644 --- a/labs/CanvasLayout/samples/CanvasLayout.Uwp/CanvasLayout.Uwp.csproj +++ b/labs/CanvasLayout/samples/CanvasLayout.Uwp/CanvasLayout.Uwp.csproj @@ -6,6 +6,21 @@ true + false + false + false + false + false + false + false + true + false + false + false + false + false + false + false diff --git a/labs/CanvasLayout/samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj b/labs/CanvasLayout/samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj index 5d7445cdc..47a70e62e 100644 --- a/labs/CanvasLayout/samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj +++ b/labs/CanvasLayout/samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj @@ -3,6 +3,21 @@ true + false + true + false + false + false + false + false + false + false + false + false + false + false + false + false diff --git a/labs/CanvasLayout/samples/CanvasLayout.WinAppSdk/CanvasLayout.WinAppSdk.csproj b/labs/CanvasLayout/samples/CanvasLayout.WinAppSdk/CanvasLayout.WinAppSdk.csproj index 6b08a211d..0b45d97a9 100644 --- a/labs/CanvasLayout/samples/CanvasLayout.WinAppSdk/CanvasLayout.WinAppSdk.csproj +++ b/labs/CanvasLayout/samples/CanvasLayout.WinAppSdk/CanvasLayout.WinAppSdk.csproj @@ -3,6 +3,21 @@ true + false + false + false + false + false + false + false + false + true + false + false + false + false + false + false diff --git a/labs/SizerBase/samples/SizerBase.Uwp/SizerBase.Uwp.csproj b/labs/SizerBase/samples/SizerBase.Uwp/SizerBase.Uwp.csproj index dee4638a3..a7e53c784 100644 --- a/labs/SizerBase/samples/SizerBase.Uwp/SizerBase.Uwp.csproj +++ b/labs/SizerBase/samples/SizerBase.Uwp/SizerBase.Uwp.csproj @@ -6,6 +6,21 @@ true + false + false + false + false + false + false + false + true + false + false + false + false + false + false + false diff --git a/labs/SizerBase/samples/SizerBase.Wasm/SizerBase.Wasm.csproj b/labs/SizerBase/samples/SizerBase.Wasm/SizerBase.Wasm.csproj index 707eb4578..d62508cab 100644 --- a/labs/SizerBase/samples/SizerBase.Wasm/SizerBase.Wasm.csproj +++ b/labs/SizerBase/samples/SizerBase.Wasm/SizerBase.Wasm.csproj @@ -3,6 +3,21 @@ true + false + true + false + false + false + false + false + false + false + false + false + false + false + false + false diff --git a/labs/SizerBase/samples/SizerBase.WinAppSdk/SizerBase.WinAppSdk.csproj b/labs/SizerBase/samples/SizerBase.WinAppSdk/SizerBase.WinAppSdk.csproj index ec4aa8b51..62c6d031b 100644 --- a/labs/SizerBase/samples/SizerBase.WinAppSdk/SizerBase.WinAppSdk.csproj +++ b/labs/SizerBase/samples/SizerBase.WinAppSdk/SizerBase.WinAppSdk.csproj @@ -3,6 +3,21 @@ true + false + false + false + false + false + false + false + false + true + false + false + false + false + false + false diff --git a/platforms/CommunityToolkit.Labs.Droid/CommunityToolkit.Labs.Droid.csproj b/platforms/CommunityToolkit.Labs.Droid/CommunityToolkit.Labs.Droid.csproj index e057c577f..f484f86ef 100644 --- a/platforms/CommunityToolkit.Labs.Droid/CommunityToolkit.Labs.Droid.csproj +++ b/platforms/CommunityToolkit.Labs.Droid/CommunityToolkit.Labs.Droid.csproj @@ -5,8 +5,22 @@ - true true + true + false + false + false + true + false + false + false + false + false + false + false + false + false + false diff --git a/platforms/CommunityToolkit.Labs.Skia.Gtk/CommunityToolkit.Labs.Skia.Gtk.csproj b/platforms/CommunityToolkit.Labs.Skia.Gtk/CommunityToolkit.Labs.Skia.Gtk.csproj index a3e7838ad..1ad6a213d 100644 --- a/platforms/CommunityToolkit.Labs.Skia.Gtk/CommunityToolkit.Labs.Skia.Gtk.csproj +++ b/platforms/CommunityToolkit.Labs.Skia.Gtk/CommunityToolkit.Labs.Skia.Gtk.csproj @@ -2,10 +2,22 @@ - True - False - False true + true + false + false + false + false + false + false + false + false + false + false + false + true + true + false diff --git a/platforms/CommunityToolkit.Labs.Skia.WPF.Host/CommunityToolkit.Labs.Skia.Wpf.Host.csproj b/platforms/CommunityToolkit.Labs.Skia.WPF.Host/CommunityToolkit.Labs.Skia.Wpf.Host.csproj index f0395c584..3b000ed11 100644 --- a/platforms/CommunityToolkit.Labs.Skia.WPF.Host/CommunityToolkit.Labs.Skia.Wpf.Host.csproj +++ b/platforms/CommunityToolkit.Labs.Skia.WPF.Host/CommunityToolkit.Labs.Skia.Wpf.Host.csproj @@ -3,10 +3,22 @@ - False - True - False - False + true + true + false + false + false + false + false + false + false + false + true + true + false + false + false + false diff --git a/platforms/CommunityToolkit.Labs.Skia.WPF/CommunityToolkit.Labs.Skia.WPF.csproj b/platforms/CommunityToolkit.Labs.Skia.WPF/CommunityToolkit.Labs.Skia.WPF.csproj index a02c481b9..988e5d64b 100644 --- a/platforms/CommunityToolkit.Labs.Skia.WPF/CommunityToolkit.Labs.Skia.WPF.csproj +++ b/platforms/CommunityToolkit.Labs.Skia.WPF/CommunityToolkit.Labs.Skia.WPF.csproj @@ -2,11 +2,22 @@ - False - True - True - False true + true + false + false + false + false + false + false + false + false + true + false + true + false + false + false $(WpfLibTargetFramework) diff --git a/platforms/CommunityToolkit.Labs.Uwp/CommunityToolkit.Labs.Uwp.csproj b/platforms/CommunityToolkit.Labs.Uwp/CommunityToolkit.Labs.Uwp.csproj index 4807dba81..d17f7aaa8 100644 --- a/platforms/CommunityToolkit.Labs.Uwp/CommunityToolkit.Labs.Uwp.csproj +++ b/platforms/CommunityToolkit.Labs.Uwp/CommunityToolkit.Labs.Uwp.csproj @@ -6,6 +6,21 @@ true + false + false + false + false + false + false + false + true + false + false + false + false + false + false + false diff --git a/platforms/CommunityToolkit.Labs.Wasm/CommunityToolkit.Labs.Wasm.csproj b/platforms/CommunityToolkit.Labs.Wasm/CommunityToolkit.Labs.Wasm.csproj index b9c9136cd..9d9ef6ae3 100644 --- a/platforms/CommunityToolkit.Labs.Wasm/CommunityToolkit.Labs.Wasm.csproj +++ b/platforms/CommunityToolkit.Labs.Wasm/CommunityToolkit.Labs.Wasm.csproj @@ -3,6 +3,21 @@ true + true + true + true + false + false + false + false + false + false + false + false + false + false + false + false diff --git a/platforms/CommunityToolkit.Labs.WinAppSdk/CommunityToolkit.Labs.WinAppSdk.csproj b/platforms/CommunityToolkit.Labs.WinAppSdk/CommunityToolkit.Labs.WinAppSdk.csproj index 62e6a2541..5629ae128 100644 --- a/platforms/CommunityToolkit.Labs.WinAppSdk/CommunityToolkit.Labs.WinAppSdk.csproj +++ b/platforms/CommunityToolkit.Labs.WinAppSdk/CommunityToolkit.Labs.WinAppSdk.csproj @@ -3,6 +3,21 @@ true + false + false + false + false + false + false + false + false + true + false + false + false + false + false + false diff --git a/platforms/CommunityToolkit.Labs.iOS/CommunityToolkit.Labs.iOS.csproj b/platforms/CommunityToolkit.Labs.iOS/CommunityToolkit.Labs.iOS.csproj index 1dd75072d..ac7b2b2bb 100644 --- a/platforms/CommunityToolkit.Labs.iOS/CommunityToolkit.Labs.iOS.csproj +++ b/platforms/CommunityToolkit.Labs.iOS/CommunityToolkit.Labs.iOS.csproj @@ -5,8 +5,22 @@ - true true + true + false + false + false + false + false + true + false + false + false + false + false + false + false + false diff --git a/platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj b/platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj index 74cd5fc86..11c114075 100644 --- a/platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj +++ b/platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj @@ -5,8 +5,22 @@ - true true + true + false + false + false + false + true + false + false + false + false + false + false + false + false + false diff --git a/template/lab/samples/ProjectTemplate.Uwp/ProjectTemplate.Uwp.csproj b/template/lab/samples/ProjectTemplate.Uwp/ProjectTemplate.Uwp.csproj index db16ab18a..313d8fea8 100644 --- a/template/lab/samples/ProjectTemplate.Uwp/ProjectTemplate.Uwp.csproj +++ b/template/lab/samples/ProjectTemplate.Uwp/ProjectTemplate.Uwp.csproj @@ -6,6 +6,21 @@ true + false + false + false + false + false + false + false + true + false + false + false + false + false + false + false diff --git a/template/lab/samples/ProjectTemplate.Wasm/ProjectTemplate.Wasm.csproj b/template/lab/samples/ProjectTemplate.Wasm/ProjectTemplate.Wasm.csproj index d54d3db90..04e9945c9 100644 --- a/template/lab/samples/ProjectTemplate.Wasm/ProjectTemplate.Wasm.csproj +++ b/template/lab/samples/ProjectTemplate.Wasm/ProjectTemplate.Wasm.csproj @@ -3,6 +3,21 @@ true + false + true + false + false + false + false + false + false + false + false + false + false + false + false + false diff --git a/template/lab/samples/ProjectTemplate.WinAppSdk/ProjectTemplate.WinAppSdk.csproj b/template/lab/samples/ProjectTemplate.WinAppSdk/ProjectTemplate.WinAppSdk.csproj index cd1bf7f24..c4561c798 100644 --- a/template/lab/samples/ProjectTemplate.WinAppSdk/ProjectTemplate.WinAppSdk.csproj +++ b/template/lab/samples/ProjectTemplate.WinAppSdk/ProjectTemplate.WinAppSdk.csproj @@ -3,6 +3,21 @@ true + false + false + false + false + false + false + false + false + true + false + false + false + false + false + false From 03238df11486affc03eaf204280d3973797d7f2d Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 19 Jul 2022 20:45:05 -0500 Subject: [PATCH 10/11] Fixed incorrect IsUno value --- .../samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj | 2 +- labs/SizerBase/samples/SizerBase.Wasm/SizerBase.Wasm.csproj | 2 +- .../samples/ProjectTemplate.Wasm/ProjectTemplate.Wasm.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/labs/CanvasLayout/samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj b/labs/CanvasLayout/samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj index 47a70e62e..50133db1a 100644 --- a/labs/CanvasLayout/samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj +++ b/labs/CanvasLayout/samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj @@ -3,7 +3,7 @@ true - false + true true false false diff --git a/labs/SizerBase/samples/SizerBase.Wasm/SizerBase.Wasm.csproj b/labs/SizerBase/samples/SizerBase.Wasm/SizerBase.Wasm.csproj index d62508cab..fdbad81f0 100644 --- a/labs/SizerBase/samples/SizerBase.Wasm/SizerBase.Wasm.csproj +++ b/labs/SizerBase/samples/SizerBase.Wasm/SizerBase.Wasm.csproj @@ -3,7 +3,7 @@ true - false + true true false false diff --git a/template/lab/samples/ProjectTemplate.Wasm/ProjectTemplate.Wasm.csproj b/template/lab/samples/ProjectTemplate.Wasm/ProjectTemplate.Wasm.csproj index 04e9945c9..932362c09 100644 --- a/template/lab/samples/ProjectTemplate.Wasm/ProjectTemplate.Wasm.csproj +++ b/template/lab/samples/ProjectTemplate.Wasm/ProjectTemplate.Wasm.csproj @@ -3,7 +3,7 @@ true - false + true true false false From 0f9665221e7f25467281816cd69a42a08f9c74ba Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 19 Jul 2022 21:12:40 -0500 Subject: [PATCH 11/11] Fixed BindableMetadataProvider error on WPF --- .../CommunityToolkit.Labs.Skia.WPF.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platforms/CommunityToolkit.Labs.Skia.WPF/CommunityToolkit.Labs.Skia.WPF.csproj b/platforms/CommunityToolkit.Labs.Skia.WPF/CommunityToolkit.Labs.Skia.WPF.csproj index 988e5d64b..bf587cf0e 100644 --- a/platforms/CommunityToolkit.Labs.Skia.WPF/CommunityToolkit.Labs.Skia.WPF.csproj +++ b/platforms/CommunityToolkit.Labs.Skia.WPF/CommunityToolkit.Labs.Skia.WPF.csproj @@ -13,7 +13,7 @@ false false true - false + true true false false