diff --git a/gitversion.yml b/gitversion.yml
index 12b24f2..b8643dd 100644
--- a/gitversion.yml
+++ b/gitversion.yml
@@ -1,6 +1,6 @@
 assembly-versioning-scheme: MajorMinorPatch
 mode: ContinuousDeployment
-next-version: 1.21.0
+next-version: 1.23.0
 continuous-delivery-fallback-tag: ""
 branches:
   master:
diff --git a/readme.md b/readme.md
index abe1e73..df5a4c0 100644
--- a/readme.md
+++ b/readme.md
@@ -18,3 +18,8 @@
 | `CompilationReferencesListingGenerator` | _none_ | Generate a file without _useful_ code, containing only comments detailing references used to compile the project. | [Documentation](doc/Compilation%20References.md) |
 | `EqualityGenerator` | `[GenerateEquality]` | Generate code for efficient `.Equals()` members generation. | [Documentation](doc/Equality%20Generation.md) |
 | `ImmutableGenerator` | `[GenerateImmutable]` | Generate code to build truly immutable entities. | [Documentation](doc/Immutable%20Generation.md) |
+
+## Release Notes
+
+### 1.22.0 (May 17th 2018)
+- Added support for System.Guid as a supported immutable type.
\ No newline at end of file
diff --git a/src/Uno.CodeGen.ClassLifecycle/Uno.CodeGen.ClassLifecycle.csproj b/src/Uno.CodeGen.ClassLifecycle/Uno.CodeGen.ClassLifecycle.csproj
index d2475b0..34c000e 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.1.1" PrivateAssets="all" />
-		<PackageReference Include="Uno.SourceGeneration" Version="1.20.1" PrivateAssets="all" />
+		<PackageReference Include="Uno.SourceGeneration" Version="1.21.0" PrivateAssets="all" />
 	</ItemGroup>
 	
 	<ItemGroup>
-		<PackageReference Include="Uno.SourceGenerationTasks" Version="1.20.1" PrivateAssets="none">
+		<PackageReference Include="Uno.SourceGenerationTasks" Version="1.21.0" 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 03bccf8..b5be7eb 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.4.1" />
-		<PackageReference Include="Uno.SourceGenerationTasks" Version="1.20.1" />
+		<PackageReference Include="Uno.SourceGenerationTasks" Version="1.21.0" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/Uno.CodeGen.Tests/Uno.CodeGen.Tests.csproj b/src/Uno.CodeGen.Tests/Uno.CodeGen.Tests.csproj
index 62afb1c..84bfd14 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.1" />
 		<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
 		<PackageReference Include="System.ComponentModel.Annotations" Version="4.4.1" />
-		<PackageReference Include="Uno.Core" Version="1.20.2" />
-		<PackageReference Include="Uno.SourceGenerationTasks" Version="1.20.1" />
+		<PackageReference Include="Uno.Core" Version="1.21.0" />
+		<PackageReference Include="Uno.SourceGenerationTasks" Version="1.21.0" />
 	</ItemGroup>
 
 	<Import Project="..\Uno.CodeGen\build\Uno.CodeGen.props" />
diff --git a/src/Uno.CodeGen/Uno.CodeGen.csproj b/src/Uno.CodeGen/Uno.CodeGen.csproj
index 8f89017..0b5ce64 100644
--- a/src/Uno.CodeGen/Uno.CodeGen.csproj
+++ b/src/Uno.CodeGen/Uno.CodeGen.csproj
@@ -19,11 +19,11 @@
 	<ItemGroup Condition="'$(TargetFramework)'=='net46'">
 		<PackageReference Include="System.ValueTuple" Version="4.4.0" PrivateAssets="all" />
 		<PackageReference Include="Uno.RoslynHelpers" Version="1.1.1" PrivateAssets="all" />
-		<PackageReference Include="Uno.SourceGeneration" Version="1.20.1" PrivateAssets="all" />
+		<PackageReference Include="Uno.SourceGeneration" Version="1.21.0" PrivateAssets="all" />
 	</ItemGroup>
 	
 	<ItemGroup>
-		<PackageReference Include="Uno.SourceGenerationTasks" Version="1.20.1" PrivateAssets="none" />
+		<PackageReference Include="Uno.SourceGenerationTasks" Version="1.21.0" PrivateAssets="none" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)'!='net46'">