Merge pull request #442 from Particular/release-4.0

Release 4.0
Particular · May 15, 2018 · 1aa1d48 · 1aa1d48
2 parents a8b3787 + 41d7139
commit 1aa1d48
Show file tree

Hide file tree

Showing 128 changed files with 1,831 additions and 3,209 deletions.
diff --git a/.gitattributes b/.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

diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,7 +1,7 @@
 assembly-versioning-scheme: Major
-next-version: 3.1
+next-version: 4.0
 branches:
   develop:
     tag: alpha
   release:
-    tag: rc
+    tag: rc
diff --git a/packaging/nuget/NServiceBus.SqlServer.nuspec b/packaging/nuget/NServiceBus.SqlServer.nuspec
diff --git a/...ibilityTests/Facade_1.2/Facade_1.2.csproj → ...ibilityTests/Facade_1.2/Facade_1_2.csproj b/...ibilityTests/Facade_1.2/Facade_1.2.csproj → ...ibilityTests/Facade_1.2/Facade_1_2.csproj
@@ -1,15 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>net452</TargetFramework>
     <AssemblyName>Facade</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="log4net" Version="2.0.0" />
-    <PackageReference Include="NServiceBus" Version="4.4.8" />
-    <PackageReference Include="NServiceBus.Interfaces" Version="4.4.8" />
-    <PackageReference Include="NServiceBus.SqlServer" Version="1.2.5" />
     <ProjectReference Include="..\..\NServiceBus.SqlServer.CompatibilityTests.Common\NServiceBus.SqlServer.CompatibilityTests.Common.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
     <Reference Include="System.Configuration" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="log4net" Version="2.*" />
