Add net5.0-windows

README.md

@@ -18,6 +18,7 @@
 - [x] Tizen
 - [x] WPF
 - [x] MacOS
+- [x] Net5-Windows
 
 ## Documentation
 You can find all descriptions of [Getting Started](https://github.com/rotorgames/Rg.Plugins.Popup/wiki/Getting-started), [How to use](https://github.com/rotorgames/Rg.Plugins.Popup/wiki/PopupPage), [Troubleshooting](https://github.com/rotorgames/Rg.Plugins.Popup/wiki/Troubleshooting) and etc in the [Wiki](https://github.com/rotorgames/Rg.Plugins.Popup/wiki)

Rg.Plugins.Popup.sln

@@ -34,6 +34,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demo.WPF", "Samples\Demo.WP
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demo.Mac", "Samples\Demo.Mac\Demo.Mac.csproj", "{AE8BE751-A884-410B-957C-7F5B643BDEF7}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demo.Windows", "Samples\Demo.Windows\Demo.Windows.csproj", "{B5F32090-B4A6-4B11-9A49-74D0579BA33A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@@ -577,6 +579,66 @@ Global
 		{AE8BE751-A884-410B-957C-7F5B643BDEF7}.Release|x64.Build.0 = Release|Any CPU
 		{AE8BE751-A884-410B-957C-7F5B643BDEF7}.Release|x86.ActiveCfg = Release|Any CPU
 		{AE8BE751-A884-410B-957C-7F5B643BDEF7}.Release|x86.Build.0 = Release|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.AppStore|x64.Build.0 = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.AppStore|x86.Build.0 = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Debug|ARM.Build.0 = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Debug|x64.Build.0 = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Debug|x86.Build.0 = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Publish|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Publish|Any CPU.Build.0 = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Publish|ARM.ActiveCfg = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Publish|ARM.Build.0 = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Publish|iPhone.ActiveCfg = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Publish|iPhone.Build.0 = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Publish|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Publish|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Publish|x64.ActiveCfg = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Publish|x64.Build.0 = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Publish|x86.ActiveCfg = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Publish|x86.Build.0 = Debug|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Release|ARM.ActiveCfg = Release|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Release|ARM.Build.0 = Release|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Release|iPhone.Build.0 = Release|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Release|x64.ActiveCfg = Release|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Release|x64.Build.0 = Release|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Release|x86.ActiveCfg = Release|Any CPU
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -589,6 +651,7 @@ Global
 		{629564FB-8C63-40BD-BD06-FE2453BB461F} = {04D48DA4-E0DD-4E8A-A124-B656FE163F41}
 		{0C21CF96-BEE6-4683-B061-14E69A4D2AB9} = {04D48DA4-E0DD-4E8A-A124-B656FE163F41}
 		{AE8BE751-A884-410B-957C-7F5B643BDEF7} = {04D48DA4-E0DD-4E8A-A124-B656FE163F41}
+		{B5F32090-B4A6-4B11-9A49-74D0579BA33A} = {04D48DA4-E0DD-4E8A-A124-B656FE163F41}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D8C190DB-BF68-4BD7-9DB8-DE92D9DC0AAB}

Rg.Plugins.Popup/Platforms/Uap/Impl/PopupPlatformWindows.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Rg.Plugins.Popup.Contracts;
+using Rg.Plugins.Popup.Exceptions;
 using Rg.Plugins.Popup.Pages;
 using Rg.Plugins.Popup.Services;
 using Rg.Plugins.Popup.Windows.Renderers;

Rg.Plugins.Popup/Rg.Plugins.Popup.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup Condition=" '$(TargetsToBuild)' == 'All' ">
-    <TargetFrameworks>netstandard2.0;xamarin.ios10;xamarin.mac20;xamarin.tvos10;xamarin.watchos10;monoandroid9.0;monoandroid10.0;tizen80;netcoreapp3.1;net472</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;xamarin.ios10;xamarin.mac20;xamarin.tvos10;xamarin.watchos10;monoandroid9.0;monoandroid10.0;tizen80;netcoreapp3.1;net472;net5.0-windows</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">uap10.0.17763;$(TargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 
@@ -38,14 +38,23 @@
     <Compile Include="Platforms\Netstandard\**\*.cs" />
   </ItemGroup>
 
-  <ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) And '$(OS)' == 'Windows_NT' ">
+  <ItemGroup Condition="$(TargetFramework.StartsWith('net4')) Or $(TargetFramework.EndsWith('windows')) And '$(OS)' == 'Windows_NT' ">
     <None Remove="Platforms\Net\**\*.cs" />
     <None Remove="Platforms\Wpf\**\*.cs" />
     <Compile Include="Platforms\Net\**\*.cs" />
     <Compile Include="Platforms\Wpf\**\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup Condition="$(TargetFramework.StartsWith('net4')) And '$(OS)' == 'Windows_NT'">
     <PackageReference Include="Xamarin.Forms.Platform.WPF" Version="4.5.0.657" />
   </ItemGroup>
 
