Merge pull request #123 from Particular/hotfix-6.0.1

Hotfix 6.0.1
Particular · Mar 24, 2017 · c2ee59f · c2ee59f
2 parents 2ba54f6 + 709eea0
commit c2ee59f
Show file tree

Hide file tree

Showing 17 changed files with 202 additions and 240 deletions.
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -0,0 +1,7 @@
+assembly-versioning-scheme: Major
+next-version: 6.0
+branches:
+  develop:
+    tag: alpha
+  releases?[/-]:
+    tag: rc
diff --git a/GitVersionConfig.yaml b/GitVersionConfig.yaml
diff --git a/Octopus/DeploymentProcess.json b/Octopus/DeploymentProcess.json
diff --git a/Octopus/Project.json b/Octopus/Project.json
diff --git a/packaging/nuget/nservicebus.hosting.profiles.nuspec b/packaging/nuget/nservicebus.hosting.profiles.nuspec
@@ -19,6 +19,6 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="..\..\src\NServiceBus.Hosting.Profiles\**\*.cs" target="content\App_Packages\NServiceBus.Hosting.Profiles" />
+    <file src="..\..\src\NServiceBus.Hosting.Profiles\**\*.cs" exclude="..\..\src\NServiceBus.Hosting.Profiles\obj\**\*.cs" target="content\App_Packages\NServiceBus.Hosting.Profiles" />
   </files>
 </package>
diff --git a/src/NServiceBus.Host.Deploy/NServiceBus.Host.Deploy.csproj b/src/NServiceBus.Host.Deploy/NServiceBus.Host.Deploy.csproj
diff --git a/src/NServiceBus.Host.Deploy/packages.config b/src/NServiceBus.Host.Deploy/packages.config
diff --git a/src/NServiceBus.Host.sln b/src/NServiceBus.Host.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30723.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.9
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NServiceBus.Host32", "NServiceBus.Hosting.Windows\NServiceBus.Host32.csproj", "{79487CAA-C060-49C8-B689-6250C61A46D5}"
 EndProject
@@ -16,13 +16,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{5026BE
 		.nuget\packages.config = .nuget\packages.config
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NServiceBus.Host.Deploy", "NServiceBus.Host.Deploy\NServiceBus.Host.Deploy.csproj", "{3CC95C0D-6F30-4E47-9F0E-DFC4C375F6D8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{60826589-EB19-46F7-9567-69F46C3668B9} = {60826589-EB19-46F7-9567-69F46C3668B9}
-		{79487CAA-C060-49C8-B689-6250C61A46D5} = {79487CAA-C060-49C8-B689-6250C61A46D5}
-		{85E813C0-4A94-4946-8B1F-DE1E39AA7D11} = {85E813C0-4A94-4946-8B1F-DE1E39AA7D11}
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -73,16 +66,6 @@ Global
 		{93B2CD66-7860-47A3-A039-B7D778E9A8F4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{93B2CD66-7860-47A3-A039-B7D778E9A8F4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{93B2CD66-7860-47A3-A039-B7D778E9A8F4}.Release|x86.ActiveCfg = Release|Any CPU
-		{3CC95C0D-6F30-4E47-9F0E-DFC4C375F6D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3CC95C0D-6F30-4E47-9F0E-DFC4C375F6D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3CC95C0D-6F30-4E47-9F0E-DFC4C375F6D8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3CC95C0D-6F30-4E47-9F0E-DFC4C375F6D8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3CC95C0D-6F30-4E47-9F0E-DFC4C375F6D8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3CC95C0D-6F30-4E47-9F0E-DFC4C375F6D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3CC95C0D-6F30-4E47-9F0E-DFC4C375F6D8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3CC95C0D-6F30-4E47-9F0E-DFC4C375F6D8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3CC95C0D-6F30-4E47-9F0E-DFC4C375F6D8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{3CC95C0D-6F30-4E47-9F0E-DFC4C375F6D8}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE