diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8655cb0cb..ef5782c8d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,19 +17,81 @@ on:
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
- # This workflow contains a single job called "build"
- build:
+ # This workflow contains a single job called "Build-WinUI-2"
+ Build-WinUI-2:
# The type of runner that the job will run on
runs-on: windows-latest
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- # Needed until XAML Styler updates to .NET 6
- - name: Install .NET Core 3.1 SDK
+ - name: Install .NET 6 SDK
uses: actions/setup-dotnet@v1
with:
- dotnet-version: '3.1.x'
+ dotnet-version: '6.0.201'
+
+ # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+ - name: Checkout Repository
+ uses: actions/checkout@v2
+
+ # Restore Tools from Manifest list in the Repository
+ - name: Restore dotnet tools
+ run: dotnet tool restore
+
+ - name: Run Uno Check to Install Dependencies
+ run: dotnet tool run uno-check --ci --fix --non-interactive --skip wsl --skip androidemulator --verbose
+
+ - name: Add msbuild to PATH
+ uses: microsoft/setup-msbuild@v1.0.3
+
+ - name: Enable all TargetFrameworks
+ working-directory: ./common/Scripts/
+ run: ./UseTargetFrameworks.ps1 all
+
+ - name: MSBuild
+ # working-directory: ./
+ run: msbuild.exe Toolkit.Labs.All.sln /restore -p:Configuration=Release
+
+ # Build All Packages - TODO: Detect experiments
+ - name: pack CanvasLayout
+ working-directory: ./labs/CanvasLayout/src
+ run: msbuild -t:pack /p:Configuration=Release /p:DebugType=Portable
+
+ # Push Packages to our DevOps Artifacts Feed
+ - name: Add source
+ run: dotnet nuget add source "https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-Labs/nuget/v3/index.json" --name LabsFeed --username dummy --password ${{ secrets.DEVOPS_PACKAGE_PUSH_TOKEN }}
+
+ - name: Push packages
+ if: ${{github.ref == 'refs/heads/main'}}
+ run: dotnet nuget push "**/*.nupkg" --api-key dummy --source LabsFeed --skip-duplicate
+
+ # Run tests
+ - name: Setup VSTest Path
+ uses: darenm/Setup-VSTest@v1
+
+ - name: Run SourceGenerators tests
+ run: vstest.console.exe ./Common/CommunityToolkit.Labs.Core.SourceGenerators.Tests/CommunityToolkit.Labs.Core.SourceGenerators.Tests/bin/Release/net6.0/CommunityToolkit.Labs.Core.SourceGenerators.Tests.dll /logger:"trx;LogFileName=SourceGenerators.trx"
+ - name: Run experiment tests against UWP
+ run: vstest.console.exe ./Tests/**/CommunityToolkit.Labs.UnitTests.UWP.build.appxrecipe /Framework:FrameworkUap10 /logger:"trx;LogFileName=UWP.trx"
+
+ - name: Run experiment tests against WinAppSDK
+ run: vstest.console.exe ./Tests/**/CommunityToolkit.Labs.UnitTests.WinAppSdk.build.appxrecipe /Framework:FrameworkUap10 /logger:"trx;LogFileName=WinAppSdk.trx"
+
+ - name: Create test reports
+ uses: dorny/test-reporter@v1
+ if: success() || failure() # run this step even if previous step failed
+ with:
+ name: Test results
+ path: './TestResults/*.trx'
+ reporter: dotnet-trx
+
+ # This workflow contains a single job called "Build-WinUI-3"
+ Build-WinUI-3:
+ # The type of runner that the job will run on
+ runs-on: windows-latest
+
+ # Steps represent a sequence of tasks that will be executed as part of the job
+ steps:
- name: Install .NET 6 SDK
uses: actions/setup-dotnet@v1
with:
@@ -43,11 +105,8 @@ jobs:
- name: Restore dotnet tools
run: dotnet tool restore
- - name: Check XAML Styling
- run: ./ApplyXamlStyling.ps1 -Passive
-
- name: Run Uno Check to Install Dependencies
- run: dotnet tool run uno-check --ci --fix --non-interactive --skip wsl --skip androidemulator #--verbose
+ run: dotnet tool run uno-check --ci --fix --non-interactive --skip wsl --skip androidemulator --verbose
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.0.3
@@ -56,6 +115,10 @@ jobs:
working-directory: ./common/Scripts/
run: ./UseTargetFrameworks.ps1 all
+ - name: Enable WinUI 3
+ working-directory: ./common/Scripts/
+ run: ./UseUnoWinUI.ps1 3
+
- name: MSBuild
# working-directory: ./
run: msbuild.exe Toolkit.Labs.All.sln /restore -p:Configuration=Release
@@ -73,7 +136,6 @@ jobs:
if: ${{github.ref == 'refs/heads/main'}}
run: dotnet nuget push "**/*.nupkg" --api-key dummy --source LabsFeed --skip-duplicate
-
# Run tests
- name: Setup VSTest Path
uses: darenm/Setup-VSTest@v1
@@ -94,6 +156,30 @@ jobs:
name: Test results
path: './TestResults/*.trx'
reporter: dotnet-trx
+
+ # This workflow contains a single job called "Xaml-Style-Check"
+ Xaml-Style-Check:
+ # The type of runner that the job will run on
+ runs-on: windows-latest
+
+ # Steps represent a sequence of tasks that will be executed as part of the job
+ steps:
+ # Needed until XAML Styler updates to .NET 6
+ - name: Install .NET Core 3.1 SDK
+ uses: actions/setup-dotnet@v1
+ with:
+ dotnet-version: '3.1.x'
+
+ # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+ - name: Checkout Repository
+ uses: actions/checkout@v2
+
+ # Restore Tools from Manifest list in the Repository
+ - name: Restore dotnet tools
+ run: dotnet tool restore
+
+ - name: Check XAML Styling
+ run: ./ApplyXamlStyling.ps1 -Passive
# Test/temp job to build a single experiment to ensure our changes work for both our main types of solutions at the moment
experiment:
diff --git a/common/CommunityToolkit.Labs.Shared/App.xaml.cs b/common/CommunityToolkit.Labs.Shared/App.xaml.cs
index 60048da08..1e80ce84c 100644
--- a/common/CommunityToolkit.Labs.Shared/App.xaml.cs
+++ b/common/CommunityToolkit.Labs.Shared/App.xaml.cs
@@ -56,50 +56,27 @@ public App()
/// Details about the launch request and process.
protected override void OnLaunched(LaunchActivatedEventArgs e)
{
- Frame? rootFrame = null;
-
#if WINAPPSDK
- var window = new Window();
-#else
- rootFrame = currentWindow.Content as Frame;
+ currentWindow = new Window();
#endif
// Do not repeat app initialization when the Window already has content,
// just ensure that the window is active
- if (rootFrame == null)
+ if (currentWindow.Content is not Frame rootFrame)
{
// Create a Frame to act as the navigation context and navigate to the first page
- rootFrame = new Frame();
+ currentWindow.Content = rootFrame = new Frame();
rootFrame.NavigationFailed += OnNavigationFailed;
-
-#if WINAPPSDK
- window.Content = rootFrame;
-#else
- // Place the frame in the current Window
- currentWindow.Content = rootFrame;
-#endif
}
-
-#if WINAPPSDK
- rootFrame.Navigate(typeof(AppLoadingView), e.Arguments);
- window.Activate();
-#else
+#if !WINAPPSDK
if (e.PrelaunchActivated == false)
- {
- if (rootFrame is null)
- throw new InvalidOperationException("Cannot display app content, root frame is missing.");
-
- if (rootFrame.Content == null)
- {
- rootFrame.Navigate(typeof(AppLoadingView), e.Arguments);
- }
-
- // Ensure the current window is active
- currentWindow.Activate();
- }
#endif
+ rootFrame.Navigate(typeof(AppLoadingView), e.Arguments);
+
+ // Ensure the current window is active
+ currentWindow.Activate();
}
///
diff --git a/common/Labs.Head.props b/common/Labs.Head.props
index 18ce2781c..71f95018f 100644
--- a/common/Labs.Head.props
+++ b/common/Labs.Head.props
@@ -1,6 +1,5 @@
-
diff --git a/common/Labs.MultiTarget.props b/common/Labs.MultiTarget.props
index de1eafcae..ccd245502 100644
--- a/common/Labs.MultiTarget.props
+++ b/common/Labs.MultiTarget.props
@@ -1,9 +1,8 @@
-
+
+
- 2.x
-
- netstandard2.0;
+ $(NetStandardCommonTargetFramework);
$(UwpTargetFramework);
$(WinAppSdkTargetFramework);
$(MacOSLibTargetFramework);
@@ -19,11 +18,9 @@
$(AndroidLibTargetFramework);
- True
-
true
false
- WINAPPSDK
+ $(DefineConstants);WINAPPSDK
@@ -31,10 +28,6 @@
10.0.19041.0
-
-
-
-
@@ -42,15 +35,11 @@
-
-
-
-
diff --git a/common/Labs.TargetFrameworks.All.props b/common/Labs.TargetFrameworks.All.props
index 80b091f45..e0299d571 100644
--- a/common/Labs.TargetFrameworks.All.props
+++ b/common/Labs.TargetFrameworks.All.props
@@ -7,11 +7,16 @@
net5.0
netcoreapp3.1
- netstandard2.0
- netstandard2.0
monoandroid11.0
xamarinmac20
xamarinios10
+
+
+ netstandard2.0
+ netstandard2.0
netstandard2.0
+
+
+ netstandard2.0
\ No newline at end of file
diff --git a/common/Labs.TargetFrameworks.props b/common/Labs.TargetFrameworks.props
index 78d051bb6..417d9af87 100644
--- a/common/Labs.TargetFrameworks.props
+++ b/common/Labs.TargetFrameworks.props
@@ -7,11 +7,16 @@
net5.0
netcoreapp3.1
- netstandard2.0
-
+
+
+ netstandard2.0
+ netstandard2.0
netstandard2.0
+
+
+ netstandard2.0
diff --git a/common/Labs.Uno.props b/common/Labs.Uno.props
new file mode 100644
index 000000000..1f6ef9c5f
--- /dev/null
+++ b/common/Labs.Uno.props
@@ -0,0 +1,47 @@
+
+
+
+
+ True
+ True
+ True
+
+ True
+ True
+ True
+
+ True
+ True
+ True
+
+ True
+ True
+ True
+
+ True
+
+ $(DefineConstants);
+
+ Uwp
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/common/Labs.Uwp.Base.props b/common/Labs.Uwp.Base.props
index e03164903..312a1e57f 100644
--- a/common/Labs.Uwp.Base.props
+++ b/common/Labs.Uwp.Base.props
@@ -25,7 +25,7 @@
true
bin\x86\Debug\
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
+ $(DefineConstants);DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
;2008
full
x86
@@ -36,7 +36,7 @@
bin\x86\Release\
- TRACE;NETFX_CORE;WINDOWS_UWP
+ $(DefineConstants);TRACE;NETFX_CORE;WINDOWS_UWP
true
;2008
pdbonly
@@ -50,7 +50,7 @@
true
bin\ARM\Debug\
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
+ $(DefineConstants);DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
;2008
full
ARM
@@ -61,7 +61,7 @@
bin\ARM\Release\
- TRACE;NETFX_CORE;WINDOWS_UWP
+ $(DefineConstants);TRACE;NETFX_CORE;WINDOWS_UWP
true
;2008
pdbonly
@@ -75,7 +75,7 @@
true
bin\ARM64\Debug\
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
+ $(DefineConstants);DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
;2008
full
ARM64
@@ -87,7 +87,7 @@
bin\ARM64\Release\
- TRACE;NETFX_CORE;WINDOWS_UWP
+ $(DefineConstants);TRACE;NETFX_CORE;WINDOWS_UWP
true
;2008
pdbonly
@@ -101,7 +101,7 @@
true
bin\x64\Debug\
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
+ $(DefineConstants);DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
;2008
full
x64
@@ -112,7 +112,7 @@
bin\x64\Release\
- TRACE;NETFX_CORE;WINDOWS_UWP
+ $(DefineConstants);TRACE;NETFX_CORE;WINDOWS_UWP
true
;2008
pdbonly
diff --git a/common/Labs.Wasm.props b/common/Labs.Wasm.props
index 7d60d3005..0eb1f9bc4 100644
--- a/common/Labs.Wasm.props
+++ b/common/Labs.Wasm.props
@@ -2,10 +2,19 @@
+
+ False
+ False
+ False
+ True
+ False
+
+
+
+
Exe
$(WasmHeadTargetFramework)
- NU1701
true
@@ -26,9 +35,6 @@
-
-
-
diff --git a/common/Scripts/UseTargetFrameworks.ps1 b/common/Scripts/UseTargetFrameworks.ps1
index cafc25b3a..256008db8 100644
--- a/common/Scripts/UseTargetFrameworks.ps1
+++ b/common/Scripts/UseTargetFrameworks.ps1
@@ -8,18 +8,19 @@ Param (
)
if ($allowGitChanges.IsPresent) {
- Write-Warning "Changes to the default TargetFrameworks in Labs can now be committed. Run this command again without the --allow-git-changes flag to disable committing further changes.";
+ Write-Warning "Changes to the default TargetFrameworks in Labs can now be committed. Run this command again without the -allowGitChanges flag to disable committing further changes.";
git update-index --no-assume-unchanged ../Labs.TargetFrameworks.props
}
else {
+ Write-Output "Changes to the default TargetFrameworks in Labs are now suppressed. To switch branches, run git reset --hard with a clean working tree.";
git update-index --assume-unchanged ../Labs.TargetFrameworks.props
}
-$WasmTfm = "WasmLibTargetFramework";
$UwpTfm = "UwpTargetFramework";
$WinAppSdkTfm = "WinAppSdkTargetFramework";
-$WpfTfm = "WpfLibTargetFramework";
-$GtkTfm = "LinuxLibTargetFramework";
+$WasmTfm = "NetStandardCommonTargetFramework";
+$WpfTfm = "NetStandardCommonTargetFramework";
+$GtkTfm = "NetStandardCommonTargetFramework";
$macOSTfm = "MacOSLibTargetFramework";
$iOSTfm = "iOSLibTargetFramework";
$DroidTfm = "AndroidLibTargetFramework";
diff --git a/common/Scripts/UseUnoWinUI.ps1 b/common/Scripts/UseUnoWinUI.ps1
new file mode 100644
index 000000000..06451ac93
--- /dev/null
+++ b/common/Scripts/UseUnoWinUI.ps1
@@ -0,0 +1,33 @@
+Param (
+ [Parameter(HelpMessage = "The WinUI version to use when building an Uno head.", Mandatory = $true)]
+ [ValidateSet('2', '3')]
+ [string]$targets,
+
+ [Parameter(HelpMessage = "Disables suppressing changes to the Labs.Uno.props file in git, allowing changes to be committed.")]
+ [switch]$allowGitChanges = $false
+)
+
+if ($allowGitChanges.IsPresent) {
+ Write-Warning "Changes to the default Uno package references in Labs can now be committed. Run this command again without the -allowGitChanges flag to disable committing further changes.";
+ git update-index --no-assume-unchanged ../Labs.Uno.props
+}
+else {
+ Write-Output "Changes the default Uno package references in Labs are now suppressed. To switch branches, run git reset --hard with a clean working tree.";
+ git update-index --assume-unchanged ../Labs.Uno.props
+}
+
+$fileContents = Get-Content -Path ../Labs.Uno.props
+
+if ($targets -eq "3") {
+ $fileContents = $fileContents -replace 'Uno.UI', 'Uno.WinUI';
+ $fileContents = $fileContents -replace 'Uwp', 'WinUI';
+ $fileContents = $fileContents -replace '\$\(DefineConstants\);', '$(DefineConstants);WINAPPSDK;';
+}
+
+if ($targets -eq "2") {
+ $fileContents = $fileContents -replace 'Uno.WinUI', 'Uno.UI';
+ $fileContents = $fileContents -replace 'WinUI', 'Uwp';
+ $fileContents = $fileContents -replace 'WINAPPSDK;', '';
+}
+
+Set-Content -Force -Path ../Labs.Uno.props -Value $fileContents;
diff --git a/labs/CanvasLayout/samples/CanvasLayout.Sample/CanvasLayout.Sample.csproj b/labs/CanvasLayout/samples/CanvasLayout.Sample/CanvasLayout.Sample.csproj
index ed0dd8119..a5beb8062 100644
--- a/labs/CanvasLayout/samples/CanvasLayout.Sample/CanvasLayout.Sample.csproj
+++ b/labs/CanvasLayout/samples/CanvasLayout.Sample/CanvasLayout.Sample.csproj
@@ -38,8 +38,6 @@
-
- WinUITarget=$(WinUITarget)
-
+
diff --git a/labs/CanvasLayout/samples/CanvasLayout.Wasm/Program.cs b/labs/CanvasLayout/samples/CanvasLayout.Wasm/Program.cs
index 236a5af5e..8de4e65c7 100644
--- a/labs/CanvasLayout/samples/CanvasLayout.Wasm/Program.cs
+++ b/labs/CanvasLayout/samples/CanvasLayout.Wasm/Program.cs
@@ -1,6 +1,11 @@
using CommunityToolkit.Labs.Shared;
using System;
+
+#if WINAPPSDK
+using Microsoft.UI.Xaml;
+#else
using Windows.UI.Xaml;
+#endif
namespace CanvasLayout.Wasm
{
@@ -10,7 +15,7 @@ public class Program
static int Main(string[] args)
{
- Windows.UI.Xaml.Application.Start(_ => _app = new App());
+ Application.Start(_ => _app = new App());
return 0;
}
diff --git a/labs/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj b/labs/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj
index be7d35e73..555ac1cc3 100644
--- a/labs/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj
+++ b/labs/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj
@@ -6,7 +6,7 @@
- CommunityToolkit.Labs.WinUI.CanvasLayout
+ CommunityToolkit.Labs.$(PackageIdVariant).CanvasLayout
This package contains a CanvasLayout Layout for ItemsRepeater.
diff --git a/platforms/CommunityToolkit.Labs.Droid/CommunityToolkit.Labs.Droid.csproj b/platforms/CommunityToolkit.Labs.Droid/CommunityToolkit.Labs.Droid.csproj
index b07cb3927..b13f17e5f 100644
--- a/platforms/CommunityToolkit.Labs.Droid/CommunityToolkit.Labs.Droid.csproj
+++ b/platforms/CommunityToolkit.Labs.Droid/CommunityToolkit.Labs.Droid.csproj
@@ -1,8 +1,15 @@
-
-
+
+
+
+
+ True
+
+
+
+
Debug
AnyCPU
@@ -30,7 +37,7 @@
portable
false
bin\Debug\
- DEBUG;TRACE
+ $(DefineConstants);DEBUG;TRACE
prompt
4
True
@@ -49,7 +56,7 @@
true
true
bin\Release\
- TRACE
+ $(DefineConstants);TRACE
prompt
4
False
@@ -70,8 +77,6 @@
-
-
diff --git a/platforms/CommunityToolkit.Labs.Droid/Main.cs b/platforms/CommunityToolkit.Labs.Droid/Main.cs
index 74223ee4c..82cf65bcf 100644
--- a/platforms/CommunityToolkit.Labs.Droid/Main.cs
+++ b/platforms/CommunityToolkit.Labs.Droid/Main.cs
@@ -9,7 +9,14 @@
using Android.Views;
using Android.Widget;
using Com.Nostra13.Universalimageloader.Core;
+
+#if WINAPPSDK
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Media;
+#else
+using Windows.UI.Xaml;
using Windows.UI.Xaml.Media;
+#endif
namespace CommunityToolkit.Labs.Droid
{
@@ -20,7 +27,7 @@ namespace CommunityToolkit.Labs.Droid
HardwareAccelerated = true,
Theme = "@style/AppTheme"
)]
- public class Application : Windows.UI.Xaml.NativeApplication
+ public class Application : NativeApplication
{
public Application(IntPtr javaReference, JniHandleOwnership transfer)
: base(() => new CommunityToolkit.Labs.Shared.App(), javaReference, transfer)
diff --git a/platforms/CommunityToolkit.Labs.Droid/MainActivity.cs b/platforms/CommunityToolkit.Labs.Droid/MainActivity.cs
index df8943307..ad3a52a51 100644
--- a/platforms/CommunityToolkit.Labs.Droid/MainActivity.cs
+++ b/platforms/CommunityToolkit.Labs.Droid/MainActivity.cs
@@ -4,6 +4,12 @@
using Android.Content.PM;
using Android.Views;
+#if WINAPPSDK
+using Microsoft.UI.Xaml;
+#else
+using Windows.UI.Xaml;
+#endif
+
namespace CommunityToolkit.Labs.Droid
{
[Activity(
@@ -11,7 +17,7 @@ namespace CommunityToolkit.Labs.Droid
ConfigurationChanges = global::Uno.UI.ActivityHelper.AllConfigChanges,
WindowSoftInputMode = SoftInput.AdjustPan | SoftInput.StateHidden
)]
- public class MainActivity : Windows.UI.Xaml.ApplicationActivity
+ public class MainActivity : ApplicationActivity
{
}
}
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 c173c14e1..3862b9b00 100644
--- a/platforms/CommunityToolkit.Labs.Skia.Gtk/CommunityToolkit.Labs.Skia.Gtk.csproj
+++ b/platforms/CommunityToolkit.Labs.Skia.Gtk/CommunityToolkit.Labs.Skia.Gtk.csproj
@@ -2,6 +2,14 @@
+
+
+ True
+ False
+ False
+
+
+
WinExe
@@ -19,9 +27,6 @@
-
-
-
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 125d1b578..30ac604b8 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,6 +1,15 @@
+
+ False
+ True
+ False
+ False
+
+
+
+
WinExe
Exe
@@ -8,9 +17,8 @@
true
app.manifest
+
-
-
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 ee5fb2f80..3f24e2e0d 100644
--- a/platforms/CommunityToolkit.Labs.Skia.WPF/CommunityToolkit.Labs.Skia.WPF.csproj
+++ b/platforms/CommunityToolkit.Labs.Skia.WPF/CommunityToolkit.Labs.Skia.WPF.csproj
@@ -4,13 +4,18 @@
+ False
+ True
+ True
+ False
$(WpfLibTargetFramework)
+
+
+
-
-
diff --git a/platforms/CommunityToolkit.Labs.Wasm/CommunityToolkit.Labs.Wasm.csproj b/platforms/CommunityToolkit.Labs.Wasm/CommunityToolkit.Labs.Wasm.csproj
index 481ed1b1c..b78aa367f 100644
--- a/platforms/CommunityToolkit.Labs.Wasm/CommunityToolkit.Labs.Wasm.csproj
+++ b/platforms/CommunityToolkit.Labs.Wasm/CommunityToolkit.Labs.Wasm.csproj
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/platforms/CommunityToolkit.Labs.Wasm/Program.cs b/platforms/CommunityToolkit.Labs.Wasm/Program.cs
index f498a68a6..8e0b71456 100644
--- a/platforms/CommunityToolkit.Labs.Wasm/Program.cs
+++ b/platforms/CommunityToolkit.Labs.Wasm/Program.cs
@@ -1,6 +1,11 @@
using CommunityToolkit.Labs.Shared;
using System;
+
+#if WINAPPSDK
+using Microsoft.UI.Xaml;
+#else
using Windows.UI.Xaml;
+#endif
namespace CommunityToolkit.Labs.Wasm
{
@@ -10,7 +15,7 @@ public class Program
static int Main(string[] args)
{
- Windows.UI.Xaml.Application.Start(_ => _app = new App());
+ Application.Start(_ => _app = new App());
return 0;
}
diff --git a/platforms/CommunityToolkit.Labs.iOS/CommunityToolkit.Labs.iOS.csproj b/platforms/CommunityToolkit.Labs.iOS/CommunityToolkit.Labs.iOS.csproj
index 2d243a6ce..1067a459b 100644
--- a/platforms/CommunityToolkit.Labs.iOS/CommunityToolkit.Labs.iOS.csproj
+++ b/platforms/CommunityToolkit.Labs.iOS/CommunityToolkit.Labs.iOS.csproj
@@ -1,8 +1,15 @@
-
+
+
+
+ True
+
+
+
+
Debug
iPhoneSimulator
@@ -21,7 +28,7 @@
portable
false
bin\iPhoneSimulator\Debug
- DEBUG
+ $(DefineConstants);DEBUG
prompt
4
false
@@ -46,7 +53,7 @@
full
false
bin\iPhone\Debug
- DEBUG
+ $(DefineConstants);DEBUG
prompt
4
false
@@ -116,8 +123,6 @@
-
-
diff --git a/platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj b/platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj
index 07387dceb..52c7ab153 100644
--- a/platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj
+++ b/platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj
@@ -1,8 +1,15 @@
-
-
+
+
+
+
+ True
+
+
+
+
Debug
iPhoneSimulator
@@ -20,7 +27,7 @@
full
false
bin\Debug
- DEBUG
+ $(DefineConstants);DEBUG
prompt
4
false
@@ -45,8 +52,7 @@
pdbonly
true
bin\Release
-
-
+ $(DefineConstants);
prompt
4
false
@@ -72,8 +78,6 @@
-
-