From 063f98e6937e83392af56cba231b81857255cc80 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Fri, 13 Nov 2020 21:45:27 -0500 Subject: [PATCH] feat: Add template support for WinUI Desktop Update API surface to WinUI Preview 3 --- build/run-template-tests.ps1 | 2 +- .../Uno.ProjectTemplates.Dotnet.csproj | 12 +- .../.template.config/template.json | 94 ++- .../.template.config/vs-2017.3.host.json | 35 + .../PublishProfiles/win10-arm64.pubxml | 16 + .../PublishProfiles/win10-x64.pubxml | 16 + .../PublishProfiles/win10-x86.pubxml | 16 + .../UnoWinUIQuickStart.Windows.Desktop.csproj | 22 + .../app.manifest | 15 + .../Images/LockScreenLogo.scale-200.png | Bin 0 -> 1430 bytes .../Images/SplashScreen.scale-200.png | Bin 0 -> 7700 bytes .../Images/Square150x150Logo.scale-200.png | Bin 0 -> 2937 bytes .../Images/Square44x44Logo.scale-200.png | Bin 0 -> 1647 bytes ...x44Logo.targetsize-24_altform-unplated.png | Bin 0 -> 1255 bytes .../Images/StoreLogo.png | Bin 0 -> 1451 bytes .../Images/Wide310x150Logo.scale-200.png | Bin 0 -> 3204 bytes .../Package.appxmanifest | 49 ++ ...UnoWinUIQuickStart.Windows.Package.wapproj | 73 +++ .../build/Microsoft.WinUI.AppX.targets | 238 +++++++ .../unoapp-winui/UnoWinUIQuickStart.sln | 612 +++++++++--------- .../UnoSolutionTemplate/Shared/App.xaml.cs | 16 +- .../PointerRoutedEventArgs.cs | 2 +- .../UI/Xaml/Controls/Control/Control.cs | 8 +- .../Input/PointerRoutedEventArgs.netstdref.cs | 13 + src/Uno.UWP/UI/Composition/RectangleClip.cs | 2 +- .../Uno.UWPSyncGenerator.Reference.csproj | 2 +- 26 files changed, 940 insertions(+), 303 deletions(-) create mode 100644 src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Desktop/Properties/PublishProfiles/win10-arm64.pubxml create mode 100644 src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Desktop/Properties/PublishProfiles/win10-x64.pubxml create mode 100644 src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Desktop/Properties/PublishProfiles/win10-x86.pubxml create mode 100644 src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Desktop/UnoWinUIQuickStart.Windows.Desktop.csproj create mode 100644 src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Desktop/app.manifest create mode 100644 src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Images/LockScreenLogo.scale-200.png create mode 100644 src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Images/SplashScreen.scale-200.png create mode 100644 src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Images/Square150x150Logo.scale-200.png create mode 100644 src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Images/Square44x44Logo.scale-200.png create mode 100644 src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Images/Square44x44Logo.targetsize-24_altform-unplated.png create mode 100644 src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Images/StoreLogo.png create mode 100644 src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Images/Wide310x150Logo.scale-200.png create mode 100644 src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Package.appxmanifest create mode 100644 src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/UnoWinUIQuickStart.Windows.Package.wapproj create mode 100644 src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/build/Microsoft.WinUI.AppX.targets create mode 100644 src/Uno.UI/UI/Xaml/Input/PointerRoutedEventArgs.netstdref.cs 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 0000000000000000000000000000000000000000..735f57adb5dfc01886d137b4e493d7e97cf13af3 GIT binary patch literal 1430 zcmaJ>TTC2P7~aKltDttVHYH6u8Io4i*}3fO&d$gd*bA_<3j~&e7%8(eXJLfhS!M@! zKrliY>>6yT4+Kr95$!DoD(Qn-5TP|{V_KS`k~E6(LGS@#`v$hQo&^^BKsw3HIsZBT z_y6C2n`lK@apunKojRQ^(_P}Mgewt$(^BBKCTZ;*xa?J3wQ7~@S0lUvbcLeq1Bg4o zH-bvQi|wt~L7q$~a-gDFP!{&TQfc3fX*6=uHv* zT&1&U(-)L%Xp^djI2?~eBF2cxC@YOP$+9d?P&h?lPy-9M2UT9fg5jKm1t$m#iWE{M zIf%q9@;fyT?0UP>tcw-bLkz;s2LlKl2qeP0w zECS7Ate+Awk|KQ+DOk;fl}Xsy4o^CY=pwq%QAAKKl628_yNPsK>?A>%D8fQG6IgdJ ztnxttBz#NI_a@fk7SU`WtrpsfZsNs9^0(2a z@C3#YO3>k~w7?2hipBf{#b6`}Xw1hlG$yi?;1dDs7k~xDAw@jiI*+tc;t2Lflg&bM)0!Y;0_@=w%`LW^8DsYpS#-bLOklX9r?Ei}TScw|4DbpW%+7 zFgAI)f51s}{y-eWb|vrU-Ya!GuYKP)J7z#*V_k^Xo>4!1Yqj*m)x&0L^tg3GJbVAJ zJ-Pl$R=NAabouV=^z_t;^K*0AvFs!vYU>_<|I^#c?>>CR<(T?=%{;U=aI*SbZADLH z&(f2wz_Y0??Tf|g;?|1Znw6}6U43Q#qNRwv1vp9uFn1)V#*4p&%$mP9x&15^OaBiDS(XppT|z^>;B{PLVEbS3IFYV yGvCsSX*m literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..023e7f1feda78d5100569825acedfd213a0d84e9 GIT binary patch literal 7700 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..af49fec1a5484db1d52a7f9b5ec90a27c7030186 GIT binary patch literal 2937 zcma)84OCO-8BSud5)jwMLRVKgX(S?$n?Ld|vrsm<$CF7)&zTbyy1FE5bU`Q17MRv`9ue$;R(@8kR;#vJ*IM0>cJIAOte!d7oRgdH zd%ySjdB6L9=gX^A6)VzH7p2l@v~3zJAMw|DFy#^)F@@F*`mqUn=Il>l)8_+ab;nOW{%+iPx z+s{Eu|&pIs)Z7{La9~?xKfyl z#43?gjEL15d4WbOZo#SiP%>DB^+BcnJ=7dHEe;r#G=tuw|ka z%q@}##Uh7;tc%L_64m(kHtw74ty%BJMb)_1)#S0j`)F8_1jF7vScpsnH=0V19bO8y zR`0SjIdCUo&=>JwMQF8KHA<{ODHTiQh}0^@5QRmCA?gOH6_H3K^-_sNB^RrdNuK-R zOO*vOrKCVvDwgUck`kF(E7j{I#iiN;b*ZdCt4m@HPA`EuEqGGf4%!K<;(=I=&Vyrw z%TwcWtxa}8mCZ%Cyf&ActJ6_$ox5z6-D!0-dvnRx6t7y3d+h6QYpKWO;8OdnvERo7 zuEf>ih5`wqY)~o@OeVt-wM?Q!>QzdGRj!bz6fzYrfw$hZfAKzr2-M+D+R>}~oT574c;_3zquHcElqKIsryILt3g8n3jcMb+j?i?-L3FpZJ z2WRVBRdDPc+G5aaYg#5hpE+6nQ|(VSoxT3|biF;BUq#==-27Xi=gihDPYP$7?=9cP zYKE$jeQ|3~_L0VG-(F~2ZPyD0=k{J4Q~h(t__{-mz_w8{JDY9{`1ouzz!Vr5!ECdE z6U~O1k8c}24V7~zzXWTV-Pe4)y}wQJS&q%H5`Fo_f_JvIU489aCX$;P`u#!I-=^4ijC2{&9!O&h>mi?9oYD=GC#%)6{GzN6nQYw+Fal50!#x^asjBBR50i`+mho*ttoqV)ubM2KD9S~k7+FR4>{29?6 z{!l6kDdyTN0YJ9LgkPWeXm|gyi@zM3?0@{&pXT12w|78&W-q!RRF)&iLCEZVH<|fR zN0fr2^t8H(>L?>K#>^+jWROLral(Qy-xoBq1U7A&DV||wClb)Otd9?(gZ|8znMF}D zf<1haWz^s0qgecz;RFGt0C-B4g`jNGHsFU+;{<%t65v^sjk^h$lmWn#B0#_)9ij&d z-~lc`A)YYExi^7sBuPM^Y|wA2g*5?`K?#7tzELQYNxGo$UB$4J8RJp1k(8Jj+~hMT zlN~>M@KTTh^--8y3PK_NZ@AC!{PT=CziBzGd+wTJ^@icH!Bd}%)g8V)%K?|c&WTUk zy}qv1C%(fjRoZ4ozC3{O%@5?)XzH35zHns$pgU*Q?fj4v?fp1Qbm+j;3l;9jam9Da zXVcKjPlQ73x78QPu|Ffm6x?`~e3oD=gl=4kYK?={kD5j~QCXU)`HSdduNNENzA*2$ zOm3PzF!lN5e*06-f1Uot67wY#{o-S1!KZ7E=!~7ynnk9_iJR#kFoNbAOT#^2Gd17F zMmvU6>lndZQGd|ax9kUoXXO+$N?|j@6qpsF&_j7YXvwo_C{JpmLw5&#e6k>atv%es z5)7r*Wvv_JkUpT}M!_o!nVlEk1Zbl=a*2hQ*<|%*K1Glj^FcF`6kTzGQ3lz~2tCc@ z&x|tj;aH&1&9HwcJBcT`;{?a+pnej;M1HO(6Z{#J!cZA04hnFl;NXA+&`=7bjW_^o zfC40u3LMG?NdPtwGl>Tq6u}*QG)}-y;)lu-_>ee3kibW(69n0$0Zy!}9rQz%*v1iO zT9_H>99yIrSPYVy6^);rR}7Yo=J_T@hi+qhTZXnVWyf;JDYm5#eYLTxr*?kiNn!+Y zQ+LUkBafNJ#rH#C(?d5^;gw9o#%daEI{mA*LHPIHPU`#|H$hD zwm>0&+kahQ)E#%~k>&5@&#Vg82H?s%71=)(soi@174pi9--2{w{1$}Sz4zGn3Du&x bht0Iza^2ykEt4(epJ78uh5nDlX8(TxzDYwP literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ce342a2ec8a61291ba76c54604aea7e9d20af11b GIT binary patch literal 1647 zcmaJ?eM}Q)7(e+G1Q(|`V9JhTI2>MkceK4;p;PR&$Pi?ejk3YQ_3o`S&|W_dsOZ8# zWPTt69g`t$ab`0cj-Y0yiBSOqmd)tG7G(}M5aP0_%&9TijB#&)I{zSE^4@#z^FF`l z`8{8`o%wlL(UI|y2!cdsuVamHH~H86F!*-15em4)NqUpCQM5?aoC_eCf@lV4wvF2a zjDQn1JBL69f&@2M3rvzJcfE!eZ8FZUBlFlC5RD)it33{mF9#B82AiyQE%w)`vlwa> zv{<1sm&kSKK$&%2jSFn7$t&P%%6Ue>R=EAnG8N7fqynWG8L3p!4801a;8{+nliO(qd(jNJ_?+9W3#hLIDLoT6~3fx9=`CC-D}-AMrpEO7HK zt3$GicGPc?GmDjy7K2P@La;eu4!$zWCZ`ym{Z$b zu-O6RM&K4JT|BIZB`E-gxqG%FzanI#+2FFmqHqXG7yxWB=w55RGOM)$xMb(>kSNR z2w=1AZi%z=AmG~yea~XaXJR!v7vLn(RUnELfiB1|6D84ICOS}^Zo2AdN}<&*h}G_u z{xZ!(%>tLT3J3<5XhWy-tg+6)0nmUUENLW8TWA{R6bgVd3X;anYFZ^IRis*_P-C-r z;i>%1^eL3UI2-{w8nuFFcs0e~7J{O2k^~Ce%+Ly4U?|=!0LH=t6()xi<^I-rs+9sF z*q{E-CxZbGPeu#a;XJwE;9S1?#R&uns>^0G3p`hEUF*v`M?@h%T%J%RChmD|EVydq zmHWh*_=S%emRC*mhxaVLzT@>Z2SX0u9v*DIJ@WC^kLVdlGV6LpK$KIrlJqc zpJ921)+3JJdTx|<`G&kXpKkjGJv=76R`yYIQ{#c-`%+`#V(7}Q;&@6U8!Td1`d;?N z_9mnI#?AA}4J!r)LN4!E-@H5eXauuB7TOawS>Y|{-P?NNx-lq+z1W-+y(;39P&&LP zL{N80?&=C*qKmdA^moMZRuPcD!B<*mq$ch=0Cnlitw#txRWhb3%TQvPqjkC`F69G4b! ze7z9MZ#+;_#l?H37UqUhDFb^l&s2{oM$3I0o^Q!yx;;V)QmCMo)Tb_ui|mit8MS?U zm##6$sZZ1$@|s%?l@>4Z<*Q}sRBSKMhb4I{e5LdEhsHIHTe8Bod5c>6QtT>$XgUBz z6MK`kO$=jmt@FqggOhJ5j~e@ygRbG;<{Vu)*+nn9aQeo0;$#j;|MS=S$&L?BeV25z xs3B`@=#`5TF{^6(A1rvdY@|-RtQ|iS5{tyX+wH?;n8E)G$kykv-D^wh{{!TZT%7;_ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f6c02ce97e0a802b85f6021e822c89f8bf57d5cd GIT binary patch literal 1255 zcmaJ>TWs4@7*5+{G#S+&C!qC#> zf>5N3P6jO*Cz>ug*(_DmW=)kea&m$gZ^+nyiF`;j%w@}y8)>p*SH}C`m?DXeieF2U zyQHecc_L%Gh!7GMt+hG06y;+|p4>m~}PjA}rKViGiEnn7G0ZO<>G|7q;2?NwGCM3s?eued6%hd$B+ z*kQJ{#~$S=DFE(%=E+UkmlEI*%3llUf~8Ja9YU1Vui0IbGBkW_gHB%Rd&!!ioX zs40O?i9I{};kle7GMvE7(rk`la=gTI)47=>%?q@^iL-nUo3}h4S}N-KHn8t5mVP8w z&bSErwp+37 zNJJ8?a|{r5Q3R0Z5s-LB1WHOwYC@7pCHWND#cL1cZ?{kJ368_*(UDWUDyb<}0y@o# zfMF016iMWPCb6obAxT$JlB6(2DrlXDTB&!0`!m??4F(qWMhjVZo?JXQmz`1*58Z=& zcDmB|S-E@j?BoFGix0flckqdS4jsPNzhfWyWIM98GxcLs89C(~dw%$_t;JjX-SD}E zfiGV;{8Q%8r}w9x>EEigW81>`kvnU@pK)4+xk9@+bNj9L!AAZ@SZ@q|)&BmY3+HZx zul~BeG4|}-;L%cHViQGQX?^zFfO0&#cHwel=d`lH9sJ-@Sl@n*(8J2>%Ac`IxyY?Q z{=GhWvC#gu-~Ia7*n{=+;qM?Ul_wy1+u7ho;=`>EwP^g~R@{unBds`!#@}tluZQpS zm)M~nYEifJWJGx?_6DcTy>#uh%>!H9=hb^(v`=m3F1{L>db=<5_tm+_&knAQ2EU$s Mu9UqpbNZeC0BbUo^Z)<= literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7385b56c0e4d3c6b0efe3324aa1194157d837826 GIT binary patch literal 1451 zcmaJ>eN5D57_Z|bH;{0+1#mbl)eTU3{h)Wf7EZV?;HD@XL@{B`Ui%(2aMxQ~xdXSv z5nzWi(LW)U2=Vc-cY@s7nPt{i0hc6!7xN4NNHI#EQl>YNBy8l4%x9gr_W-j zEZMQmmTIy(>;lblRfh`dIyTgc9W5d!VP$L4(kKrN1c5G~(O_#xG zAJCNTstD^5SeXFB+&$h=ToJP2H>xr$iqPs-#O*;4(!Fjw25-!gEb*)mU}=)J;Iu>w zxK(5XoD0wrPSKQ~rbL^Cw6O_03*l*}i=ydbu7adJ6y;%@tjFeXIXT+ms30pmbOP%Q zX}S;+LBh8Tea~TSkHzvX6$rYb)+n&{kSbIqh|c7hmlxmwSiq5iVhU#iEQ<>a18|O^Sln-8t&+t`*{qBWo5M?wFM(JuimAOb5!K#D}XbslM@#1ZVz_;!9U zpfEpLAOz=0g@bd6Xj_ILi-x^!M}73h^o@}hM$1jflTs|Yuj9AL@A3<-?MV4!^4q`e z)fO@A;{9K^?W?DbnesnPr6kK>$zaKo&;FhFd(GYFCIU^T+OIMb%Tqo+P%oq(IdX7S zf6+HLO?7o0m+p>~Tp5UrXWh!UH!wZ5kv!E`_w)PTpI(#Iw{AS`gH4^b(bm^ZCq^FZ zY9DD7bH}rq9mg88+KgA$Zp!iWncuU2n1AuIa@=sWvUR-s`Qb{R*kk(SPU^`$6BXz8 zn#7yaFOIK%qGxyi`dYtm#&qqox0$h=pNi#u=M8zUG@bpiZ=3sT=1}Trr}39cC)H|v zbL?W)=&s4zrh)7>L(|cc%$1#!zfL?HjpeP%T+x_a+jZ16b^iKOHxFEX$7d|8${H-* zIrOJ5w&i$>*D>AKaIoYg`;{L@jM((Kt?$N$5OnuPqVvq**Nm}(f0wwOF%iX_Pba;V z;m@wxX&NcV3?<1+u?A{y_DIj7#m3Af1rCE)o`D&Y3}0%7E;iX1yMDiS)sh0wKi!36 zL!Wmq?P^Ku&rK~HJd97KkLTRl>ScGFYZNlYytWnhmuu|)L&ND8_PmkayQb{HOY640 bno1(wj@u8DCVuFR|31B*4ek@pZJqxCDDe1x literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..288995b397fdbef1fb7e85afd71445d5de1952c5 GIT binary patch literal 3204 zcmbVPeQXow8NYmBd90>}0NP?GhXW~VaeThm=a0tV#EwJMI!)6M3}|c4_Bl3=Kd>G0 z(GHx1wl<7(tP?FsOQkTilSo*iIvF%uArExJ73~P zSv1xEy!U(Wd4A9D`FQV@W3@F^qJ@PEF$@z`Z!*BbFsS(^?B zyiAzJ+q})bkgiQHWqEb*jJD-coHYr1^iocg)l!Qa{Xqs-l~6J}p-|##ZHYofskQ3$ zI0;xzXyhazBeXhIsg5A=%ufo@f)1yy&ScKS0;HF^!r_2UE^lpZEom(+@duma3awTv zCrCL-%D_SvYWIcdHkmI}#50(fkUi)Qgx!80ju>g1za^}ff>JI8Z@^-iCiaCgg@TgF z+vtE?Q9{VQUX&MW9SYYmGcxA14%N2@7FwBTD4N<(2{nWgV8$e3?-F=L^&FrtWn~(U_Q~~^uYiyeY6-KoTnfh9AWz@ zIKje0)u!_Lw)E}G!#kEfwKVdNt(UAf9*f>tEL_(=xco-T%jTi@7YlC3hs2ik%Le0H ztj}RTeCF(5mwvi3_56>-yB?l;J>-1%!9~=fs|QcNG3J~a@JCu`4SB460s0ZO+##4fFUSGLcj_ja^fL4&BKALfb#$6$O?>P@qx2Agl^x0i&ugt zsy5Pyu=()`7HRMG3IB7F1@`_ z+-!J%#i6e^U$e#+C%Q>_qVRzWRsG^W_n+@OcX@vzI&z;mzHNb!GQ?LWA(wtpqHqTM z1OFw_{Zn?fD)p)`c`kOgv{de=v@suGRqY{N^U7gI1VF3*F=obwaXI6ob5__Yn zVTguS!%(NI09J8x#AO_aW!9W7k*UvB;IWDFC3srwftr{kHj%g)fvnAm;&h_dnl~

MY- zf+K}sCe8qU6Ujs`3ua{U0Of$R_gVQBuUA za0v=mu#vIOqiiAZOr&h*$WyOw&k-xr$;G4Ixa!#TJNr>95(h>l%)PUy4p+^SgR(uR zta%k*?ny-+nAr8spEk1fo{J4i!b^Fia`N{_F6@zidA2ZTTrjl#^5Z-2KfB@Cu}l9s z(*|Z2jc?p~vn2f)3y9i*7zJV1L{$?|&q)4oaT;uXi6>1GkRXVTOzAz(RHEmr=eFIi z`}<>-Q?K0GN8!IYxeP1XKXO+jsJbp~o^);Bc;%b7Flpe7;1`Ny@3r7ZR;?R)aJt8C ziNlEC<@3f_lIV4TwV}&e;D!Ee5_|e#g0LUh=5vmYWYm7&2h*M>QPKvGh9-)wfMMW3 z8J9b%1k7dzPzO0_NGQy92BZ^FR6R~6;^6?lqO;-QUP4BY%cG%3vEhbm#>4vIhPBh3 z-+pZGjh$x%Hp{?=FHsMp0&wNPlj00us{&`1ZOZTqs8%4X&xH=UDr*xyBW(Zp&Em94 zf)ZSfn#yg0N)>!1kWdkqJ^S*z0FF5|fj&qcE#Na|%OY0$uO>!&hP+1ywfD_WXk@4J(?MBftK7>$Nvqh@tDuarN%PrTLQ2Uzysx>UV=V zk^RrDSvdQ?0;=hY67EgII-f4`t=+i*yS=Y~!XlqIy_4x&%+OdfbKOFPXS2X5%4R{N z$SQMX^AK6(fA + + + + + + + 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