From 6ce9604fe04ba75d46fc67eccb09019a91e27375 Mon Sep 17 00:00:00 2001
From: Xiaotian GU <xiaotian.gu@nventive.com>
Date: Tue, 11 Dec 2018 16:07:03 -0500
Subject: [PATCH 1/3] Updates to latest beta.

---
 .../Uno.CodeGen.ClassLifecycle.csproj                         | 4 ++--
 .../Uno.CodeGen.Tests.ExternalClasses.csproj                  | 2 +-
 src/Uno.CodeGen.Tests/Uno.CodeGen.Tests.csproj                | 4 ++--
 src/Uno.CodeGen/Uno.CodeGen.csproj                            | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Uno.CodeGen.ClassLifecycle/Uno.CodeGen.ClassLifecycle.csproj b/src/Uno.CodeGen.ClassLifecycle/Uno.CodeGen.ClassLifecycle.csproj
index 64bb583..0872820 100644
--- a/src/Uno.CodeGen.ClassLifecycle/Uno.CodeGen.ClassLifecycle.csproj
+++ b/src/Uno.CodeGen.ClassLifecycle/Uno.CodeGen.ClassLifecycle.csproj
@@ -25,11 +25,11 @@ This package is part of the Uno.CodeGen to generate classes lifecycle methods in
 	<ItemGroup Condition="'$(TargetFramework)'=='net46'">
 		<PackageReference Include="System.ValueTuple" Version="4.4.0" PrivateAssets="all" />
 		<PackageReference Include="Uno.RoslynHelpers" Version="1.2.0-dev.10" PrivateAssets="all" />
-		<PackageReference Include="Uno.SourceGeneration" Version="1.29.0-dev.157" PrivateAssets="all" />
+		<PackageReference Include="Uno.SourceGeneration" Version="1.29.0-beta.202" PrivateAssets="all" />
 	</ItemGroup>
 	
 	<ItemGroup>
-		<PackageReference Include="Uno.SourceGenerationTasks" Version="1.29.0-dev.157" PrivateAssets="none">
+		<PackageReference Include="Uno.SourceGenerationTasks" Version="1.29.0-beta.202" PrivateAssets="none">
 		  <NoWarn>NU1701</NoWarn>
 		</PackageReference>
 	</ItemGroup>
diff --git a/src/Uno.CodeGen.Tests.ExternalClasses/Uno.CodeGen.Tests.ExternalClasses.csproj b/src/Uno.CodeGen.Tests.ExternalClasses/Uno.CodeGen.Tests.ExternalClasses.csproj
index e32931e..e312fc5 100644
--- a/src/Uno.CodeGen.Tests.ExternalClasses/Uno.CodeGen.Tests.ExternalClasses.csproj
+++ b/src/Uno.CodeGen.Tests.ExternalClasses/Uno.CodeGen.Tests.ExternalClasses.csproj
@@ -13,7 +13,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
-		<PackageReference Include="Uno.SourceGenerationTasks" Version="1.29.0-dev.157" />
+		<PackageReference Include="Uno.SourceGenerationTasks" Version="1.29.0-beta.202" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/Uno.CodeGen.Tests/Uno.CodeGen.Tests.csproj b/src/Uno.CodeGen.Tests/Uno.CodeGen.Tests.csproj
index 6a7a7a9..d261dd4 100644
--- a/src/Uno.CodeGen.Tests/Uno.CodeGen.Tests.csproj
+++ b/src/Uno.CodeGen.Tests/Uno.CodeGen.Tests.csproj
@@ -20,8 +20,8 @@
 		<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
 		<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
 		<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
-		<PackageReference Include="Uno.Core" Version="1.26.0-dev.58" />
-	  <PackageReference Include="Uno.SourceGenerationTasks" Version="1.29.0-dev.157">
+		<PackageReference Include="Uno.Core" Version="1.26.0-beta.64" />
+	  <PackageReference Include="Uno.SourceGenerationTasks" Version="1.29.0-beta.202">
 		  <NoWarn>NU1701</NoWarn>
 
 	  </PackageReference>
