Merge branch 'release-6.0.0'

Particular · Oct 5, 2016 · 569b6ae · 569b6ae
2 parents 9360a7e + 610f976
commit 569b6ae
Show file tree

Hide file tree

Showing 1,975 changed files with 77,851 additions and 51,619 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,9 +12,11 @@ results
 CommonAssemblyInfo.cs
 lib/sqlite/System.Data.SQLite.dll
 *.orig
+*.zip
 Samples/DataBus/storage
 packages
 PrecompiledWeb
+tempstorage
 core-only
 Release
 Artifacts
@@ -82,4 +84,8 @@ _ReSharper*/
 src/scaffolding.config
 
 # Approval tests temp file
-*.received.*
+*.received.*
+
+# JetBrains Rider
+.idea/
+*.sln.iml
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/IntegrationTests/GenericHost/GenericHost.sln b/IntegrationTests/GenericHost/GenericHost.sln
diff --git a/IntegrationTests/GenericHost/Logging/App.config b/IntegrationTests/GenericHost/Logging/App.config
diff --git a/IntegrationTests/GenericHost/Logging/Endpoint.cs b/IntegrationTests/GenericHost/Logging/Endpoint.cs
diff --git a/IntegrationTests/GenericHost/Logging/Logging.csproj b/IntegrationTests/GenericHost/Logging/Logging.csproj
diff --git a/IntegrationTests/GenericHost/LoggingWithConfigurableThreshold/App.config b/IntegrationTests/GenericHost/LoggingWithConfigurableThreshold/App.config
diff --git a/IntegrationTests/GenericHost/LoggingWithConfigurableThreshold/EndpointConfig.cs b/IntegrationTests/GenericHost/LoggingWithConfigurableThreshold/EndpointConfig.cs
diff --git a/...ests/GenericHost/LoggingWithConfigurableThreshold/LoggingWithConfigurableThreshold.csproj b/...ests/GenericHost/LoggingWithConfigurableThreshold/LoggingWithConfigurableThreshold.csproj
diff --git a/IntegrationTests/MessageMutators/Client/App.config b/IntegrationTests/MessageMutators/Client/App.config
diff --git a/IntegrationTests/MessageMutators/Client/Client.cs b/IntegrationTests/MessageMutators/Client/Client.cs