WixSetup now working, no other changes.

salesagility · Dec 12, 2018 · b386599 · b386599
1 parent 2a7c6d3
commit b386599
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 13 deletions.
diff --git a/Doxyfile b/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = "SuiteCRM Outlook Add-in"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 3.0.16.0
+PROJECT_NUMBER         = 3.0.16.5
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ### What's in this repository 
 
-SuiteCRM Outlook Plug-In v 3.0.16.0
+SuiteCRM Outlook Plug-In v 3.0.16.5
 
 This repository has been created to allow community members to collaborate and contribute to the project.
 

diff --git a/SuiteCRMAddIn/Properties/AssemblyInfo.cs b/SuiteCRMAddIn/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.16.0")]
+[assembly: AssemblyVersion("3.0.16.5")]
 [assembly: AssemblyFileVersion("3.0.1")]
 
diff --git a/SuiteCRMAddInSetup/SuiteCRMAddInSetup.isl b/SuiteCRMAddInSetup/SuiteCRMAddInSetup.isl
@@ -4423,7 +4423,7 @@ RABlAGIAdQBnAAEARQB4AHAAcgBlAHMAcwA=
 		<row><td>PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS</td><td>##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##</td><td/></row>
 		<row><td>ProductCode</td><td>{3BFCFDAB-2396-46E0-A826-0F142CA288EB}</td><td/></row>
 		<row><td>ProductName</td><td>SuiteCRMAddIn</td><td/></row>
-		<row><td>ProductVersion</td><td>3.0.16.0</td><td/></row>
+		<row><td>ProductVersion</td><td>3.0.16.5</td><td/></row>
 		<row><td>ProgressType0</td><td>install</td><td/></row>
 		<row><td>ProgressType1</td><td>Installing</td><td/></row>
 		<row><td>ProgressType2</td><td>installed</td><td/></row>

diff --git a/SuiteCRMAddInWixSetup/Product.wxs b/SuiteCRMAddInWixSetup/Product.wxs
@@ -128,7 +128,7 @@ https://www.microsoft.com/en-us/download/details.aspx?id=55170">
 				<File Id="TidyHTML5Managed_dll" KeyPath="yes" Name="TidyHTML5Managed.dll" Source="$(var.AddinFiles)" />
 			</Component>
 			<Component Id="SuiteCRMClient_dll_Component">
-				<File Id="SuiteCRMClient_dll" KeyPath="yes" Name="SuiteCRMClient.dll" Source="$(var.AddinFiles)"></File>
+				<File Id="SuiteCRMClient_dll" KeyPath="yes" Name="SuiteCRMClient.dll" Source="$(var.ClientFiles)"></File>
 			</Component>
 			<Component Id="SuiteCRMAddIn_dll_manifest_Component">
 				<File Id="SuiteCRMAddIn_dll_manifest" KeyPath="yes" Name="SuiteCRMAddIn.dll.manifest" Source="$(var.AddinFiles)"></File>
@@ -143,7 +143,7 @@ https://www.microsoft.com/en-us/download/details.aspx?id=55170">
 				<File Id="SuiteCRMAddIn_dll" KeyPath="yes" Name="SuiteCRMAddIn.dll" Source="$(var.AddinFiles)" />
 			</Component>
 			<Component Id="SuiteCRMClient_config_Component" >
-				<File Id="SuiteCRMClient_config" KeyPath="yes" Name="SuiteCRMClient.dll.config" Source="$(var.AddinFiles)" />
+				<File Id="SuiteCRMClient_config" KeyPath="yes" Name="SuiteCRMClient.dll.config" Source="$(var.ClientFiles)" />
 			</Component>
 			<Component Id="SuiteCRMAddIn_config_Component" >
 				<File Id="SuiteCRMAddIn_config" KeyPath="yes" Name="SuiteCRMAddIn.dll.config" Source="$(var.AddinFiles)" />

diff --git a/SuiteCRMAddInWixSetup/SuiteCRMAddInWixSetup.wixproj b/SuiteCRMAddInWixSetup/SuiteCRMAddInWixSetup.wixproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,20 +12,20 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-    <DefineConstants>Debug;AddinFiles=..\SuiteCRMAddIn\bin\$(Configuration)\</DefineConstants>
+    <DefineConstants>Debug;AddinFiles=..\SuiteCRMAddIn\bin\$(Configuration)\;ClientFiles=..\SuiteCRMClient\bin\$(Configuration)\</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-    <DefineConstants>AddinFiles=..\SuiteCRMAddIn\bin\$(Configuration)\</DefineConstants>
+    <DefineConstants>AddinFiles=..\SuiteCRMAddIn\bin\$(Configuration)\;ClientFiles=..\SuiteCRMClient\bin\$(Configuration)\</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Product.wxs" />
   </ItemGroup>
   <ItemGroup>
     <WixExtension Include="WixUtilExtension">
