diff --git a/SccAutoSwitcher/Guids.cs b/SccAutoSwitcher/Guids.cs
index 97f13dd..6c223c3 100644
--- a/SccAutoSwitcher/Guids.cs
+++ b/SccAutoSwitcher/Guids.cs
@@ -5,6 +5,10 @@ namespace SccAutoSwitcher
 {
     static class GuidList
     {
+#if VS10
+        public const string guidPkgString = "e0602ccb-aef8-4c8a-a598-530ff1be851b";
+#else
         public const string guidPkgString = "99316bc5-70c5-4ef1-9a29-ea7568408ed0";
+#endif
     };
 }
\ No newline at end of file
diff --git a/SccAutoSwitcher/ManifestVS10/source.extension.vsixmanifest b/SccAutoSwitcher/ManifestVS10/source.extension.vsixmanifest
index 86c2db1..b915d38 100644
--- a/SccAutoSwitcher/ManifestVS10/source.extension.vsixmanifest
+++ b/SccAutoSwitcher/ManifestVS10/source.extension.vsixmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Vsix xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="1.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2010">
-  <Identifier Id="99316bc5-70c5-4ef1-9a29-ea7568408ed0">
+  <Identifier Id="e0602ccb-aef8-4c8a-a598-530ff1be851b">
     <Name>Scc Auto Switcher</Name>
     <Author>Francesco Pretto</Author>
     <Version>1.2.0</Version>
diff --git a/SccAutoSwitcher/SccAutoSwitcher.VS10.csproj b/SccAutoSwitcher/SccAutoSwitcher.VS10.csproj
index 803a82d..d870a34 100644
--- a/SccAutoSwitcher/SccAutoSwitcher.VS10.csproj
+++ b/SccAutoSwitcher/SccAutoSwitcher.VS10.csproj
@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\targetVS10\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;VS10</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -27,7 +27,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\targetVS10\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;CODE_ANALYSIS;VS10</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <RunCodeAnalysis>true</RunCodeAnalysis>