diff --git a/src/Uno.CodeGen/Uno.CodeGen.csproj b/src/Uno.CodeGen/Uno.CodeGen.csproj
index 075785f..173b531 100644
--- a/src/Uno.CodeGen/Uno.CodeGen.csproj
+++ b/src/Uno.CodeGen/Uno.CodeGen.csproj
@@ -21,12 +21,12 @@
   <ItemGroup Condition="'$(TargetFramework)'=='net46'">
 	<PackageReference Include="System.ValueTuple" Version="4.4.0" PrivateAssets="all" />
 	<PackageReference Include="Uno.RoslynHelpers" Version="1.2.0-dev.10" PrivateAssets="all" />
-	<PackageReference Include="Uno.SourceGeneration" Version="1.29.0-dev.157" PrivateAssets="all" />
+	<PackageReference Include="Uno.SourceGeneration" Version="1.29.0-beta.202" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
 	<PackageReference Include="Microsoft.CodeAnalysis" Version="2.3.0" PrivateAssets="all" />
-	<PackageReference Include="Uno.SourceGenerationTasks" Version="1.29.0-dev.157" PrivateAssets="none">
+	<PackageReference Include="Uno.SourceGenerationTasks" Version="1.29.0-beta.202" PrivateAssets="none">
 		<NoWarn>NU1701</NoWarn>
 	</PackageReference>
   </ItemGroup>

From 24ac6a49d726d67059597a90bdaf6ecf59b1f239 Mon Sep 17 00:00:00 2001
From: Xiaotian GU <xiaotian.gu@nventive.com>
Date: Tue, 11 Dec 2018 16:46:37 -0500
Subject: [PATCH 2/3] changed target framework `net46` to `net461`

---
 src/Uno.ClassLifecycle/Uno.ClassLifecycle.csproj            | 2 +-
 .../Build/Uno.CodeGen.ClassLifecycle.props                  | 2 +-
 .../Uno.CodeGen.ClassLifecycle.csproj                       | 6 +++---
 .../Uno.CodeGen.Tests.ExternalClasses.csproj                | 4 ++--
 src/Uno.CodeGen.Tests/Uno.CodeGen.Tests.csproj              | 4 ++--
 src/Uno.CodeGen/Uno.CodeGen.csproj                          | 6 +++---
 src/Uno.CodeGen/build/Uno.CodeGen.props                     | 2 +-
 src/Uno.Common.props                                        | 2 +-
 src/Uno.Equality/Uno.Equality.csproj                        | 2 +-
 src/Uno.Immutables/Uno.Immutables.csproj                    | 2 +-
 src/Uno.Injectable/Uno.Injectable.csproj                    | 2 +-
 11 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/Uno.ClassLifecycle/Uno.ClassLifecycle.csproj b/src/Uno.ClassLifecycle/Uno.ClassLifecycle.csproj
index e6cb610..581580e 100644
--- a/src/Uno.ClassLifecycle/Uno.ClassLifecycle.csproj
+++ b/src/Uno.ClassLifecycle/Uno.ClassLifecycle.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net46;netstandard1.3;netstandard2.0</TargetFrameworks>
+		<TargetFrameworks>net461;netstandard1.3;netstandard2.0</TargetFrameworks>
 		<Product>Object life cycle declaration</Product>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
diff --git a/src/Uno.CodeGen.ClassLifecycle/Build/Uno.CodeGen.ClassLifecycle.props b/src/Uno.CodeGen.ClassLifecycle/Build/Uno.CodeGen.ClassLifecycle.props
index c0df4be..d4f2402 100644
--- a/src/Uno.CodeGen.ClassLifecycle/Build/Uno.CodeGen.ClassLifecycle.props
+++ b/src/Uno.CodeGen.ClassLifecycle/Build/Uno.CodeGen.ClassLifecycle.props
@@ -1,6 +1,6 @@
 <Project>
 	<ItemGroup>
