diff --git a/build/run-template-tests.ps1 b/build/run-template-tests.ps1 index d1c52876c3b3..8185fa0e4683 100644 --- a/build/run-template-tests.ps1 +++ b/build/run-template-tests.ps1 @@ -112,7 +112,7 @@ dotnet new unolib-crossruntime -n MyCrossRuntimeLib Assert-ExitCodeIsZero # WinUI - Default -dotnet new unoapp-winui -n UnoAppWinUI +dotnet new unoapp-winui -n UnoAppWinUI --winui-desktop=false & $msbuild $debug UnoAppWinUI\UnoAppWinUI.sln Assert-ExitCodeIsZero diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/Uno.ProjectTemplates.Dotnet.csproj b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/Uno.ProjectTemplates.Dotnet.csproj index 184273d79d35..0a6a3e7cab5a 100644 --- a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/Uno.ProjectTemplates.Dotnet.csproj +++ b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/Uno.ProjectTemplates.Dotnet.csproj @@ -95,6 +95,10 @@ <_UnoLibTemplateFiles Include="..\UnoLibraryTemplate\**" Exclude="@(_UnoLibTemplateFilesExclude)" /> + + + + @@ -156,9 +160,9 @@ - - - + + + @@ -208,7 +212,7 @@ var replacedNuget = @" - 3.0.0-preview1.200515.3 + 3.0.0-preview3.201113.0 "; diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/.template.config/template.json b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/.template.config/template.json index 548587b87956..55fa56d6ebd4 100644 --- a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/.template.config/template.json +++ b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/.template.config/template.json @@ -22,6 +22,7 @@ }, "shortName": "unoapp-winui", "sourceName": "UnoWinUIQuickStart", + "defaultName": "UnoApp", "placeholderFilename": "template-ignore", "preferNameDirectory": true, "guids": [ @@ -32,7 +33,7 @@ "B445DF73-AC9E-4276-9FBA-7CB5AD5D2518", "3EA9E612-E717-4E55-9034-DE653429FEFD", // WPF "3EA9E612-E717-4E55-9034-C415CD62AF9A", // UWP - "2B1FDFB6-C93C-4CA1-A6AB-528C4B3654B9", // UWP + "2B1FDFB6-C93C-4CA1-A6AB-528C4B3654B9" // UWP ], "symbols": { "guid1": { @@ -51,6 +52,46 @@ "format": "N" } }, + "guid3": { + "type": "generated", + "generator": "guid", + "replaces": "$guid3$", + "parameters": { + "format": "N" + } + }, + "guid4": { + "type": "generated", + "generator": "guid", + "replaces": "$guid4$", + "parameters": { + "format": "N" + } + }, + "guid5": { + "type": "generated", + "generator": "guid", + "replaces": "$guid5$", + "parameters": { + "format": "N" + } + }, + "guid6": { + "type": "generated", + "generator": "guid", + "replaces": "$guid6$", + "parameters": { + "format": "N" + } + }, + "guid7": { + "type": "generated", + "generator": "guid", + "replaces": "$guid7$", + "parameters": { + "format": "N" + } + }, "windowsPublisherName": { "type": "parameter", "datatype": "text", @@ -88,6 +129,24 @@ "defaultValue": "true", "description": "Enables the macOS platform support project" }, + "skia-wpf": { + "type": "parameter", + "dataType": "bool", + "defaultValue": "true", + "description": "Enables the Skia/WPF platform support project" + }, + "skia-gtk": { + "type": "parameter", + "dataType": "bool", + "defaultValue": "true", + "description": "Enables the Skia/GTK platform support project" + }, + "winui-desktop": { + "type": "parameter", + "dataType": "bool", + "defaultValue": "true", + "description": "Enables the WinUI desktop platform support project" + }, "vscodeWasm": { "type": "parameter", "dataType": "bool", @@ -111,6 +170,14 @@ "condition": "UWP", "path": "UnoWinUIQuickStart.UWP\\UnoWinUIQuickStart.Uwp.csproj" }, + { + "condition": "winui-desktop", + "path": "UnoWinUIQuickStart.Windows.Desktop\\UnoWinUIQuickStart.Windows.Desktop.csproj" + }, + { + "condition": "winui-desktop", + "path": "UnoWinUIQuickStart.Windows.Package\\UnoWinUIQuickStart.Windows.Package.csproj" + }, { "condition": "Wasm", "path": "UnoWinUIQuickStart.Wasm\\UnoWinUIQuickStart.Wasm.csproj" @@ -118,6 +185,18 @@ { "condition": "macOS", "path": "UnoWinUIQuickStart.macOS\\UnoWinUIQuickStart.macOS.csproj" + }, + { + "condition": "skia-gtk", + "path": "UnoWinUIQuickStart.macOS\\UnoWinUIQuickStart.Skia.Gtk.csproj" + }, + { + "condition": "skia-wpf", + "path": "UnoWinUIQuickStart.macOS\\UnoWinUIQuickStart.Skia.WPF.csproj" + }, + { + "condition": "skia-wpf", + "path": "UnoWinUIQuickStart.macOS\\UnoWinUIQuickStart.Skia.WPF.Host.csproj" } ], "sources": [ @@ -153,6 +232,19 @@ "UnoWinUIQuickStart.UWP/**/*" ] }, + { + "condition": "(!skia-gtk)", + "exclude": [ + "UnoWinUIQuickStart.Skia.Gtk/**/*" + ] + }, + { + "condition": "(!skia-wpf)", + "exclude": [ + "UnoWinUIQuickStart.Skia.WPF/**/*", + "UnoWinUIQuickStart.Skia.WPF.Host/**/*" + ] + }, { "condition": "(!vscodeWasm)", "exclude": [ diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/.template.config/vs-2017.3.host.json b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/.template.config/vs-2017.3.host.json index d3b9fb52e402..9c9104e71e19 100644 --- a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/.template.config/vs-2017.3.host.json +++ b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/.template.config/vs-2017.3.host.json @@ -16,6 +16,20 @@ "$isMultiProjectTemplate$": "true" }, "symbolInfo": [ + { + "id": "windowsPublisherName", + "name": { + "text": "Provides the value to use for the Windows head publisher" + }, + "isVisible": "true" + }, + { + "id": "WebAssembly", + "name": { + "text": "Enables the WebAssembly platform support project" + }, + "isVisible": "true" + }, { "id": "UWP", "name": { @@ -43,6 +57,27 @@ "text": "Add support for macOS" }, "isVisible": "true" + }, + { + "id": "skia-wpf", + "name": { + "text": "Enables the Skia/WPF platform support project" + }, + "isVisible": "true" + }, + { + "id": "skia-gtk", + "name": { + "text": "Enables the Skia/GTK platform support project" + }, + "isVisible": "true" + }, + { + "id": "vscodeWasm", + "name": { + "text": "Adds the Visual Studio Code Debugging support files for WebAssembly" + }, + "isVisible": "false" } ] } diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Desktop/Properties/PublishProfiles/win10-arm64.pubxml b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Desktop/Properties/PublishProfiles/win10-arm64.pubxml new file mode 100644 index 000000000000..f8763fd5f51c --- /dev/null +++ b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Desktop/Properties/PublishProfiles/win10-arm64.pubxml @@ -0,0 +1,16 @@ + + + + + FileSystem + arm64 + win10-arm64 + bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ + true + False + True + True + + \ No newline at end of file diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Desktop/Properties/PublishProfiles/win10-x64.pubxml b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Desktop/Properties/PublishProfiles/win10-x64.pubxml new file mode 100644 index 000000000000..9341269df3c7 --- /dev/null +++ b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Desktop/Properties/PublishProfiles/win10-x64.pubxml @@ -0,0 +1,16 @@ + + + + + FileSystem + x64 + win10-x64 + bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ + true + False + True + True + + \ No newline at end of file diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Desktop/Properties/PublishProfiles/win10-x86.pubxml b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Desktop/Properties/PublishProfiles/win10-x86.pubxml new file mode 100644 index 000000000000..6ec2ebadf523 --- /dev/null +++ b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Desktop/Properties/PublishProfiles/win10-x86.pubxml @@ -0,0 +1,16 @@ + + + + + FileSystem + x86 + win10-x86 + bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ + true + False + True + True + + \ No newline at end of file diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Desktop/UnoWinUIQuickStart.Windows.Desktop.csproj b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Desktop/UnoWinUIQuickStart.Windows.Desktop.csproj new file mode 100644 index 000000000000..6c32746c74c8 --- /dev/null +++ b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Desktop/UnoWinUIQuickStart.Windows.Desktop.csproj @@ -0,0 +1,22 @@ + + + WinExe + net5.0-windows10.0.18362.0 + 10.0.17134.0 + UnoWinUIQuickStart + app.manifest + x86;x64;arm64 + win10-x86;win10-x64;win10-arm64 + + + + + + + + + + + + + diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Desktop/app.manifest b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Desktop/app.manifest new file mode 100644 index 000000000000..a7fc216daa0c --- /dev/null +++ b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Desktop/app.manifest @@ -0,0 +1,15 @@ + + + + + + + + true/PM + PerMonitorV2, PerMonitor + + + diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Images/LockScreenLogo.scale-200.png b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Images/LockScreenLogo.scale-200.png new file mode 100644 index 000000000000..735f57adb5df Binary files /dev/null and b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Images/LockScreenLogo.scale-200.png differ diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Images/SplashScreen.scale-200.png b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Images/SplashScreen.scale-200.png new file mode 100644 index 000000000000..023e7f1feda7 Binary files /dev/null and b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Images/SplashScreen.scale-200.png differ diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Images/Square150x150Logo.scale-200.png b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Images/Square150x150Logo.scale-200.png new file mode 100644 index 000000000000..af49fec1a548 Binary files /dev/null and b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Images/Square150x150Logo.scale-200.png differ diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Images/Square44x44Logo.scale-200.png b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Images/Square44x44Logo.scale-200.png new file mode 100644 index 000000000000..ce342a2ec8a6 Binary files /dev/null and b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Images/Square44x44Logo.scale-200.png differ diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Images/Square44x44Logo.targetsize-24_altform-unplated.png b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Images/Square44x44Logo.targetsize-24_altform-unplated.png new file mode 100644 index 000000000000..f6c02ce97e0a Binary files /dev/null and b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Images/Square44x44Logo.targetsize-24_altform-unplated.png differ diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Images/StoreLogo.png b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Images/StoreLogo.png new file mode 100644 index 000000000000..7385b56c0e4d Binary files /dev/null and b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Images/StoreLogo.png differ diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Images/Wide310x150Logo.scale-200.png b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Images/Wide310x150Logo.scale-200.png new file mode 100644 index 000000000000..288995b397fd Binary files /dev/null and b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Images/Wide310x150Logo.scale-200.png differ diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Package.appxmanifest b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Package.appxmanifest new file mode 100644 index 000000000000..13c8d24243cb --- /dev/null +++ b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Package.appxmanifest @@ -0,0 +1,49 @@ + + + + + + + + UnoWinUIQuickStart + UnoWinUIQuickStart + Images\StoreLogo.png + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/UnoWinUIQuickStart.Windows.Package.wapproj b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/UnoWinUIQuickStart.Windows.Package.wapproj new file mode 100644 index 000000000000..7208fe4c4aa8 --- /dev/null +++ b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/UnoWinUIQuickStart.Windows.Package.wapproj @@ -0,0 +1,73 @@ + + + + 15.0 + + + + Debug + x86 + + + Release + x86 + + + Debug + x64 + + + Release + x64 + + + Debug + arm64 + + + Release + arm64 + + + + $(MSBuildExtensionsPath)\Microsoft\DesktopBridge\ + UnoWinUIQuickStart.Windows.Desktop\ + + + + $guid6$ + 10.0.19041.0 + 10.0.17763.0 + en-US + false + $(MSBuildThisFileDirectory)build\ + ..\UnoWinUIQuickStart.Windows.Desktop\UnoWinUIQuickStart.Windows.Desktop.csproj + + + + Designer + + + + + + + + + + + + + + True + Properties\PublishProfiles\win10-$(Platform).pubxml + + + + + + + + + + diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/build/Microsoft.WinUI.AppX.targets b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/build/Microsoft.WinUI.AppX.targets new file mode 100644 index 000000000000..a2bd354b1da4 --- /dev/null +++ b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/build/Microsoft.WinUI.AppX.targets @@ -0,0 +1,238 @@ + + + + + + + + + + + + $(MSBuildThisFileDirectory) + + + $(WinUIClassRegistrationsDir.Substring(0,$(WinUIClassRegistrationsDir.IndexOf(';')))) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(MSBuildWarningsAsMessages); + + + APPX1707; + + + $(MSBuildWarningsAsMessages); + + + MSB3268; + + + + + + + + + Windows + 10.0 + en-US + + + + + + <_MuxRuntimeIdentifier Condition="'$(Platform)' == 'Win32'">win10-x86 + <_MuxRuntimeIdentifier Condition="'$(Platform)' != 'Win32'">win10-$(Platform) + + + + $([MSBuild]::MakeRelative($(MSBuildThisFileDirectory)..\runtimes\$(_MuxRuntimeIdentifier)\native\, %(RootDir)%(Directory))) + + + + + + + + + %(WapProjPackageFile.DestinationSubDirectory)%(TargetPath) + + + %(UploadWapProjPackageFile.DestinationSubDirectory)%(TargetPath) + + + + + + + + + + + + + + + + + + + + + UAP + + + + diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.sln b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.sln index 8985b35f2f60..ec9faeb2b560 100644 --- a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.sln +++ b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.sln @@ -1,4 +1,3 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29920.165 @@ -8,17 +7,17 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "UnoWinUIQuickStart.Shared", EndProject #//#if (Android) -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnoWinUIQuickStart.Droid", "UnoWinUIQuickStart.Droid\UnoWinUIQuickStart.Droid.csproj", "{39B54BC2-8C54-40EC-8872-AFA27A17F208}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnoWinUIQuickStart.Droid", "UnoWinUIQuickStart.Droid\UnoWinUIQuickStart.Droid.csproj", "{$guid2$}" EndProject #//#endif #//#if (iOS) -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnoWinUIQuickStart.iOS", "UnoWinUIQuickStart.iOS\UnoWinUIQuickStart.iOS.csproj", "{5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnoWinUIQuickStart.iOS", "UnoWinUIQuickStart.iOS\UnoWinUIQuickStart.iOS.csproj", "{$guid4$}" EndProject #//#endif #//#if (UWP) -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnoWinUIQuickStart.Uwp", "UnoWinUIQuickStart.UWP\UnoWinUIQuickStart.Uwp.csproj", "{BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnoWinUIQuickStart.Uwp", "UnoWinUIQuickStart.UWP\UnoWinUIQuickStart.Uwp.csproj", "{$guid1$}" EndProject #//#endif @@ -28,34 +27,42 @@ EndProject #//#endif #//#if (macOS) -Project("{FCC8D2E7-3137-4432-B623-163BC51B21E7}") = "UnoWinUIQuickStart.macOS", "UnoWinUIQuickStart.macOS\UnoWinUIQuickStart.macOS.csproj", "{AC825774-BC14-4981-BEE1-DB6F7510ED50}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnoWinUIQuickStart.macOS", "UnoWinUIQuickStart.macOS\UnoWinUIQuickStart.macOS.csproj", "{$guid3$}" +EndProject +#//#endif + +#//#if (skia-gtk) +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnoWinUIQuickStart.Skia.Gtk", "UnoWinUIQuickStart.Skia.Gtk\UnoWinUIQuickStart.Skia.Gtk.csproj", "{A5B8155A-118F-4794-B551-C6F3CF7E5411}" +EndProject +#//#endif + +#//#if (skia-wpf) +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnoWinUIQuickStart.Skia.WPF", "UnoWinUIQuickStart.Skia.WPF\UnoWinUIQuickStart.Skia.WPF.csproj", "{$guid5$}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnoWinUIQuickStart.Skia.Wpf.Host", "UnoWinUIQuickStart.Skia.WPF.Host\UnoWinUIQuickStart.Skia.Wpf.Host.csproj", "{6CF284A4-22B1-4F05-97F4-F095C07A598E}" +EndProject +#//#endif + +#//#if (winui-desktop) +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnoWinUIQuickStart.Windows.Desktop", "UnoWinUIQuickStart.Windows.Desktop\UnoWinUIQuickStart.Windows.Desktop.csproj", "{1AA13270-F438-4864-9435-54FD806E10EA}" +EndProject +Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "UnoWinUIQuickStart.Windows.Package", "UnoWinUIQuickStart.Windows.Package\UnoWinUIQuickStart.Windows.Package.wapproj", "{$guid6$}" EndProject #//#endif Global GlobalSection(SharedMSBuildProjectFiles) = preSolution - testunoapp.Shared\testunoapp.Shared.projitems*{313fcf91-a6db-4585-a23e-49bbeef4784d}*SharedItemsImports = 4 - testunoapp.Shared\testunoapp.Shared.projitems*{40ea03f7-8a22-4143-b251-79bac3eb13d2}*SharedItemsImports = 5 - testunoapp.Shared\testunoapp.Shared.projitems*{46fd60bd-c9af-4ccf-aec2-b950258fd4dc}*SharedItemsImports = 4 - testunoapp.Shared\testunoapp.Shared.projitems*{5ebe92ab-ca99-4524-9eb5-ba82e9f615e0}*SharedItemsImports = 4 - testunoapp.Shared\testunoapp.Shared.projitems*{6279c845-92f8-4333-ab99-3d213163593c}*SharedItemsImports = 13 - testunoapp.Shared\testunoapp.Shared.projitems*{ba84ed6f-9b66-4fcf-816a-c3a63a3bb5c7}*SharedItemsImports = 4 + UnoWinUIQuickStart.Shared\UnoWinUIQuickStart.Shared.projitems*{1aa13270-f438-4864-9435-54fd806e10ea}*SharedItemsImports = 5 + UnoWinUIQuickStart.Shared\UnoWinUIQuickStart.Shared.projitems*{$guid3$}*SharedItemsImports = 4 + UnoWinUIQuickStart.Shared\UnoWinUIQuickStart.Shared.projitems*{40ea03f7-8a22-4143-b251-79bac3eb13d2}*SharedItemsImports = 5 + UnoWinUIQuickStart.Shared\UnoWinUIQuickStart.Shared.projitems*{$guid5$}*SharedItemsImports = 5 + UnoWinUIQuickStart.Shared\UnoWinUIQuickStart.Shared.projitems*{6279c845-92f8-4333-ab99-3d213163593c}*SharedItemsImports = 13 + UnoWinUIQuickStart.Shared\UnoWinUIQuickStart.Shared.projitems*{$guid1$}*SharedItemsImports = 4 + UnoWinUIQuickStart.Shared\UnoWinUIQuickStart.Shared.projitems*{$guid4$}*SharedItemsImports = 4 + UnoWinUIQuickStart.Shared\UnoWinUIQuickStart.Shared.projitems*{a5b8155a-118f-4794-b551-c6f3cf7e5411}*SharedItemsImports = 5 + UnoWinUIQuickStart.Shared\UnoWinUIQuickStart.Shared.projitems*{$guid2$}*SharedItemsImports = 4 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution - Ad-Hoc|Any CPU = Ad-Hoc|Any CPU - Ad-Hoc|ARM = Ad-Hoc|ARM - Ad-Hoc|ARM64 = Ad-Hoc|ARM64 - Ad-Hoc|iPhone = Ad-Hoc|iPhone - Ad-Hoc|iPhoneSimulator = Ad-Hoc|iPhoneSimulator - Ad-Hoc|x64 = Ad-Hoc|x64 - Ad-Hoc|x86 = Ad-Hoc|x86 - AppStore|Any CPU = AppStore|Any CPU - AppStore|ARM = AppStore|ARM - AppStore|ARM64 = AppStore|ARM64 - AppStore|iPhone = AppStore|iPhone - AppStore|iPhoneSimulator = AppStore|iPhoneSimulator - AppStore|x64 = AppStore|x64 - AppStore|x86 = AppStore|x86 Debug|Any CPU = Debug|Any CPU Debug|ARM = Debug|ARM Debug|ARM64 = Debug|ARM64 @@ -72,226 +79,243 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Ad-Hoc|ARM.Build.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Ad-Hoc|ARM.Deploy.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Ad-Hoc|ARM64.ActiveCfg = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Ad-Hoc|ARM64.Build.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Ad-Hoc|ARM64.Deploy.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Ad-Hoc|iPhone.Deploy.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Ad-Hoc|x64.Build.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Ad-Hoc|x64.Deploy.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Ad-Hoc|x86.Build.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Ad-Hoc|x86.Deploy.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.AppStore|Any CPU.ActiveCfg = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.AppStore|Any CPU.Build.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.AppStore|Any CPU.Deploy.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.AppStore|ARM.ActiveCfg = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.AppStore|ARM.Build.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.AppStore|ARM.Deploy.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.AppStore|ARM64.ActiveCfg = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.AppStore|ARM64.Build.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.AppStore|ARM64.Deploy.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.AppStore|iPhone.ActiveCfg = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.AppStore|iPhone.Build.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.AppStore|iPhone.Deploy.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.AppStore|iPhoneSimulator.Deploy.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.AppStore|x64.ActiveCfg = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.AppStore|x64.Build.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.AppStore|x64.Deploy.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.AppStore|x86.ActiveCfg = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.AppStore|x86.Build.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.AppStore|x86.Deploy.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Debug|ARM.ActiveCfg = Debug|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Debug|ARM.Build.0 = Debug|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Debug|ARM.Deploy.0 = Debug|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Debug|ARM64.Build.0 = Debug|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Debug|ARM64.Deploy.0 = Debug|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Debug|iPhone.Build.0 = Debug|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Debug|iPhone.Deploy.0 = Debug|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Debug|x64.ActiveCfg = Debug|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Debug|x64.Build.0 = Debug|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Debug|x64.Deploy.0 = Debug|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Debug|x86.ActiveCfg = Debug|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Debug|x86.Build.0 = Debug|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Debug|x86.Deploy.0 = Debug|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Release|Any CPU.Build.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Release|Any CPU.Deploy.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Release|ARM.ActiveCfg = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Release|ARM.Build.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Release|ARM.Deploy.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Release|ARM64.ActiveCfg = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Release|ARM64.Build.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Release|ARM64.Deploy.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Release|iPhone.ActiveCfg = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Release|iPhone.Build.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Release|iPhone.Deploy.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Release|x64.ActiveCfg = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Release|x64.Build.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Release|x64.Deploy.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Release|x86.ActiveCfg = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Release|x86.Build.0 = Release|Any CPU - {46FD60BD-C9AF-4CCF-AEC2-B950258FD4DC}.Release|x86.Deploy.0 = Release|Any CPU - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.Ad-Hoc|ARM.ActiveCfg = Ad-Hoc|iPhone - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.Ad-Hoc|ARM64.ActiveCfg = Ad-Hoc|iPhone - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.Ad-Hoc|x64.ActiveCfg = Ad-Hoc|iPhone - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.Ad-Hoc|x86.ActiveCfg = Ad-Hoc|iPhone - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.AppStore|ARM.ActiveCfg = AppStore|iPhone - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.AppStore|ARM64.ActiveCfg = AppStore|iPhone - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.AppStore|iPhone.ActiveCfg = AppStore|iPhone - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.AppStore|iPhone.Build.0 = AppStore|iPhone - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.AppStore|x64.ActiveCfg = AppStore|iPhone - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.AppStore|x86.ActiveCfg = AppStore|iPhone - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.Debug|Any CPU.ActiveCfg = Debug|iPhone - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.Debug|ARM.ActiveCfg = Debug|iPhone - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.Debug|ARM64.ActiveCfg = Debug|iPhone - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.Debug|iPhone.ActiveCfg = Debug|iPhone - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.Debug|iPhone.Build.0 = Debug|iPhone - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.Debug|x64.ActiveCfg = Debug|iPhone - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.Debug|x86.ActiveCfg = Debug|iPhone - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.Release|Any CPU.ActiveCfg = Release|iPhone - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.Release|ARM.ActiveCfg = Release|iPhone - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.Release|ARM64.ActiveCfg = Release|iPhone - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.Release|iPhone.ActiveCfg = Release|iPhone - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.Release|iPhone.Build.0 = Release|iPhone - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.Release|x64.ActiveCfg = Release|iPhone - {5EBE92AB-CA99-4524-9EB5-BA82E9F615E0}.Release|x86.ActiveCfg = Release|iPhone - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Ad-Hoc|Any CPU.ActiveCfg = Release|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Ad-Hoc|Any CPU.Build.0 = Release|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Ad-Hoc|Any CPU.Deploy.0 = Release|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Ad-Hoc|ARM.ActiveCfg = Release|ARM - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Ad-Hoc|ARM.Build.0 = Release|ARM - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Ad-Hoc|ARM.Deploy.0 = Release|ARM - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Ad-Hoc|ARM64.ActiveCfg = Release|ARM64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Ad-Hoc|ARM64.Build.0 = Release|ARM64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Ad-Hoc|ARM64.Deploy.0 = Release|ARM64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Ad-Hoc|iPhone.ActiveCfg = Release|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Ad-Hoc|iPhone.Build.0 = Release|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Ad-Hoc|iPhone.Deploy.0 = Release|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Ad-Hoc|x64.ActiveCfg = Release|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Ad-Hoc|x64.Build.0 = Release|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Ad-Hoc|x64.Deploy.0 = Release|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Ad-Hoc|x86.ActiveCfg = Release|x86 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Ad-Hoc|x86.Build.0 = Release|x86 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Ad-Hoc|x86.Deploy.0 = Release|x86 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.AppStore|Any CPU.ActiveCfg = Release|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.AppStore|Any CPU.Build.0 = Release|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.AppStore|Any CPU.Deploy.0 = Release|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.AppStore|ARM.ActiveCfg = Release|ARM - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.AppStore|ARM.Build.0 = Release|ARM - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.AppStore|ARM.Deploy.0 = Release|ARM - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.AppStore|ARM64.ActiveCfg = Release|ARM64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.AppStore|ARM64.Build.0 = Release|ARM64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.AppStore|ARM64.Deploy.0 = Release|ARM64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.AppStore|iPhone.ActiveCfg = Release|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.AppStore|iPhone.Build.0 = Release|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.AppStore|iPhone.Deploy.0 = Release|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.AppStore|iPhoneSimulator.ActiveCfg = Release|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.AppStore|iPhoneSimulator.Build.0 = Release|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.AppStore|iPhoneSimulator.Deploy.0 = Release|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.AppStore|x64.ActiveCfg = Release|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.AppStore|x64.Build.0 = Release|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.AppStore|x64.Deploy.0 = Release|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.AppStore|x86.ActiveCfg = Release|x86 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.AppStore|x86.Build.0 = Release|x86 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.AppStore|x86.Deploy.0 = Release|x86 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Debug|Any CPU.ActiveCfg = Debug|x86 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Debug|ARM.ActiveCfg = Debug|ARM - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Debug|ARM.Build.0 = Debug|ARM - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Debug|ARM.Deploy.0 = Debug|ARM - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Debug|ARM64.Build.0 = Debug|ARM64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Debug|ARM64.Deploy.0 = Debug|ARM64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Debug|iPhone.ActiveCfg = Debug|x86 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Debug|x64.ActiveCfg = Debug|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Debug|x64.Build.0 = Debug|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Debug|x64.Deploy.0 = Debug|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Debug|x86.ActiveCfg = Debug|x86 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Debug|x86.Build.0 = Debug|x86 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Debug|x86.Deploy.0 = Debug|x86 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Release|Any CPU.ActiveCfg = Release|x86 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Release|ARM.ActiveCfg = Release|ARM - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Release|ARM.Build.0 = Release|ARM - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Release|ARM.Deploy.0 = Release|ARM - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Release|ARM64.ActiveCfg = Release|ARM64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Release|ARM64.Build.0 = Release|ARM64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Release|ARM64.Deploy.0 = Release|ARM64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Release|iPhone.ActiveCfg = Release|x86 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Release|iPhoneSimulator.ActiveCfg = Release|x86 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Release|x64.ActiveCfg = Release|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Release|x64.Build.0 = Release|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Release|x64.Deploy.0 = Release|x64 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Release|x86.ActiveCfg = Release|x86 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Release|x86.Build.0 = Release|x86 - {BA84ED6F-9B66-4FCF-816A-C3A63A3BB5C7}.Release|x86.Deploy.0 = Release|x86 - {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU - {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU - {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU - {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU - {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU - {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU - {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU - {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU - {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU - {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU - {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Ad-Hoc|x64.Build.0 = Debug|Any CPU - {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU - {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Ad-Hoc|x86.Build.0 = Debug|Any CPU - {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU - {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.AppStore|Any CPU.Build.0 = Debug|Any CPU - {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.AppStore|ARM.ActiveCfg = Debug|Any CPU - {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.AppStore|ARM.Build.0 = Debug|Any CPU - {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.AppStore|ARM64.ActiveCfg = Debug|Any CPU - {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.AppStore|ARM64.Build.0 = Debug|Any CPU - {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.AppStore|iPhone.ActiveCfg = Debug|Any CPU - {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.AppStore|iPhone.Build.0 = Debug|Any CPU - {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU - {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.AppStore|x64.ActiveCfg = Debug|Any CPU - {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.AppStore|x64.Build.0 = Debug|Any CPU - {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.AppStore|x86.ActiveCfg = Debug|Any CPU - {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.AppStore|x86.Build.0 = Debug|Any CPU + {$guid2$}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {$guid2$}.Debug|Any CPU.Build.0 = Debug|Any CPU + {$guid2$}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {$guid2$}.Debug|ARM.ActiveCfg = Debug|Any CPU + {$guid2$}.Debug|ARM.Build.0 = Debug|Any CPU + {$guid2$}.Debug|ARM.Deploy.0 = Debug|Any CPU + {$guid2$}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {$guid2$}.Debug|ARM64.Build.0 = Debug|Any CPU + {$guid2$}.Debug|ARM64.Deploy.0 = Debug|Any CPU + {$guid2$}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {$guid2$}.Debug|iPhone.Build.0 = Debug|Any CPU + {$guid2$}.Debug|iPhone.Deploy.0 = Debug|Any CPU + {$guid2$}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {$guid2$}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {$guid2$}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU + {$guid2$}.Debug|x64.ActiveCfg = Debug|Any CPU + {$guid2$}.Debug|x64.Build.0 = Debug|Any CPU + {$guid2$}.Debug|x64.Deploy.0 = Debug|Any CPU + {$guid2$}.Debug|x86.ActiveCfg = Debug|Any CPU + {$guid2$}.Debug|x86.Build.0 = Debug|Any CPU + {$guid2$}.Debug|x86.Deploy.0 = Debug|Any CPU + + {$guid2$}.Release|Any CPU.ActiveCfg = Release|Any CPU + {$guid2$}.Release|Any CPU.Build.0 = Release|Any CPU + {$guid2$}.Release|Any CPU.Deploy.0 = Release|Any CPU + {$guid2$}.Release|ARM.ActiveCfg = Release|Any CPU + {$guid2$}.Release|ARM.Build.0 = Release|Any CPU + {$guid2$}.Release|ARM.Deploy.0 = Release|Any CPU + {$guid2$}.Release|ARM64.ActiveCfg = Release|Any CPU + {$guid2$}.Release|ARM64.Build.0 = Release|Any CPU + {$guid2$}.Release|ARM64.Deploy.0 = Release|Any CPU + {$guid2$}.Release|iPhone.ActiveCfg = Release|Any CPU + {$guid2$}.Release|iPhone.Build.0 = Release|Any CPU + {$guid2$}.Release|iPhone.Deploy.0 = Release|Any CPU + {$guid2$}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {$guid2$}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {$guid2$}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU + {$guid2$}.Release|x64.ActiveCfg = Release|Any CPU + {$guid2$}.Release|x64.Build.0 = Release|Any CPU + {$guid2$}.Release|x64.Deploy.0 = Release|Any CPU + {$guid2$}.Release|x86.ActiveCfg = Release|Any CPU + {$guid2$}.Release|x86.Build.0 = Release|Any CPU + {$guid2$}.Release|x86.Deploy.0 = Release|Any CPU + {$guid4$}.Debug|Any CPU.ActiveCfg = Debug|iPhone + {$guid4$}.Debug|Any CPU.Build.0 = Debug|iPhone + {$guid4$}.Debug|Any CPU.Deploy.0 = Debug|iPhone + {$guid4$}.Debug|ARM.ActiveCfg = Debug|iPhone + {$guid4$}.Debug|ARM64.ActiveCfg = Debug|iPhone + {$guid4$}.Debug|iPhone.ActiveCfg = Debug|iPhone + {$guid4$}.Debug|iPhone.Build.0 = Debug|iPhone + {$guid4$}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator + {$guid4$}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator + {$guid4$}.Debug|x64.ActiveCfg = Debug|iPhone + {$guid4$}.Debug|x64.Build.0 = Debug|iPhone + {$guid4$}.Debug|x64.Deploy.0 = Debug|iPhone + {$guid4$}.Debug|x86.ActiveCfg = Debug|iPhoneSimulator + {$guid4$}.Debug|x86.Build.0 = Debug|iPhoneSimulator + {$guid4$}.Debug|x86.Deploy.0 = Debug|iPhoneSimulator + {$guid4$}.Release|Any CPU.ActiveCfg = Release|iPhone + {$guid4$}.Release|ARM.ActiveCfg = Release|iPhone + {$guid4$}.Release|ARM64.ActiveCfg = Release|iPhone + {$guid4$}.Release|iPhone.ActiveCfg = Release|iPhone + {$guid4$}.Release|iPhone.Build.0 = Release|iPhone + {$guid4$}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator + {$guid4$}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator + {$guid4$}.Release|x64.ActiveCfg = Release|iPhoneSimulator + {$guid4$}.Release|x64.Build.0 = Release|iPhoneSimulator + {$guid4$}.Release|x64.Deploy.0 = Release|iPhoneSimulator + {$guid4$}.Release|x86.ActiveCfg = Release|iPhoneSimulator + {$guid4$}.Release|x86.Build.0 = Release|iPhoneSimulator + + {$guid1$}.Debug|Any CPU.ActiveCfg = Debug|x86 + {$guid1$}.Debug|Any CPU.Build.0 = Debug|x86 + {$guid1$}.Debug|Any CPU.Deploy.0 = Debug|x86 + {$guid1$}.Debug|ARM.ActiveCfg = Debug|ARM + {$guid1$}.Debug|ARM.Build.0 = Debug|ARM + {$guid1$}.Debug|ARM.Deploy.0 = Debug|ARM + {$guid1$}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {$guid1$}.Debug|ARM64.Build.0 = Debug|ARM64 + {$guid1$}.Debug|ARM64.Deploy.0 = Debug|ARM64 + {$guid1$}.Debug|iPhone.ActiveCfg = Debug|x86 + {$guid1$}.Debug|iPhone.Build.0 = Debug|x86 + {$guid1$}.Debug|iPhone.Deploy.0 = Debug|x86 + {$guid1$}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86 + {$guid1$}.Debug|iPhoneSimulator.Build.0 = Debug|x86 + {$guid1$}.Debug|iPhoneSimulator.Deploy.0 = Debug|x86 + {$guid1$}.Debug|x64.ActiveCfg = Debug|x64 + {$guid1$}.Debug|x64.Build.0 = Debug|x64 + {$guid1$}.Debug|x64.Deploy.0 = Debug|x64 + {$guid1$}.Debug|x86.ActiveCfg = Debug|x86 + {$guid1$}.Debug|x86.Build.0 = Debug|x86 + {$guid1$}.Debug|x86.Deploy.0 = Debug|x86 + {$guid1$}.Release|Any CPU.ActiveCfg = Release|x86 + {$guid1$}.Release|ARM.ActiveCfg = Release|ARM + {$guid1$}.Release|ARM.Build.0 = Release|ARM + {$guid1$}.Release|ARM.Deploy.0 = Release|ARM + {$guid1$}.Release|ARM64.ActiveCfg = Release|ARM64 + {$guid1$}.Release|ARM64.Build.0 = Release|ARM64 + {$guid1$}.Release|ARM64.Deploy.0 = Release|ARM64 + {$guid1$}.Release|iPhone.ActiveCfg = Release|x86 + {$guid1$}.Release|iPhone.Build.0 = Release|x86 + {$guid1$}.Release|iPhoneSimulator.ActiveCfg = Release|x86 + {$guid1$}.Release|iPhoneSimulator.Build.0 = Release|x86 + {$guid1$}.Release|iPhoneSimulator.Deploy.0 = Release|x86 + {$guid1$}.Release|x64.ActiveCfg = Release|x64 + {$guid1$}.Release|x64.Build.0 = Release|x64 + {$guid1$}.Release|x64.Deploy.0 = Release|x64 + {$guid1$}.Release|x86.ActiveCfg = Release|x86 + {$guid1$}.Release|x86.Build.0 = Release|x86 + {$guid1$}.Release|x86.Deploy.0 = Release|x86 + + {$guid5$}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {$guid5$}.Debug|Any CPU.Build.0 = Debug|Any CPU + {$guid5$}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {$guid5$}.Debug|ARM.ActiveCfg = Debug|Any CPU + {$guid5$}.Debug|ARM.Build.0 = Debug|Any CPU + {$guid5$}.Debug|ARM.Deploy.0 = Debug|Any CPU + {$guid5$}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {$guid5$}.Debug|ARM64.Build.0 = Debug|Any CPU + {$guid5$}.Debug|ARM64.Deploy.0 = Debug|Any CPU + {$guid5$}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {$guid5$}.Debug|iPhone.Build.0 = Debug|Any CPU + {$guid5$}.Debug|iPhone.Deploy.0 = Debug|Any CPU + {$guid5$}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {$guid5$}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {$guid5$}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU + {$guid5$}.Debug|x64.ActiveCfg = Debug|Any CPU + {$guid5$}.Debug|x64.Build.0 = Debug|Any CPU + {$guid5$}.Debug|x64.Deploy.0 = Debug|Any CPU + {$guid5$}.Debug|x86.ActiveCfg = Debug|Any CPU + {$guid5$}.Debug|x86.Build.0 = Debug|Any CPU + {$guid5$}.Debug|x86.Deploy.0 = Debug|Any CPU + {$guid5$}.Release|Any CPU.ActiveCfg = Release|Any CPU + {$guid5$}.Release|Any CPU.Build.0 = Release|Any CPU + {$guid5$}.Release|ARM.ActiveCfg = Release|Any CPU + {$guid5$}.Release|ARM.Build.0 = Release|Any CPU + {$guid5$}.Release|ARM.Deploy.0 = Release|Any CPU + {$guid5$}.Release|ARM64.ActiveCfg = Release|Any CPU + {$guid5$}.Release|ARM64.Build.0 = Release|Any CPU + {$guid5$}.Release|ARM64.Deploy.0 = Release|Any CPU + {$guid5$}.Release|iPhone.ActiveCfg = Release|Any CPU + {$guid5$}.Release|iPhone.Build.0 = Release|Any CPU + {$guid5$}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {$guid5$}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {$guid5$}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU + {$guid5$}.Release|x64.ActiveCfg = Release|Any CPU + {$guid5$}.Release|x64.Build.0 = Release|Any CPU + {$guid5$}.Release|x64.Deploy.0 = Release|Any CPU + {$guid5$}.Release|x86.ActiveCfg = Release|Any CPU + {$guid5$}.Release|x86.Build.0 = Release|Any CPU + {$guid5$}.Release|x86.Deploy.0 = Release|Any CPU + + {A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|ARM.ActiveCfg = Debug|Any CPU + {A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|ARM.Build.0 = Debug|Any CPU + {A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|ARM64.Build.0 = Debug|Any CPU + {A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|iPhone.Build.0 = Debug|Any CPU + {A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|x64.ActiveCfg = Debug|Any CPU + {A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|x64.Build.0 = Debug|Any CPU + {A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|x86.ActiveCfg = Debug|Any CPU + {A5B8155A-118F-4794-B551-C6F3CF7E5411}.Debug|x86.Build.0 = Debug|Any CPU + {A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|Any CPU.Build.0 = Release|Any CPU + {A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|ARM.ActiveCfg = Release|Any CPU + {A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|ARM.Build.0 = Release|Any CPU + {A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|ARM64.ActiveCfg = Release|Any CPU + {A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|ARM64.Build.0 = Release|Any CPU + {A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|iPhone.ActiveCfg = Release|Any CPU + {A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|iPhone.Build.0 = Release|Any CPU + {A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|x64.ActiveCfg = Release|Any CPU + {A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|x64.Build.0 = Release|Any CPU + {A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|x86.ActiveCfg = Release|Any CPU + {A5B8155A-118F-4794-B551-C6F3CF7E5411}.Release|x86.Build.0 = Release|Any CPU + {6CF284A4-22B1-4F05-97F4-F095C07A598E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6CF284A4-22B1-4F05-97F4-F095C07A598E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6CF284A4-22B1-4F05-97F4-F095C07A598E}.Debug|ARM.ActiveCfg = Debug|Any CPU + {6CF284A4-22B1-4F05-97F4-F095C07A598E}.Debug|ARM.Build.0 = Debug|Any CPU + {6CF284A4-22B1-4F05-97F4-F095C07A598E}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {6CF284A4-22B1-4F05-97F4-F095C07A598E}.Debug|ARM64.Build.0 = Debug|Any CPU + {6CF284A4-22B1-4F05-97F4-F095C07A598E}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {6CF284A4-22B1-4F05-97F4-F095C07A598E}.Debug|iPhone.Build.0 = Debug|Any CPU + {6CF284A4-22B1-4F05-97F4-F095C07A598E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {6CF284A4-22B1-4F05-97F4-F095C07A598E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {6CF284A4-22B1-4F05-97F4-F095C07A598E}.Debug|x64.ActiveCfg = Debug|Any CPU + {6CF284A4-22B1-4F05-97F4-F095C07A598E}.Debug|x64.Build.0 = Debug|Any CPU + {6CF284A4-22B1-4F05-97F4-F095C07A598E}.Debug|x86.ActiveCfg = Debug|Any CPU + {6CF284A4-22B1-4F05-97F4-F095C07A598E}.Debug|x86.Build.0 = Debug|Any CPU + {6CF284A4-22B1-4F05-97F4-F095C07A598E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6CF284A4-22B1-4F05-97F4-F095C07A598E}.Release|Any CPU.Build.0 = Release|Any CPU + {6CF284A4-22B1-4F05-97F4-F095C07A598E}.Release|ARM.ActiveCfg = Release|Any CPU + {6CF284A4-22B1-4F05-97F4-F095C07A598E}.Release|ARM.Build.0 = Release|Any CPU + {6CF284A4-22B1-4F05-97F4-F095C07A598E}.Release|ARM64.ActiveCfg = Release|Any CPU + {6CF284A4-22B1-4F05-97F4-F095C07A598E}.Release|ARM64.Build.0 = Release|Any CPU + {6CF284A4-22B1-4F05-97F4-F095C07A598E}.Release|iPhone.ActiveCfg = Release|Any CPU + {6CF284A4-22B1-4F05-97F4-F095C07A598E}.Release|iPhone.Build.0 = Release|Any CPU + {6CF284A4-22B1-4F05-97F4-F095C07A598E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {6CF284A4-22B1-4F05-97F4-F095C07A598E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {6CF284A4-22B1-4F05-97F4-F095C07A598E}.Release|x64.ActiveCfg = Release|Any CPU + {6CF284A4-22B1-4F05-97F4-F095C07A598E}.Release|x64.Build.0 = Release|Any CPU + {6CF284A4-22B1-4F05-97F4-F095C07A598E}.Release|x86.ActiveCfg = Release|Any CPU + {6CF284A4-22B1-4F05-97F4-F095C07A598E}.Release|x86.Build.0 = Release|Any CPU + {1AA13270-F438-4864-9435-54FD806E10EA}.Debug|Any CPU.ActiveCfg = Debug|x86 + {1AA13270-F438-4864-9435-54FD806E10EA}.Debug|Any CPU.Build.0 = Debug|x86 + {1AA13270-F438-4864-9435-54FD806E10EA}.Debug|ARM.ActiveCfg = Debug|Any CPU + {1AA13270-F438-4864-9435-54FD806E10EA}.Debug|ARM.Build.0 = Debug|Any CPU + {1AA13270-F438-4864-9435-54FD806E10EA}.Debug|ARM64.ActiveCfg = Debug|x86 + {1AA13270-F438-4864-9435-54FD806E10EA}.Debug|ARM64.Build.0 = Debug|x86 + {1AA13270-F438-4864-9435-54FD806E10EA}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {1AA13270-F438-4864-9435-54FD806E10EA}.Debug|iPhone.Build.0 = Debug|Any CPU + {1AA13270-F438-4864-9435-54FD806E10EA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {1AA13270-F438-4864-9435-54FD806E10EA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {1AA13270-F438-4864-9435-54FD806E10EA}.Debug|x64.ActiveCfg = Debug|x86 + {1AA13270-F438-4864-9435-54FD806E10EA}.Debug|x64.Build.0 = Debug|x86 + {1AA13270-F438-4864-9435-54FD806E10EA}.Debug|x86.ActiveCfg = Debug|x86 + {1AA13270-F438-4864-9435-54FD806E10EA}.Debug|x86.Build.0 = Debug|x86 + {1AA13270-F438-4864-9435-54FD806E10EA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1AA13270-F438-4864-9435-54FD806E10EA}.Release|Any CPU.Build.0 = Release|Any CPU + {1AA13270-F438-4864-9435-54FD806E10EA}.Release|ARM.ActiveCfg = Release|Any CPU + {1AA13270-F438-4864-9435-54FD806E10EA}.Release|ARM.Build.0 = Release|Any CPU + {1AA13270-F438-4864-9435-54FD806E10EA}.Release|ARM64.ActiveCfg = Release|x86 + {1AA13270-F438-4864-9435-54FD806E10EA}.Release|ARM64.Build.0 = Release|x86 + {1AA13270-F438-4864-9435-54FD806E10EA}.Release|iPhone.ActiveCfg = Release|Any CPU + {1AA13270-F438-4864-9435-54FD806E10EA}.Release|iPhone.Build.0 = Release|Any CPU + {1AA13270-F438-4864-9435-54FD806E10EA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {1AA13270-F438-4864-9435-54FD806E10EA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {1AA13270-F438-4864-9435-54FD806E10EA}.Release|x64.ActiveCfg = Release|x86 + {1AA13270-F438-4864-9435-54FD806E10EA}.Release|x64.Build.0 = Release|x86 + {1AA13270-F438-4864-9435-54FD806E10EA}.Release|x86.ActiveCfg = Release|x86 + {1AA13270-F438-4864-9435-54FD806E10EA}.Release|x86.Build.0 = Release|x86 + {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Debug|Any CPU.Build.0 = Debug|Any CPU {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -320,50 +344,60 @@ Global {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Release|x64.Build.0 = Release|Any CPU {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Release|x86.ActiveCfg = Release|Any CPU {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Release|x86.Build.0 = Release|Any CPU - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Ad-Hoc|Any CPU.ActiveCfg = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Ad-Hoc|Any CPU.Build.0 = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Ad-Hoc|ARM.ActiveCfg = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Ad-Hoc|ARM.Build.0 = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Ad-Hoc|ARM64.ActiveCfg = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Ad-Hoc|ARM64.Build.0 = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Ad-Hoc|iPhone.ActiveCfg = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Ad-Hoc|iPhone.Build.0 = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Ad-Hoc|x64.ActiveCfg = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Ad-Hoc|x64.Build.0 = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Ad-Hoc|x86.ActiveCfg = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Ad-Hoc|x86.Build.0 = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.AppStore|Any CPU.ActiveCfg = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.AppStore|Any CPU.Build.0 = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.AppStore|ARM.ActiveCfg = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.AppStore|ARM.Build.0 = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.AppStore|ARM64.ActiveCfg = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.AppStore|ARM64.Build.0 = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.AppStore|iPhone.ActiveCfg = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.AppStore|iPhone.Build.0 = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.AppStore|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.AppStore|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.AppStore|x64.ActiveCfg = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.AppStore|x64.Build.0 = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.AppStore|x86.ActiveCfg = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.AppStore|x86.Build.0 = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Debug|ARM.ActiveCfg = Debug|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Debug|ARM64.ActiveCfg = Debug|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Debug|iPhone.ActiveCfg = Debug|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Debug|x64.ActiveCfg = Debug|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Debug|x86.ActiveCfg = Debug|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Release|ARM.ActiveCfg = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Release|ARM64.ActiveCfg = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Release|iPhone.ActiveCfg = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Release|x64.ActiveCfg = Release|iPhoneSimulator - {313FCF91-A6DB-4585-A23E-49BBEEF4784D}.Release|x86.ActiveCfg = Release|iPhoneSimulator + + {$guid3$}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator + {$guid3$}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator + {$guid3$}.Debug|ARM.ActiveCfg = Debug|iPhoneSimulator + {$guid3$}.Debug|ARM64.ActiveCfg = Debug|iPhoneSimulator + {$guid3$}.Debug|iPhone.ActiveCfg = Debug|iPhoneSimulator + {$guid3$}.Debug|iPhone.Build.0 = Debug|iPhoneSimulator + {$guid3$}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator + {$guid3$}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator + {$guid3$}.Debug|x64.ActiveCfg = Debug|iPhoneSimulator + {$guid3$}.Debug|x64.Build.0 = Debug|iPhoneSimulator + {$guid3$}.Debug|x86.ActiveCfg = Debug|iPhoneSimulator + {$guid3$}.Debug|x86.Build.0 = Debug|iPhoneSimulator + {$guid3$}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator + {$guid3$}.Release|ARM.ActiveCfg = Release|iPhoneSimulator + {$guid3$}.Release|ARM64.ActiveCfg = Release|iPhoneSimulator + {$guid3$}.Release|iPhone.ActiveCfg = Release|iPhoneSimulator + {$guid3$}.Release|iPhone.Build.0 = Release|iPhoneSimulator + {$guid3$}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator + {$guid3$}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator + {$guid3$}.Release|x64.ActiveCfg = Release|iPhoneSimulator + {$guid3$}.Release|x64.Build.0 = Release|iPhoneSimulator + {$guid3$}.Release|x86.ActiveCfg = Release|iPhoneSimulator + {$guid3$}.Release|x86.Build.0 = Release|iPhoneSimulator + + {04D3A50A-BD96-4168-A331-3AC5E63800DE}.Debug|Any CPU.ActiveCfg = Debug|arm64 + {04D3A50A-BD96-4168-A331-3AC5E63800DE}.Debug|Any CPU.Build.0 = Debug|arm64 + {04D3A50A-BD96-4168-A331-3AC5E63800DE}.Debug|ARM.ActiveCfg = Debug|Any CPU + {04D3A50A-BD96-4168-A331-3AC5E63800DE}.Debug|ARM.Build.0 = Debug|Any CPU + {04D3A50A-BD96-4168-A331-3AC5E63800DE}.Debug|ARM64.ActiveCfg = Debug|arm64 + {04D3A50A-BD96-4168-A331-3AC5E63800DE}.Debug|ARM64.Build.0 = Debug|arm64 + {04D3A50A-BD96-4168-A331-3AC5E63800DE}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {04D3A50A-BD96-4168-A331-3AC5E63800DE}.Debug|iPhone.Build.0 = Debug|Any CPU + {04D3A50A-BD96-4168-A331-3AC5E63800DE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {04D3A50A-BD96-4168-A331-3AC5E63800DE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {04D3A50A-BD96-4168-A331-3AC5E63800DE}.Debug|x64.ActiveCfg = Debug|x64 + {04D3A50A-BD96-4168-A331-3AC5E63800DE}.Debug|x64.Build.0 = Debug|x64 + {04D3A50A-BD96-4168-A331-3AC5E63800DE}.Debug|x86.ActiveCfg = Debug|x86 + {04D3A50A-BD96-4168-A331-3AC5E63800DE}.Debug|x86.Build.0 = Debug|x86 + {04D3A50A-BD96-4168-A331-3AC5E63800DE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {04D3A50A-BD96-4168-A331-3AC5E63800DE}.Release|Any CPU.Build.0 = Release|Any CPU + {04D3A50A-BD96-4168-A331-3AC5E63800DE}.Release|ARM.ActiveCfg = Release|Any CPU + {04D3A50A-BD96-4168-A331-3AC5E63800DE}.Release|ARM.Build.0 = Release|Any CPU + {04D3A50A-BD96-4168-A331-3AC5E63800DE}.Release|ARM64.ActiveCfg = Release|arm64 + {04D3A50A-BD96-4168-A331-3AC5E63800DE}.Release|ARM64.Build.0 = Release|arm64 + {04D3A50A-BD96-4168-A331-3AC5E63800DE}.Release|iPhone.ActiveCfg = Release|Any CPU + {04D3A50A-BD96-4168-A331-3AC5E63800DE}.Release|iPhone.Build.0 = Release|Any CPU + {04D3A50A-BD96-4168-A331-3AC5E63800DE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {04D3A50A-BD96-4168-A331-3AC5E63800DE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {04D3A50A-BD96-4168-A331-3AC5E63800DE}.Release|x64.ActiveCfg = Release|x64 + {04D3A50A-BD96-4168-A331-3AC5E63800DE}.Release|x64.Build.0 = Release|x64 + {04D3A50A-BD96-4168-A331-3AC5E63800DE}.Release|x86.ActiveCfg = Release|x86 + {04D3A50A-BD96-4168-A331-3AC5E63800DE}.Release|x86.Build.0 = Release|x86 + EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/SolutionTemplate/UnoSolutionTemplate/Shared/App.xaml.cs b/src/SolutionTemplate/UnoSolutionTemplate/Shared/App.xaml.cs index e9b207253e36..ebb761db5d39 100644 --- a/src/SolutionTemplate/UnoSolutionTemplate/Shared/App.xaml.cs +++ b/src/SolutionTemplate/UnoSolutionTemplate/Shared/App.xaml.cs @@ -48,7 +48,15 @@ protected override void OnLaunched(LaunchActivatedEventArgs e) // this.DebugSettings.EnableFrameRateCounter = true; } #endif - Frame rootFrame = Windows.UI.Xaml.Window.Current.Content as Frame; + +#if NET5_0 && WINDOWS + var window = new Window(); + window.Activate(); +#else + var window = Windows.UI.Xaml.Window.Current; +#endif + + Frame rootFrame = window.Content as Frame; // Do not repeat app initialization when the Window already has content, // just ensure that the window is active @@ -65,10 +73,12 @@ protected override void OnLaunched(LaunchActivatedEventArgs e) } // Place the frame in the current Window - Windows.UI.Xaml.Window.Current.Content = rootFrame; + window.Content = rootFrame; } +#if !(NET5_0 && WINDOWS) if (e.PrelaunchActivated == false) +#endif { if (rootFrame.Content == null) { @@ -78,7 +88,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs e) rootFrame.Navigate(typeof(MainPage), e.Arguments); } // Ensure the current window is active - Windows.UI.Xaml.Window.Current.Activate(); + window.Activate(); } } diff --git a/src/Uno.UI/Generated/3.0.0.0/Windows.UI.Xaml.Input/PointerRoutedEventArgs.cs b/src/Uno.UI/Generated/3.0.0.0/Windows.UI.Xaml.Input/PointerRoutedEventArgs.cs index 36f0be6d0acc..4d817c0399e6 100644 --- a/src/Uno.UI/Generated/3.0.0.0/Windows.UI.Xaml.Input/PointerRoutedEventArgs.cs +++ b/src/Uno.UI/Generated/3.0.0.0/Windows.UI.Xaml.Input/PointerRoutedEventArgs.cs @@ -15,7 +15,7 @@ public partial class PointerRoutedEventArgs : global::Windows.UI.Xaml.RoutedEve // Forced skipping of method Windows.UI.Xaml.Input.PointerRoutedEventArgs.KeyModifiers.get // Forced skipping of method Windows.UI.Xaml.Input.PointerRoutedEventArgs.Handled.get // Forced skipping of method Windows.UI.Xaml.Input.PointerRoutedEventArgs.Handled.set - #if false || false || false || false || false || __NETSTD_REFERENCE__ || false + #if false || false || false || false || false || false || false [global::Uno.NotImplemented("__NETSTD_REFERENCE__")] public global::Windows.UI.Input.PointerPoint GetCurrentPoint( global::Windows.UI.Xaml.UIElement relativeTo) { diff --git a/src/Uno.UI/UI/Xaml/Controls/Control/Control.cs b/src/Uno.UI/UI/Xaml/Controls/Control/Control.cs index 2bef32f5b93b..7456ee42f357 100644 --- a/src/Uno.UI/UI/Xaml/Controls/Control/Control.cs +++ b/src/Uno.UI/UI/Xaml/Controls/Control/Control.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Text; using Uno.Extensions; @@ -724,7 +724,11 @@ protected override void OnIsEnabledChanged(bool oldValue, bool newValue) && IsEnabled && IsTabStop; - public bool Focus(FocusState value) + public +#if HAS_UNO_WINUI // Focus is moved to UIElement, avoid breaking binary compatibility. + new +#endif + bool Focus(FocusState value) { if (value == FocusState.Unfocused) { diff --git a/src/Uno.UI/UI/Xaml/Input/PointerRoutedEventArgs.netstdref.cs b/src/Uno.UI/UI/Xaml/Input/PointerRoutedEventArgs.netstdref.cs new file mode 100644 index 000000000000..ced2172ccae3 --- /dev/null +++ b/src/Uno.UI/UI/Xaml/Input/PointerRoutedEventArgs.netstdref.cs @@ -0,0 +1,13 @@ +using Windows.Foundation; +using Windows.UI.Input; + +namespace Windows.UI.Xaml.Input +{ + partial class PointerRoutedEventArgs + { + public PointerPoint GetCurrentPoint(UIElement relativeTo) + { + throw new global::System.NotImplementedException("The member PointerPoint PointerRoutedEventArgs.GetCurrentPoint(UIElement relativeTo) is not implemented in Uno."); + } + } +} diff --git a/src/Uno.UWP/UI/Composition/RectangleClip.cs b/src/Uno.UWP/UI/Composition/RectangleClip.cs index 93e0c2a6ccb7..dcacedf41717 100644 --- a/src/Uno.UWP/UI/Composition/RectangleClip.cs +++ b/src/Uno.UWP/UI/Composition/RectangleClip.cs @@ -5,7 +5,7 @@ namespace Windows.UI.Composition { [global::Uno.NotImplemented] - public partial class RectangleClip : CompositionObject + public partial class RectangleClip : CompositionClip { internal RectangleClip(Compositor compositor) : base(compositor) { diff --git a/src/Uno.UWPSyncGenerator.Reference/Uno.UWPSyncGenerator.Reference.csproj b/src/Uno.UWPSyncGenerator.Reference/Uno.UWPSyncGenerator.Reference.csproj index 4cce765600b4..8a3e0d7d41fa 100644 --- a/src/Uno.UWPSyncGenerator.Reference/Uno.UWPSyncGenerator.Reference.csproj +++ b/src/Uno.UWPSyncGenerator.Reference/Uno.UWPSyncGenerator.Reference.csproj @@ -122,7 +122,7 @@ 6.2.9 - 3.0.0-preview2.200713.0 + 3.0.0-preview3.201113.0 Windows Desktop Extensions for the UWP