Merge pull request #126 from Particular/release-7.0

Release 7.0

Author: bording

.gitattributes

@@ -64,11 +64,6 @@
 *.bat text eol=crlf
 
 # Custom for Visual Studio
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union 
-*.sln text eol=crlf merge=union
 *.suo 	-text -diff
 *.snk 	-text -diff
 *.cub 	-text -diff

.gitignore

@@ -12,10 +12,12 @@ results
 CommonAssemblyInfo.cs
 lib/sqlite/System.Data.SQLite.dll
 *.orig
+*.zip
 Samples/DataBus/storage
 packages
 PrecompiledWeb
 tempstorage
+.learningtransport
 core-only
 Release
 Artifacts
@@ -41,6 +43,9 @@ installer/ServiceControl-cache
 # User-specific files
 *.suo
 *.user
+*.json.lock
+*.nuget.targets
+*.lock.json
 *.userosscache
 *.sln.docstates
 .vs/

CODEOWNERS

@@ -0,0 +1,2 @@
+# These owners will be the default owners for everything in the repo.
+*      @Particular/nservicebus-maintainers

GitVersion.yml

@@ -1,7 +1,7 @@
 assembly-versioning-scheme: Major
-next-version: 6.0
+next-version: 7.0
 branches:
   develop:
     tag: alpha
-  releases?[/-]:
+  release:
     tag: rc

Octopus/DeploymentProcess.json

@@ -0,0 +1,8 @@
+<Project>
+
+  <PropertyGroup>
+    <LangVersion>latest</LangVersion>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+</Project>