diff --git a/Bitbucket.Authentication/Src/Bitbucket.Authentication.csproj b/Bitbucket.Authentication/Src/Bitbucket.Authentication.csproj
index a288ddd..8a6e549 100644
--- a/Bitbucket.Authentication/Src/Bitbucket.Authentication.csproj
+++ b/Bitbucket.Authentication/Src/Bitbucket.Authentication.csproj
@@ -11,16 +11,12 @@
     <ProjectName>Bitbucket.Authentication</ProjectName>
     <RootNamespace>Atlassian.Bitbucket.Authentication</RootNamespace>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <Import Project="..\..\build.props" />
   <PropertyGroup>
+    <ProjectDir>$(MSBuildThisFileDirectory)</ProjectDir>
+    <OutputPath>$(ProjectDir)$(OutputPath)</OutputPath>
+    <Prefer32Bit>false</Prefer32Bit>
     <RunCodeAnalysis>false</RunCodeAnalysis>
   </PropertyGroup>
   <ItemGroup>
diff --git a/GitCredentialManager.sln b/GitCredentialManager.sln
index 4b1bd2b..bbd473f 100644
--- a/GitCredentialManager.sln
+++ b/GitCredentialManager.sln
@@ -61,43 +61,19 @@ Global
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{19770407-B493-459D-BB4F-04FBEFB1BA13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{19770407-B493-459D-BB4F-04FBEFB1BA13}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{19770407-B493-459D-BB4F-04FBEFB1BA13}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{19770407-B493-459D-BB4F-04FBEFB1BA13}.Debug|x64.Build.0 = Debug|Any CPU
-		{19770407-B493-459D-BB4F-04FBEFB1BA13}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{19770407-B493-459D-BB4F-04FBEFB1BA13}.Debug|x86.Build.0 = Debug|Any CPU
 		{19770407-B493-459D-BB4F-04FBEFB1BA13}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{19770407-B493-459D-BB4F-04FBEFB1BA13}.Release|Any CPU.Build.0 = Release|Any CPU
-		{19770407-B493-459D-BB4F-04FBEFB1BA13}.Release|x64.ActiveCfg = Release|Any CPU
-		{19770407-B493-459D-BB4F-04FBEFB1BA13}.Release|x64.Build.0 = Release|Any CPU
-		{19770407-B493-459D-BB4F-04FBEFB1BA13}.Release|x86.ActiveCfg = Release|Any CPU
-		{19770407-B493-459D-BB4F-04FBEFB1BA13}.Release|x86.Build.0 = Release|Any CPU
 		{19770407-D7D8-4A37-914C-F552FF4B90D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{19770407-D7D8-4A37-914C-F552FF4B90D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{19770407-D7D8-4A37-914C-F552FF4B90D4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{19770407-D7D8-4A37-914C-F552FF4B90D4}.Debug|x64.Build.0 = Debug|Any CPU
-		{19770407-D7D8-4A37-914C-F552FF4B90D4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{19770407-D7D8-4A37-914C-F552FF4B90D4}.Debug|x86.Build.0 = Debug|Any CPU
 		{19770407-D7D8-4A37-914C-F552FF4B90D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{19770407-D7D8-4A37-914C-F552FF4B90D4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{19770407-D7D8-4A37-914C-F552FF4B90D4}.Release|x64.ActiveCfg = Release|Any CPU
-		{19770407-D7D8-4A37-914C-F552FF4B90D4}.Release|x64.Build.0 = Release|Any CPU
-		{19770407-D7D8-4A37-914C-F552FF4B90D4}.Release|x86.ActiveCfg = Release|Any CPU
-		{19770407-D7D8-4A37-914C-F552FF4B90D4}.Release|x86.Build.0 = Release|Any CPU
 		{CF306116-BBF0-4CC7-AFCE-A506AC4752CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CF306116-BBF0-4CC7-AFCE-A506AC4752CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CF306116-BBF0-4CC7-AFCE-A506AC4752CB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CF306116-BBF0-4CC7-AFCE-A506AC4752CB}.Debug|x64.Build.0 = Debug|Any CPU
-		{CF306116-BBF0-4CC7-AFCE-A506AC4752CB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CF306116-BBF0-4CC7-AFCE-A506AC4752CB}.Debug|x86.Build.0 = Debug|Any CPU
 		{CF306116-BBF0-4CC7-AFCE-A506AC4752CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CF306116-BBF0-4CC7-AFCE-A506AC4752CB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CF306116-BBF0-4CC7-AFCE-A506AC4752CB}.Release|x64.ActiveCfg = Release|Any CPU
@@ -106,123 +82,43 @@ Global
 		{CF306116-BBF0-4CC7-AFCE-A506AC4752CB}.Release|x86.Build.0 = Release|Any CPU
 		{EE663736-5BAD-4CA6-A4F8-99978925AD8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EE663736-5BAD-4CA6-A4F8-99978925AD8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EE663736-5BAD-4CA6-A4F8-99978925AD8A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EE663736-5BAD-4CA6-A4F8-99978925AD8A}.Debug|x64.Build.0 = Debug|Any CPU
-		{EE663736-5BAD-4CA6-A4F8-99978925AD8A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EE663736-5BAD-4CA6-A4F8-99978925AD8A}.Debug|x86.Build.0 = Debug|Any CPU
 		{EE663736-5BAD-4CA6-A4F8-99978925AD8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EE663736-5BAD-4CA6-A4F8-99978925AD8A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EE663736-5BAD-4CA6-A4F8-99978925AD8A}.Release|x64.ActiveCfg = Release|Any CPU
-		{EE663736-5BAD-4CA6-A4F8-99978925AD8A}.Release|x64.Build.0 = Release|Any CPU
-		{EE663736-5BAD-4CA6-A4F8-99978925AD8A}.Release|x86.ActiveCfg = Release|Any CPU
-		{EE663736-5BAD-4CA6-A4F8-99978925AD8A}.Release|x86.Build.0 = Release|Any CPU
 		{19770407-63D4-40A8-A9DF-F1C4B473308A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{19770407-63D4-40A8-A9DF-F1C4B473308A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{19770407-63D4-40A8-A9DF-F1C4B473308A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{19770407-63D4-40A8-A9DF-F1C4B473308A}.Debug|x64.Build.0 = Debug|Any CPU
-		{19770407-63D4-40A8-A9DF-F1C4B473308A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{19770407-63D4-40A8-A9DF-F1C4B473308A}.Debug|x86.Build.0 = Debug|Any CPU
 		{19770407-63D4-40A8-A9DF-F1C4B473308A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{19770407-63D4-40A8-A9DF-F1C4B473308A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{19770407-63D4-40A8-A9DF-F1C4B473308A}.Release|x64.ActiveCfg = Release|Any CPU
-		{19770407-63D4-40A8-A9DF-F1C4B473308A}.Release|x64.Build.0 = Release|Any CPU
-		{19770407-63D4-40A8-A9DF-F1C4B473308A}.Release|x86.ActiveCfg = Release|Any CPU
-		{19770407-63D4-40A8-A9DF-F1C4B473308A}.Release|x86.Build.0 = Release|Any CPU
 		{19770407-B33A-4EBE-92B8-04C93F43CAE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{19770407-B33A-4EBE-92B8-04C93F43CAE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{19770407-B33A-4EBE-92B8-04C93F43CAE0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{19770407-B33A-4EBE-92B8-04C93F43CAE0}.Debug|x64.Build.0 = Debug|Any CPU
-		{19770407-B33A-4EBE-92B8-04C93F43CAE0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{19770407-B33A-4EBE-92B8-04C93F43CAE0}.Debug|x86.Build.0 = Debug|Any CPU
 		{19770407-B33A-4EBE-92B8-04C93F43CAE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{19770407-B33A-4EBE-92B8-04C93F43CAE0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{19770407-B33A-4EBE-92B8-04C93F43CAE0}.Release|x64.ActiveCfg = Release|Any CPU
-		{19770407-B33A-4EBE-92B8-04C93F43CAE0}.Release|x64.Build.0 = Release|Any CPU
-		{19770407-B33A-4EBE-92B8-04C93F43CAE0}.Release|x86.ActiveCfg = Release|Any CPU
-		{19770407-B33A-4EBE-92B8-04C93F43CAE0}.Release|x86.Build.0 = Release|Any CPU
 		{19781214-371F-415C-93C5-44CEAA0E9A34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{19781214-371F-415C-93C5-44CEAA0E9A34}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{19781214-371F-415C-93C5-44CEAA0E9A34}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{19781214-371F-415C-93C5-44CEAA0E9A34}.Debug|x64.Build.0 = Debug|Any CPU
-		{19781214-371F-415C-93C5-44CEAA0E9A34}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{19781214-371F-415C-93C5-44CEAA0E9A34}.Debug|x86.Build.0 = Debug|Any CPU
 		{19781214-371F-415C-93C5-44CEAA0E9A34}.Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{19781214-371F-415C-93C5-44CEAA0E9A34}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{19781214-371F-415C-93C5-44CEAA0E9A34}.Release|x64.ActiveCfg = Debug|Any CPU
-		{19781214-371F-415C-93C5-44CEAA0E9A34}.Release|x64.Build.0 = Debug|Any CPU
-		{19781214-371F-415C-93C5-44CEAA0E9A34}.Release|x86.ActiveCfg = Debug|Any CPU
-		{19781214-371F-415C-93C5-44CEAA0E9A34}.Release|x86.Build.0 = Debug|Any CPU
 		{19781214-5254-464A-BC69-FAC502046564}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{19781214-5254-464A-BC69-FAC502046564}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{19781214-5254-464A-BC69-FAC502046564}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{19781214-5254-464A-BC69-FAC502046564}.Debug|x64.Build.0 = Debug|Any CPU
-		{19781214-5254-464A-BC69-FAC502046564}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{19781214-5254-464A-BC69-FAC502046564}.Debug|x86.Build.0 = Debug|Any CPU
 		{19781214-5254-464A-BC69-FAC502046564}.Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{19781214-5254-464A-BC69-FAC502046564}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{19781214-5254-464A-BC69-FAC502046564}.Release|x64.ActiveCfg = Debug|Any CPU
-		{19781214-5254-464A-BC69-FAC502046564}.Release|x64.Build.0 = Debug|Any CPU
-		{19781214-5254-464A-BC69-FAC502046564}.Release|x86.ActiveCfg = Debug|Any CPU
-		{19781214-5254-464A-BC69-FAC502046564}.Release|x86.Build.0 = Debug|Any CPU
 		{AECD6D57-F900-4D43-A01A-4AA3C68F39C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AECD6D57-F900-4D43-A01A-4AA3C68F39C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AECD6D57-F900-4D43-A01A-4AA3C68F39C2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AECD6D57-F900-4D43-A01A-4AA3C68F39C2}.Debug|x64.Build.0 = Debug|Any CPU
-		{AECD6D57-F900-4D43-A01A-4AA3C68F39C2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AECD6D57-F900-4D43-A01A-4AA3C68F39C2}.Debug|x86.Build.0 = Debug|Any CPU
 		{AECD6D57-F900-4D43-A01A-4AA3C68F39C2}.Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{AECD6D57-F900-4D43-A01A-4AA3C68F39C2}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{AECD6D57-F900-4D43-A01A-4AA3C68F39C2}.Release|x64.ActiveCfg = Release|Any CPU
-		{AECD6D57-F900-4D43-A01A-4AA3C68F39C2}.Release|x64.Build.0 = Release|Any CPU
-		{AECD6D57-F900-4D43-A01A-4AA3C68F39C2}.Release|x86.ActiveCfg = Release|Any CPU
-		{AECD6D57-F900-4D43-A01A-4AA3C68F39C2}.Release|x86.Build.0 = Release|Any CPU
 		{19781214-AE6D-4DCC-BA9F-12CB0C6581AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{19781214-AE6D-4DCC-BA9F-12CB0C6581AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{19781214-AE6D-4DCC-BA9F-12CB0C6581AE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{19781214-AE6D-4DCC-BA9F-12CB0C6581AE}.Debug|x64.Build.0 = Debug|Any CPU
-		{19781214-AE6D-4DCC-BA9F-12CB0C6581AE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{19781214-AE6D-4DCC-BA9F-12CB0C6581AE}.Debug|x86.Build.0 = Debug|Any CPU
 		{19781214-AE6D-4DCC-BA9F-12CB0C6581AE}.Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{19781214-AE6D-4DCC-BA9F-12CB0C6581AE}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{19781214-AE6D-4DCC-BA9F-12CB0C6581AE}.Release|x64.ActiveCfg = Debug|Any CPU
-		{19781214-AE6D-4DCC-BA9F-12CB0C6581AE}.Release|x64.Build.0 = Debug|Any CPU
-		{19781214-AE6D-4DCC-BA9F-12CB0C6581AE}.Release|x86.ActiveCfg = Debug|Any CPU
-		{19781214-AE6D-4DCC-BA9F-12CB0C6581AE}.Release|x86.Build.0 = Debug|Any CPU
 		{F24E0E80-8DDB-41D4-9F94-DCBC0CE81583}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F24E0E80-8DDB-41D4-9F94-DCBC0CE81583}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F24E0E80-8DDB-41D4-9F94-DCBC0CE81583}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F24E0E80-8DDB-41D4-9F94-DCBC0CE81583}.Debug|x64.Build.0 = Debug|Any CPU
-		{F24E0E80-8DDB-41D4-9F94-DCBC0CE81583}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F24E0E80-8DDB-41D4-9F94-DCBC0CE81583}.Debug|x86.Build.0 = Debug|Any CPU
 		{F24E0E80-8DDB-41D4-9F94-DCBC0CE81583}.Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{F24E0E80-8DDB-41D4-9F94-DCBC0CE81583}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{F24E0E80-8DDB-41D4-9F94-DCBC0CE81583}.Release|x64.ActiveCfg = Release|Any CPU
-		{F24E0E80-8DDB-41D4-9F94-DCBC0CE81583}.Release|x64.Build.0 = Release|Any CPU
-		{F24E0E80-8DDB-41D4-9F94-DCBC0CE81583}.Release|x86.ActiveCfg = Release|Any CPU
-		{F24E0E80-8DDB-41D4-9F94-DCBC0CE81583}.Release|x86.Build.0 = Release|Any CPU
 		{2F110EEF-14BA-4324-9DA4-C7D16469B064}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2F110EEF-14BA-4324-9DA4-C7D16469B064}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2F110EEF-14BA-4324-9DA4-C7D16469B064}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2F110EEF-14BA-4324-9DA4-C7D16469B064}.Debug|x64.Build.0 = Debug|Any CPU
-		{2F110EEF-14BA-4324-9DA4-C7D16469B064}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2F110EEF-14BA-4324-9DA4-C7D16469B064}.Debug|x86.Build.0 = Debug|Any CPU
-		{2F110EEF-14BA-4324-9DA4-C7D16469B064}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2F110EEF-14BA-4324-9DA4-C7D16469B064}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2F110EEF-14BA-4324-9DA4-C7D16469B064}.Release|x64.ActiveCfg = Release|Any CPU
-		{2F110EEF-14BA-4324-9DA4-C7D16469B064}.Release|x64.Build.0 = Release|Any CPU
-		{2F110EEF-14BA-4324-9DA4-C7D16469B064}.Release|x86.ActiveCfg = Release|Any CPU
-		{2F110EEF-14BA-4324-9DA4-C7D16469B064}.Release|x86.Build.0 = Release|Any CPU
+		{2F110EEF-14BA-4324-9DA4-C7D16469B064}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F110EEF-14BA-4324-9DA4-C7D16469B064}.Release|Any CPU.Build.0 = Debug|Any CPU
 		{19770407-3808-4B17-9EE0-21DD3468F875}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{19770407-3808-4B17-9EE0-21DD3468F875}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{19770407-3808-4B17-9EE0-21DD3468F875}.Debug|x64.Build.0 = Debug|Any CPU
-		{19770407-3808-4B17-9EE0-21DD3468F875}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{19770407-3808-4B17-9EE0-21DD3468F875}.Debug|x86.Build.0 = Debug|Any CPU
 		{19770407-3808-4B17-9EE0-21DD3468F875}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{19770407-3808-4B17-9EE0-21DD3468F875}.Release|Any CPU.Build.0 = Release|Any CPU
-		{19770407-3808-4B17-9EE0-21DD3468F875}.Release|x64.ActiveCfg = Release|Any CPU
-		{19770407-3808-4B17-9EE0-21DD3468F875}.Release|x64.Build.0 = Release|Any CPU
-		{19770407-3808-4B17-9EE0-21DD3468F875}.Release|x86.ActiveCfg = Release|Any CPU
-		{19770407-3808-4B17-9EE0-21DD3468F875}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/GitHub.Authentication/Src/GitHub.Authentication.csproj b/GitHub.Authentication/Src/GitHub.Authentication.csproj
index 0f55561..c05cb56 100644
--- a/GitHub.Authentication/Src/GitHub.Authentication.csproj
+++ b/GitHub.Authentication/Src/GitHub.Authentication.csproj
@@ -16,8 +16,9 @@
   </PropertyGroup>
   <Import Project="..\..\build.props" />
   <PropertyGroup>
+    <ProjectDir>$(MSBuildThisFileDirectory)</ProjectDir>
+    <OutputPath>$(ProjectDir)$(OutputPath)</OutputPath>
     <RunCodeAnalysis>false</RunCodeAnalysis>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
diff --git a/Installer/Installer.proj b/Installer/Installer.proj
index 208da4e..c0c6928 100644
--- a/Installer/Installer.proj
+++ b/Installer/Installer.proj
@@ -29,7 +29,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <GcmExePath>$(OutputPath)\GCMW-$(GcmVersion).exe</GcmExePath>
-    <GcmPkgPath>$(OutputPath)\Microsoft.Alm.Authentication.$(PkgVersion).nupkg</GcmPkgPath>
+    <GcmPkgPath>$(OutputPath)\VisualStudioTeamServices.Authentication.$(PkgVersion).nupkg</GcmPkgPath>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Cli\Askpass\Cli-Askpass.csproj">
diff --git a/VisualStudioTeamServices.Authentication/Src/VisualStudioTeamServices.Authentication.csproj b/VisualStudioTeamServices.Authentication/Src/VisualStudioTeamServices.Authentication.csproj
index d6d50c2..3887491 100644
--- a/VisualStudioTeamServices.Authentication/Src/VisualStudioTeamServices.Authentication.csproj
+++ b/VisualStudioTeamServices.Authentication/Src/VisualStudioTeamServices.Authentication.csproj
@@ -83,15 +83,14 @@
     <!-- Only download a new copy of nuget.exe if we don't have a copy available -->
     <PropertyGroup>
       <NugetPath>nuget.exe</NugetPath>
-      <IsSigned>
-      </IsSigned>
+      <IsSigned></IsSigned>
       <IsSigned Condition=" '$(SignType)' == '' Or '$(SignType)' == '*Undefined*' ">-unsigned</IsSigned>
       <NugetWorkDir>$(OutputPath.TrimEnd('\'))</NugetWorkDir>
     </PropertyGroup>
     <PropertyGroup Condition="!Exists($(NugetPath))">
       <NugetPath>..\..\packages\NuGet.CommandLine.4.6.2\tools\NuGet.exe</NugetPath>
     </PropertyGroup>
-    <Exec Command="&quot;$(NugetPath)&quot; pack &quot;$(ProjectDir)\VisualStudioTeamServices.Authentication.nuspec&quot; -BasePath &quot;$(NugetWorkDir)&quot; -IncludeReferencedProjects -Properties Configuration=&quot;$(Configuration)&quot;;Version=&quot;$(AssemblyVersion)$(IsSigned)&quot;;Id=&quot;VisualStudioTeamServices.Authentication&quot;;Title=&quot;$(AssemblyTitle)&quot;;Description=&quot;$(AssemblyDescription)&quot; -OutputDirectory &quot;$(NugetWorkDir)&quot;" />
+    <Exec Command="&quot;$(NugetPath)&quot; pack &quot;$(ProjectDir)\VisualStudioTeamServices.Authentication.nuspec&quot; -BasePath &quot;$(NugetWorkDir)&quot; -IncludeReferencedProjects -Properties Configuration=&quot;$(Configuration)&quot;;Version=&quot;$(AssemblyVersion)$(IsSigned)&quot;;Id=&quot;$(AssemblyName)&quot;;Title=&quot;$(AssemblyTitle)&quot;;Description=&quot;$(AssemblyDescription)&quot; -OutputDirectory &quot;$(NugetWorkDir)&quot;" />
   </Target>
   <Target Name="CopyNupkgToOut" AfterTargets="BuildNupkg">
     <ItemGroup>
diff --git a/build.props b/build.props
index ab62a83..07c3e01 100644
--- a/build.props
+++ b/build.props
@@ -16,10 +16,10 @@
   </PropertyGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' Or '$(Configuration)' == '*Undefined*' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' Or  '$(Platform)' == '*Undefined*' " >AnyCPU</Platform>
+    <Platform Condition=" '$(Platform)' == '' Or  '$(Platform)' == '*Undefined*' " >Any CPU</Platform>
     <SolutionDir Condition=" '$(SolutionDir)' == '' Or '$(SolutionDir)' == '*Undefined*' " >$(MSBuildThisFileDirectory)</SolutionDir>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Any CPU' Or '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -27,7 +27,7 @@
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|Any CPU' Or '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
diff --git a/build.targets b/build.targets
index c9486f0..77e2bfb 100644
--- a/build.targets
+++ b/build.targets
@@ -3,7 +3,7 @@
   <Target Name="EnumerateProps" BeforeTargets="BeforeBuild">
     <Message Text="ProjectName = $(ProjectName)" />
     <Message Text="ProjectUrl = $(ProjectUrl)" />
-    <Message Text="ConfigurationPlatfotm = $(Configuration)|$(Platform)" />
+    <Message Text="ConfigurationPlatform = $(Configuration)|$(Platform)" />
     <Message Text="TargetFrameworkVersion = $(TargetFrameworkVersion)" />
     <Message Text="RootNamespace = $(RootNamespace)" />
     <Message Text="AutoGenerateBindingRedirects = $(AutoGenerateBindingRedirects)" />
diff --git a/vsts-ci.yml b/vsts-ci.yml
index eb3ef81..f0d7bf0 100644
--- a/vsts-ci.yml
+++ b/vsts-ci.yml
@@ -1,69 +1,6 @@
-queue:
-  name: Hosted VS2017
-  demands: 
-  - msbuild
-  - visualstudio
-  - vstest
-
-steps:
-- task: NuGetToolInstaller@0
-  displayName: 'Use NuGet 4.4.0'
-  inputs:
-    versionSpec: 4.4.0
-
-- task: NuGetCommand@2
-  displayName: NuGet restore
-  inputs:
-    restoreSolution: '$(Build.Solution)'
-    verbosityRestore: '$(Build.Verbosity)'
-
-- task: MSBuild@1
-  displayName: 'Core Build'
-  inputs:
-    solution: '$(Build.Target)'
-    msbuildArguments: '/nologo /verbosity:$(Build.Verbosity) /binaryLogger:$(Build.SourcesDirectory)/gcmwci.binlog'
-    platform: '$(Build.Platform)'
-    configuration: '$(Build.Configuration)'
-    maximumCpuCount: true
-    msbuildArchitecture: '$(Build.Architecture)'
-
-- task: VSTest@2
-  displayName: 'Execute Tests (Xunit)'
-  inputs:
-    testAssemblyVer2: |
-     **\*Test.dll
-     !**\xunit.*.dll
-     !**\obj\**
-    searchFolder: '$(Build.SourcesDirectory)'
-    runInParallel: true
-    runTestsInIsolation: true
-    codeCoverageEnabled: true
-    platform: '$(Build.Platform)'
-    configuration: '$(Build.Configuration)'
-
-- task: PublishBuildArtifacts@1
-  displayName: 'Publish Artifact: Binary Log'
-  continueOnError: true
-  inputs:
-    pathtoPublish: '$(Build.SourcesDirectory)\gcmwci.binlog'
-    artifactName: 'Binary Logs'
-    publishLocation: Container
-
-- task: PublishBuildArtifacts@1
-  displayName: 'Publish Artifact: Deploy Folder'
-  continueOnError: true
-  inputs:
-    pathtoPublish: '$(Build.SourcesDirectory)\Deploy\'
-    artifactName: 'Git Credential Manager'
-    publishLocation: Container
-
-- task: DeleteFiles@1
-  displayName: 'Delete Artifacts from Agent'
-  inputs:
-    sourceFolder: '$(Build.SourcesDirectory)'
-    contents: |
-     *.binlog
-     Deploy\*.*
-     **\bin\**\*.*
-     **\obj\**\*.*
-
+phases:
+  - template: vsts-tt.yml
+    parameters:
+      QueueName: 'Hosted VS2017'
+      MicrobuildSetup: []
+      MicrobuildClean: []
diff --git a/vsts-rs.yml b/vsts-rs.yml
new file mode 100644
index 0000000..f13a2d1
--- /dev/null
+++ b/vsts-rs.yml
@@ -0,0 +1,19 @@
+phases:
+  - template: vsts-tt.yml
+    parameters:
+      QueueName: 'VSEng-MicroBuildVS2017'
+      MicrobuildSetup:
+        - task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@1
+          displayName: Setup MicroBuild Signing
+          condition: and(succeeded(), or(eq(variables['signType'],'real'), eq(variables['signType'],'test')))
+          continueOnError: true
+          inputs:
+            feedSource: https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json
+            signType: '$(SignType)'
+            zipSources: true
+
+      MicrobuildClean:
+        - task: ms-vseng.MicroBuildTasks.521a94ea-9e68-468a-8167-6dcf361ea776.MicroBuildCleanup@1
+          displayName: MicroBuild Cleanup
+          condition: or(eq(variables['signType'],'real'), eq(variables['signType'],'test'))
+          continueOnError: true
diff --git a/vsts-tt.yml b/vsts-tt.yml
new file mode 100644
index 0000000..0af0a31
--- /dev/null
+++ b/vsts-tt.yml
@@ -0,0 +1,82 @@
+parameters:
+  QueueName: ''
+  MicrobuildSetup: []
+  MicrobuildClean: []
+
+phases:
+  - phase: Build
+    queue:
+      name: ${{ parameters.QueueName }}
+      demands: 
+      - msbuild
+      - visualstudio
+      - vstest
+    
+    steps:
+    - task: NuGetToolInstaller@0
+      displayName: 'Use NuGet 4.4.0'
+      inputs:
+        versionSpec: 4.4.0
+    
+    - task: NuGetCommand@2
+      displayName: NuGet restore
+      inputs:
+        restoreSolution: '$(Build.Solution)'
+        verbosityRestore: 'quiet'
+    
+    - ${{ parameters.MicrobuildSetup }}
+    
+    - task: MSBuild@1
+      displayName: 'Core Build'
+      inputs:
+        solution: '$(Build.Target)'
+        msbuildArguments: '/nologo /verbosity:$(Build.Verbosity) /binaryLogger:$(Build.SourcesDirectory)/gcmw-$(build.buildNumber).binlog'
+        platform: '$(Build.Platform)'
+        configuration: '$(Build.Configuration)'
+        maximumCpuCount: false
+        msbuildArchitecture: '$(Build.Architecture)'
+    
+    - task: VSTest@2
+      displayName: 'Execute Tests (Xunit)'
+      inputs:
+        testAssemblyVer2: |
+         **\*Test.dll
+         !**\xunit.*.dll
+         !**\obj\**
+        searchFolder: '$(Build.SourcesDirectory)'
+        runInParallel: true
+        runTestsInIsolation: true
+        codeCoverageEnabled: true
+        platform: '$(Build.Platform)'
+        configuration: '$(Build.Configuration)'
+    
+    - task: PublishBuildArtifacts@1
+      displayName: 'Publish Artifact: Binary Log'
+      continueOnError: true
+      condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
+      inputs:
+        pathtoPublish: '$(Build.SourcesDirectory)\gcmw-$(build.buildNumber).binlog'
+        artifactName: '$(build.buildNumber).binlog'
+        publishLocation: Container
+    
+    - task: PublishBuildArtifacts@1
+      displayName: 'Publish Artifact: Deploy Folder'
+      continueOnError: true
+      condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
+      inputs:
+        pathtoPublish: '$(Build.SourcesDirectory)\Deploy\'
+        artifactName: '$(Build.BuildNumber)-Artifacts'
+        publishLocation: Container
+    
+    - task: DeleteFiles@1
+      displayName: 'Delete Artifacts from Agent'
+      inputs:
+        sourceFolder: '$(Build.SourcesDirectory)'
+        contents: |
+         *.binlog
+         Deploy\*.*
+         **\bin\**\*.*
+         **\obj\**\*.*
+    
+    - ${{ parameters.MicrobuildClean }}
+    
\ No newline at end of file