diff --git a/Android/Addon/TestProject.SDK.Examples.Android.Addon/Addon/TestProject.SDK.Examples.Android.Addon.csproj b/Android/Addon/TestProject.SDK.Examples.Android.Addon/Addon/TestProject.SDK.Examples.Android.Addon.csproj
index 739e420..e5ba966 100644
--- a/Android/Addon/TestProject.SDK.Examples.Android.Addon/Addon/TestProject.SDK.Examples.Android.Addon.csproj
+++ b/Android/Addon/TestProject.SDK.Examples.Android.Addon/Addon/TestProject.SDK.Examples.Android.Addon.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="TestProject.SDK" Version="0.54.3" />
+    <PackageReference Include="TestProject.SDK" Version="0.61.0" Publish="false" />
   </ItemGroup>
 
 </Project>
diff --git a/Android/Addon/TestProject.SDK.Examples.Android.Addon/Runners/Console/TestProject.SDK.Examples.Android.Runners.Console.csproj b/Android/Addon/TestProject.SDK.Examples.Android.Addon/Runners/Console/TestProject.SDK.Examples.Android.Runners.Console.csproj
index ec211d2..18c521f 100644
--- a/Android/Addon/TestProject.SDK.Examples.Android.Addon/Runners/Console/TestProject.SDK.Examples.Android.Runners.Console.csproj
+++ b/Android/Addon/TestProject.SDK.Examples.Android.Addon/Runners/Console/TestProject.SDK.Examples.Android.Runners.Console.csproj
@@ -5,10 +5,6 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="TestProject.SDK" Version="0.54.3" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\Addon\TestProject.SDK.Examples.Android.Addon.csproj" />
   </ItemGroup>
diff --git a/Android/Addon/TestProject.SDK.Examples.Android.Addon/Runners/Nunit/TestProject.SDK.Examples.Android.Runners.Nunit.csproj b/Android/Addon/TestProject.SDK.Examples.Android.Addon/Runners/Nunit/TestProject.SDK.Examples.Android.Runners.Nunit.csproj
index 7def23f..c1742c5 100644
--- a/Android/Addon/TestProject.SDK.Examples.Android.Addon/Runners/Nunit/TestProject.SDK.Examples.Android.Runners.Nunit.csproj
+++ b/Android/Addon/TestProject.SDK.Examples.Android.Addon/Runners/Nunit/TestProject.SDK.Examples.Android.Runners.Nunit.csproj
@@ -8,7 +8,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.11.0" />
-    <PackageReference Include="TestProject.SDK" Version="0.54.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Android/Test/TestProject.SDK.Examples.Android.Test/Runners/Console/TestProject.SDK.Examples.Android.Runners.Console.csproj b/Android/Test/TestProject.SDK.Examples.Android.Test/Runners/Console/TestProject.SDK.Examples.Android.Runners.Console.csproj
index b8df7cc..b1fa340 100644
--- a/Android/Test/TestProject.SDK.Examples.Android.Test/Runners/Console/TestProject.SDK.Examples.Android.Runners.Console.csproj
+++ b/Android/Test/TestProject.SDK.Examples.Android.Test/Runners/Console/TestProject.SDK.Examples.Android.Runners.Console.csproj
@@ -6,10 +6,6 @@
     <AssemblyName>TestProject.SDK.Examples.Android.Runners.Console</AssemblyName>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="TestProject.SDK" Version="0.54.3" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\Test\TestProject.SDK.Examples.Android.Test.csproj" />
   </ItemGroup>
diff --git a/Android/Test/TestProject.SDK.Examples.Android.Test/Runners/Nunit/TestProject.SDK.Examples.Android.Runners.Nunit.csproj b/Android/Test/TestProject.SDK.Examples.Android.Test/Runners/Nunit/TestProject.SDK.Examples.Android.Runners.Nunit.csproj
index 7988e7f..3d68822 100644
--- a/Android/Test/TestProject.SDK.Examples.Android.Test/Runners/Nunit/TestProject.SDK.Examples.Android.Runners.Nunit.csproj
+++ b/Android/Test/TestProject.SDK.Examples.Android.Test/Runners/Nunit/TestProject.SDK.Examples.Android.Runners.Nunit.csproj
@@ -8,7 +8,6 @@
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.11.0" />
-    <PackageReference Include="TestProject.SDK" Version="0.54.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Android/Test/TestProject.SDK.Examples.Android.Test/Test/TestProject.SDK.Examples.Android.Test.csproj b/Android/Test/TestProject.SDK.Examples.Android.Test/Test/TestProject.SDK.Examples.Android.Test.csproj
index 5d1079b..9b8b521 100644
--- a/Android/Test/TestProject.SDK.Examples.Android.Test/Test/TestProject.SDK.Examples.Android.Test.csproj
+++ b/Android/Test/TestProject.SDK.Examples.Android.Test/Test/TestProject.SDK.Examples.Android.Test.csproj
@@ -5,13 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Remove="Pages_old\**" />
-    <EmbeddedResource Remove="Pages_old\**" />
-    <None Remove="Pages_old\**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="TestProject.SDK" Version="0.54.3" />
+	  <PackageReference Include="TestProject.SDK" Version="0.61.0" Publish="false" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Generic/Addon/TestProject.SDK.Examples.Generic.Addon/Addon/TestProject.SDK.Examples.Generic.Addon.csproj b/Generic/Addon/TestProject.SDK.Examples.Generic.Addon/Addon/TestProject.SDK.Examples.Generic.Addon.csproj
index 739e420..f4a0a8e 100644
--- a/Generic/Addon/TestProject.SDK.Examples.Generic.Addon/Addon/TestProject.SDK.Examples.Generic.Addon.csproj
+++ b/Generic/Addon/TestProject.SDK.Examples.Generic.Addon/Addon/TestProject.SDK.Examples.Generic.Addon.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="TestProject.SDK" Version="0.54.3" />
+	  <PackageReference Include="TestProject.SDK" Version="0.61.0" Publish="false" />
   </ItemGroup>
 
 </Project>
