Merge pull request #311 from nventive/release/stable/X2

Release/stable/x2

.gitattributes

@@ -1 +0,0 @@
-*.md merge=union

.gitignore

@@ -30,6 +30,7 @@ Resource.Designer.cs
 bld/
 [Bb]in/
 [Oo]bj/
+logfile=obj/
 
 # Visual Studio 2015 cache/options directory
 .vs/

README.md

@@ -19,6 +19,7 @@ Here's a list of live apps made with the Uno Platform for WebAssembly.
 * The [Uno.RoslynQuoter](http://roslynquoter-wasm.platform.uno/), a [Roslyn]() based C# analysis tool ([Source](https://github.com/nventive/Uno.RoslynQuoter))
 * The [Uno.BikeSharing360 App](http://bikerider-wasm.platform.uno/), a Xamarin.Forms app running on top of Uno for WebAssembly ([Source](https://github.com/nventive/Uno.BikeSharing360_MobileApps))
 * The [Uno.WindowsStateTriggers App](http://winstatetriggers-wasm.platform.uno/), a demo of the [Morten's WindowsStateTriggers](https://github.com/dotMorten/WindowsStateTriggers) ([Source](https://github.com/nventive/Uno.WindowsStateTriggers))
+* The [SQLite + Entity Framework Core App](http://sqliteefcore-wasm.platform.uno), a demo of the combination of [Roslyn](https://github.com/dotnet/roslyn), [Entity Framework Core](https://docs.microsoft.com/en-us/ef/core/), [SQLite](https://github.com/nventive/Uno.SQLitePCLRaw.Wasm) and the Uno Platform to manipulate an in-browser database.
 
 Let us know if you've made your app publicly available, we'll list it here!
 
@@ -54,7 +55,7 @@ Let us know if you've made your app publicly available, we'll list it here!
     * [State Triggers](https://blogs.msdn.microsoft.com/mvpawardprogram/2017/02/07/state-triggers-uwp-apps/)
     * [Adaptive Triggers](https://docs.microsoft.com/en-us/uwp/api/Windows.UI.Xaml.AdaptiveTrigger)
 * Platform Specific 
-    * Native controls and properties via [conditional XAML](doc/articles/using-uno-ui.md)
+    * Native controls and properties via [conditional XAML](doc/articles/using-uno-ui.md#supporting-multiple-platforms-in-xaml-files)
     * Any of the existing Xamarin iOS/Android libraries available
 
 # Getting Started

build/Uno.UI.WpfHost.nuspec

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+	<id>Uno.UI.WpfHost</id>
+	<version>2.7.1000</version>
+	<title>Uno.UI.WpfHost</title>
+	<authors>nventive</authors>
+	<owners>nventive</owners>
+	<requireLicenseAcceptance>false</requireLicenseAcceptance>
+	<projectUrl>https://github.com/nventive/Uno</projectUrl>
+	<iconUrl>https://nv-assets.azurewebsites.net/logos/uno.png</iconUrl>
+	<description>A WPF host for the WebAssembly build on Uno.UI</description>
+	<copyright>Copyright (C) 2015-2018 nventive inc. - all rights reserved</copyright>
+	<repository type="git" url="https://github.com/nventive/Uno.git" />
+
+	<dependencies>
+
+	  <!-- Android 7.1 -->
+	  <group targetFramework="net462">
+		<dependency id="Uno.UI" version="1.40.0" />
+		<dependency id="cef.redist.x64" version="3.3396.1786" />
+		<dependency id="cef.redist.x86" version="3.3396.1786" />
+		<dependency id="CefSharp.Common" version="67.0.0" />
+		<dependency id="CefSharp.Wpf" version="67.0.0" />
+		<dependency id="System.Reactive" version="4.1.0" />
+	  </group>
+
+	</dependencies>
+
+	<references>
+	  <!-- .NET Standard 2.0 -->
+	  <group targetFramework="net462">
+		<reference file="Uno.UI.WpfHost.dll" />
+	  </group>
+	</references>
+  </metadata>
+  <files>
+	<file src="..\src\Uno.UI.WpfHost\bin\x86\Release\Uno.UI.WpfHost.dll" target="lib\net462" />
+  </files>
+</package>

build/Uno.UI.nuspec

@@ -20,7 +20,7 @@
 		<dependency id="Xamarin.Android.Support.v4" version="25.3.1" />
 		<dependency id="Xamarin.Android.Support.v7.AppCompat" version="25.3.1" />
 		<dependency id="Xamarin.Android.Support.v7.RecyclerView" version="25.3.1" />
-		<dependency id="Uno.SourceGenerationTasks" version="1.26.0" />
+		<dependency id="Uno.SourceGenerationTasks" version="1.27.0" />
 		<dependency id="Uno.Core" version="1.24.0" />
 		<dependency id="Uno.Core.Build" version="1.24.0" />
 	  </group>
@@ -30,21 +30,21 @@
 		<dependency id="Xamarin.Android.Support.v4" version="26.1.0.1" />
 		<dependency id="Xamarin.Android.Support.v7.AppCompat" version="26.1.0.1" />
 		<dependency id="Xamarin.Android.Support.v7.RecyclerView" version="26.1.0.1" />
-		<dependency id="Uno.SourceGenerationTasks" version="1.26.0" />
+		<dependency id="Uno.SourceGenerationTasks" version="1.27.0" />
 		<dependency id="Uno.Core" version="1.24.0" />
 		<dependency id="Uno.Core.Build" version="1.24.0" />
 	  </group>
 
 	  <!-- iOS -->
 	  <group targetFramework="xamarinios10">
-		<dependency id="Uno.SourceGenerationTasks" version="1.26.0" />
+		<dependency id="Uno.SourceGenerationTasks" version="1.27.0" />
 		<dependency id="Uno.Core" version="1.24.0" />
 		<dependency id="Uno.Core.Build" version="1.24.0" />
 	  </group>
 
 	  <!-- .NET Standard 2.0 -->
 	  <group targetFramework="netstandard2.0">
-		<dependency id="Uno.SourceGenerationTasks" version="1.26.0" />
+		<dependency id="Uno.SourceGenerationTasks" version="1.27.0" />
 		<dependency id="Uno.Core" version="1.24.0" />
 		<dependency id="Uno.Core.Build" version="1.24.0" />
 		<dependency id="System.Numerics.Vectors" version="4.5.0-preview1-26216-02" />
@@ -109,13 +109,6 @@
 	<file src="..\src\Uno.UI.Toolkit\bin\Release\xamarinios10\Uno.UI.Toolkit.pdb" target="lib\xamarinios10" />
 	<file src="..\src\Uno.UI.Toolkit\bin\Release\netstandard2.0\Uno.UI.Toolkit.dll" target="lib\netstandard2.0" />
 	<file src="..\src\Uno.UI.Toolkit\bin\Release\netstandard2.0\Uno.UI.Toolkit.pdb" target="lib\netstandard2.0" />
-
-	<!-- Uno.UI.Toolkit Ref -->
-	<file src="..\src\Uno.UI.Toolkit\bin\Release\uap10.0\ref\Uno.UI.Toolkit.dll" target="ref\UAP" />
-	<file src="..\src\Uno.UI.Toolkit\bin\Release\MonoAndroid71\ref\Uno.UI.Toolkit.dll" target="ref\MonoAndroid71" />
-	<file src="..\src\Uno.UI.Toolkit\bin\Release\MonoAndroid80\ref\Uno.UI.Toolkit.dll" target="ref\MonoAndroid80" />
-	<file src="..\src\Uno.UI.Toolkit\bin\Release\xamarinios10\ref\Uno.UI.Toolkit.dll" target="ref\xamarinios10" />
-	<file src="..\src\Uno.UI.Toolkit\bin\Release\netstandard2.0\ref\Uno.UI.Toolkit.dll" target="ref\netstandard2.0" />
 
 	<!-- Android 7.1 -->
 	<file src="..\src\Uno.UI\Bin\Release\monoandroid71\Uno.dll" target="lib\MonoAndroid71" />
@@ -130,12 +123,6 @@
 	<file src="..\src\Uno.UI\Bin\Release\monoandroid71\Uno.Xaml.pdb" target="lib\MonoAndroid71" />
 	<file src="..\src\Uno.UI\Bin\Release\monoandroid71\*.xml" target="lib\MonoAndroid71" />
 
-	<!-- Android 7.1 Ref -->
-	<file src="..\src\Uno.UWP\Bin\Release\monoandroid71\ref\Uno.dll" target="ref\MonoAndroid71" />
-	<file src="..\src\Uno.Foundation\Bin\Release\monoandroid71\ref\Uno.Foundation.dll" target="ref\MonoAndroid71" />
-	<file src="..\src\Uno.UI.BindingHelper.Android\Bin\Release\monoandroid71\ref\Uno.UI.BindingHelper.Android.dll" target="ref\MonoAndroid71" />
-	<file src="..\src\Uno.UI\Bin\Release\monoandroid71\ref\Uno.UI.dll" target="ref\MonoAndroid71" />
-	<file src="..\src\SourceGenerators\System.Xaml\bin\Release\monoandroid71\ref\Uno.Xaml.dll" target="ref\MonoAndroid71" />
 
 	<!-- Android 8.0 -->
 	<file src="..\src\Uno.UI\Bin\Release\monoandroid80\Uno.dll" target="lib\MonoAndroid80" />
@@ -150,13 +137,6 @@
 	<file src="..\src\Uno.UI\Bin\Release\monoandroid80\Uno.Xaml.pdb" target="lib\MonoAndroid80" />
 	<file src="..\src\Uno.UI\Bin\Release\monoandroid80\*.xml" target="lib\MonoAndroid80" />
 
-	<!-- Android 8.0 Ref -->
-	<file src="..\src\Uno.UWP\Bin\Release\monoandroid80\ref\Uno.dll" target="ref\MonoAndroid80" />
-	<file src="..\src\Uno.Foundation\Bin\Release\monoandroid80\ref\Uno.Foundation.dll" target="ref\MonoAndroid80" />
-	<file src="..\src\Uno.UI.BindingHelper.Android\Bin\Release\monoandroid80\ref\Uno.UI.BindingHelper.Android.dll" target="ref\MonoAndroid80" />
-	<file src="..\src\Uno.UI\Bin\Release\monoandroid80\ref\Uno.UI.dll" target="ref\MonoAndroid80" />
-	<file src="..\src\SourceGenerators\System.Xaml\bin\Release\monoandroid80\ref\Uno.Xaml.dll" target="ref\MonoAndroid80" />
-
 	<!-- iOS Unified -->
 	<file src="..\src\Uno.UI\Bin\Release\xamarinios10\Uno.dll" target="lib\xamarinios10" />
 	<file src="..\src\Uno.UI\Bin\Release\xamarinios10\Uno.pdb" target="lib\xamarinios10" />
@@ -168,12 +148,6 @@
 	<file src="..\src\Uno.UI\Bin\Release\xamarinios10\Uno.Xaml.pdb" target="lib\xamarinios10" />
 	<file src="..\src\Uno.UI\bin\Release\xamarinios10\*.xml" target="lib\xamarinios10" />
 
-	<!-- iOS Unified Ref -->
-	<file src="..\src\Uno.UWP\Bin\Release\xamarinios10\ref\Uno.dll" target="ref\xamarinios10" />
-	<file src="..\src\Uno.Foundation\Bin\Release\xamarinios10\ref\Uno.Foundation.dll" target="ref\xamarinios10" />
-	<file src="..\src\Uno.UI\Bin\Release\xamarinios10\ref\Uno.UI.dll" target="ref\xamarinios10" />
-	<file src="..\src\SourceGenerators\System.Xaml\bin\Release\xamarinios10\ref\Uno.Xaml.dll" target="ref\xamarinios10" />
-
 	<!-- .NET Standard 2.0 -->
 	<file src="..\src\Uno.UI\Bin\Release\netstandard2.0\Uno.dll" target="lib\netstandard2.0" />
 	<file src="..\src\Uno.UI\Bin\Release\netstandard2.0\Uno.pdb" target="lib\netstandard2.0" />
@@ -186,13 +160,6 @@
 	<file src="..\src\Uno.UI.Wasm\bin\Release\netstandard2.0\Uno.UI.Wasm.dll" target="lib\netstandard2.0" />
 	<file src="..\src\Uno.UI.Wasm\bin\Release\netstandard2.0\Uno.UI.Wasm.pdb" target="lib\netstandard2.0" />
 	<file src="..\src\Uno.UI\bin\Release\netstandard2.0\*.xml" target="lib\netstandard2.0" />
-
-	<!-- .NET Standard 2.0 Ref -->
-	<file src="..\src\Uno.UWP\Bin\Release\netstandard2.0\ref\Uno.dll" target="ref\netstandard2.0" />
-	<file src="..\src\Uno.Foundation\Bin\Release\netstandard2.0\ref\Uno.Foundation.dll" target="ref\netstandard2.0" />
-	<file src="..\src\Uno.UI\Bin\Release\netstandard2.0\ref\Uno.UI.dll" target="ref\netstandard2.0" />
-	<file src="..\src\SourceGenerators\System.Xaml\bin\Release\netstandard2.0\ref\Uno.Xaml.dll" target="ref\netstandard2.0" />
-	<file src="..\src\Uno.UI.Wasm\bin\Release\netstandard2.0\ref\Uno.UI.Wasm.dll" target="ref\netstandard2.0" />
 
 	<file src="..\src\Uno.Analyzers\Bin\Release\Uno.Analyzers.dll" target="analyzers" />
 	<file src="..\src\Uno.Analyzers\Bin\Release\Uno.Analyzers.pdb" target="analyzers" />

build/Uno.UI.proj

@@ -94,9 +94,13 @@
 
   </Target>
 
-  <Target Name="GenerateDoc">
-	<Exec Command="$(NuGetPackageRoot)\docfx.console\2.36.0\tools\docfx.exe ..\doc\docfx.json -o $(OutputDir)\doc" />
-  </Target>
+	<Target Name="GenerateDoc">
+	  <MSBuild Properties="Configuration=Release;VisualStudioVersion=15.0"
+				Projects="..\src\Uno.UWPSyncGenerator\Uno.UWPSyncGenerator.csproj"
+				Targets="Build" />
+		<Exec Command="..\src\Uno.UWPSyncGenerator\Bin\Release\net46\Uno.UWPSyncGenerator.exe &quot;doc&quot;" />
+		<Exec Command="$(NuGetPackageRoot)\docfx.console\2.36.0\tools\docfx.exe ..\doc\docfx.json -o $(OutputDir)\doc" />
+	</Target>
 
   <Target Name="GenerateAPIDiff">
 	<PropertyGroup>
@@ -129,20 +133,21 @@
 
 	<XmlUpdate
 		XmlFileName=".\Uno.UI.nuspec"
-		XPath="/x:package/x:metadata/x:version"
+		XPath="/x:package/x:metadata/x:dependencies/x:dependency/@version"
 		Value="$(GITVERSION_FullSemVer)"
 		Namespace="$(NugetNamespace)"
 		Prefix="x"/>
 
 	<XmlUpdate
-		XmlFileName=".\Uno.UI.nuspec"
-		XPath="/x:package/x:metadata/x:dependencies/x:dependency/@version"
+		XmlFileName=".\Uno.UI.WpfHost.nuspec"
+		XPath="/x:package/x:metadata/x:dependencies//x:dependency[@id='Uno.UI']/@version"
 		Value="$(GITVERSION_FullSemVer)"
 		Namespace="$(NugetNamespace)"
 		Prefix="x"/>
 
 	<!-- Create the packages -->
-	<Exec Command="$(NuGetBin) pack Uno.UI.nuspec -Verbosity Detailed" />
+	<Exec Command="$(NuGetBin) pack Uno.UI.nuspec -Verbosity Detailed -Version &quot;$(GITVERSION_FullSemVer)&quot;" />
+	<Exec Command="$(NuGetBin) pack Uno.UI.WpfHost.nuspec -Verbosity Detailed -Version &quot;$(GITVERSION_FullSemVer)&quot;" />
   </Target>
 
   <Import Project="GetMsBuildVersion.targets" />