+  <ItemGroup Condition="$(TargetFramework.EndsWith('windows')) And '$(OS)' == 'Windows_NT'">
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
+    <PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.1874" />
+  </ItemGroup>
+
+
   <ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
     <None Remove="Platforms\Shared\**\*.cs" />
     <Compile Include="Platforms\Shared\**\*.cs" />
@@ -111,7 +120,7 @@
     <Compile Include="Platforms\Xamarin\**\*.cs" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'!='net5.0-windows'">
     <PackageReference Include="Xamarin.Forms" Version="4.5.0.657" />
   </ItemGroup>
 

Samples/Demo.Tizen/Demo.Tizen.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Tizen.NET.Sdk/1.0.9">
+<Project Sdk="Tizen.NET.Sdk/1.1.6">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>

Samples/Demo.Windows/App.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+    </startup>
+</configuration>

Samples/Demo.Windows/App.xaml

@@ -0,0 +1,9 @@
+<Application x:Class="Demo.WPF.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:Demo.WPF"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+
+    </Application.Resources>
+</Application>

Samples/Demo.Windows/App.xaml.cs

@@ -0,0 +1,11 @@
+using System.Windows;
+
+namespace Demo.WPF
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application
+    {
+    }
+}

Samples/Demo.Windows/Demo.Windows.csproj

@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+  <PropertyGroup>
+    <TargetFramework>net5-windows</TargetFramework>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>Demo.WPF</RootNamespace>
+    <AssemblyName>Demo.WPF</AssemblyName>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
+    <PackageReference Include="Xamarin.Forms.Platform.WPF">
+      <Version>5.0.0.1874</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Rg.Plugins.Popup\Rg.Plugins.Popup.csproj" />
+    <ProjectReference Include="..\Demo\Demo.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Remove="App.xaml" />
+    <EmbeddedResource Remove="MainWindow.xaml" />
+  </ItemGroup>
+</Project>

Samples/Demo.Windows/MainWindow.xaml

@@ -0,0 +1,13 @@
+<wpf:FormsApplicationPage  xmlns:wpf="clr-namespace:Xamarin.Forms.Platform.WPF;assembly=Xamarin.Forms.Platform.WPF"
+                           x:Class="Demo.WPF.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Demo.WPF"
+        mc:Ignorable="d"
+        Title="MainWindow" Height="450" Width="800">
+    <Grid>
+
+    </Grid>
+</wpf:FormsApplicationPage>

Samples/Demo.Windows/MainWindow.xaml.cs

@@ -0,0 +1,19 @@
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.WPF;
+
+namespace Demo.WPF
+{
+    /// <summary>
+    /// Interaction logic for MainWindow.xaml
+    /// </summary>
+    public partial class MainWindow : FormsApplicationPage
+    {
+        public MainWindow()
+        {
+            InitializeComponent();
+            Forms.Init();
+            Rg.Plugins.Popup.Popup.Init();
+            LoadApplication(new Demo.App());
+        }
+    }
+}

Samples/Demo.Windows/Properties/AssemblyInfo.cs

@@ -0,0 +1,53 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Demo.WPF")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Demo.WPF")]
+[assembly: AssemblyCopyright("Copyright ©  2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+//In order to begin building localizable applications, set
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page,
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page,
+                                              // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]