Migrate v5.7 from CodePlex

BTDF · Nov 9, 2017 · 7fb1bb1 · 7fb1bb1
1 parent d7b5b97
commit 7fb1bb1
Show file tree

Hide file tree

Showing 364 changed files with 6,289 additions and 9,593 deletions.
diff --git a/src/Developer/GenericBizTalkMSI.wxs b/src/Developer/GenericBizTalkMSI.wxs
@@ -73,32 +73,12 @@
       <RegistrySearch Id="SearchForBTSProductName" Root="HKLM" Key="SOFTWARE\Microsoft\BizTalk Server\3.0" Name="ProductName" Type="raw" />
     </Property>
 
-    <PropertyRef Id="NETFRAMEWORK20INSTALLROOTDIR" />
-    <PropertyRef Id="NETFRAMEWORK35INSTALLROOTDIR" />
     <PropertyRef Id="NETFRAMEWORK40FULLINSTALLROOTDIR" />
 
     <SetProperty Id="DEPLOYMENTDIR" Value="[INSTALLDIR]\Deployment" Sequence="both" After="CostFinalize"/>
 
-    <SetProperty Id="MSBUILDPATH" Action="SetMSBUILDPATH2006" Value="[NETFRAMEWORK20INSTALLROOTDIR]\MSBuild.exe" Sequence="both" After="CostFinalize">
-      <![CDATA[BTS_PRODUCTNAME = "Microsoft BizTalk Server 2006" OR BTS_PRODUCTNAME = "Microsoft BizTalk Server 2006 R2"]]>
-    </SetProperty>
-    <SetProperty Id="MSBUILDTOOLSVER" Action="SetMSBUILDTOOLSVER2006" Value="" Sequence="both" After="SetMSBUILDPATH2006">
-      <![CDATA[BTS_PRODUCTNAME = "Microsoft BizTalk Server 2006" OR BTS_PRODUCTNAME = "Microsoft BizTalk Server 2006 R2"]]>
-    </SetProperty>
-
-    <SetProperty Id="MSBUILDPATH" Action="SetMSBUILDPATH2009" Value="[NETFRAMEWORK35INSTALLROOTDIR]\MSBuild.exe" Sequence="both" After="CostFinalize">
-      <![CDATA[BTS_PRODUCTNAME = "Microsoft BizTalk Server 2009"]]>
-    </SetProperty>
-    <SetProperty Id="MSBUILDTOOLSVER" Action="SetMSBUILDTOOLSVER2009" Value="/tv:3.5" Sequence="both" After="SetMSBUILDPATH2009">
-      <![CDATA[BTS_PRODUCTNAME = "Microsoft BizTalk Server 2009"]]>
-    </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" 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" OR BTS_PRODUCTNAME = "Microsoft BizTalk Server 2013 R2"]]>
-    </SetProperty>
+    <SetProperty Id="MSBUILDPATH" Action="SetMSBUILDPATH2010" Value="[NETFRAMEWORK40FULLINSTALLROOTDIR]\MSBuild.exe" Sequence="both" After="CostFinalize" />
+    <SetProperty Id="MSBUILDTOOLSVER" Action="SetMSBUILDTOOLSVER2010" Value="/tv:4.0" Sequence="both" After="SetMSBUILDPATH2010" />
 
     <!-- Set up for checkbox to auto-start deploy script at end of install wizard -->
     <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Start deploying to BizTalk when I click Finish" />

diff --git a/src/Developer/MigrateToProjectFolderStructure.cmd b/src/Developer/MigrateToProjectFolderStructure.cmd
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-15 Thomas F. Abraham, 2004-08 Scott Colestock
+  Copyright (C) Thomas F. Abraham, Scott Colestock
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Installer">
   <PropertyGroup>

diff --git a/src/Documentation/Src/DeploymentFrameworkForBizTalkDocs.hnd b/src/Documentation/Src/DeploymentFrameworkForBizTalkDocs.hnd
diff --git a/src/Framework/BizTalkDeploymentFramework.ServerExecute.targets b/src/Framework/BizTalkDeploymentFramework.ServerExecute.targets
@@ -6,15 +6,14 @@
     This source file is subject to the Microsoft Public License (Ms-PL).
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="Microsoft.Sdc.Common.tasks"/>
   <UsingTask AssemblyFile="BizTalkDeploymentFramework.Tasks.dll" TaskName="Pause" />
   <UsingTask AssemblyFile="BizTalkDeploymentFramework.Tasks.dll" TaskName="StartProcess" />
 
   <!--
   This MSBuild targets file may be used to deploy, undeploy or redeploy your BizTalk app from a command-line/unattended script.
   
   Command line parameters:
-    tv - 4.0 for BizTalk 2010, 3.5 for BizTalk 2009 and DO NOT USE for BizTalk 2006 or 2006 R2  (example /tv:4.0)
+    tv - 4.0 for BizTalk 2010 (example /tv:4.0)
 	t - Deploy, Undeploy, Redeploy or QuickDeploy (example /t:Deploy)
 	
   Property Parameters or Environment Variables (set these either as an environment variable (as the SetEnvUI wizard does) or with the /p command line parameter
@@ -88,13 +87,13 @@
   </Target>
 
   <Target Name="Copy">
-    <Time.GetTime Format="yyyyMMdd_HHmm">
-      <Output TaskParameter="Time" PropertyName="Now" />
-    </Time.GetTime>
+    <PropertyGroup>
+      <LogFilename>DeployResults_$(COMPUTERNAME)_$([System.DateTime]::Now.ToString('yyyyMMdd_HHmm')).txt</LogFilename>
+    </PropertyGroup>
     <Copy
       SourceFiles="..\..\DeployResults\DeployResults.txt"
-      DestinationFiles="..\..\DeployResults\DeployResults_$(COMPUTERNAME)_$(Now).txt"
-	  ContinueOnError="true" />
+      DestinationFiles="..\..\DeployResults\$(LogFilename)"
+  	  ContinueOnError="true" />
   </Target>
 
   <Target Name="PauseForError" DependsOnTargets="Copy">

diff --git a/src/Framework/BizTalkDeploymentFramework.WiXSetup.targets b/src/Framework/BizTalkDeploymentFramework.WiXSetup.targets
@@ -6,6 +6,8 @@
 -->
 
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Installer">
+  <UsingTask AssemblyFile="BizTalkDeploymentFramework.Tasks.IIS.dll" TaskName="CopyVirtualDirectoryFiles" />
+
   <PropertyGroup>
     <ObjDir>obj\$(Configuration)</ObjDir>
     <IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == ''">$(ObjDir)</IntermediateOutputPath>
@@ -71,12 +73,13 @@
     <MakeDir Directories="$(RedistDir)\DeployResults" />
 
     <!-- Force MSBuild to expand the item spec into physical file specs -->
-    <CreateItem Include="@(VDirList->'%(Physdir)\**\*.*')" AdditionalMetadata="Path=%(Physdir)" Condition="'$(IncludeVirtualDirectories)' == 'true'">
+    <CreateItem Include="@(VDirList->'%(Physdir)\**\*.*')" AdditionalMetadata="Path=%(Physdir)" Condition="'$(IncludeVirtualDirectories)' == 'true' and '@(VDirList)' != ''">
       <Output TaskParameter="Include" ItemName="IncludeVirtualDirectoriesSourceGroup" />
     </CreateItem>
 
-    <MakeDir Directories="$(RedistDir)\Vdirs\%(VDirList.Physdir)" Condition="'$(IncludeVirtualDirectories)' == 'true'" />
-    <Copy SourceFiles="@(IncludeVirtualDirectoriesSourceGroup)" DestinationFolder="$(RedistDir)\Vdirs\%(Physdir)\%(RecursiveDir)" Condition="'$(IncludeVirtualDirectories)' == 'true'" />
+    <MakeDir Directories="$(RedistDir)\Vdirs\%(VDirList.Physdir)" Condition="'@(IncludeVirtualDirectoriesSourceGroup)' != ''" />
+    <Copy SourceFiles="@(IncludeVirtualDirectoriesSourceGroup)" DestinationFolder="$(RedistDir)\Vdirs\%(Physdir)\%(RecursiveDir)" Condition="'@(IncludeVirtualDirectoriesSourceGroup)' != ''" />
+    <CopyVirtualDirectoryFiles Items="@(IISApp)" MSBuildProjectDirectory="$(MSBuildProjectDirectory)" RedistPath="$(RedistDir)" Condition="'@(IISApp)' != ''" />
 
     <!-- Grab miscellaneous files -->
     <Copy DestinationFolder="$(RedistDir)\Deployment" SourceFiles="InstallWizard.xml"/>