diff --git a/Generic/Addon/TestProject.SDK.Examples.Generic.Addon/Runners/Console/TestProject.SDK.Examples.Generic.Runners.Console.csproj b/Generic/Addon/TestProject.SDK.Examples.Generic.Addon/Runners/Console/TestProject.SDK.Examples.Generic.Runners.Console.csproj
index 4f6daf2..d69ad1c 100644
--- a/Generic/Addon/TestProject.SDK.Examples.Generic.Addon/Runners/Console/TestProject.SDK.Examples.Generic.Runners.Console.csproj
+++ b/Generic/Addon/TestProject.SDK.Examples.Generic.Addon/Runners/Console/TestProject.SDK.Examples.Generic.Runners.Console.csproj
@@ -5,10 +5,6 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="TestProject.SDK" Version="0.54.3" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\Addon\TestProject.SDK.Examples.Generic.Addon.csproj" />
   </ItemGroup>
diff --git a/Generic/Addon/TestProject.SDK.Examples.Generic.Addon/Runners/Nunit/TestProject.SDK.Examples.Generic.Runners.Nunit.csproj b/Generic/Addon/TestProject.SDK.Examples.Generic.Addon/Runners/Nunit/TestProject.SDK.Examples.Generic.Runners.Nunit.csproj
index 00a005f..1f73918 100644
--- a/Generic/Addon/TestProject.SDK.Examples.Generic.Addon/Runners/Nunit/TestProject.SDK.Examples.Generic.Runners.Nunit.csproj
+++ b/Generic/Addon/TestProject.SDK.Examples.Generic.Addon/Runners/Nunit/TestProject.SDK.Examples.Generic.Runners.Nunit.csproj
@@ -9,7 +9,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.11.0" />
-    <PackageReference Include="TestProject.SDK" Version="0.54.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Generic/Test/TestProject.SDK.Examples.Generic.Test/Runners/Console/TestProject.SDK.Examples.Generic.Runners.Console.csproj b/Generic/Test/TestProject.SDK.Examples.Generic.Test/Runners/Console/TestProject.SDK.Examples.Generic.Runners.Console.csproj
index e2791a2..94bb96d 100644
--- a/Generic/Test/TestProject.SDK.Examples.Generic.Test/Runners/Console/TestProject.SDK.Examples.Generic.Runners.Console.csproj
+++ b/Generic/Test/TestProject.SDK.Examples.Generic.Test/Runners/Console/TestProject.SDK.Examples.Generic.Runners.Console.csproj
@@ -5,10 +5,6 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="TestProject.SDK" Version="0.54.3" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\Test\TestProject.SDK.Examples.Generic.Test.csproj" />
   </ItemGroup>
