Update deps and fix some tests

FoundatioFx · Jun 12, 2019 · 2d48727 · 2d48727
1 parent f3e08d4
commit 2d48727
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 12 deletions.
diff --git a/Foundatio.sln b/Foundatio.sln
@@ -10,8 +10,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 		appveyor.yml = appveyor.yml
 		build\common.props = build\common.props
-		README.md = README.md
+		src\Directory.Build.props = src\Directory.Build.props
+		tests\Directory.Build.props = tests\Directory.Build.props
 		Dockerfile = Dockerfile
+		global.json = global.json
+		README.md = README.md
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{A1DFF80C-113F-4FEC-84BB-1E3790FB410F}"

diff --git a/build/common.props b/build/common.props
@@ -36,7 +36,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19270-01" PrivateAssets="All"/>
     <PackageReference Include="AsyncFixer" Version="1.1.6" PrivateAssets="All" />
   </ItemGroup>
 

diff --git a/global.json b/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "2.2.300"
+  }
+}
diff --git a/samples/Foundatio.HostingSample/Foundatio.HostingSample.csproj b/samples/Foundatio.HostingSample/Foundatio.HostingSample.csproj
@@ -6,7 +6,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="3.0.1" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
   </ItemGroup>
 </Project>
diff --git a/src/Foundatio.AppMetrics/Foundatio.AppMetrics.csproj b/src/Foundatio.AppMetrics/Foundatio.AppMetrics.csproj
@@ -3,7 +3,7 @@
     <PackageTags>$(PackageTags);AppMetrics;Logging;Log</PackageTags>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="App.Metrics.Abstractions" Version="3.0.0" />
+    <PackageReference Include="App.Metrics.Abstractions" Version="3.1.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Foundatio\Foundatio.csproj" />

diff --git a/src/Foundatio.Hosting/Foundatio.Hosting.csproj b/src/Foundatio.Hosting/Foundatio.Hosting.csproj
@@ -4,7 +4,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="2.2.5" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="2.2.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/Foundatio.Jobs.Commands/Foundatio.Jobs.Commands.csproj b/src/Foundatio.Jobs.Commands/Foundatio.Jobs.Commands.csproj
@@ -4,6 +4,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
   </ItemGroup>
 </Project>
diff --git a/src/Foundatio.JsonNet/Foundatio.JsonNet.csproj b/src/Foundatio.JsonNet/Foundatio.JsonNet.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Foundatio\Foundatio.csproj" />

diff --git a/src/Foundatio/Foundatio.csproj b/src/Foundatio/Foundatio.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
-    <PackageReference Include="MessagePack" Version="1.7.3.4" />
+    <PackageReference Include="MessagePack" Version="1.7.3.7" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
   </ItemGroup>

diff --git a/src/Foundatio/Messaging/scenarios.md b/src/Foundatio/Messaging/scenarios.md
@@ -0,0 +1,18 @@
+- Multiple receivers (pub/sub)
+  - Fire and forget
+  - Message acknowledgement
+- Worker queues
+  - Single Worker
+  - Round robin workers
+- Delayed delivery
+  - Can schedule delivery, messages are persisted to a message store and a background task polls for messages that are due and then sends them out
+- Message persistence
+  - Not all messages need to be persisted and guaranteed delivery
+- Message subscriptions are push based with prefetch count setting which should greatly improve throughput
+- Can either use generic method overloads or use options to change the message type or topic the message is being published to
+- Can subscribe to multiple message types by controlling the message topic instead of using the default topic per .net type
+- Request/response
+  - Publishes message and then does a single message receive on a topic that is for that exact request and waits the specified amount of time
+- Receive message (pull model)
+  - Equivalent of current worker queues pulling a single message at a time
+  - Ability to receive a batch of messages 
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -5,7 +5,7 @@
     <IsPackable>False</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
   </ItemGroup>

diff --git a/tests/Foundatio.Tests/Metrics/StatsDMetricsTests.cs b/tests/Foundatio.Tests/Metrics/StatsDMetricsTests.cs
@@ -15,8 +15,8 @@ public class StatsDMetricsTests : TestWithLoggingBase, IDisposable {
         private readonly TestUdpListener _listener;
 
         public StatsDMetricsTests(ITestOutputHelper output) : base(output) {
-            _listener = new TestUdpListener("224.0.0.1", _port, Log);
-            _client = new StatsDMetricsClient(o => o.Server("224.0.0.1", _port).Prefix("test"));
+            _listener = new TestUdpListener("127.0.0.1", _port, Log);
+            _client = new StatsDMetricsClient(o => o.Server("127.0.0.1", _port).Prefix("test"));
         }
 
         [Fact]

diff --git a/tests/Foundatio.Tests/Utility/SystemClockTests.cs b/tests/Foundatio.Tests/Utility/SystemClockTests.cs
@@ -21,9 +21,10 @@ public class SystemClockTests : TestWithLoggingBase {
                 Assert.Equal(now.ToLocalTime(), clock.Now);
                 Assert.Equal(now.ToUniversalTime(), clock.OffsetUtcNow);
 
+                // set using utc
                 now = DateTime.UtcNow;
                 clock.SetTime(now);
-                Assert.Equal(now, clock.Now);
+                Assert.Equal(now, clock.UtcNow);
                 Assert.Equal(DateTimeOffset.Now.Offset, clock.Offset);
                 Assert.Equal(now.ToUniversalTime(), clock.UtcNow);
                 Assert.Equal(now.ToLocalTime(), clock.Now);