diff --git a/Common/Tests/SccPackage/SccPackage.cs b/Common/Tests/SccPackage/SccPackage.cs
index 9e64ddedfa..659da68d9f 100644
--- a/Common/Tests/SccPackage/SccPackage.cs
+++ b/Common/Tests/SccPackage/SccPackage.cs
@@ -41,7 +41,7 @@ namespace Microsoft.TestSccPackage
     [PackageRegistration(UseManagedResourcesOnly = true)]
     [Guid(Guids.guidSccPackagePkgString)]
     [ProvideService(typeof(TestSccProvider), ServiceName="Test Source Provider")]
-    [ProvideSourceControlProvider("Test Source Provider", Guids.guidSccPackageCmdSetString, typeof(SccPackage), typeof(TestSccProvider))]
+    [@ProvideSourceControlProvider("Test Source Provider", Guids.guidSccPackageCmdSetString, typeof(SccPackage), typeof(TestSccProvider))]
     [ProvideMenuResource(1000, 1)]                              // This attribute is needed to let the shell know that this package exposes some menus.
     public sealed class SccPackage : Package
     {
diff --git a/Python/Product/BuildTasks/TestTargets/Microsoft.PythonTools.Django.targets b/Python/Product/BuildTasks/TestTargets/Microsoft.PythonTools.Django.targets
index 84825bd515..414119ba63 100644
--- a/Python/Product/BuildTasks/TestTargets/Microsoft.PythonTools.Django.targets
+++ b/Python/Product/BuildTasks/TestTargets/Microsoft.PythonTools.Django.targets
@@ -12,7 +12,7 @@
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <_PythonToolsPath>$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)Exp\Extensions\Microsoft\Python Tools for Visual Studio - Django\2.2.4</_PythonToolsPath>
+    <_PythonToolsPath>$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)Exp\Extensions\Microsoft\Python Tools for Visual Studio - Django\2.2.5</_PythonToolsPath>
     <!-- Enable logging for publish/preview -->
     <EnablePackageProcessLoggingAndAssert>true</EnablePackageProcessLoggingAndAssert>
   </PropertyGroup>
diff --git a/Python/Product/BuildTasks/TestTargets/Microsoft.PythonTools.Web.targets b/Python/Product/BuildTasks/TestTargets/Microsoft.PythonTools.Web.targets
index eaed31af0f..73cdaa16bd 100644
--- a/Python/Product/BuildTasks/TestTargets/Microsoft.PythonTools.Web.targets
+++ b/Python/Product/BuildTasks/TestTargets/Microsoft.PythonTools.Web.targets
@@ -12,7 +12,7 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <_PythonToolsPath>$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)Exp\Extensions\Microsoft\Python Tools for Visual Studio\2.2.4</_PythonToolsPath>
+    <_PythonToolsPath>$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)Exp\Extensions\Microsoft\Python Tools for Visual Studio\2.2.5</_PythonToolsPath>
     <!-- Enable logging for publish/preview -->
     <EnablePackageProcessLoggingAndAssert>true</EnablePackageProcessLoggingAndAssert>
   </PropertyGroup>
diff --git a/Python/Product/BuildTasks/TestTargets/Microsoft.PythonTools.Worker.targets b/Python/Product/BuildTasks/TestTargets/Microsoft.PythonTools.Worker.targets
index 2c99ea4a93..7bf1dd7907 100644
--- a/Python/Product/BuildTasks/TestTargets/Microsoft.PythonTools.Worker.targets
+++ b/Python/Product/BuildTasks/TestTargets/Microsoft.PythonTools.Worker.targets
@@ -12,7 +12,7 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <_PythonToolsPath>$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)Exp\Extensions\Microsoft\Python Tools for Visual Studio\2.2.4</_PythonToolsPath>
+    <_PythonToolsPath>$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)Exp\Extensions\Microsoft\Python Tools for Visual Studio\2.2.5</_PythonToolsPath>
     <!-- Enable logging for publish/preview -->
     <EnablePackageProcessLoggingAndAssert>true</EnablePackageProcessLoggingAndAssert>
   </PropertyGroup>
diff --git a/Python/Product/BuildTasks/TestTargets/Microsoft.PythonTools.targets b/Python/Product/BuildTasks/TestTargets/Microsoft.PythonTools.targets
index e7537d7540..2ee5d7ca25 100644
--- a/Python/Product/BuildTasks/TestTargets/Microsoft.PythonTools.targets
+++ b/Python/Product/BuildTasks/TestTargets/Microsoft.PythonTools.targets
@@ -12,7 +12,7 @@
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <_PythonToolsPath>$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)Exp\Extensions\Microsoft\Python Tools for Visual Studio\2.2.4</_PythonToolsPath>
+    <_PythonToolsPath>$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)Exp\Extensions\Microsoft\Python Tools for Visual Studio\2.2.5</_PythonToolsPath>
   </PropertyGroup>
   
   <Import Project="$(_PythonToolsPath)\Microsoft.PythonTools.targets" />