-        <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
-        <Name>WixUtilExtension</Name>
+      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+      <Name>WixUtilExtension</Name>
     </WixExtension>
     <WixExtension Include="WixUIExtension">
       <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
@@ -58,4 +58,4 @@
 	<Target Name="AfterBuild">
 	</Target>
 	-->
-</Project>
+</Project>
diff --git a/SuiteCRMClient/Properties/AssemblyInfo.cs b/SuiteCRMClient/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.16.0")]
+[assembly: AssemblyVersion("3.0.16.5")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/SuiteCRMOutlookAddIn.sln b/SuiteCRMOutlookAddIn.sln
@@ -160,6 +160,34 @@ Global
 		{245DBFF1-8518-4EC9-9AB4-E00392396485}.SingleImage|Mixed Platforms.Build.0 = Release|Any CPU
 		{245DBFF1-8518-4EC9-9AB4-E00392396485}.SingleImage|x86.ActiveCfg = Release|Any CPU
 		{245DBFF1-8518-4EC9-9AB4-E00392396485}.SingleImage|x86.Build.0 = Release|Any CPU
+		{03906F90-2AFD-411D-B1D5-BE9A934BAF74}.CD_ROM|Any CPU.ActiveCfg = Release|x86
+		{03906F90-2AFD-411D-B1D5-BE9A934BAF74}.CD_ROM|Any CPU.Build.0 = Release|x86
+		{03906F90-2AFD-411D-B1D5-BE9A934BAF74}.CD_ROM|Mixed Platforms.ActiveCfg = Release|x86
+		{03906F90-2AFD-411D-B1D5-BE9A934BAF74}.CD_ROM|Mixed Platforms.Build.0 = Release|x86
+		{03906F90-2AFD-411D-B1D5-BE9A934BAF74}.CD_ROM|x86.ActiveCfg = Release|x86
+		{03906F90-2AFD-411D-B1D5-BE9A934BAF74}.CD_ROM|x86.Build.0 = Release|x86
+		{03906F90-2AFD-411D-B1D5-BE9A934BAF74}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{03906F90-2AFD-411D-B1D5-BE9A934BAF74}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{03906F90-2AFD-411D-B1D5-BE9A934BAF74}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{03906F90-2AFD-411D-B1D5-BE9A934BAF74}.Debug|x86.ActiveCfg = Debug|x86
+		{03906F90-2AFD-411D-B1D5-BE9A934BAF74}.Debug|x86.Build.0 = Debug|x86
+		{03906F90-2AFD-411D-B1D5-BE9A934BAF74}.DVD-5|Any CPU.ActiveCfg = Release|x86
+		{03906F90-2AFD-411D-B1D5-BE9A934BAF74}.DVD-5|Any CPU.Build.0 = Release|x86
+		{03906F90-2AFD-411D-B1D5-BE9A934BAF74}.DVD-5|Mixed Platforms.ActiveCfg = Debug|x86
+		{03906F90-2AFD-411D-B1D5-BE9A934BAF74}.DVD-5|Mixed Platforms.Build.0 = Debug|x86
+		{03906F90-2AFD-411D-B1D5-BE9A934BAF74}.DVD-5|x86.ActiveCfg = Debug|x86
+		{03906F90-2AFD-411D-B1D5-BE9A934BAF74}.DVD-5|x86.Build.0 = Debug|x86
+		{03906F90-2AFD-411D-B1D5-BE9A934BAF74}.Release|Any CPU.ActiveCfg = Release|x86
+		{03906F90-2AFD-411D-B1D5-BE9A934BAF74}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{03906F90-2AFD-411D-B1D5-BE9A934BAF74}.Release|Mixed Platforms.Build.0 = Release|x86
+		{03906F90-2AFD-411D-B1D5-BE9A934BAF74}.Release|x86.ActiveCfg = Release|x86
+		{03906F90-2AFD-411D-B1D5-BE9A934BAF74}.Release|x86.Build.0 = Release|x86
+		{03906F90-2AFD-411D-B1D5-BE9A934BAF74}.SingleImage|Any CPU.ActiveCfg = Release|x86
+		{03906F90-2AFD-411D-B1D5-BE9A934BAF74}.SingleImage|Any CPU.Build.0 = Release|x86
+		{03906F90-2AFD-411D-B1D5-BE9A934BAF74}.SingleImage|Mixed Platforms.ActiveCfg = Release|x86
+		{03906F90-2AFD-411D-B1D5-BE9A934BAF74}.SingleImage|Mixed Platforms.Build.0 = Release|x86
+		{03906F90-2AFD-411D-B1D5-BE9A934BAF74}.SingleImage|x86.ActiveCfg = Release|x86
+		{03906F90-2AFD-411D-B1D5-BE9A934BAF74}.SingleImage|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE