Fix MSDeploy target to output valid attribute ("kind" instead of "type")

Source/Artefacts/Scripts/StealFocus.Build.MSDeploy2.1.targets

@@ -96,7 +96,7 @@
       TaskAction="AddAttribute"
       File="$(ParametersXmlFilePath)"
       Element="/parameters/parameter[last()]/parameterValidation"
-      Key="type"
+      Key="kind"
       Value="RegularExpression" />
     <MSBuild.ExtensionPack.Xml.XmlFile
       TaskAction="AddAttribute"
@@ -114,7 +114,7 @@
       TaskAction="AddAttribute"
       File="$(ParametersXmlFilePath)"
       Element="/parameters/parameter[last()]/parameterEntry"
-      Key="type"
+      Key="kind"
       Value="DeploymentObjectAttribute" />
     <MSBuild.ExtensionPack.Xml.XmlFile
       TaskAction="AddAttribute"
@@ -168,7 +168,7 @@
       TaskAction="AddAttribute"
       File="$(ParametersXmlFilePath)"
       Element="/parameters/parameter[last()]/parameterEntry"
-      Key="type"
+      Key="kind"
       Value="DeploymentObjectAttribute" />
     <MSBuild.ExtensionPack.Xml.XmlFile
       TaskAction="AddAttribute"

Source/Artefacts/Scripts/StealFocus.Build.MSTest2010.targets → Source/Artefacts/Scripts/StealFocus.Build.MSTest.targets

@@ -1,102 +1,107 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project 
-  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!-- 
-    IMPORTANT - please do not customise this .targets file. Modifications will affect all Solutions using the software 
-    factory and maybe overridden by future updates to the software factory. Customise your build process by editing 
-    the *.targets/*.proj files in your solution.
-  -->
-
-  <PropertyGroup Condition=" '$(MSTest2010ExePath)'=='' ">
-    <MSTest2010ExePath>$(SystemDrive)\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\MSTest.exe</MSTest2010ExePath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(MSTestAssemblyNameFilter)'=='' And '$(MSTestMetadataFilePath)'=='' ">
-    <MSTestAssemblyNameFilter>*Tests*.dll</MSTestAssemblyNameFilter>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(MSTestWebTestFilter)'=='' And '$(MSTestMetadataFilePath)'=='' ">
-    <MSTestWebTestFilter>*.webtest</MSTestWebTestFilter>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(MSTestLoadTestFilter)'=='' And '$(MSTestMetadataFilePath)'=='' ">
-    <MSTestLoadTestFilter>*.loadtest</MSTestLoadTestFilter>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(MSTestSettingsFilePath)'=='' And '$(MSTestMetadataFilePath)'=='' ">
-    <MSTestSettingsFilePath>$(SolutionDirectoryPath)\Local.testsettings</MSTestSettingsFilePath>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <!--
-    <MSTestMetadataFilePath>$(SolutionDirectoryPath)\Acme.PetShop.vsmdi</MSTestMetadataFilePath>
-    <MSTestCategoryFilter>MyFilter</MSTestCategoryFilter>
-    <MSTestMaxPriority>100</MSTestMaxPriority>
-    <MSTestMinPriority>0</MSTestMinPriority>
-    -->
-  </PropertyGroup>
-
-  <Target Name="ShowMSTestProperties">
-    <Message
-      Importance="high"
-      Text="Using the following properties for MSTest." />
-    <Message
-      Importance="high"
-      Text="'MSTest2010ExePath' is '$(MSTest2010ExePath)'." />
-    <Message
-      Importance="high"
-      Text="'MSTestAssemblyNameFilter' is '$(MSTestAssemblyNameFilter)'." />
-    <Message
-      Importance="high"
-      Text="'MSTestWebTestFilter' is '$(MSTestWebTestFilter)'." />
-    <Message
-      Importance="high"
-      Text="'MSTestLoadTestFilter' is '$(MSTestLoadTestFilter)'." />
-    <Message
-      Importance="high"
-      Text="'MSTestSettingsFilePath' is '$(MSTestSettingsFilePath)'." />
-    <Message
-      Importance="high"
-      Text="'MSTestMetadataFilePath' is '$(MSTestMetadataFilePath)'." />
-    <Message
-      Importance="high"
-      Text="'MSTestCategoryFilter' is '$(MSTestCategoryFilter)'." />
-    <Message
-      Importance="high"
-      Text="'MSTestMaxPriority' is '$(MSTestMaxPriority)'." />
-    <Message
-      Importance="high"
-      Text="'MSTestMinPriority' is '$(MSTestMinPriority)'." />
-  </Target>
-
-  <Target Name="RunMSTest" DependsOnTargets="ShowMSTestProperties">
-    <Message
-      Importance="high"
-      Text="Running tests for configuration '$(Configuration)'." />
-    <ItemGroup>
-      <TestContainer Include="$(BuildDirectoryPath)\$(Configuration)\$(MSTestAssemblyNameFilter)" />
-      <TestContainer Include="$(BuildDirectoryPath)\$(Configuration)\$(MSTestWebTestFilter)" />
-      <TestContainer Include="$(BuildDirectoryPath)\$(Configuration)\$(MSTestLoadTestFilter)" />
-    </ItemGroup>
-    <PropertyGroup>
-      <TestContainerSwitchesTemp>@(TestContainer->' /testcontainer:"%(fullpath)"')</TestContainerSwitchesTemp>
-      <TestContainerSwitches>$(TestContainerSwitchesTemp.Replace(";", ""))</TestContainerSwitches>
-    </PropertyGroup>
-    <ConvertToAbsolutePath Paths="$(MSTestSettingsFilePath)">
-      <Output 
-        TaskParameter="AbsolutePaths" 
-        PropertyName="MSTestSettingsAbsoluteFilePath"/>
-    </ConvertToAbsolutePath>
-    <PropertyGroup Condition=" '$(MSTestMetadataFilePath)'=='' ">
-      <MSTestArgs>$(TestContainerSwitches) /testsettings:"$(MSTestSettingsAbsoluteFilePath)"</MSTestArgs>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(MSTestMetadataFilePath)'!='' ">
-      <MSTestArgs>/testmetadata:"$(MSTestMetadataFilePath)" /maxpriority:$(MSTestMaxPriority) /minpriority:$(MSTestMinPriority) /category:$(MSTestCategoryFilter)</MSTestArgs>
-    </PropertyGroup>
-    <Exec
-      Command='"$(MSTest2010ExePath)" $(MSTestArgs)'
-      WorkingDirectory="$(SolutionDirectoryPath)" />
-  </Target>
-
+<?xml version="1.0" encoding="utf-8"?>
+<Project 
+  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- 
+    IMPORTANT - please do not customise this .targets file. Modifications will affect all Solutions using the software 
+    factory and maybe overridden by future updates to the software factory. Customise your build process by editing 
+    the *.targets/*.proj files in your solution.
+  -->
+
+  <!-- Preserved for backward compatibility -->
+  <PropertyGroup Condition=" '$(MSTest2010ExePath)'!='' And '$(MSTestExePath)'=='' ">
+    <MSTestExePath>$(MSTest2010ExePath)</MSTestExePath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(MSTestExePath)'=='' ">
+    <MSTestExePath>$(SystemDrive)\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\MSTest.exe</MSTestExePath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(MSTestAssemblyNameFilter)'=='' And '$(MSTestMetadataFilePath)'=='' ">
+    <MSTestAssemblyNameFilter>*Tests*.dll</MSTestAssemblyNameFilter>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(MSTestWebTestFilter)'=='' And '$(MSTestMetadataFilePath)'=='' ">
+    <MSTestWebTestFilter>*.webtest</MSTestWebTestFilter>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(MSTestLoadTestFilter)'=='' And '$(MSTestMetadataFilePath)'=='' ">
+    <MSTestLoadTestFilter>*.loadtest</MSTestLoadTestFilter>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(MSTestSettingsFilePath)'=='' And '$(MSTestMetadataFilePath)'=='' ">
+    <MSTestSettingsFilePath>$(SolutionDirectoryPath)\Local.testsettings</MSTestSettingsFilePath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!--
+    <MSTestMetadataFilePath>$(SolutionDirectoryPath)\Acme.PetShop.vsmdi</MSTestMetadataFilePath>
+    <MSTestCategoryFilter>MyFilter</MSTestCategoryFilter>
+    <MSTestMaxPriority>100</MSTestMaxPriority>
+    <MSTestMinPriority>0</MSTestMinPriority>
+    -->
+  </PropertyGroup>
+
+  <Target Name="ShowMSTestProperties">
+    <Message
+      Importance="high"
+      Text="Using the following properties for MSTest." />
+    <Message
+      Importance="high"
+      Text="'MSTest2010ExePath' is '$(MSTest2010ExePath)'." />
+    <Message
+      Importance="high"
+      Text="'MSTestAssemblyNameFilter' is '$(MSTestAssemblyNameFilter)'." />
+    <Message
+      Importance="high"
+      Text="'MSTestWebTestFilter' is '$(MSTestWebTestFilter)'." />
+    <Message
+      Importance="high"
+      Text="'MSTestLoadTestFilter' is '$(MSTestLoadTestFilter)'." />
+    <Message
+      Importance="high"
+      Text="'MSTestSettingsFilePath' is '$(MSTestSettingsFilePath)'." />
+    <Message
+      Importance="high"
+      Text="'MSTestMetadataFilePath' is '$(MSTestMetadataFilePath)'." />
+    <Message
+      Importance="high"
+      Text="'MSTestCategoryFilter' is '$(MSTestCategoryFilter)'." />
+    <Message
+      Importance="high"
+      Text="'MSTestMaxPriority' is '$(MSTestMaxPriority)'." />
+    <Message
+      Importance="high"
+      Text="'MSTestMinPriority' is '$(MSTestMinPriority)'." />
+  </Target>
+
+  <Target Name="RunMSTest" DependsOnTargets="ShowMSTestProperties">
+    <Message
+      Importance="high"
+      Text="Running tests for configuration '$(Configuration)'." />
+    <ItemGroup>
+      <TestContainer Include="$(BuildDirectoryPath)\$(Configuration)\$(MSTestAssemblyNameFilter)" />
+      <TestContainer Include="$(BuildDirectoryPath)\$(Configuration)\$(MSTestWebTestFilter)" />
+      <TestContainer Include="$(BuildDirectoryPath)\$(Configuration)\$(MSTestLoadTestFilter)" />
+    </ItemGroup>
+    <PropertyGroup>
+      <TestContainerSwitchesTemp>@(TestContainer->' /testcontainer:"%(fullpath)"')</TestContainerSwitchesTemp>
+      <TestContainerSwitches>$(TestContainerSwitchesTemp.Replace(";", ""))</TestContainerSwitches>
+    </PropertyGroup>
+    <ConvertToAbsolutePath Paths="$(MSTestSettingsFilePath)">
+      <Output 
+        TaskParameter="AbsolutePaths" 
+        PropertyName="MSTestSettingsAbsoluteFilePath"/>
+    </ConvertToAbsolutePath>
+    <PropertyGroup Condition=" '$(MSTestMetadataFilePath)'=='' ">
+      <MSTestArgs>$(TestContainerSwitches) /testsettings:"$(MSTestSettingsAbsoluteFilePath)"</MSTestArgs>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(MSTestMetadataFilePath)'!='' ">
+      <MSTestArgs>/testmetadata:"$(MSTestMetadataFilePath)" /maxpriority:$(MSTestMaxPriority) /minpriority:$(MSTestMinPriority) /category:$(MSTestCategoryFilter)</MSTestArgs>
+    </PropertyGroup>
+    <Exec
+      Command='"$(MSTest2010ExePath)" $(MSTestArgs)'
+      WorkingDirectory="$(SolutionDirectoryPath)" />
+  </Target>
+
 </Project>

Source/Artefacts/Scripts/StealFocus.Build.WindowsAzure.targets

@@ -22,7 +22,7 @@
     </CreateProperty>
     <Exec
       Condition=" '$(AzureSubscriptions)'=='true' And '%(AzureSubscription.Identity)'!='' "
-      Command="powershell -ExecutionPolicy Unrestricted -NonInteractive -File $(MSBuildThisFileDirectory)\StealFocus.Build.WindowsAzure.CreateAzureSubscription.ps1 -currentDirectory $(MSBuildThisFileDirectory) -subscriptionName %22%(AzureSubscription.Name)%22 -subscriptionId %22%(AzureSubscription.Identity)%22 -managementCertificateThumbprint %22%(AzureSubscription.ManagementCertificateThumbprint)%22"
+      Command="powershell -ExecutionPolicy Unrestricted -NonInteractive -NoProfile -File $(MSBuildThisFileDirectory)\StealFocus.Build.WindowsAzure.CreateAzureSubscription.ps1 -currentDirectory $(MSBuildThisFileDirectory) -subscriptionName %22%(AzureSubscription.Name)%22 -subscriptionId %22%(AzureSubscription.Identity)%22 -managementCertificateThumbprint %22%(AzureSubscription.ManagementCertificateThumbprint)%22"
       LogStandardErrorAsError="true"
       ContinueOnError="false"
       WorkingDirectory="." />
@@ -41,7 +41,7 @@
     </CreateProperty>
     <Exec
       Condition=" '$(AzureAffinityGroups)'=='true' And '%(AzureAffinityGroup.Identity)'!='' "
-      Command="powershell -ExecutionPolicy Unrestricted -NonInteractive -File $(MSBuildThisFileDirectory)\StealFocus.Build.WindowsAzure.CreateAzureAffinityGroup.ps1 -currentDirectory $(MSBuildThisFileDirectory) -subscriptionName %22%(AzureAffinityGroup.SubscriptionName)%22 -affinityGroupName %22%(AzureAffinityGroup.Identity)%22 -affinityGroupLabel %22%(AzureAffinityGroup.Label)%22 -affinityGroupLocation %22%(AzureAffinityGroup.Location)%22"
+      Command="powershell -ExecutionPolicy Unrestricted -NonInteractive -NoProfile -File $(MSBuildThisFileDirectory)\StealFocus.Build.WindowsAzure.CreateAzureAffinityGroup.ps1 -currentDirectory $(MSBuildThisFileDirectory) -subscriptionName %22%(AzureAffinityGroup.SubscriptionName)%22 -affinityGroupName %22%(AzureAffinityGroup.Identity)%22 -affinityGroupLabel %22%(AzureAffinityGroup.Label)%22 -affinityGroupLocation %22%(AzureAffinityGroup.Location)%22"
       LogStandardErrorAsError="true"
       ContinueOnError="false"
       WorkingDirectory="." />
@@ -60,7 +60,7 @@
     </CreateProperty>
     <Exec
       Condition=" '$(AzureStorageAccounts)'=='true' And '%(AzureStorageAccount.Identity)'!='' "
-      Command="powershell -ExecutionPolicy Unrestricted -NonInteractive -File $(MSBuildThisFileDirectory)\StealFocus.Build.WindowsAzure.CreateAzureStorageAccount.ps1 -currentDirectory $(MSBuildThisFileDirectory) -subscriptionName %22%(AzureStorageAccount.SubscriptionName)%22 -affinityGroupName %22%(AzureStorageAccount.AffinityGroupName)%22 -storageAccountName %22%(AzureStorageAccount.Identity)%22 -storageAccountLabel %22%(AzureStorageAccount.Label)%22"
+      Command="powershell -ExecutionPolicy Unrestricted -NonInteractive -NoProfile -File $(MSBuildThisFileDirectory)\StealFocus.Build.WindowsAzure.CreateAzureStorageAccount.ps1 -currentDirectory $(MSBuildThisFileDirectory) -subscriptionName %22%(AzureStorageAccount.SubscriptionName)%22 -affinityGroupName %22%(AzureStorageAccount.AffinityGroupName)%22 -storageAccountName %22%(AzureStorageAccount.Identity)%22 -storageAccountLabel %22%(AzureStorageAccount.Label)%22"
       LogStandardErrorAsError="true"
       ContinueOnError="false"
       WorkingDirectory="." />
@@ -79,7 +79,7 @@
     </CreateProperty>
     <Exec
       Condition=" '$(AzurePublish)'=='true' And '%(AzurePublishAction.Identity)'!='' "
-      Command="powershell -ExecutionPolicy Unrestricted -NonInteractive -File $(MSBuildThisFileDirectory)\StealFocus.Build.WindowsAzure.PublishAzurePackage.ps1 -currentDirectory $(MSBuildThisFileDirectory) -subscriptionName %22%(AzurePublishAction.SubscriptionName)%22 -affinityGroupName %22%(AzurePublishAction.AffinityGroupName)%22 -hostedServiceName %22%(AzurePublishAction.HostedServiceName)%22 -hostedServiceLabel %22%(AzurePublishAction.HostedServiceLabel)%22 -storageAccountName %22%(AzurePublishAction.StorageAccountName)%22 -packageFilePath %22%(AzurePublishAction.PackageFilePath)%22 -configurationFilePath %22%(AzurePublishAction.ConfigurationFilePath)%22 -deploymentLabel %22%(AzurePublishAction.DeploymentLabel)%22 -removeStagingEnvironmentAfterwards %(AzurePublishAction.RemoveStagingEnvironmentAfterwards) -promoteToProductionEnvironment %(AzurePublishAction.PromoteToProductionEnvironment)"
+      Command="powershell -ExecutionPolicy Unrestricted -NonInteractive -NoProfile -File $(MSBuildThisFileDirectory)\StealFocus.Build.WindowsAzure.PublishAzurePackage.ps1 -currentDirectory $(MSBuildThisFileDirectory) -subscriptionName %22%(AzurePublishAction.SubscriptionName)%22 -affinityGroupName %22%(AzurePublishAction.AffinityGroupName)%22 -hostedServiceName %22%(AzurePublishAction.HostedServiceName)%22 -hostedServiceLabel %22%(AzurePublishAction.HostedServiceLabel)%22 -storageAccountName %22%(AzurePublishAction.StorageAccountName)%22 -packageFilePath %22%(AzurePublishAction.PackageFilePath)%22 -configurationFilePath %22%(AzurePublishAction.ConfigurationFilePath)%22 -deploymentLabel %22%(AzurePublishAction.DeploymentLabel)%22 -removeStagingEnvironmentAfterwards %(AzurePublishAction.RemoveStagingEnvironmentAfterwards) -promoteToProductionEnvironment %(AzurePublishAction.PromoteToProductionEnvironment)"
       LogStandardErrorAsError="true"
       ContinueOnError="false"
       WorkingDirectory="." />

Source/Artefacts/Scripts/StealFocus.Build.targets

@@ -27,10 +27,6 @@
     <VisualStudioVersion>2010</VisualStudioVersion>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(MSTestVersion)' == '' ">
-    <MSTestVersion>2010</MSTestVersion>
-  </PropertyGroup>
-
   <PropertyGroup Condition=" '$(MaxBuildTimeInMinutes)'=='' ">
     <MaxBuildTimeInMinutes>10</MaxBuildTimeInMinutes>
   </PropertyGroup>
@@ -97,7 +93,7 @@
 
   <Import
     Condition=" '$(MSTestVersion)'=='2010' "
-    Project="StealFocus.Build.MSTest2010.targets" />
+    Project="StealFocus.Build.MSTest.targets" />
 
   <Import Project="StealFocus.Build.NUnit.targets" />
 
@@ -237,7 +233,7 @@
     </PropertyGroup>
     <Exec
       Condition=" !Exists('$(StateFilePath)') "
-      Command="powershell -ExecutionPolicy Unrestricted -NonInteractive -File $(MSBuildThisFileDirectory)\StealFocus.Build.ValidatePrerequisites.ps1 -currentDirectory $(MSBuildThisFileDirectory) -azurePublishActionRequired $(AzurePublishActionRequired)"
+      Command="powershell -ExecutionPolicy Unrestricted -NonInteractive -NoProfile -File $(MSBuildThisFileDirectory)\StealFocus.Build.ValidatePrerequisites.ps1 -currentDirectory $(MSBuildThisFileDirectory) -azurePublishActionRequired $(AzurePublishActionRequired)"
       LogStandardErrorAsError="true"
       ContinueOnError="false"
       WorkingDirectory="." />
@@ -316,9 +312,6 @@
     <Message
       Importance="high"
       Text="'MSTestResultsDirectoryPath' is '$(MSTestResultsDirectoryPath)'." />
-    <Message
-      Importance="high"
-      Text="'MSTestVersion' is '$(MSTestVersion)'." />
     <Message
       Importance="high"
       Text="'SdkPath' is '$(SdkPath)'." />

Source/StealFocus.Build.sln

@@ -1,6 +1,8 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.30723.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{6A09D61F-58E9-431B-82A2-63E13EBD7744}"
 	ProjectSection(SolutionItems) = preProject
 		Scripts\StealFocus.Build.CCNet.proj = Scripts\StealFocus.Build.CCNet.proj
@@ -18,7 +20,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{CCD2
 		Artefacts\Scripts\StealFocus.Build.BizTalk2010.targets = Artefacts\Scripts\StealFocus.Build.BizTalk2010.targets
 		Artefacts\Scripts\StealFocus.Build.IIS7.x.targets = Artefacts\Scripts\StealFocus.Build.IIS7.x.targets
 		Artefacts\Scripts\StealFocus.Build.MSDeploy2.1.targets = Artefacts\Scripts\StealFocus.Build.MSDeploy2.1.targets
-		Artefacts\Scripts\StealFocus.Build.MSTest2010.targets = Artefacts\Scripts\StealFocus.Build.MSTest2010.targets
+		Artefacts\Scripts\StealFocus.Build.MSTest.targets = Artefacts\Scripts\StealFocus.Build.MSTest.targets
 		Artefacts\Scripts\StealFocus.Build.NUnit.targets = Artefacts\Scripts\StealFocus.Build.NUnit.targets
 		Artefacts\Scripts\StealFocus.Build.Project.Assembly.targets = Artefacts\Scripts\StealFocus.Build.Project.Assembly.targets
 		Artefacts\Scripts\StealFocus.Build.Project.BizTalk2010.targets = Artefacts\Scripts\StealFocus.Build.Project.BizTalk2010.targets