* обновлены GUID основных компонентов пакета для обеспечения возможно…

…сти одновременной установки 2.3 и 2.4 (#9) - исправлен `ProductCode` в Bootstrapper (#6)
IT-Service · Dec 18, 2016 · c9888f6 · c9888f6
1 parent f4b3e6f
commit c9888f6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Bootstrapper/Program.cs b/Bootstrapper/Program.cs
@@ -19,7 +19,7 @@ class Bootstrapper
 
 		static
 		Guid
-		ProductCode = new Guid("{ABA668A2-5226-4163-8595-89BA3FDF2D23}");
+		ProductCode = new Guid("{0DBA7CA3-BAF1-4A2D-B36D-54C6E0B9AC66}");
 
         enum CsmTool
         {
@@ -105,7 +105,7 @@ enum CsmTool
                     ToolPath = Package.ProvideComponent(
 						ProductCode
                         , Tool.ToString()
-                        , new Guid("{E5957298-538D-44F3-86B5-76D09E721E0E}")
+                        , new Guid("{D49011DA-C023-4B55-AA7C-724C7A7F3679}")
                     );
                     break;
                 case "csmmain":
@@ -114,15 +114,15 @@ enum CsmTool
                     ToolPath = Package.ProvideComponent(
 						ProductCode
                         , Tool.ToString()
-                        , new Guid("{A8840BA1-D58E-4DAC-A867-2131F2CFE7B6}")
+                        , new Guid("{C06C793C-468A-4E39-874D-3DCF7E5E9CE0}")
                     );
                     break;
                 case "markinv":
                     Tool = CsmTool.markinv;
                     ToolPath = Package.ProvideComponent(
 						ProductCode
                         , Tool.ToString()
-                        , new Guid("{787104E4-96B1-4D9E-A10D-B2D285A47E13}")
+                        , new Guid("{81ED99F6-06D3-47A9-924D-ADC05230B10C}")
                     );
                     break;
                 default:

diff --git a/Metrcontrol/CSMmain.wxs b/Metrcontrol/CSMmain.wxs
@@ -54,7 +54,7 @@
 	<DirectoryRef Id="APPLICATIONFOLDER" FileSource=".\SourceDir">
 		<Component
 			Id="csmmain.exe"
-			Guid="{A8840BA1-D58E-4DAC-A867-2131F2CFE7B6}"
+			Guid="{C06C793C-468A-4E39-874D-3DCF7E5E9CE0}"
 			Location="either"
 			Win64="$(var.Win64)"
 		>

diff --git a/Metrcontrol/csmadmin.wxs b/Metrcontrol/csmadmin.wxs
@@ -40,7 +40,7 @@
 	<DirectoryRef Id="APPLICATIONFOLDER" FileSource=".\SourceDir">
 		<Component
 			Id="csmadmin.exe"
-			Guid="{E5957298-538D-44F3-86B5-76D09E721E0E}"
+			Guid="{D49011DA-C023-4B55-AA7C-724C7A7F3679}"
 			Location="either"
 			Win64="$(var.Win64)"
 		>

diff --git a/Metrcontrol/markInv.wxs b/Metrcontrol/markInv.wxs
@@ -36,7 +36,7 @@
 	<DirectoryRef Id="APPLICATIONFOLDER" FileSource=".\SourceDir">
 		<Component
 			Id="markinv.exe"
-			Guid="{787104E4-96B1-4D9E-A10D-B2D285A47E13}"
+			Guid="{81ED99F6-06D3-47A9-924D-ADC05230B10C}"
 			Location="either"
 			Win64="$(var.Win64)"
 		>