diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 26e8fb8..ef2e71e 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -23,6 +23,12 @@ steps:
   - checkout: self
     clean: true
 
+  - task: GitVersion@5
+    inputs:
+      useConfigFile: true
+      configFilePath: GitVersion.yml
+      updateAssemblyInfo: false
+
   - powershell: './build/build.ps1 -Script build/build.cake'
 
   - task: VSTest@2
diff --git a/build/build.cake b/build/build.cake
index ed8fd31..65ecc2f 100644
--- a/build/build.cake
+++ b/build/build.cake
@@ -1,6 +1,5 @@
-#addin "Cake.FileHelpers"
-#addin "Cake.Powershell"
-#tool "nuget:?package=GitVersion.CommandLine&version=4.0.0" 
+#addin "nuget:?package=Cake.FileHelpers&version=3.2.1"
+#addin "nuget:?package=Cake.Powershell&version=0.4.8"
 
 using System;
 using System.Linq;
@@ -16,7 +15,6 @@ var target = Argument("target", "Default");
 // VERSIONS
 //////////////////////////////////////////////////////////////////////
 
-var gitVersioningVersion = "2.0.41";
 var signClientVersion = "0.9.0";
 
 //////////////////////////////////////////////////////////////////////
@@ -26,7 +24,6 @@ var signClientVersion = "0.9.0";
 var baseDir = MakeAbsolute(Directory("../")).ToString();
 var buildDir = baseDir + "/build";
 var Solution = baseDir + "/src/Uno.Core.sln";
-GitVersion versionInfo = null;
 
 //////////////////////////////////////////////////////////////////////
 // METHODS
@@ -83,7 +80,6 @@ void VerifyHeaders(bool Replace)
 //////////////////////////////////////////////////////////////////////
 
 Task("Build")
-    .IsDependentOn("Version")
     .IsDependentOn("ValidateHeaders")
     .Description("Build all projects and get the assemblies")
     .Does(() =>
@@ -94,8 +90,8 @@ Task("Build")
     {
     }
     .SetConfiguration("Release")
-    .WithProperty("PackageVersion", versionInfo.FullSemVer)
-    .WithProperty("InformationalVersion", versionInfo.InformationalVersion)
+    .WithProperty("PackageVersion", EnvironmentVariable("GITVERSION_FULLSEMVER"))
+    .WithProperty("InformationalVersion", EnvironmentVariable("GITVERSION_INFORMATIONALVERSION"))
     .WithProperty("PackageOutputPath", buildDir)
     .WithTarget("Restore")
     .WithTarget("Build")
@@ -126,18 +122,6 @@ Task("ValidateHeaders")
     VerifyHeaders(false);
 });
 
-Task("Version")
-    .Description("Updates target versions")
-    .Does(() =>
-{
-	versionInfo = GitVersion(new GitVersionSettings {
-        UpdateAssemblyInfo = true,
-		UpdateAssemblyInfoFilePath = baseDir + "/build/AssemblyVersion.cs"
-    });
-
-    Information($"FullSemVer: {versionInfo.FullSemVer} Sha: {versionInfo.Sha}");
-});
-
 //////////////////////////////////////////////////////////////////////
 // EXECUTION
 //////////////////////////////////////////////////////////////////////
diff --git a/build/tools/packages.config b/build/tools/packages.config
index d654602..ec87d00 100644
--- a/build/tools/packages.config
+++ b/build/tools/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-    <package id="Cake" version="0.24.0" />
+    <package id="Cake" version="0.35.0" />
 </packages>
diff --git a/gitversion.yml b/gitversion.yml
index 3ef9c5d..b6c5dba 100644
--- a/gitversion.yml
+++ b/gitversion.yml
@@ -9,6 +9,12 @@ branches:
     tag: dev
     increment: Minor
 
+  pull-request:
+    regex: ^(pull|pull\-requests|pr)[/-]
+    mode: ContinuousDeployment
+    tag: PullRequest
+    increment: Inherit
+
   stable:
     regex: release/stable/.*
     tag: ''
@@ -24,6 +30,7 @@ branches:
     source-branches: ['master']
 
   dev:
+    mode: ContinuousDeployment
     regex: dev/.*?/(.*?)
     tag: dev.{BranchName}
     source-branches: ['master', 'release', 'projects', 'feature']