Skip to content

Commit 7fb1bb1

Browse files
tfabrahamtfabraham
committed
Migrate v5.7 from CodePlex
1 parent d7b5b97 commit 7fb1bb1

File tree

364 files changed

+6289
-9593
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

364 files changed

+6289
-9593
lines changed

‎src/Developer/GenericBizTalkMSI.wxs

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -73,32 +73,12 @@
7373
<RegistrySearch Id="SearchForBTSProductName" Root="HKLM" Key="SOFTWARE\Microsoft\BizTalk Server\3.0" Name="ProductName" Type="raw" />
7474
</Property>
7575

76-
<PropertyRef Id="NETFRAMEWORK20INSTALLROOTDIR" />
77-
<PropertyRef Id="NETFRAMEWORK35INSTALLROOTDIR" />
7876
<PropertyRef Id="NETFRAMEWORK40FULLINSTALLROOTDIR" />
7977

8078
<SetProperty Id="DEPLOYMENTDIR" Value="[INSTALLDIR]\Deployment" Sequence="both" After="CostFinalize"/>
8179

82-
<SetProperty Id="MSBUILDPATH" Action="SetMSBUILDPATH2006" Value="[NETFRAMEWORK20INSTALLROOTDIR]\MSBuild.exe" Sequence="both" After="CostFinalize">
83-
<![CDATA[BTS_PRODUCTNAME = "Microsoft BizTalk Server 2006" OR BTS_PRODUCTNAME = "Microsoft BizTalk Server 2006 R2"]]>
84-
</SetProperty>
85-
<SetProperty Id="MSBUILDTOOLSVER" Action="SetMSBUILDTOOLSVER2006" Value="" Sequence="both" After="SetMSBUILDPATH2006">
86-
<![CDATA[BTS_PRODUCTNAME = "Microsoft BizTalk Server 2006" OR BTS_PRODUCTNAME = "Microsoft BizTalk Server 2006 R2"]]>
87-
</SetProperty>
88-
89-
<SetProperty Id="MSBUILDPATH" Action="SetMSBUILDPATH2009" Value="[NETFRAMEWORK35INSTALLROOTDIR]\MSBuild.exe" Sequence="both" After="CostFinalize">
90-
<![CDATA[BTS_PRODUCTNAME = "Microsoft BizTalk Server 2009"]]>
91-
</SetProperty>
92-
<SetProperty Id="MSBUILDTOOLSVER" Action="SetMSBUILDTOOLSVER2009" Value="/tv:3.5" Sequence="both" After="SetMSBUILDPATH2009">
93-
<![CDATA[BTS_PRODUCTNAME = "Microsoft BizTalk Server 2009"]]>
94-
</SetProperty>
95-
96-
<SetProperty Id="MSBUILDPATH" Action="SetMSBUILDPATH2010" Value="[NETFRAMEWORK40FULLINSTALLROOTDIR]\MSBuild.exe" Sequence="both" After="CostFinalize">
97-
<![CDATA[BTS_PRODUCTNAME = "Microsoft BizTalk Server 2010" OR BTS_PRODUCTNAME = "Microsoft BizTalk Server 2013" OR BTS_PRODUCTNAME = "Microsoft BizTalk Server 2013 R2"]]>
98-
</SetProperty>
99-
<SetProperty Id="MSBUILDTOOLSVER" Action="SetMSBUILDTOOLSVER2010" Value="/tv:4.0" Sequence="both" After="SetMSBUILDPATH2010">
100-
<![CDATA[BTS_PRODUCTNAME = "Microsoft BizTalk Server 2010" OR BTS_PRODUCTNAME = "Microsoft BizTalk Server 2013" OR BTS_PRODUCTNAME = "Microsoft BizTalk Server 2013 R2"]]>
101-
</SetProperty>
80+
<SetProperty Id="MSBUILDPATH" Action="SetMSBUILDPATH2010" Value="[NETFRAMEWORK40FULLINSTALLROOTDIR]\MSBuild.exe" Sequence="both" After="CostFinalize" />
81+
<SetProperty Id="MSBUILDTOOLSVER" Action="SetMSBUILDTOOLSVER2010" Value="/tv:4.0" Sequence="both" After="SetMSBUILDPATH2010" />
10282

10383
<!-- Set up for checkbox to auto-start deploy script at end of install wizard -->
10484
<Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Start deploying to BizTalk when I click Finish" />

‎src/Developer/MigrateToProjectFolderStructure.cmd

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎src/Developer/ProjectTemplate/Deployment.btdfproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<!--
33
Deployment Framework for BizTalk
4-
Copyright (C) 2008-15 Thomas F. Abraham, 2004-08 Scott Colestock
4+
Copyright (C) Thomas F. Abraham, Scott Colestock
55
-->
66
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Installer">
77
<PropertyGroup>

‎src/Documentation/Src/DeploymentFrameworkForBizTalkDocs.hnd

112 KB
Binary file not shown.

‎src/Framework/BizTalkDeploymentFramework.ServerExecute.targets

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@
66
This source file is subject to the Microsoft Public License (Ms-PL).
77
-->
88
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
9-
<Import Project="Microsoft.Sdc.Common.tasks"/>
109
<UsingTask AssemblyFile="BizTalkDeploymentFramework.Tasks.dll" TaskName="Pause" />
1110
<UsingTask AssemblyFile="BizTalkDeploymentFramework.Tasks.dll" TaskName="StartProcess" />
1211

1312
<!--
1413
This MSBuild targets file may be used to deploy, undeploy or redeploy your BizTalk app from a command-line/unattended script.
1514
1615
Command line parameters:
17-
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)
16+
tv - 4.0 for BizTalk 2010 (example /tv:4.0)
1817
t - Deploy, Undeploy, Redeploy or QuickDeploy (example /t:Deploy)
1918
2019
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 @@
8887
</Target>
8988

9089
<Target Name="Copy">
91-
<Time.GetTime Format="yyyyMMdd_HHmm">
92-
<Output TaskParameter="Time" PropertyName="Now" />
93-
</Time.GetTime>
90+
<PropertyGroup>
91+
<LogFilename>DeployResults_$(COMPUTERNAME)_$([System.DateTime]::Now.ToString('yyyyMMdd_HHmm')).txt</LogFilename>
92+
</PropertyGroup>
9493
<Copy
9594
SourceFiles="..\..\DeployResults\DeployResults.txt"
96-
DestinationFiles="..\..\DeployResults\DeployResults_$(COMPUTERNAME)_$(Now).txt"
97-
ContinueOnError="true" />
95+
DestinationFiles="..\..\DeployResults\$(LogFilename)"
96+
ContinueOnError="true" />
9897
</Target>
9998

10099
<Target Name="PauseForError" DependsOnTargets="Copy">

‎src/Framework/BizTalkDeploymentFramework.WiXSetup.targets

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
-->
77

88
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Installer">
9+
<UsingTask AssemblyFile="BizTalkDeploymentFramework.Tasks.IIS.dll" TaskName="CopyVirtualDirectoryFiles" />
10+
911
<PropertyGroup>
1012
<ObjDir>obj\$(Configuration)</ObjDir>
1113
<IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == ''">$(ObjDir)</IntermediateOutputPath>
@@ -71,12 +73,13 @@
7173
<MakeDir Directories="$(RedistDir)\DeployResults" />
7274

7375
<!-- Force MSBuild to expand the item spec into physical file specs -->
74-
<CreateItem Include="@(VDirList->'%(Physdir)\**\*.*')" AdditionalMetadata="Path=%(Physdir)" Condition="'$(IncludeVirtualDirectories)' == 'true'">
76+
<CreateItem Include="@(VDirList->'%(Physdir)\**\*.*')" AdditionalMetadata="Path=%(Physdir)" Condition="'$(IncludeVirtualDirectories)' == 'true' and '@(VDirList)' != ''">
7577
<Output TaskParameter="Include" ItemName="IncludeVirtualDirectoriesSourceGroup" />
7678
</CreateItem>
7779

78-
<MakeDir Directories="$(RedistDir)\Vdirs\%(VDirList.Physdir)" Condition="'$(IncludeVirtualDirectories)' == 'true'" />
79-
<Copy SourceFiles="@(IncludeVirtualDirectoriesSourceGroup)" DestinationFolder="$(RedistDir)\Vdirs\%(Physdir)\%(RecursiveDir)" Condition="'$(IncludeVirtualDirectories)' == 'true'" />
80+
<MakeDir Directories="$(RedistDir)\Vdirs\%(VDirList.Physdir)" Condition="'@(IncludeVirtualDirectoriesSourceGroup)' != ''" />
81+
<Copy SourceFiles="@(IncludeVirtualDirectoriesSourceGroup)" DestinationFolder="$(RedistDir)\Vdirs\%(Physdir)\%(RecursiveDir)" Condition="'@(IncludeVirtualDirectoriesSourceGroup)' != ''" />
82+
<CopyVirtualDirectoryFiles Items="@(IISApp)" MSBuildProjectDirectory="$(MSBuildProjectDirectory)" RedistPath="$(RedistDir)" Condition="'@(IISApp)' != ''" />
8083

8184
<!-- Grab miscellaneous files -->
8285
<Copy DestinationFolder="$(RedistDir)\Deployment" SourceFiles="InstallWizard.xml"/>

0 commit comments

Comments
 (0)