Update install location and licence header

mikefourie-zz · May 28, 2017 · 6e8e975 · 6e8e975
1 parent 7c4fc89
commit 6e8e975
Show file tree

Hide file tree

Showing 196 changed files with 563 additions and 564 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 Mike Fourie and Contributors
+Copyright (c) 2017 Mike Fourie and Contributors (http://www.MSBuildExtensionPack.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Solutions/Main/BizTalk/Adaptor.cs b/Solutions/Main/BizTalk/Adaptor.cs
@@ -1,6 +1,6 @@
-//-----------------------------------------------------------------------
-// <copyright file="Adaptor.cs">(c) http://www.msbuildextensionpack.com. This source is subject to the Microsoft Permissive License. See http://www.microsoft.com/resources/sharedsource/licensingbasics/sharedsourcelicenses.mspx. All other rights reserved.</copyright>
-//-----------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------------------------------------------------------------------------
+// <copyright file="Adaptor.cs">(c) 2017 Mike Fourie and Contributors (http://www.MSBuildExtensionPack.com) under MIT License. See https://opensource.org/licenses/MIT </copyright>
+//-------------------------------------------------------------------------------------------------------------------------------------------------------------------
 namespace MSBuild.ExtensionPack.BizTalk
 {
     using System;

diff --git a/Solutions/Main/BizTalk/Application.cs b/Solutions/Main/BizTalk/Application.cs
@@ -1,6 +1,6 @@
-//-----------------------------------------------------------------------
-// <copyright file="Application.cs">(c) http://www.msbuildextensionpack.com. This source is subject to the Microsoft Permissive License. See http://www.microsoft.com/resources/sharedsource/licensingbasics/sharedsourcelicenses.mspx. All other rights reserved.</copyright>
-//-----------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------------------------------------------------------------------------
+// <copyright file="Application.cs">(c) 2017 Mike Fourie and Contributors (http://www.MSBuildExtensionPack.com) under MIT License. See https://opensource.org/licenses/MIT </copyright>
+//-------------------------------------------------------------------------------------------------------------------------------------------------------------------
 namespace MSBuild.ExtensionPack.BizTalk
 {
     using System;

diff --git a/Solutions/Main/BizTalk/Assembly.cs b/Solutions/Main/BizTalk/Assembly.cs
@@ -1,6 +1,6 @@
-//-----------------------------------------------------------------------
-// <copyright file="Assembly.cs">(c) http://www.msbuildextensionpack.com. This source is subject to the Microsoft Permissive License. See http://www.microsoft.com/resources/sharedsource/licensingbasics/sharedsourcelicenses.mspx. All other rights reserved.</copyright>
-//-----------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------------------------------------------------------------------------
+// <copyright file="Assembly.cs">(c) 2017 Mike Fourie and Contributors (http://www.MSBuildExtensionPack.com) under MIT License. See https://opensource.org/licenses/MIT </copyright>
+//-------------------------------------------------------------------------------------------------------------------------------------------------------------------
 namespace MSBuild.ExtensionPack.BizTalk
 {
     using System;

diff --git a/Solutions/Main/BizTalk/BizTalkHelper.cs b/Solutions/Main/BizTalk/BizTalkHelper.cs
@@ -1,6 +1,6 @@
-//-----------------------------------------------------------------------
-// <copyright file="BizTalkHelper.cs">(c) http://www.msbuildextensionpack.com. This source is subject to the Microsoft Permissive License. See http://www.microsoft.com/resources/sharedsource/licensingbasics/sharedsourcelicenses.mspx. All other rights reserved.</copyright>
-//-----------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------------------------------------------------------------------------
+// <copyright file="BizTalkHelper.cs">(c) 2017 Mike Fourie and Contributors (http://www.MSBuildExtensionPack.com) under MIT License. See https://opensource.org/licenses/MIT </copyright>
+//-------------------------------------------------------------------------------------------------------------------------------------------------------------------
 namespace MSBuild.ExtensionPack.BizTalk
 {
     using System.Text.RegularExpressions;

diff --git a/Solutions/Main/BizTalk/BizTalkHostInstance.cs b/Solutions/Main/BizTalk/BizTalkHostInstance.cs
@@ -1,6 +1,6 @@
-//-----------------------------------------------------------------------
-// <copyright file="BizTalkHostInstance.cs">(c) http://www.msbuildextensionpack.com. This source is subject to the Microsoft Permissive License. See http://www.microsoft.com/resources/sharedsource/licensingbasics/sharedsourcelicenses.mspx. All other rights reserved.</copyright>
-//-----------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------------------------------------------------------------------------
+// <copyright file="BizTalkHostInstance.cs">(c) 2017 Mike Fourie and Contributors (http://www.MSBuildExtensionPack.com) under MIT License. See https://opensource.org/licenses/MIT </copyright>
+//-------------------------------------------------------------------------------------------------------------------------------------------------------------------
 namespace MSBuild.ExtensionPack.BizTalk
 {
     using System;

diff --git a/Solutions/Main/BizTalk/GlobalSuppressions.cs b/Solutions/Main/BizTalk/GlobalSuppressions.cs
@@ -1,6 +1,6 @@
-//-----------------------------------------------------------------------
-// <copyright file="GlobalSuppressions.cs">(c) http://www.msbuildextensionpack.com. This source is subject to the Microsoft Permissive License. See http://www.microsoft.com/resources/sharedsource/licensingbasics/sharedsourcelicenses.mspx. All other rights reserved.</copyright>
-//-----------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------------------------------------------------------------------------
+// <copyright file="GlobalSuppressions.cs">(c) 2017 Mike Fourie and Contributors (http://www.MSBuildExtensionPack.com) under MIT License. See https://opensource.org/licenses/MIT </copyright>
+//-------------------------------------------------------------------------------------------------------------------------------------------------------------------
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA2210:AssembliesShouldHaveValidStrongNames", Justification = "Delay Signed")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Scope = "member", Target = "MSBuild.ExtensionPack.BaseTask.#Execute()")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "MSBuild.ExtensionPack")]

diff --git a/Solutions/Main/BizTalk/Host.cs b/Solutions/Main/BizTalk/Host.cs
@@ -1,6 +1,6 @@
-//-----------------------------------------------------------------------
-// <copyright file="Host.cs">(c) http://www.msbuildextensionpack.com. This source is subject to the Microsoft Permissive License. See http://www.microsoft.com/resources/sharedsource/licensingbasics/sharedsourcelicenses.mspx. All other rights reserved.</copyright>
-//-----------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------------------------------------------------------------------------
+// <copyright file="Host.cs">(c) 2017 Mike Fourie and Contributors (http://www.MSBuildExtensionPack.com) under MIT License. See https://opensource.org/licenses/MIT </copyright>
+//-------------------------------------------------------------------------------------------------------------------------------------------------------------------
 namespace MSBuild.ExtensionPack.BizTalk
 {
     using System;

diff --git a/Solutions/Main/BizTalk/Properties/ExtraAssemblyInfo.cs b/Solutions/Main/BizTalk/Properties/ExtraAssemblyInfo.cs
@@ -1,6 +1,6 @@
-//-----------------------------------------------------------------------
-// <copyright file="ExtraAssemblyInfo.cs">(c) http://www.msbuildextensionpack.com. This source is subject to the Microsoft Permissive License. See http://www.microsoft.com/resources/sharedsource/licensingbasics/sharedsourcelicenses.mspx. All other rights reserved.</copyright>
-//-----------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------------------------------------------------------------------------
+// <copyright file="ExtraAssemblyInfo.cs">(c) 2017 Mike Fourie and Contributors (http://www.MSBuildExtensionPack.com) under MIT License. See https://opensource.org/licenses/MIT </copyright>
+//-------------------------------------------------------------------------------------------------------------------------------------------------------------------
 using System;
 using System.Reflection;
 

diff --git a/Solutions/Main/BizTalk/ReceiveHandler.cs b/Solutions/Main/BizTalk/ReceiveHandler.cs
@@ -1,6 +1,6 @@
-//-----------------------------------------------------------------------
-// <copyright file="ReceiveHandler.cs">(c) http://www.msbuildextensionpack.com. This source is subject to the Microsoft Permissive License. See http://www.microsoft.com/resources/sharedsource/licensingbasics/sharedsourcelicenses.mspx. All other rights reserved.</copyright>
-//-----------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------------------------------------------------------------------------
+// <copyright file="ReceiveHandler.cs">(c) 2017 Mike Fourie and Contributors (http://www.MSBuildExtensionPack.com) under MIT License. See https://opensource.org/licenses/MIT </copyright>
+//-------------------------------------------------------------------------------------------------------------------------------------------------------------------
 namespace MSBuild.ExtensionPack.BizTalk
 {
     using System;

diff --git a/Solutions/Main/BizTalk/SendHandler.cs b/Solutions/Main/BizTalk/SendHandler.cs
@@ -1,6 +1,6 @@
-//-----------------------------------------------------------------------
-// <copyright file="SendHandler.cs">(c) http://www.msbuildextensionpack.com. This source is subject to the Microsoft Permissive License. See http://www.microsoft.com/resources/sharedsource/licensingbasics/sharedsourcelicenses.mspx. All other rights reserved.</copyright>
-//-----------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------------------------------------------------------------------------
+// <copyright file="SendHandler.cs">(c) 2017 Mike Fourie and Contributors (http://www.MSBuildExtensionPack.com) under MIT License. See https://opensource.org/licenses/MIT </copyright>
+//-------------------------------------------------------------------------------------------------------------------------------------------------------------------
 namespace MSBuild.ExtensionPack.BizTalk
 {
     using System;

diff --git a/Solutions/Main/Build/Build.proj b/Solutions/Main/Build/Build.proj
@@ -1,8 +1,9 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Import Project="$(MSBuildExtensionsPath)\ExtensionPack\4.0\MSBuild.ExtensionPack.tasks"/>
+    <Import Project="$(ProgramFiles)\MSBuildExtensionPack\4.0\MSBuild.ExtensionPack.tasks"/>
+
     <PropertyGroup>
         <BuildDrive>C:</BuildDrive>
-        <ReleaseVersion>4.0.13.0</ReleaseVersion>
+        <ReleaseVersion>4.0.14.0</ReleaseVersion>
         <ProductName>MSBuild Extension Pack</ProductName>
         <DropFolder>$(BuildDrive)\$(ProductName)\$(ReleaseVersion)</DropFolder>
         <RootFolder>$(MSBuildProjectDirectory)..\..</RootFolder>

diff --git a/Solutions/Main/Build/Setup/Product.x64.wxs b/Solutions/Main/Build/Setup/Product.x64.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Product Id="*" Name="MSBuild Extension Pack 4.0.13.0 (x64)" Language="1033" Version="4.0.13.0" Manufacturer="Mike Fourie" UpgradeCode="C4FE8F8B-1239-44DF-AFC8-99FD7E35FC98">
+    <Product Id="*" Name="MSBuild Extension Pack 4.0.14.0 (x64)" Language="1033" Version="4.0.14.0" Manufacturer="Mike Fourie" UpgradeCode="C4FE8F8B-1239-44DF-AFC8-99FD7E35FC98">
         <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine"/>
 
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed."/>
@@ -27,12 +27,10 @@
             </Directory>
             <Directory Id="ProgramFiles64Folder">
                 <?endif?>
-                <Directory Id="MSBuild" Name="MSBuild">
-                    <Directory Id="ExtensionPack" Name="ExtensionPack">
-                      <Directory Id="INSTALLFOLDER" Name="4.0">
-                        <Directory Id="INSTALLRESOURCES" Name="Resources"/>
-                      </Directory>
-                    </Directory>
+                <Directory Id="MSBuildExtensionPack" Name="MSBuildExtensionPack">
+				  <Directory Id="INSTALLFOLDER" Name="4.0">
+					<Directory Id="INSTALLRESOURCES" Name="Resources"/>
+				  </Directory>
                 </Directory>
             </Directory>
         </Directory>

diff --git a/Solutions/Main/Build/Setup/Product.x86.wxs b/Solutions/Main/Build/Setup/Product.x86.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Product Id="*" Name="MSBuild Extension Pack 4.0.13.0" Language="1033" Version="4.0.13.0" Manufacturer="Mike Fourie" UpgradeCode="CBBB56DB-4CAA-431D-9786-4D3471CCE222">
+    <Product Id="*" Name="MSBuild Extension Pack 4.0.14.0" Language="1033" Version="4.0.14.0" Manufacturer="Mike Fourie" UpgradeCode="CBBB56DB-4CAA-431D-9786-4D3471CCE222">
         <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine"/>
 
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed."/>
@@ -27,12 +27,10 @@
             </Directory>
             <Directory Id="ProgramFiles64Folder">
                 <?endif?>
-                <Directory Id="MSBuild" Name="MSBuild">
-                    <Directory Id="ExtensionPack" Name="ExtensionPack">
+                <Directory Id="MSBuildExtensionPack" Name="MSBuildExtensionPack">
                       <Directory Id="INSTALLFOLDER" Name="4.0">
                         <Directory Id="INSTALLRESOURCES" Name="Resources"/>
                       </Directory>
-                    </Directory>
                 </Directory>
             </Directory>
         </Directory>

diff --git a/Solutions/Main/Build/Setup/Resources/License.rtf b/Solutions/Main/Build/Setup/Resources/License.rtf
diff --git a/Solutions/Main/Build/Setup/Setup.x64.wixproj b/Solutions/Main/Build/Setup/Setup.x64.wixproj
@@ -15,6 +15,7 @@
     <SccAuxPath>SAK</SccAuxPath>
     <SccLocalPath>SAK</SccLocalPath>
     <Name>Setup.x86</Name>
+	<DefineSolutionProperties>false</DefineSolutionProperties>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <OutputPath>..\..\BuildBinaries\</OutputPath>

diff --git a/Solutions/Main/Build/Setup/Setup.x86.wixproj b/Solutions/Main/Build/Setup/Setup.x86.wixproj
@@ -15,6 +15,7 @@
     <SccAuxPath>SAK</SccAuxPath>
     <SccLocalPath>SAK</SccLocalPath>
     <Name>Setup.x86</Name>
+	<DefineSolutionProperties>false</DefineSolutionProperties>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>..\..\BuildBinaries\</OutputPath>

diff --git a/Solutions/Main/Common/BaseAppDomainIsolatedTask.cs b/Solutions/Main/Common/BaseAppDomainIsolatedTask.cs
@@ -1,6 +1,6 @@
-//-----------------------------------------------------------------------
-// <copyright file="BaseAppDomainIsolatedTask.cs">(c) http://www.msbuildextensionpack.com. This source is subject to the Microsoft Permissive License. See http://www.microsoft.com/resources/sharedsource/licensingbasics/sharedsourcelicenses.mspx. All other rights reserved.</copyright>
-//-----------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------------------------------------------------------------------------
+// <copyright file="BaseAppDomainIsolatedTask.cs">(c) 2017 Mike Fourie and Contributors (http://www.MSBuildExtensionPack.com) under MIT License. See https://opensource.org/licenses/MIT </copyright>
+//-------------------------------------------------------------------------------------------------------------------------------------------------------------------
 namespace MSBuild.ExtensionPack
 {
     using System;

diff --git a/Solutions/Main/Common/BaseTask.cs b/Solutions/Main/Common/BaseTask.cs
@@ -1,6 +1,6 @@
-//-----------------------------------------------------------------------
-// <copyright file="BaseTask.cs">(c) http://www.msbuildextensionpack.com. This source is subject to the Microsoft Permissive License. See http://www.microsoft.com/resources/sharedsource/licensingbasics/sharedsourcelicenses.mspx. All other rights reserved.</copyright>
-//-----------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------------------------------------------------------------------------
+// <copyright file="BaseTask.cs">(c) 2017 Mike Fourie and Contributors (http://www.MSBuildExtensionPack.com) under MIT License. See https://opensource.org/licenses/MIT </copyright>
+//-------------------------------------------------------------------------------------------------------------------------------------------------------------------
 namespace MSBuild.ExtensionPack
 {
     using System;

diff --git a/Solutions/Main/Common/CommonAssemblyInfo.cs b/Solutions/Main/Common/CommonAssemblyInfo.cs
@@ -1,15 +1,15 @@
-//-----------------------------------------------------------------------
-// <copyright file="CommonAssemblyInfo.cs">(c) http://www.msbuildextensionpack.com. This source is subject to the Microsoft Permissive License. See http://www.microsoft.com/resources/sharedsource/licensingbasics/sharedsourcelicenses.mspx. All other rights reserved.</copyright>
-//-----------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------------------------------------------------------------------------
+// <copyright file="CommonAssemblyInfo.cs">(c) 2017 Mike Fourie and Contributors (http://www.MSBuildExtensionPack.com) under MIT License. See https://opensource.org/licenses/MIT </copyright>
+//-------------------------------------------------------------------------------------------------------------------------------------------------------------------
 using System.Reflection;
 using System.Resources;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyVersion("4.0.0.0")]
-[assembly: AssemblyFileVersion("4.0.13.0")]
+[assembly: AssemblyFileVersion("4.0.14.0")]
 [assembly: AssemblyInformationalVersion("4.0.0.0")]
 [assembly: AssemblyCompany("http://www.MSBuildExtensionPack.com")]
-[assembly: AssemblyCopyright("Copyright © 2008 - 2016 http://www.MSBuildExtensionPack.com")]
+[assembly: AssemblyCopyright("Copyright © 2008 - 2017 Mike Fourie and Contributors under MIT License. See https://opensource.org/licenses/MIT")]
 [assembly: AssemblyTrademark("Mike Fourie")]
 [assembly: NeutralResourcesLanguage("")]
 [assembly: AssemblyCulture("")]

diff --git a/Solutions/Main/Common/MSBuild.ExtensionPack.tasks b/Solutions/Main/Common/MSBuild.ExtensionPack.tasks
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <BuildPath Condition="'$(BuildPath)' == ''">$(MSBuildProjectDirectory)</BuildPath>
         <ExtensionTasksPath Condition="Exists('$(BuildPath)\..\..\BuildBinaries\MSBuild.ExtensionPack.dll')">$(BuildPath)\..\..\BuildBinaries\</ExtensionTasksPath>
-        <ExtensionTasksPath Condition="'$(ExtensionTasksPath)' == ''">$(MSBuildExtensionsPath)\ExtensionPack\4.0\</ExtensionTasksPath>
+        <ExtensionTasksPath Condition="'$(ExtensionTasksPath)' == ''">$(ProgramFiles)\MSBuildExtensionPack\4.0\</ExtensionTasksPath>
     </PropertyGroup>
 
     <!-- ============== Crm ============== -->