diff --git a/Generic/Test/TestProject.SDK.Examples.Generic.Test/Runners/Nunit/TestProject.SDK.Examples.Generic.Runners.Nunit.csproj b/Generic/Test/TestProject.SDK.Examples.Generic.Test/Runners/Nunit/TestProject.SDK.Examples.Generic.Runners.Nunit.csproj
index 1b59e8a..6101706 100644
--- a/Generic/Test/TestProject.SDK.Examples.Generic.Test/Runners/Nunit/TestProject.SDK.Examples.Generic.Runners.Nunit.csproj
+++ b/Generic/Test/TestProject.SDK.Examples.Generic.Test/Runners/Nunit/TestProject.SDK.Examples.Generic.Runners.Nunit.csproj
@@ -8,7 +8,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.11.0" />
-    <PackageReference Include="TestProject.SDK" Version="0.54.3" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/Generic/Test/TestProject.SDK.Examples.Generic.Test/Test/TestProject.SDK.Examples.Generic.Test.csproj b/Generic/Test/TestProject.SDK.Examples.Generic.Test/Test/TestProject.SDK.Examples.Generic.Test.csproj
index f087695..117da2c 100644
--- a/Generic/Test/TestProject.SDK.Examples.Generic.Test/Test/TestProject.SDK.Examples.Generic.Test.csproj
+++ b/Generic/Test/TestProject.SDK.Examples.Generic.Test/Test/TestProject.SDK.Examples.Generic.Test.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="TestProject.SDK" Version="0.54.3" />
+	  <PackageReference Include="TestProject.SDK" Version="0.61.0" Publish="false" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/IOS/Addon/TestProject.SDK.Examples.IOS.Addon/Addon/TestProject.SDK.Examples.IOS.Addon.csproj b/IOS/Addon/TestProject.SDK.Examples.IOS.Addon/Addon/TestProject.SDK.Examples.IOS.Addon.csproj
index 739e420..f4a0a8e 100644
--- a/IOS/Addon/TestProject.SDK.Examples.IOS.Addon/Addon/TestProject.SDK.Examples.IOS.Addon.csproj
+++ b/IOS/Addon/TestProject.SDK.Examples.IOS.Addon/Addon/TestProject.SDK.Examples.IOS.Addon.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="TestProject.SDK" Version="0.54.3" />
+	  <PackageReference Include="TestProject.SDK" Version="0.61.0" Publish="false" />
   </ItemGroup>
 
 </Project>
diff --git a/IOS/Addon/TestProject.SDK.Examples.IOS.Addon/Runners/Console/TestProject.SDK.Examples.Android.Runners.Console.csproj b/IOS/Addon/TestProject.SDK.Examples.IOS.Addon/Runners/Console/TestProject.SDK.Examples.Android.Runners.Console.csproj
index d0a12c5..5615078 100644
--- a/IOS/Addon/TestProject.SDK.Examples.IOS.Addon/Runners/Console/TestProject.SDK.Examples.Android.Runners.Console.csproj
+++ b/IOS/Addon/TestProject.SDK.Examples.IOS.Addon/Runners/Console/TestProject.SDK.Examples.Android.Runners.Console.csproj
@@ -5,10 +5,6 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="TestProject.SDK" Version="0.54.3" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\Addon\TestProject.SDK.Examples.IOS.Addon.csproj" />
   </ItemGroup>
diff --git a/IOS/Addon/TestProject.SDK.Examples.IOS.Addon/Runners/Nunit/TestProject.SDK.Examples.IOS.Runners.Nunit.csproj b/IOS/Addon/TestProject.SDK.Examples.IOS.Addon/Runners/Nunit/TestProject.SDK.Examples.IOS.Runners.Nunit.csproj
index bc832a6..e3e6b17 100644
--- a/IOS/Addon/TestProject.SDK.Examples.IOS.Addon/Runners/Nunit/TestProject.SDK.Examples.IOS.Runners.Nunit.csproj
+++ b/IOS/Addon/TestProject.SDK.Examples.IOS.Addon/Runners/Nunit/TestProject.SDK.Examples.IOS.Runners.Nunit.csproj
@@ -8,7 +8,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.11.0" />
-    <PackageReference Include="TestProject.SDK" Version="0.54.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/IOS/Test/Runners/Console/TestProject.SDK.Examples.IOS.Runners.Console.csproj b/IOS/Test/Runners/Console/TestProject.SDK.Examples.IOS.Runners.Console.csproj
index eba68ab..e4a545f 100644
--- a/IOS/Test/Runners/Console/TestProject.SDK.Examples.IOS.Runners.Console.csproj
+++ b/IOS/Test/Runners/Console/TestProject.SDK.Examples.IOS.Runners.Console.csproj
@@ -6,10 +6,6 @@
     <RootNamespace>TestProject.SDK.Examples.IOS.Runners.Console</RootNamespace>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="TestProject.SDK" Version="0.54.3" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\Test\TestProject.SDK.Examples.IOS.Test.csproj" />
   </ItemGroup>