-		<SourceGenerator Include="$(MSBuildThisFileDirectory)..\bin\$(Configuration)\net46\Uno.CodeGen.ClassLifecycle.dll" 
+		<SourceGenerator Include="$(MSBuildThisFileDirectory)..\bin\$(Configuration)\net461\Uno.CodeGen.ClassLifecycle.dll" 
 				 Condition="Exists('$(MSBuildThisFileDirectory)..\bin')" />
 		<SourceGenerator Include="$(MSBuildThisFileDirectory)..\tools\Uno.CodeGen.ClassLifecycle.dll" 
 				 Condition="Exists('$(MSBuildThisFileDirectory)..\tools')" />
diff --git a/src/Uno.CodeGen.ClassLifecycle/Uno.CodeGen.ClassLifecycle.csproj b/src/Uno.CodeGen.ClassLifecycle/Uno.CodeGen.ClassLifecycle.csproj
index 0872820..1be13d2 100644
--- a/src/Uno.CodeGen.ClassLifecycle/Uno.CodeGen.ClassLifecycle.csproj
+++ b/src/Uno.CodeGen.ClassLifecycle/Uno.CodeGen.ClassLifecycle.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
    <PropertyGroup>
-		<TargetFrameworks>net46;netstandard1.3;netstandard2.0</TargetFrameworks>
+		<TargetFrameworks>net461;netstandard1.3;netstandard2.0</TargetFrameworks>
 		<IsTool>true</IsTool>
 		<Product>Generator of class lifecycle</Product>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -22,7 +22,7 @@ This package is part of the Uno.CodeGen to generate classes lifecycle methods in
 	
 	<Import Project="..\Uno.Common.props" />
 
-	<ItemGroup Condition="'$(TargetFramework)'=='net46'">
+	<ItemGroup Condition="'$(TargetFramework)'=='net461'">
 		<PackageReference Include="System.ValueTuple" Version="4.4.0" PrivateAssets="all" />
 		<PackageReference Include="Uno.RoslynHelpers" Version="1.2.0-dev.10" PrivateAssets="all" />
 		<PackageReference Include="Uno.SourceGeneration" Version="1.29.0-beta.202" PrivateAssets="all" />
@@ -34,7 +34,7 @@ This package is part of the Uno.CodeGen to generate classes lifecycle methods in
 		</PackageReference>
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)'!='net46'">
+	<ItemGroup Condition="'$(TargetFramework)'!='net461'">
 		<Compile Remove="**\*.cs" />
 		<None Include="**\*.cs" Exclude="obj\**\*.cs;bin\**\.cs" />
 	</ItemGroup>
diff --git a/src/Uno.CodeGen.Tests.ExternalClasses/Uno.CodeGen.Tests.ExternalClasses.csproj b/src/Uno.CodeGen.Tests.ExternalClasses/Uno.CodeGen.Tests.ExternalClasses.csproj
index e312fc5..bc45c12 100644
--- a/src/Uno.CodeGen.Tests.ExternalClasses/Uno.CodeGen.Tests.ExternalClasses.csproj
+++ b/src/Uno.CodeGen.Tests.ExternalClasses/Uno.CodeGen.Tests.ExternalClasses.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net46;netstandard2.0;netstandard1.3</TargetFrameworks>
+		<TargetFrameworks>net461;netstandard2.0;netstandard1.3</TargetFrameworks>
 		<IsPackable>false</IsPackable>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<SourceGenerator Include="..\Uno.CodeGen\bin\$(Configuration)\net46\Uno.CodeGen.dll" />
+		<SourceGenerator Include="..\Uno.CodeGen\bin\$(Configuration)\net461\Uno.CodeGen.dll" />
 	</ItemGroup>
 
 	<Import Project="..\Uno.CodeGen\build\Uno.CodeGen.props" />
