Migrate v5.6 from CodePlex

BTDF · Nov 8, 2017 · b2fd78f · b2fd78f
1 parent 8bbcc20
commit b2fd78f
Show file tree

Hide file tree

Showing 101 changed files with 1,819 additions and 2,474 deletions.
diff --git a/src/Developer/GenericBizTalkMSI.wxs b/src/Developer/GenericBizTalkMSI.wxs
@@ -8,20 +8,20 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
   <Product UpgradeCode="$(var.ProductUpgradeCode)"
-           Name="$(var.ProductName) $(var.ProductVersion)"
+           Name="$(var.ProductName)"
            Id="$(var.ProductId)"
            Version="$(var.ProductVersion)"
            Manufacturer="$(var.Manufacturer)"
            Language="1033">
 
-    <Package Id="*"
-             Description="$(var.PackageDescription)"
+    <?if $(var.PackageComments) = ""?>
+    <Package Description="$(var.PackageDescription)"
+             InstallerVersion="200" Compressed="yes" InstallScope="perMachine"/>
+    <?else?>
+    <Package Description="$(var.PackageDescription)"
              Comments="$(var.PackageComments)"
-             Manufacturer="$(var.Manufacturer)"
-             InstallerVersion="200"
-             Languages="1033"
-             Compressed="yes"
-			 InstallScope="perMachine"/>
+             InstallerVersion="200" Compressed="yes" InstallScope="perMachine"/>
+    <?endif?>
 
     <Media Id="1" EmbedCab="yes" Cabinet="BizTalkSolution.cab" />
 
@@ -61,6 +61,10 @@
     <WixVariable Id="WixUILicenseRtf" Value="License.rtf" />
     <WixVariable Id="WixUISupportPerUser" Value="0" />
 
+    <?if $(var.ExplicitInstallDir) != ""?>
+    <SetProperty Id="INSTALLDIR" Value="$(var.ExplicitInstallDir)" Sequence="both" Before="AppSearch" />
+    <?endif?>
+
     <Property Id="LicenseAccepted" Value="1" />
     <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
     <Property Id='DISABLEADVTSHORTCUTS' Value='1' />
@@ -90,10 +94,10 @@
     </SetProperty>
 
     <SetProperty Id="MSBUILDPATH" Action="SetMSBUILDPATH2010" Value="[NETFRAMEWORK40FULLINSTALLROOTDIR]\MSBuild.exe" Sequence="both" After="CostFinalize">
-      <![CDATA[BTS_PRODUCTNAME = "Microsoft BizTalk Server 2010" OR BTS_PRODUCTNAME = "Microsoft BizTalk Server 2013"]]>
+      <![CDATA[BTS_PRODUCTNAME = "Microsoft BizTalk Server 2010" OR BTS_PRODUCTNAME = "Microsoft BizTalk Server 2013" OR BTS_PRODUCTNAME = "Microsoft BizTalk Server 2013 R2"]]>
     </SetProperty>
     <SetProperty Id="MSBUILDTOOLSVER" Action="SetMSBUILDTOOLSVER2010" Value="/tv:4.0" Sequence="both" After="SetMSBUILDPATH2010">
-      <![CDATA[BTS_PRODUCTNAME = "Microsoft BizTalk Server 2010" OR BTS_PRODUCTNAME = "Microsoft BizTalk Server 2013"]]>
+      <![CDATA[BTS_PRODUCTNAME = "Microsoft BizTalk Server 2010" OR BTS_PRODUCTNAME = "Microsoft BizTalk Server 2013" OR BTS_PRODUCTNAME = "Microsoft BizTalk Server 2013 R2"]]>
     </SetProperty>
 
     <!-- Set up for checkbox to auto-start deploy script at end of install wizard -->

diff --git a/src/Developer/ProjectTemplate/Deployment.btdfproj b/src/Developer/ProjectTemplate/Deployment.btdfproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!-- 
   Deployment Framework for BizTalk
-  Copyright (C) 2008-14 Thomas F. Abraham, 2004-08 Scott Colestock
+  Copyright (C) 2008-15 Thomas F. Abraham, 2004-08 Scott Colestock
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Installer">
   <PropertyGroup>
@@ -22,10 +22,9 @@
     <ProductId>[GUID1]</ProductId>
     <!-- BizTalk App Version Upgrade -->
 
-    <ProductName>[PROJECTNAME] for BizTalk</ProductName>
+    <ProductName>[PROJECTNAME] for BizTalk $(ProductVersion)</ProductName>
     <Manufacturer>Deployment Framework User</Manufacturer>
     <PackageDescription>[PROJECTNAME]</PackageDescription>
-    <PackageComments>[PROJECTNAME]</PackageComments>
     <!-- NEVER change the ProductUpgradeCode. -->
     <ProductUpgradeCode>[GUID2]</ProductUpgradeCode>
   </PropertyGroup>
@@ -36,18 +35,16 @@
     <DeploymentFrameworkTargetsPath>$(MSBuildExtensionsPath)\DeploymentFrameworkForBizTalk\5.0\</DeploymentFrameworkTargetsPath>
     <OutputPath Condition="'$(TeamBuildOutDir)' == ''">bin\Debug\</OutputPath>
     <OutputPath Condition="'$(TeamBuildOutDir)' != ''">$(TeamBuildOutDir)</OutputPath>
-    <DeployPDBsToGac>false</DeployPDBsToGac>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <DeploymentFrameworkTargetsPath>$(MSBuildExtensionsPath)\DeploymentFrameworkForBizTalk\5.0\</DeploymentFrameworkTargetsPath>
     <OutputPath Condition="'$(TeamBuildOutDir)' == ''">bin\Release\</OutputPath>
     <OutputPath Condition="'$(TeamBuildOutDir)' != ''">$(TeamBuildOutDir)</OutputPath>
-    <DeployPDBsToGac>false</DeployPDBsToGac>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)' == 'Server'">
     <DeploymentFrameworkTargetsPath>Framework\</DeploymentFrameworkTargetsPath>
     <!-- Get our PDBs into the GAC so we get file/line number information in stack traces. -->
-    <DeployPDBsToGac>true</DeployPDBsToGac>
+    <DeployPDBsToGac>false</DeployPDBsToGac>
   </PropertyGroup>
   <ItemGroup>
     <PropsFromEnvSettings Include="SsoAppUserGroup;SsoAppAdminGroup" />