diff --git a/Python/Product/Django/source.extension.vsixmanifest b/Python/Product/Django/source.extension.vsixmanifest
index 85085357a6..38dfaaf830 100644
--- a/Python/Product/Django/source.extension.vsixmanifest
+++ b/Python/Product/Django/source.extension.vsixmanifest
@@ -3,7 +3,7 @@
   <Identifier Id="a8637c34-aa55-46e2-973c-9c3e09afc17b">
     <Name>Python Tools for Visual Studio - Django</Name>
     <Author>Microsoft</Author>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
     <Description xml:space="preserve">Provides templates and integration for the Django web framework.</Description>
     <MoreInfoUrl>http://aka.ms/ptvs</MoreInfoUrl>
     <GettingStartedGuide>http://aka.ms/ptvs</GettingStartedGuide>
@@ -34,11 +34,11 @@
     <SupportedFrameworkRuntimeEdition MinVersion="4.5" />
   </Identifier>
   <References>
-    <Reference Id="96492FC7-7BC6-46F7-8559-66BB4E09FD1E" MinVersion="2.2.4" MaxVersion="2.2.4">
+    <Reference Id="96492FC7-7BC6-46F7-8559-66BB4E09FD1E" MinVersion="2.2.5" MaxVersion="2.2.5">
       <Name>Python Tools for Visual Studio</Name>
       <MoreInfoUrl>http://aka.ms/ptvs</MoreInfoUrl>
     </Reference>
-    <Reference Id="ce8d8e55-ad29-423e-aca2-810d0b16cdc4" MinVersion="2.2.4">
+    <Reference Id="ce8d8e55-ad29-423e-aca2-810d0b16cdc4" MinVersion="2.2.5">
       <Name>Python Tools for Visual Studio - Interactive</Name>
       <MoreInfoUrl>http://aka.ms/ptvs</MoreInfoUrl>
     </Reference>
diff --git a/Python/Product/Hpc/source.extension.vsixmanifest b/Python/Product/Hpc/source.extension.vsixmanifest
index 60cd5ebe86..ae96ef0be7 100644
--- a/Python/Product/Hpc/source.extension.vsixmanifest
+++ b/Python/Product/Hpc/source.extension.vsixmanifest
@@ -3,7 +3,7 @@
   <Identifier Id="413E24B0-F748-48D4-B638-01D121A88A04">
     <Name>Python Tools for Visual Studio - HPC</Name>
     <Author>Microsoft</Author>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
     <Description xml:space="preserve">Provides templates for MPI projects as well as cluster deployment and debugging support.</Description>
     <Locale>1033</Locale>
     <InstalledByMsi>true</InstalledByMsi>
@@ -30,7 +30,7 @@
     <Reference Id="Microsoft.VisualStudio.MPF" MinVersion="10.0">
       <Name>Visual Studio MPF</Name>
     </Reference>
-    <Reference Id="96492FC7-7BC6-46F7-8559-66BB4E09FD1E" MinVersion="2.2.4">
+    <Reference Id="96492FC7-7BC6-46F7-8559-66BB4E09FD1E" MinVersion="2.2.5">
       <Name>Python Tools for Visual Studio</Name>
     </Reference>
   </References>
diff --git a/Python/Product/IronPython/source.extension.vsixmanifest b/Python/Product/IronPython/source.extension.vsixmanifest
index 12b3861365..bce112b7a9 100644
--- a/Python/Product/IronPython/source.extension.vsixmanifest
+++ b/Python/Product/IronPython/source.extension.vsixmanifest
@@ -3,7 +3,7 @@
   <Identifier Id="0AC9CC8C-C057-4CFA-884B-0D4318BB2EFC">
     <Name>Python Tools for Visual Studio - IronPython</Name>
     <Author>Microsoft</Author>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
     <Description xml:space="preserve">Adds templates and intellisense support for IronPython based projects in Python Tools for Visual Studio.</Description>
     <Locale>1033</Locale>
     <InstalledByMsi>true</InstalledByMsi>
@@ -32,7 +32,7 @@
     <SupportedFrameworkRuntimeEdition MinVersion="4.5" />
   </Identifier>
   <References>
-    <Reference Id="96492FC7-7BC6-46F7-8559-66BB4E09FD1E" MinVersion="2.2.4" MaxVersion="2.2.4">
+    <Reference Id="96492FC7-7BC6-46F7-8559-66BB4E09FD1E" MinVersion="2.2.5" MaxVersion="2.2.5">
       <Name>Python Tools for Visual Studio</Name>
       <MoreInfoUrl>http://aka.ms/ptvs</MoreInfoUrl>
     </Reference>  
diff --git a/Python/Product/ML/source.extension.vsixmanifest b/Python/Product/ML/source.extension.vsixmanifest
index 5ded5a876f..c3fc25c6df 100644
--- a/Python/Product/ML/source.extension.vsixmanifest
+++ b/Python/Product/ML/source.extension.vsixmanifest
@@ -3,7 +3,7 @@
   <Identifier Id="8706DC58-B4CC-4C79-937F-B7BAC9D5EC71">
     <Name>Python Tools for Visual Studio - Machine Learning</Name>
     <Author>Microsoft</Author>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
     <Description xml:space="preserve">Provides templates and support for machine learning projects written with Python.</Description>
     <Locale>1033</Locale>
     <License>Python Tools for VS License.rtf</License>
@@ -27,7 +27,7 @@
     <SupportedFrameworkRuntimeEdition MinVersion="4.0" />
   </Identifier>
   <References>
-    <Reference Id="96492FC7-7BC6-46F7-8559-66BB4E09FD1E" MinVersion="2.2.4">
+    <Reference Id="96492FC7-7BC6-46F7-8559-66BB4E09FD1E" MinVersion="2.2.5">
       <Name>Python Tools for Visual Studio</Name>
     </Reference>
   </References>
diff --git a/Python/Product/Profiling/source.extension.vsixmanifest b/Python/Product/Profiling/source.extension.vsixmanifest
index aab3d632d0..002aa68328 100644
--- a/Python/Product/Profiling/source.extension.vsixmanifest
+++ b/Python/Product/Profiling/source.extension.vsixmanifest
@@ -3,7 +3,7 @@
   <Identifier Id="81da0100-e6db-4783-91ea-c38c3fa1b81e">
     <Name>Python Tools for Visual Studio - Profiling</Name>
     <Author>Microsoft</Author>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
     <Description xml:space="preserve">Provides support for profiling Python projects</Description>
     <Locale>1033</Locale>
     <InstalledByMsi>true</InstalledByMsi>
@@ -28,9 +28,9 @@
     <Reference Id="Microsoft.VisualStudio.MPF" MinVersion="10.0">
       <Name>Visual Studio MPF</Name>
     </Reference>
-    <Reference Id="96492FC7-7BC6-46F7-8559-66BB4E09FD1E" MinVersion="2.2.4" MaxVersion="2.2.4">
+    <Reference Id="96492FC7-7BC6-46F7-8559-66BB4E09FD1E" MinVersion="2.2.5" MaxVersion="2.2.5">
       <Name>Python Tools for Visual Studio</Name>
-      <MoreInfoUrl>http://pytools.codeplex.com/</MoreInfoUrl>
+      <MoreInfoUrl>http://aka.ms/ptvs</MoreInfoUrl>
     </Reference>
   </References>
   <Content>
diff --git a/Python/Product/PythonTools/Dev10/source.extension.vsixmanifest b/Python/Product/PythonTools/Dev10/source.extension.vsixmanifest
index 50470c852a..d4a0bea147 100644
--- a/Python/Product/PythonTools/Dev10/source.extension.vsixmanifest
+++ b/Python/Product/PythonTools/Dev10/source.extension.vsixmanifest
@@ -3,7 +3,7 @@
   <Identifier Id="96492FC7-7BC6-46F7-8559-66BB4E09FD1E">
     <Name>Python Tools for Visual Studio</Name>
     <Author>Microsoft</Author>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
     <Description xml:space="preserve">Provides support for editing and debugging Python programs.</Description>
     <Locale>1033</Locale>
     <MoreInfoUrl>http://aka.ms/ptvs</MoreInfoUrl>
@@ -21,7 +21,7 @@
     <SupportedFrameworkRuntimeEdition MinVersion="4.5" />
   </Identifier>
   <References>
-    <Reference Id="ce8d8e55-ad29-423e-aca2-810d0b16cdc4" MinVersion="2.2.4">
+    <Reference Id="ce8d8e55-ad29-423e-aca2-810d0b16cdc4" MinVersion="2.2.5">
       <Name>Python Tools for Visual Studio - Interactive</Name>
     </Reference>
   </References>