diff --git a/src/Uno.CodeGen.Tests/Uno.CodeGen.Tests.csproj b/src/Uno.CodeGen.Tests/Uno.CodeGen.Tests.csproj
index d261dd4..7d1179b 100644
--- a/src/Uno.CodeGen.Tests/Uno.CodeGen.Tests.csproj
+++ b/src/Uno.CodeGen.Tests/Uno.CodeGen.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net46</TargetFramework>
+		<TargetFramework>net461</TargetFramework>
 		<IsPackable>false</IsPackable>
 		<NoWarn>1701;1702;1705;NU1701</NoWarn>
 		<CodeAnalysisRuleSet>Uno.CodeGen.Tests.ruleset</CodeAnalysisRuleSet>
@@ -9,7 +9,7 @@
 
 	<ItemGroup>
 		<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-		<SourceGenerator Include="..\Uno.CodeGen\bin\$(Configuration)\net46\Uno.CodeGen.dll" />
+		<SourceGenerator Include="..\Uno.CodeGen\bin\$(Configuration)\net461\Uno.CodeGen.dll" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/Uno.CodeGen/Uno.CodeGen.csproj b/src/Uno.CodeGen/Uno.CodeGen.csproj
index 173b531..88102a8 100644
--- a/src/Uno.CodeGen/Uno.CodeGen.csproj
+++ b/src/Uno.CodeGen/Uno.CodeGen.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	<TargetFrameworks>net46;netstandard1.3;netstandard2.0</TargetFrameworks>
+	<TargetFrameworks>net461;netstandard1.3;netstandard2.0</TargetFrameworks>
 	<IsTool>true</IsTool>
 	<NoWarn>1701;1702;1705;NU1701</NoWarn>
 	<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -18,7 +18,7 @@
 
   <Import Project="..\Uno.Common.props" />
 
-  <ItemGroup Condition="'$(TargetFramework)'=='net46'">
+  <ItemGroup Condition="'$(TargetFramework)'=='net461'">
 	<PackageReference Include="System.ValueTuple" Version="4.4.0" PrivateAssets="all" />
 	<PackageReference Include="Uno.RoslynHelpers" Version="1.2.0-dev.10" PrivateAssets="all" />
 	<PackageReference Include="Uno.SourceGeneration" Version="1.29.0-beta.202" PrivateAssets="all" />
@@ -31,7 +31,7 @@
 	</PackageReference>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'!='net46'">
+  <ItemGroup Condition="'$(TargetFramework)'!='net461'">
 	<Compile Remove="**\*.cs" />
 	<None Include="**\*.cs" Exclude="bin\**\*.cs;obj\**\*.cs" />
   </ItemGroup>
diff --git a/src/Uno.CodeGen/build/Uno.CodeGen.props b/src/Uno.CodeGen/build/Uno.CodeGen.props
index 3ee61de..aa17edb 100644
--- a/src/Uno.CodeGen/build/Uno.CodeGen.props
+++ b/src/Uno.CodeGen/build/Uno.CodeGen.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Project ToolsVersion="15.0">
 	<ItemGroup>
-		<SourceGenerator Include="$(MSBuildThisFileDirectory)..\bin\$(Configuration)\net46\Uno.CodeGen.dll" 
+		<SourceGenerator Include="$(MSBuildThisFileDirectory)..\bin\$(Configuration)\net461\Uno.CodeGen.dll" 
 		                 Condition="Exists('$(MSBuildThisFileDirectory)..\bin')" />
 		<SourceGenerator Include="$(MSBuildThisFileDirectory)..\tools\Uno.CodeGen.dll" 
 		                 Condition="Exists('$(MSBuildThisFileDirectory)..\tools')" />