diff --git a/IOS/Test/Runners/Nunit/TestProject.SDK.Examples.IOS.Runners.Nunit.csproj b/IOS/Test/Runners/Nunit/TestProject.SDK.Examples.IOS.Runners.Nunit.csproj
index 6741a56..ee244f7 100644
--- a/IOS/Test/Runners/Nunit/TestProject.SDK.Examples.IOS.Runners.Nunit.csproj
+++ b/IOS/Test/Runners/Nunit/TestProject.SDK.Examples.IOS.Runners.Nunit.csproj
@@ -8,7 +8,6 @@
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.11.0" />
-    <PackageReference Include="TestProject.SDK" Version="0.54.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/IOS/Test/Test/TestProject.SDK.Examples.IOS.Test.csproj b/IOS/Test/Test/TestProject.SDK.Examples.IOS.Test.csproj
index 1a11f6d..c007fc2 100644
--- a/IOS/Test/Test/TestProject.SDK.Examples.IOS.Test.csproj
+++ b/IOS/Test/Test/TestProject.SDK.Examples.IOS.Test.csproj
@@ -5,13 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Remove="Pages_old\**" />
-    <EmbeddedResource Remove="Pages_old\**" />
-    <None Remove="Pages_old\**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="TestProject.SDK" Version="0.54.3" />
+	  <PackageReference Include="TestProject.SDK" Version="0.61.0" Publish="false" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Web/Addon/TestProject.SDK.Examples.Web.Addon/Addon/TestProject.SDK.Examples.Web.Addon.csproj b/Web/Addon/TestProject.SDK.Examples.Web.Addon/Addon/TestProject.SDK.Examples.Web.Addon.csproj
index a181a36..7e62d37 100644
--- a/Web/Addon/TestProject.SDK.Examples.Web.Addon/Addon/TestProject.SDK.Examples.Web.Addon.csproj
+++ b/Web/Addon/TestProject.SDK.Examples.Web.Addon/Addon/TestProject.SDK.Examples.Web.Addon.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="TestProject.SDK" Version="0.54.3" />
+	  <PackageReference Include="TestProject.SDK" Version="0.61.0" Publish="false" />
   </ItemGroup>
 
 </Project>
diff --git a/Web/Addon/TestProject.SDK.Examples.Web.Addon/Runners/Nunit/TestProject.SDK.Examples.Web.Runners.Nunit.csproj b/Web/Addon/TestProject.SDK.Examples.Web.Addon/Runners/Nunit/TestProject.SDK.Examples.Web.Runners.Nunit.csproj
index eedb969..3e35362 100644
--- a/Web/Addon/TestProject.SDK.Examples.Web.Addon/Runners/Nunit/TestProject.SDK.Examples.Web.Runners.Nunit.csproj
+++ b/Web/Addon/TestProject.SDK.Examples.Web.Addon/Runners/Nunit/TestProject.SDK.Examples.Web.Runners.Nunit.csproj
@@ -11,7 +11,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.0-preview-20181205-02" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.11.2" />
-    <PackageReference Include="TestProject.SDK" Version="0.54.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Web/Test/TestProject.SDK.Examples.Web.Test/Runners/Console/TestProject.SDK.Examples.Web.Runners.Console.csproj b/Web/Test/TestProject.SDK.Examples.Web.Test/Runners/Console/TestProject.SDK.Examples.Web.Runners.Console.csproj
index 8664ff0..e56e74f 100644
--- a/Web/Test/TestProject.SDK.Examples.Web.Test/Runners/Console/TestProject.SDK.Examples.Web.Runners.Console.csproj
+++ b/Web/Test/TestProject.SDK.Examples.Web.Test/Runners/Console/TestProject.SDK.Examples.Web.Runners.Console.csproj
@@ -5,10 +5,6 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="TestProject.SDK" Version="0.54.3" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\Test\TestProject.SDK.Examples.Web.Test.csproj" />
   </ItemGroup>
diff --git a/Web/Test/TestProject.SDK.Examples.Web.Test/Runners/Nunit/TestProject.SDK.Examples.Web.Runners.Nunit.csproj b/Web/Test/TestProject.SDK.Examples.Web.Test/Runners/Nunit/TestProject.SDK.Examples.Web.Runners.Nunit.csproj
index 6b79777..72b1fa1 100644
--- a/Web/Test/TestProject.SDK.Examples.Web.Test/Runners/Nunit/TestProject.SDK.Examples.Web.Runners.Nunit.csproj
+++ b/Web/Test/TestProject.SDK.Examples.Web.Test/Runners/Nunit/TestProject.SDK.Examples.Web.Runners.Nunit.csproj
@@ -8,7 +8,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.11.0" />
-    <PackageReference Include="TestProject.SDK" Version="0.54.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Web/Test/TestProject.SDK.Examples.Web.Test/Test/TestProject.SDK.Examples.Web.Test.csproj b/Web/Test/TestProject.SDK.Examples.Web.Test/Test/TestProject.SDK.Examples.Web.Test.csproj
index 4e73991..22603f8 100644
--- a/Web/Test/TestProject.SDK.Examples.Web.Test/Test/TestProject.SDK.Examples.Web.Test.csproj
+++ b/Web/Test/TestProject.SDK.Examples.Web.Test/Test/TestProject.SDK.Examples.Web.Test.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="TestProject.SDK" Version="0.54.3" />
+    <PackageReference Include="TestProject.SDK" Version="0.61.0" Publish="false" />
   </ItemGroup>
 
   <ItemGroup>