diff --git a/Toolkit.Labs.All.sln b/Toolkit.Labs.All.sln
index cbb61541e..69956036c 100644
--- a/Toolkit.Labs.All.sln
+++ b/Toolkit.Labs.All.sln
@@ -68,12 +68,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{583C9ADC
common\Labs.MultiTarget.props = common\Labs.MultiTarget.props
common\Labs.SampleRefs.props = common\Labs.SampleRefs.props
common\Labs.TargetFrameworks.props = common\Labs.TargetFrameworks.props
+ common\Labs.Uwp.Base.props = common\Labs.Uwp.Base.props
common\Labs.Uwp.props = common\Labs.Uwp.props
common\Labs.Wasm.props = common\Labs.Wasm.props
common\Labs.WinAppSdk.props = common\Labs.WinAppSdk.props
Windows.Toolkit.Common.props = Windows.Toolkit.Common.props
EndProjectSection
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{DB021AE9-57A4-41BA-822F-2C76AF4A385B}"
+ ProjectSection(SolutionItems) = preProject
+ tests\Labs.Tests.props = tests\Labs.Tests.props
+ tests\Labs.Tests.Uwp.props = tests\Labs.Tests.Uwp.props
+ tests\Labs.Tests.WinAppSdk.props = tests\Labs.Tests.WinAppSdk.props
+ EndProjectSection
+EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
labs\CanvasLayout\tests\CanvasLayout.Tests\CanvasLayout.Tests.projitems*{2c7a065b-9349-4071-af95-e88f320a09a9}*SharedItemsImports = 13
@@ -1151,6 +1159,7 @@ Global
{DD69BA61-C86D-4138-AE6F-76E2C8445C9A} = {FF878CF0-59B1-4B8C-A7DB-1E2A7B47575A}
{2C7A065B-9349-4071-AF95-E88F320A09A9} = {DD69BA61-C86D-4138-AE6F-76E2C8445C9A}
{583C9ADC-96A6-446D-9573-7C33B0640915} = {24A1D6DC-FF32-4D9D-9FC2-8EB3E356A2C0}
+ {DB021AE9-57A4-41BA-822F-2C76AF4A385B} = {FF878CF0-59B1-4B8C-A7DB-1E2A7B47575A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {1F0A4823-84EF-41AA-BBF9-A07B38DDC555}
diff --git a/common/Labs.Uwp.Base.props b/common/Labs.Uwp.Base.props
new file mode 100644
index 000000000..e03164903
--- /dev/null
+++ b/common/Labs.Uwp.Base.props
@@ -0,0 +1,144 @@
+
+
+
+
+
+ 10.0.19041.0
+ 10.0.17763.0
+ false
+
+
+
+ Debug
+ x86
+ AppContainerExe
+ Properties
+ en-US
+ UAP
+ 14
+ 512
+ {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ true
+ false
+
+
+
+ true
+ bin\x86\Debug\
+ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
+ ;2008
+ full
+ x86
+ false
+ prompt
+ true
+
+
+
+ bin\x86\Release\
+ TRACE;NETFX_CORE;WINDOWS_UWP
+ true
+ ;2008
+ pdbonly
+ x86
+ false
+ prompt
+ true
+ true
+
+
+
+ true
+ bin\ARM\Debug\
+ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
+ ;2008
+ full
+ ARM
+ false
+ prompt
+ true
+
+
+
+ bin\ARM\Release\
+ TRACE;NETFX_CORE;WINDOWS_UWP
+ true
+ ;2008
+ pdbonly
+ ARM
+ false
+ prompt
+ true
+ true
+
+
+
+ true
+ bin\ARM64\Debug\
+ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
+ ;2008
+ full
+ ARM64
+ false
+ prompt
+ true
+ true
+
+
+
+ bin\ARM64\Release\
+ TRACE;NETFX_CORE;WINDOWS_UWP
+ true
+ ;2008
+ pdbonly
+ ARM64
+ false
+ prompt
+ true
+ true
+
+
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
+ ;2008
+ full
+ x64
+ false
+ prompt
+ true
+
+
+
+ bin\x64\Release\
+ TRACE;NETFX_CORE;WINDOWS_UWP
+ true
+ ;2008
+ pdbonly
+ x64
+ false
+ prompt
+ true
+ true
+
+
+
+ PackageReference
+
+
+
+
+ 6.2.12
+
+
+ 2.7.0
+
+
+
+
+ 14.0
+
+
+
+
diff --git a/common/Labs.Uwp.props b/common/Labs.Uwp.props
index ce5539590..5780fbf35 100644
--- a/common/Labs.Uwp.props
+++ b/common/Labs.Uwp.props
@@ -1,146 +1,8 @@
-
-
+
- 10.0.19041.0
- 10.0.17763.0
- false
$(UwpTargetFramework)
-
-
- Debug
- x86
- AppContainerExe
- Properties
- en-US
- UAP
- 14
- 512
- {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- true
- false
-
-
-
- true
- bin\x86\Debug\
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
- ;2008
- full
- x86
- false
- prompt
- true
-
-
-
- bin\x86\Release\
- TRACE;NETFX_CORE;WINDOWS_UWP
- true
- ;2008
- pdbonly
- x86
- false
- prompt
- true
- true
-
-
-
- true
- bin\ARM\Debug\
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
- ;2008
- full
- ARM
- false
- prompt
- true
-
-
-
- bin\ARM\Release\
- TRACE;NETFX_CORE;WINDOWS_UWP
- true
- ;2008
- pdbonly
- ARM
- false
- prompt
- true
- true
-
-
-
- true
- bin\ARM64\Debug\
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
- ;2008
- full
- ARM64
- false
- prompt
- true
- true
-
-
-
- bin\ARM64\Release\
- TRACE;NETFX_CORE;WINDOWS_UWP
- true
- ;2008
- pdbonly
- ARM64
- false
- prompt
- true
- true
-
-
-
- true
- bin\x64\Debug\
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
- ;2008
- full
- x64
- false
- prompt
- true
-
-
-
- bin\x64\Release\
- TRACE;NETFX_CORE;WINDOWS_UWP
- true
- ;2008
- pdbonly
- x64
- false
- prompt
- true
- true
-
-
-
- PackageReference
-
-
-
-
- 6.2.12
-
-
- 2.7.0
-
-
-
-
- 14.0
-
-
-
-
\ No newline at end of file
+
diff --git a/common/Labs.WinAppSdk.props b/common/Labs.WinAppSdk.props
index 21fa80db0..7d8834af4 100644
--- a/common/Labs.WinAppSdk.props
+++ b/common/Labs.WinAppSdk.props
@@ -14,4 +14,11 @@
true
WINAPPSDK
-
\ No newline at end of file
+
+
+
+
+
+
+
+
diff --git a/labs/CanvasLayout/tests/CanvasLayout.UnitTests.Uwp/CanvasLayout.UnitTests.Uwp.csproj b/labs/CanvasLayout/tests/CanvasLayout.UnitTests.Uwp/CanvasLayout.UnitTests.Uwp.csproj
index 132ccd952..85893112f 100644
--- a/labs/CanvasLayout/tests/CanvasLayout.UnitTests.Uwp/CanvasLayout.UnitTests.Uwp.csproj
+++ b/labs/CanvasLayout/tests/CanvasLayout.UnitTests.Uwp/CanvasLayout.UnitTests.Uwp.csproj
@@ -1,123 +1,17 @@
-
-
+
+
+
- Debug
- x86
{F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}
- AppContainerExe
- Properties
CanvasLayout.UnitTests.Uwp
CanvasLayout.UnitTests.Uwp
- en-US
- UAP
- 10.0.19041.0
- 10.0.17763.0
- 14
- 512
- {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
$(VisualStudioVersion)
- false
-
- true
- bin\x86\Debug\
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
- ;2008
- full
- x86
- false
- prompt
- true
-
-
- bin\x86\Release\
- TRACE;NETFX_CORE;WINDOWS_UWP
- true
- ;2008
- pdbonly
- x86
- false
- prompt
- true
- true
-
-
- true
- bin\ARM\Debug\
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
- ;2008
- full
- ARM
- false
- prompt
- true
-
-
- bin\ARM\Release\
- TRACE;NETFX_CORE;WINDOWS_UWP
- true
- ;2008
- pdbonly
- ARM
- false
- prompt
- true
- true
-
-
- true
- bin\ARM64\Debug\
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
- ;2008
- full
- ARM64
- false
- prompt
- true
- true
-
-
- bin\ARM64\Release\
- TRACE;NETFX_CORE;WINDOWS_UWP
- true
- ;2008
- pdbonly
- ARM64
- false
- prompt
- true
- true
-
-
- true
- bin\x64\Debug\
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
- ;2008
- full
- x64
- false
- prompt
- true
-
-
- bin\x64\Release\
- TRACE;NETFX_CORE;WINDOWS_UWP
- true
- ;2008
- pdbonly
- x64
- false
- prompt
- true
- true
-
-
- PackageReference
-
-
-
-
+
+
+
@@ -153,27 +47,8 @@
-
-
- 6.2.13
-
-
- 2.2.8
-
-
- 2.2.8
-
-
+
+
+
-
- 14.0
-
-
-
diff --git a/labs/CanvasLayout/tests/CanvasLayout.UnitTests.Uwp/UnitTestApp.xaml.cs b/labs/CanvasLayout/tests/CanvasLayout.UnitTests.Uwp/UnitTestApp.xaml.cs
index ee8411c05..b70a733cf 100644
--- a/labs/CanvasLayout/tests/CanvasLayout.UnitTests.Uwp/UnitTestApp.xaml.cs
+++ b/labs/CanvasLayout/tests/CanvasLayout.UnitTests.Uwp/UnitTestApp.xaml.cs
@@ -49,7 +49,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
// Do not repeat app initialization when the Window already has content,
// just ensure that the window is active
- if (Window.Current.Content is Frame rootFrame)
+ if (Window.Current.Content is not Frame rootFrame)
{
// Create a Frame to act as the navigation context and navigate to the first page
rootFrame = new Frame();
diff --git a/labs/CanvasLayout/tests/CanvasLayout.UnitTests.WinAppSdk/CanvasLayout.UnitTests.WinAppSdk.csproj b/labs/CanvasLayout/tests/CanvasLayout.UnitTests.WinAppSdk/CanvasLayout.UnitTests.WinAppSdk.csproj
index 7451717d5..adabebc17 100644
--- a/labs/CanvasLayout/tests/CanvasLayout.UnitTests.WinAppSdk/CanvasLayout.UnitTests.WinAppSdk.csproj
+++ b/labs/CanvasLayout/tests/CanvasLayout.UnitTests.WinAppSdk/CanvasLayout.UnitTests.WinAppSdk.csproj
@@ -1,16 +1,7 @@
-
- WinExe
- net6.0-windows10.0.19041.0
- 10.0.17763.0
- CanvasLayout.UnitTests.WinAppSdk
- app.manifest
- x86;x64;arm64
- win10-x86;win10-x64;win10-arm64
- win10-$(Platform).pubxml
- true
- true
-
+
+
+
@@ -19,12 +10,6 @@
-
-
-
-
-
-
@@ -32,26 +17,7 @@
-
-
-
-
-
-
- 2.2.8
-
-
- 2.2.8
-
-
- 17.1.0
- build
-
-
-
-
-
-
+
diff --git a/platforms/CommunityToolkit.Labs.WinAppSdk/CommunityToolkit.Labs.WinAppSdk.csproj b/platforms/CommunityToolkit.Labs.WinAppSdk/CommunityToolkit.Labs.WinAppSdk.csproj
index 530334f4e..82ef33373 100644
--- a/platforms/CommunityToolkit.Labs.WinAppSdk/CommunityToolkit.Labs.WinAppSdk.csproj
+++ b/platforms/CommunityToolkit.Labs.WinAppSdk/CommunityToolkit.Labs.WinAppSdk.csproj
@@ -9,12 +9,6 @@
app.manifest
-
-
-
-
-
-
diff --git a/tests/CommunityToolkit.Labs.UnitTests.Uwp/CommunityToolkit.Labs.UnitTests.Uwp.csproj b/tests/CommunityToolkit.Labs.UnitTests.Uwp/CommunityToolkit.Labs.UnitTests.Uwp.csproj
index 159245c90..5f0a2e0bc 100644
--- a/tests/CommunityToolkit.Labs.UnitTests.Uwp/CommunityToolkit.Labs.UnitTests.Uwp.csproj
+++ b/tests/CommunityToolkit.Labs.UnitTests.Uwp/CommunityToolkit.Labs.UnitTests.Uwp.csproj
@@ -1,123 +1,16 @@
-
+
+
- Debug
- x86
{FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}
- AppContainerExe
- Properties
CommunityToolkit.Labs.UnitTests.Uwp
CommunityToolkit.Labs.UnitTests.Uwp
- en-US
- UAP
- 10.0.19041.0
- 10.0.17763.0
- 14
- 512
- {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
$(VisualStudioVersion)
- false
-
- true
- bin\x86\Debug\
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
- ;2008
- full
- x86
- false
- prompt
- true
-
-
- bin\x86\Release\
- TRACE;NETFX_CORE;WINDOWS_UWP
- true
- ;2008
- pdbonly
- x86
- false
- prompt
- true
- true
-
-
- true
- bin\ARM\Debug\
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
- ;2008
- full
- ARM
- false
- prompt
- true
-
-
- bin\ARM\Release\
- TRACE;NETFX_CORE;WINDOWS_UWP
- true
- ;2008
- pdbonly
- ARM
- false
- prompt
- true
- true
-
-
- true
- bin\ARM64\Debug\
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
- ;2008
- full
- ARM64
- false
- prompt
- true
- true
-
-
- bin\ARM64\Release\
- TRACE;NETFX_CORE;WINDOWS_UWP
- true
- ;2008
- pdbonly
- ARM64
- false
- prompt
- true
- true
-
-
- true
- bin\x64\Debug\
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
- ;2008
- full
- x64
- false
- prompt
- true
-
-
- bin\x64\Release\
- TRACE;NETFX_CORE;WINDOWS_UWP
- true
- ;2008
- pdbonly
- x64
- false
- prompt
- true
- true
-
-
- PackageReference
-
-
-
-
+
+
+
@@ -159,21 +52,9 @@
-
-
- 6.2.13
-
-
- 2.2.8
-
-
- 2.2.8
-
-
+
+
+
-
- 14.0
-
-
diff --git a/tests/CommunityToolkit.Labs.UnitTests.Uwp/UnitTestApp.xaml.cs b/tests/CommunityToolkit.Labs.UnitTests.Uwp/UnitTestApp.xaml.cs
index 1dd2c8c9e..f2c78815d 100644
--- a/tests/CommunityToolkit.Labs.UnitTests.Uwp/UnitTestApp.xaml.cs
+++ b/tests/CommunityToolkit.Labs.UnitTests.Uwp/UnitTestApp.xaml.cs
@@ -49,7 +49,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
// Do not repeat app initialization when the Window already has content,
// just ensure that the window is active
- if (Window.Current.Content is Frame rootFrame)
+ if (Window.Current.Content is not Frame rootFrame)
{
// Create a Frame to act as the navigation context and navigate to the first page
rootFrame = new Frame();
diff --git a/tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/CommunityToolkit.Labs.UnitTests.WinAppSdk.csproj b/tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/CommunityToolkit.Labs.UnitTests.WinAppSdk.csproj
index 4d0170dd6..a4ffbfcd7 100644
--- a/tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/CommunityToolkit.Labs.UnitTests.WinAppSdk.csproj
+++ b/tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/CommunityToolkit.Labs.UnitTests.WinAppSdk.csproj
@@ -1,16 +1,7 @@
-
- WinExe
- net6.0-windows10.0.19041.0
- 10.0.17763.0
- CommunityToolkit.Labs.UnitTests.WinAppSdk
- app.manifest
- x86;x64;arm64
- win10-x86;win10-x64;win10-arm64
- win10-$(Platform).pubxml
- true
- true
-
+
+
+
@@ -21,12 +12,6 @@
-
-
-
-
-
-
@@ -34,26 +19,7 @@
-
-
-
-
-
-
- 2.2.8
-
-
- 2.2.8
-
-
- 17.1.0
- build
-
-
-
-
-
-
+
diff --git a/tests/Labs.Tests.Uwp.props b/tests/Labs.Tests.Uwp.props
new file mode 100644
index 000000000..281c85e2c
--- /dev/null
+++ b/tests/Labs.Tests.Uwp.props
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/tests/Labs.Tests.WinAppSdk.props b/tests/Labs.Tests.WinAppSdk.props
new file mode 100644
index 000000000..cbd38ae60
--- /dev/null
+++ b/tests/Labs.Tests.WinAppSdk.props
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+ 17.1.0
+ build
+
+
+
+
+
+
+
+
diff --git a/tests/Labs.Tests.props b/tests/Labs.Tests.props
new file mode 100644
index 000000000..e85d63e0d
--- /dev/null
+++ b/tests/Labs.Tests.props
@@ -0,0 +1,11 @@
+
+
+
+
+ 2.2.8
+
+
+ 2.2.8
+
+
+