diff --git a/src/Uno.Common.props b/src/Uno.Common.props
index 1a9da4b..fc987d5 100644
--- a/src/Uno.Common.props
+++ b/src/Uno.Common.props
@@ -9,7 +9,7 @@
 
 		<PropertyGroup>
 			<_OverrideTargetFramework>$(TargetFramework)</_OverrideTargetFramework>
-			<_TargetNugetFolder Condition="'$(IsTool)'=='true' AND '$(TargetFramework)' == 'net46'">$(USERPROFILE)\.nuget\packages\$(AssemblyName)\$(NugetOverrideVersion)\tools</_TargetNugetFolder>
+			<_TargetNugetFolder Condition="'$(IsTool)'=='true' AND '$(TargetFramework)' == 'net461'">$(USERPROFILE)\.nuget\packages\$(AssemblyName)\$(NugetOverrideVersion)\tools</_TargetNugetFolder>
 			<_TargetNugetFolder Condition="'$(IsTool)'!='true'">$(USERPROFILE)\.nuget\packages\$(AssemblyName)\$(NugetOverrideVersion)\lib\$(_OverrideTargetFramework)</_TargetNugetFolder>
 		</PropertyGroup>
 		<ItemGroup>
diff --git a/src/Uno.Equality/Uno.Equality.csproj b/src/Uno.Equality/Uno.Equality.csproj
index 7809001..168008a 100644
--- a/src/Uno.Equality/Uno.Equality.csproj
+++ b/src/Uno.Equality/Uno.Equality.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net46;netstandard1.3;netstandard2.0</TargetFrameworks>
+		<TargetFrameworks>net461;netstandard1.3;netstandard2.0</TargetFrameworks>
 		<Product>Equality Declarations</Product>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
diff --git a/src/Uno.Immutables/Uno.Immutables.csproj b/src/Uno.Immutables/Uno.Immutables.csproj
index 8abfa93..8e2a43e 100644
--- a/src/Uno.Immutables/Uno.Immutables.csproj
+++ b/src/Uno.Immutables/Uno.Immutables.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net46;netstandard1.3;netstandard2.0</TargetFrameworks>
+		<TargetFrameworks>net461;netstandard1.3;netstandard2.0</TargetFrameworks>
 		<Product>Immutable Declarations</Product>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
diff --git a/src/Uno.Injectable/Uno.Injectable.csproj b/src/Uno.Injectable/Uno.Injectable.csproj
index 9ed7af7..eedb3d7 100644
--- a/src/Uno.Injectable/Uno.Injectable.csproj
+++ b/src/Uno.Injectable/Uno.Injectable.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net46;netstandard1.3;netstandard2.0</TargetFrameworks>
+		<TargetFrameworks>net461;netstandard1.3;netstandard2.0</TargetFrameworks>
 		<Product>Injectable Declarations</Product>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<TreatWarningsAsErrors>True</TreatWarningsAsErrors>

From b40a5d57b81152a8afbdd592a916192a9c073667 Mon Sep 17 00:00:00 2001
From: Xiaotian GU <xiaotian.gu@nventive.com>
Date: Wed, 12 Dec 2018 11:40:04 -0500
Subject: [PATCH 3/3] added missing reference to System.Diagnostics.Contracts

---
 src/Uno.Immutables/Uno.Immutables.csproj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Uno.Immutables/Uno.Immutables.csproj b/src/Uno.Immutables/Uno.Immutables.csproj
index 8e2a43e..197ee97 100644
--- a/src/Uno.Immutables/Uno.Immutables.csproj
+++ b/src/Uno.Immutables/Uno.Immutables.csproj
@@ -21,6 +21,10 @@ This package is part of the Uno.CodeGen to generate immutable entities in your p
 	</PropertyGroup>
 	
 	<Import Project="..\Uno.Common.props" />
+	
+	<ItemGroup>
+	  <PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
+	</ItemGroup>
 
 	<ItemGroup>
 		<ProjectReference Include="..\Uno.Equality\Uno.Equality.csproj" />