Merge pull request #46 from AppMetrics/dev

2.0.0
AppMetrics · Mar 29, 2018 · 4e1ab7b · 4e1ab7b
2 parents 0b1e526 + 6ab4e87
commit 4e1ab7b
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 18 deletions.
diff --git a/build/dependencies.props b/build/dependencies.props
@@ -5,14 +5,14 @@
     <AspNetCoreVersion>2.0.0-*</AspNetCoreVersion>
     <CoreFxVersion>4.4.0-*</CoreFxVersion>
     <DependencyModelVersion>2.0.0-*</DependencyModelVersion>
-    <MoqVersion>4.7.49</MoqVersion>
+    <MoqVersion>4.8.2</MoqVersion>
     <NewtonsoftVersion>10.0.2</NewtonsoftVersion>
     <NETStandardLibraryNETFrameworkVersion>2.0.0-*</NETStandardLibraryNETFrameworkVersion>
     <RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0-*</RuntimeFrameworkVersion>
-    <TestSdkVersion>15.3.0-*</TestSdkVersion>
-    <XunitVersion>2.3.0-beta2-*</XunitVersion>
-    <FluentAssertionsVersion>4.19.2</FluentAssertionsVersion>
-    <FluentAssertionsJsonVersion>4.19.0</FluentAssertionsJsonVersion>
+    <TestSdkVersion>15.5.0</TestSdkVersion>
+    <XunitVersion>2.3.1</XunitVersion>
+    <FluentAssertionsVersion>5.2.0</FluentAssertionsVersion>
+    <FluentAssertionsJsonVersion>5.2.0</FluentAssertionsJsonVersion>
     <StyleCopAnalyzersVersion>1.0.0</StyleCopAnalyzersVersion>
   </PropertyGroup>
 </Project>
diff --git a/sandbox/MetricsReceiveSanboxApi/MetricsReceiveSanboxApi.csproj b/sandbox/MetricsReceiveSanboxApi/MetricsReceiveSanboxApi.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
@@ -16,7 +16,8 @@
     <PackageReference Include="Microsoft.AspNetCore" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Serilog.Sinks.Literate" Version="3.0.0" />
-    <PackageReference Include="Serilog.Sinks.Seq" Version="3.3.3" />
+    <PackageReference Include="Serilog.Sinks.Seq" Version="4.0.0" />
+    <PackageReference Include="Serilog.AspNetCore " Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/sandbox/ReportingSandbox/ReportingSandbox.csproj b/sandbox/ReportingSandbox/ReportingSandbox.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
@@ -13,7 +13,8 @@
     <PackageReference Include="Microsoft.AspNetCore" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Serilog.Sinks.Literate" Version="3.0.0" />
-    <PackageReference Include="Serilog.Sinks.Seq" Version="3.3.3" />
+    <PackageReference Include="Serilog.Sinks.Seq" Version="4.0.0" />
+    <PackageReference Include="Serilog.AspNetCore " Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/sandbox/ReportingSandbox/Startup.cs b/sandbox/ReportingSandbox/Startup.cs
@@ -41,7 +41,11 @@ public void Configure(IApplicationBuilder app)
 
                         using (var sr = new StreamReader(req.Body, Encoding.UTF8, true, 1024, true))
                         {
+#if NET461
+                            File.WriteAllText(fileName, sr.ReadToEnd());
+#else
                             await File.WriteAllTextAsync(fileName, sr.ReadToEnd());
+#endif
                         }
 
                         req.Body.Position = 0;

diff --git a/test/App.Metrics.Reporting.Console.Facts/MetricsConsoleReporterBuilderTests.cs b/test/App.Metrics.Reporting.Console.Facts/MetricsConsoleReporterBuilderTests.cs
@@ -124,7 +124,7 @@ public void When_using_console_reporter_with_setup_action_flush_interval_less_th
             };
 
             // Assert
-            action.ShouldThrow<InvalidOperationException>();
+            action.Should().Throw<InvalidOperationException>();
         }
 
         [Fact]

diff --git a/test/App.Metrics.Reporting.Http.Facts/MetricsHttpReporterBuilderTests.cs b/test/App.Metrics.Reporting.Http.Facts/MetricsHttpReporterBuilderTests.cs
@@ -86,7 +86,7 @@ public void Should_throw_when_using_setup_action_without_specifying_a_uri()
             };
 
             // Assert
-            action.ShouldThrow<InvalidOperationException>();
+            action.Should().Throw<InvalidOperationException>();
         }
 
         [Fact]
@@ -102,7 +102,7 @@ public void Should_throw_when_http_reporter_uri_is_not_absolute()
             };
 
             // Assert
-            action.ShouldThrow<InvalidOperationException>();
+            action.Should().Throw<InvalidOperationException>();
         }
 
         [Fact]
@@ -165,7 +165,7 @@ public void When_using_http_reporter_with_setup_action_flush_interval_less_than_
             };
 
             // Assert
-            action.ShouldThrow<InvalidOperationException>();
+            action.Should().Throw<InvalidOperationException>();
         }
 
         [Fact]
@@ -199,7 +199,7 @@ public void Http_reporter_should_throw_when_uri_is_empty_or_white_space(string u
             };
 
             // Assert
-            action.ShouldThrow<InvalidOperationException>();
+            action.Should().Throw<InvalidOperationException>();
         }
 
         [Fact]
@@ -214,7 +214,7 @@ public void Http_reporter_should_throw_when_uri_is_null()
             };
 
             // Assert
-            action.ShouldThrow<ArgumentNullException>();
+            action.Should().Throw<ArgumentNullException>();
         }
     }
 }
diff --git a/test/App.Metrics.Reporting.TextFile.Facts/MetricsTextFileReporterBuilderTests.cs b/test/App.Metrics.Reporting.TextFile.Facts/MetricsTextFileReporterBuilderTests.cs
@@ -100,7 +100,7 @@ public void Should_throw_when_using_setup_action_without_specifying_a_output_fil
             };
 
             // Assert
-            action.ShouldThrow<InvalidOperationException>();
+            action.Should().Throw<InvalidOperationException>();
         }
 
         [Fact]
@@ -159,7 +159,7 @@ public void When_using_textfile_reporter_with_setup_action_flush_interval_less_t
             };
 
             // Assert
-            action.ShouldThrow<InvalidOperationException>();
+            action.Should().Throw<InvalidOperationException>();
         }
 
         [Fact]
@@ -194,7 +194,7 @@ public void Textfile_reporter_should_throw_when_output_file_is_not_specified(str
             };
 
             // Assert
-            action.ShouldThrow<InvalidOperationException>();
+            action.Should().Throw<InvalidOperationException>();
         }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
                 };
                 // Assert
-                action.ShouldThrow<InvalidOperationException>();
+                action.Should().Throw<InvalidOperationException>();
             }
             [Fact]
@@ Expand Down @@