+    <PackageReference Include="NServiceBus" Version="4.*" />
+    <PackageReference Include="NServiceBus.Interfaces" Version="4.*" />
+    <PackageReference Include="NServiceBus.SqlServer" Version="1.2.*" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/CompatibilityTests/Facade_1.2/packages.config b/src/CompatibilityTests/Facade_1.2/packages.config
diff --git a/src/CompatibilityTests/Facade_2.2/EndpointFacade.cs b/src/CompatibilityTests/Facade_2.2/EndpointFacade.cs
@@ -160,9 +160,8 @@ public void Invoke(IncomingContext context, Action next)
         {
             next();
 
-            string intent;
 
-            if (context.PhysicalMessage.Headers.TryGetValue(Headers.MessageIntent, out intent) && intent == "Subscribe")
+            if (context.PhysicalMessage.Headers.TryGetValue(Headers.MessageIntent, out var intent) && intent == "Subscribe")
             {
                 SubscriptionStore.Increment();
             }

diff --git a/...ibilityTests/Facade_2.2/Facade_2.2.csproj → ...ibilityTests/Facade_2.2/Facade_2_2.csproj b/...ibilityTests/Facade_2.2/Facade_2.2.csproj → ...ibilityTests/Facade_2.2/Facade_2_2.csproj
@@ -1,15 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>net452</TargetFramework>
     <AssemblyName>Facade</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="log4net" Version="2.0.0" />
-    <PackageReference Include="NServiceBus" Version="5.2.14" />
-    <PackageReference Include="NServiceBus.Log4Net" Version="1.0.0" />
-    <PackageReference Include="NServiceBus.SqlServer" Version="2.2.4" />
     <ProjectReference Include="..\..\NServiceBus.SqlServer.CompatibilityTests.Common\NServiceBus.SqlServer.CompatibilityTests.Common.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
     <Reference Include="System.Configuration" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="log4net" Version="2.*" />
+    <PackageReference Include="NServiceBus" Version="5.*" />
+    <PackageReference Include="NServiceBus.Log4Net" Version="1.*" />
+    <PackageReference Include="NServiceBus.SqlServer" Version="2.2.*" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/CompatibilityTests/Facade_2.2/packages.config b/src/CompatibilityTests/Facade_2.2/packages.config
diff --git a/src/CompatibilityTests/Facade_3.0/EndpointFacade.cs b/src/CompatibilityTests/Facade_3.0/EndpointFacade.cs
@@ -185,9 +185,8 @@ class SubscriptionMonitoringBehavior : Behavior<IIncomingPhysicalMessageContext>
         public override async Task Invoke(IIncomingPhysicalMessageContext context, Func<Task> next)
         {
             await next();
-            string intent;
 
-            if (context.Message.Headers.TryGetValue(Headers.MessageIntent, out intent) && intent == "Subscribe")
+            if (context.Message.Headers.TryGetValue(Headers.MessageIntent, out var intent) && intent == "Subscribe")
             {
                 SubscriptionStore.Increment();
             }

diff --git a/...ibilityTests/Facade_3.0/Facade_3.0.csproj → ...ibilityTests/Facade_3.0/Facade_3_0.csproj b/...ibilityTests/Facade_3.0/Facade_3.0.csproj → ...ibilityTests/Facade_3.0/Facade_3_0.csproj
@@ -1,14 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>net452</TargetFramework>
     <AssemblyName>Facade</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus" Version="6.3.1" />
-    <PackageReference Include="NServiceBus.Callbacks" Version="2.0.0" />
-    <PackageReference Include="NServiceBus.SqlServer" Version="3.0.2" />
     <ProjectReference Include="..\..\NServiceBus.SqlServer.CompatibilityTests.Common\NServiceBus.SqlServer.CompatibilityTests.Common.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
     <Reference Include="System.Configuration" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="NServiceBus" Version="6.*" />
+    <PackageReference Include="NServiceBus.Callbacks" Version="2.*" />
+    <PackageReference Include="NServiceBus.SqlServer" Version="3.0.*" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/CompatibilityTests/Facade_3.0/packages.config b/src/CompatibilityTests/Facade_3.0/packages.config
diff --git a/src/CompatibilityTests/Facade_3.1/EndpointFacade.cs b/src/CompatibilityTests/Facade_3.1/EndpointFacade.cs
@@ -197,9 +197,8 @@ class SubscriptionMonitoringBehavior : Behavior<IIncomingPhysicalMessageContext>
         public override async Task Invoke(IIncomingPhysicalMessageContext context, Func<Task> next)
         {
             await next();
-            string intent;
 
-            if (context.Message.Headers.TryGetValue(Headers.MessageIntent, out intent) && intent == "Subscribe")
+            if (context.Message.Headers.TryGetValue(Headers.MessageIntent, out var intent) && intent == "Subscribe")
             {
                 SubscriptionStore.Increment();
             }

diff --git a/...ibilityTests/Facade_3.1/Facade_3.1.csproj → ...ibilityTests/Facade_3.1/Facade_3_1.csproj b/...ibilityTests/Facade_3.1/Facade_3.1.csproj → ...ibilityTests/Facade_3.1/Facade_3_1.csproj
@@ -1,14 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>net452</TargetFramework>
     <AssemblyName>Facade</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus" Version="6.3.1" />
-    <PackageReference Include="NServiceBus.Callbacks" Version="2.0.0" />
     <ProjectReference Include="..\..\NServiceBus.SqlServer.CompatibilityTests.Common\NServiceBus.SqlServer.CompatibilityTests.Common.csproj" />
-    <ProjectReference Include="..\..\NServiceBus.SqlServer\NServiceBus.SqlServer.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
     <Reference Include="System.Configuration" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="NServiceBus" Version="6.*" />
+    <PackageReference Include="NServiceBus.Callbacks" Version="2.*" />
+    <PackageReference Include="NServiceBus.SqlServer" Version="3.1.*" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/CompatibilityTests/Facade_3.1/packages.config b/src/CompatibilityTests/Facade_3.1/packages.config
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -0,0 +1,8 @@
+<Project>
+
+  <PropertyGroup>
+    <LangVersion>latest</LangVersion>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+</Project>
diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/Configuration/AppConfig.cs b/src/NServiceBus.SqlServer.AcceptanceTests/Configuration/AppConfig.cs
diff --git a/...ceptanceTests/Configuration/When_using_v2_configuration_app_config_for_schema_override.cs b/...ceptanceTests/Configuration/When_using_v2_configuration_app_config_for_schema_override.cs