Merge branch 'release-2.2.0'

Particular · Dec 10, 2018 · 35c39a3 · 35c39a3
2 parents c0a04c0 + 6d5ec82
commit 35c39a3
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/src/NServiceBus.Newtonsoft.Json/NServiceBus.Newtonsoft.Json.csproj b/src/NServiceBus.Newtonsoft.Json/NServiceBus.Newtonsoft.Json.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="[11.0.1, 12.0.0)" />
+    <PackageReference Include="Newtonsoft.Json" Version="[12.0.1, 13.0.0)" />
     <PackageReference Include="NServiceBus" Version="[7.0.0, 8.0.0)" />
     <PackageReference Include="Particular.Packaging" Version="0.1.0" PrivateAssets="All" />
   </ItemGroup>
@@ -17,4 +17,4 @@
     <DotNetCliToolReference Include="dotnet-sourcelink-git" Version="2.5.0" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/src/Sample/MyHandler.cs b/src/Sample/MyHandler.cs
@@ -6,7 +6,7 @@ class MyHandler : IHandleMessages<MyMessage>
 {
     public Task Handle(MyMessage message, IMessageHandlerContext context)
     {
-        Console.Write("Hello from MyHandler " + message.DateSend);
+        Console.WriteLine("Hello from MyHandler " + message.DateSend);
         return Task.FromResult(0);
     }
 }
diff --git a/src/Sample/Program.cs b/src/Sample/Program.cs
@@ -25,6 +25,6 @@ static async Task Run(EndpointConfiguration endpointConfiguration)
         await endpoint.SendLocal(myMessage)
             .ConfigureAwait(false);
         Console.WriteLine("\r\nPress any key to stop program\r\n");
-        Console.Read();
+        Console.ReadKey();
     }
 }
diff --git a/src/Sample/Sample.csproj b/src/Sample/Sample.csproj
@@ -1,12 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net452;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net452;netcoreapp2.1</TargetFrameworks>
     <OutputType>exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\NServiceBus.Newtonsoft.Json\NServiceBus.Newtonsoft.Json.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="NServiceBus" Version="7.1.0" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net452;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net452;netcoreapp2.1</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\NServiceBus.snk</AssemblyOriginatorKeyFile>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@@ -15,14 +15,15 @@
     <PackageReference Include="ApprovalTests" Version="3.0.13" NoWarn="NU1701" />
     <PackageReference Include="ApprovalUtilities" Version="3.0.13" NoWarn="NU1701" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
-    <PackageReference Include="NServiceBus" Version="7.0.0" />
-    <PackageReference Include="NUnit" Version="3.7.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+    <PackageReference Include="NServiceBus" Version="7.1.0" />
+    <PackageReference Include="NUnit" Version="3.10.1" />
+    <!-- requires a version that works with PublicApiGenerator (Mono.Cecil) -->
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0-alpha1" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
     <PackageReference Include="PublicApiGenerator" Version="6.4.0" />
   </ItemGroup>
 
-</Project>
+</Project>