Merge pull request #26 from Microsoft/dev/lukaszme/unique_extension_guid

Uniquify GoogleTestExtensionOptionsPage GUID between GTA/TAfGT
csoltenborn · Aug 28, 2017 · e55bd4e · e55bd4e
2 parents dd95a77 + 385c15b
commit e55bd4e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/GoogleTestAdapter/VsPackage.GTA/GoogleTestExtensionOptionsPage.cs b/GoogleTestAdapter/VsPackage.GTA/GoogleTestExtensionOptionsPage.cs
@@ -9,6 +9,7 @@ namespace GoogleTestAdapter.VsPackage
 {
     public partial class GoogleTestExtensionOptionsPage
     {
+        private const string PackageGuidString = "e7c90fcb-0943-4908-9ae8-3b6a9d22ec9e";
         private const string OptionsCategoryName = "Google Test Adapter";
 
         private void DisplayReleaseNotesIfNecessary()

diff --git a/GoogleTestAdapter/VsPackage.Shared/GoogleTestExtensionOptionsPage.cs b/GoogleTestAdapter/VsPackage.Shared/GoogleTestExtensionOptionsPage.cs
@@ -30,8 +30,6 @@ namespace GoogleTestAdapter.VsPackage
     [ProvideMenuResource("Menus.ctmenu", 1)]
     public sealed partial class GoogleTestExtensionOptionsPage : Package, IGoogleTestExtensionOptionsPage, IDisposable
     {
-        private const string PackageGuidString = "e7c90fcb-0943-4908-9ae8-3b6a9d22ec9e";
-
         private readonly string _debuggingNamedPipeId = Guid.NewGuid().ToString();
 
         private IGlobalRunSettingsInternal _globalRunSettings;

diff --git a/GoogleTestAdapter/VsPackage.TAfGT/GoogleTestExtensionOptionsPage.cs b/GoogleTestAdapter/VsPackage.TAfGT/GoogleTestExtensionOptionsPage.cs
@@ -5,6 +5,7 @@ namespace GoogleTestAdapter.VsPackage
 {
     public partial class GoogleTestExtensionOptionsPage
     {
+        private const string PackageGuidString = "1db31773-234b-424b-a887-b451fb1ba837";
         private const string OptionsCategoryName = "Test Adapter for Google Test";
 
         private void DisplayReleaseNotesIfNecessary()

diff --git a/GoogleTestAdapter/VsPackage.TAfGT/GoogleTestExtensionOptionsPage.vsct b/GoogleTestAdapter/VsPackage.TAfGT/GoogleTestExtensionOptionsPage.vsct
@@ -98,7 +98,7 @@
   </VisibilityConstraints>
 
   <Symbols>
-    <GuidSymbol name="guidGoogleTestExtensionOptionsPage" value="{e7c90fcb-0943-4908-9ae8-3b6a9d22ec9e}" />
+    <GuidSymbol name="guidGoogleTestExtensionOptionsPage" value="{1db31773-234b-424b-a887-b451fb1ba837}" />
 
     <GuidSymbol name="guidGoogleTestExtensionOptionsPageCmdSet" value="{e0d9835f-9c16-4d27-a9ad-4df7568650f7}">
       <IDSymbol name="MyMenuGroup" value="0x1020" />