diff --git a/Python/Product/PythonTools/Dev11OrLater/source.extension.vsixmanifest b/Python/Product/PythonTools/Dev11OrLater/source.extension.vsixmanifest
index ac1337d9b2..3526e11395 100644
--- a/Python/Product/PythonTools/Dev11OrLater/source.extension.vsixmanifest
+++ b/Python/Product/PythonTools/Dev11OrLater/source.extension.vsixmanifest
@@ -1,6 +1,6 @@
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="96492FC7-7BC6-46F7-8559-66BB4E09FD1E" Version="2.2.4" Language="en-US" Publisher="Microsoft" />
+    <Identity Id="96492FC7-7BC6-46F7-8559-66BB4E09FD1E" Version="2.2.5" Language="en-US" Publisher="Microsoft" />
     <DisplayName>Python Tools for Visual Studio</DisplayName>
     <Description xml:space="preserve">Provides support for editing and debugging Python programs.</Description>
     <MoreInfo>http://aka.ms/ptvs</MoreInfo>
@@ -20,7 +20,7 @@
   <Dependencies>
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" Version="4.5" />
     <Dependency Id="TestWindow.Microsoft.0771d463-d74d-4e95-aac2-39d3c7ec1f97" IsRequired="false" DisplayName="Test Explorer" Version="11.0" />
-    <Dependency Id="ce8d8e55-ad29-423e-aca2-810d0b16cdc4" IsRequired="true" DisplayName="Python Tools for Visual Studio - Interactive" Version="2.2.4"/>
+    <Dependency Id="ce8d8e55-ad29-423e-aca2-810d0b16cdc4" IsRequired="true" DisplayName="Python Tools for Visual Studio - Interactive" Version="2.2.5"/>
   </Dependencies>
   <Assets>
     <Asset Type="Microsoft.VisualStudio.Package" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
diff --git a/Python/Product/PythonTools/Dev14OrLater/source.extension.vsixmanifest b/Python/Product/PythonTools/Dev14OrLater/source.extension.vsixmanifest
index c6aaaea776..46d9866d96 100644
--- a/Python/Product/PythonTools/Dev14OrLater/source.extension.vsixmanifest
+++ b/Python/Product/PythonTools/Dev14OrLater/source.extension.vsixmanifest
@@ -1,6 +1,6 @@
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="96492FC7-7BC6-46F7-8559-66BB4E09FD1E" Version="2.2.4" Language="en-US" Publisher="Microsoft" />
+    <Identity Id="96492FC7-7BC6-46F7-8559-66BB4E09FD1E" Version="2.2.5" Language="en-US" Publisher="Microsoft" />
     <DisplayName>Python Tools for Visual Studio</DisplayName>
     <Description xml:space="preserve">Provides support for editing and debugging Python programs.</Description>
     <MoreInfo>http://aka.ms/ptvs</MoreInfo>
diff --git a/Python/Product/ReplWindow/source.extension.vsixmanifest b/Python/Product/ReplWindow/source.extension.vsixmanifest
index b8a0e5e7f6..1a8d62a2f4 100644
--- a/Python/Product/ReplWindow/source.extension.vsixmanifest
+++ b/Python/Product/ReplWindow/source.extension.vsixmanifest
@@ -3,7 +3,7 @@
   <Identifier Id="ce8d8e55-ad29-423e-aca2-810d0b16cdc4">
     <Name>Python Tools for Visual Studio - Interactive</Name>
     <Author>Microsoft</Author>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
     <Description xml:space="preserve">Provides the tool window used for Python Interactive windows.</Description>
     <Locale>1033</Locale>
     <InstalledByMsi>true</InstalledByMsi>
diff --git a/Python/Product/Uwp/source.extension.vsixmanifest b/Python/Product/Uwp/source.extension.vsixmanifest
index 7b28eb5b06..fa3183b852 100644
--- a/Python/Product/Uwp/source.extension.vsixmanifest
+++ b/Python/Product/Uwp/source.extension.vsixmanifest
@@ -3,7 +3,7 @@
   <Identifier Id="56dfe430-f4a7-4f22-b5cf-9b713a4b4c36">
     <Name>Python Tools for Visual Studio - UWP</Name>
     <Author>Microsoft</Author>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
     <Description xml:space="preserve">Provides templates and integration for the UWP framework.</Description>
     <MoreInfoUrl>http://aka.ms/ptvs</MoreInfoUrl>
     <GettingStartedGuide>http://aka.ms/ptvs</GettingStartedGuide>
@@ -28,7 +28,7 @@
     <Reference Id="Microsoft.VisualStudio.MPF" MinVersion="10.0">
         <Name>Visual Studio MPF</Name>
     </Reference>
-    <Reference Id="96492FC7-7BC6-46F7-8559-66BB4E09FD1E" MinVersion="2.2.4">
+    <Reference Id="96492FC7-7BC6-46F7-8559-66BB4E09FD1E" MinVersion="2.2.5">
       <Name>Python Tools for Visual Studio</Name>
       <MoreInfoUrl>http://aka.ms/ptvs</MoreInfoUrl>
     </Reference>