#10 updating package dependencies

AppMetrics · Feb 9, 2018 · 49a590b · 49a590b
1 parent 8d08973
commit 49a590b
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 25 deletions.
diff --git a/AspNetCore.sln b/AspNetCore.sln
@@ -1,9 +1,12 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26906.1
+VisualStudioVersion = 15.0.27130.2027
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2D805782-756E-4C98-B22E-F502BEE95318}"
+	ProjectSection(SolutionItems) = preProject
+		src\Directory.Build.props = src\Directory.Build.props
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{31A4DDB1-952E-4EED-96EF-29C669279A86}"
 	ProjectSection(SolutionItems) = preProject

diff --git a/build/dependencies.props b/build/dependencies.props
@@ -2,17 +2,19 @@
   <PropertyGroup>
     <AppMetricsCoreVersion>2.0.0-*</AppMetricsCoreVersion>
     <AppMetricsMicrosoftExtensionsVersion>2.0.0-*</AppMetricsMicrosoftExtensionsVersion>
-    <AspNetCoreVersion>2.0.0-*</AspNetCoreVersion>
+    <AspNetCoreVersion>2.0.1</AspNetCoreVersion>
+    <AspNetCoreMvcVersion>2.0.2</AspNetCoreMvcVersion>
+    <MicrosoftExtensionsVersion>2.0.0</MicrosoftExtensionsVersion>
     <CoreFxVersion>4.4.0-*</CoreFxVersion>
     <DependencyModelVersion>2.0.0-*</DependencyModelVersion>
-    <MoqVersion>4.7.49</MoqVersion>
+    <MoqVersion>4.8.1</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.0.0</FluentAssertionsVersion>
+    <FluentAssertionsJsonVersion>5.0.0</FluentAssertionsJsonVersion>
     <StyleCopAnalyzersVersion>1.0.0</StyleCopAnalyzersVersion>
   </PropertyGroup>
 </Project>
diff --git a/sandbox/MetricsReportingSandboxMvc/MetricsReportingSandboxMvc.csproj b/sandbox/MetricsReportingSandboxMvc/MetricsReportingSandboxMvc.csproj
@@ -9,11 +9,11 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreMvcVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsVersion)" />
     <PackageReference Include="Serilog.Sinks.Literate" Version="3.0.0" />
-    <PackageReference Include="Serilog.Sinks.Seq" Version="3.3.3" />
-    <PackageReference Include="Serilog.AspNetCore " Version="2.0.0" />
+    <PackageReference Include="Serilog.Sinks.Seq" Version="4.0.0" />
+    <PackageReference Include="Serilog.AspNetCore " Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="$(AspNetCoreVersion)" />
+    <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="2.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/sandbox/MetricsSandboxMvc/MetricsSandboxMvc.csproj b/sandbox/MetricsSandboxMvc/MetricsSandboxMvc.csproj
@@ -9,11 +9,11 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreMvcVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsVersion)" />
     <PackageReference Include="Serilog.Sinks.Literate" Version="3.0.0" />
-    <PackageReference Include="Serilog.Sinks.Seq" Version="3.3.3" />
-    <PackageReference Include="Serilog.AspNetCore " Version="2.0.0" />
+    <PackageReference Include="Serilog.Sinks.Seq" Version="4.0.0" />
+    <PackageReference Include="Serilog.AspNetCore " Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="$(AspNetCoreVersion)" />
+    <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="2.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/App.Metrics.AspNetCore.Core/App.Metrics.AspNetCore.Core.csproj b/src/App.Metrics.AspNetCore.Core/App.Metrics.AspNetCore.Core.csproj
@@ -15,8 +15,8 @@
     <PackageReference Include="App.Metrics.Extensions.Configuration" Version="$(AppMetricsMicrosoftExtensionsVersion)" />
     <PackageReference Include="App.Metrics.Extensions.DependencyInjection" Version="$(AppMetricsMicrosoftExtensionsVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsVersion)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project>
   <ItemGroup>
-    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.4.0" PrivateAssets="All" /> 
+    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.0" PrivateAssets="All" /> 
   </ItemGroup>
 </Project>
diff --git a/.../App.Metrics.AspNetCore.Integration.Facts/App.Metrics.AspNetCore.Integration.Facts.csproj b/.../App.Metrics.AspNetCore.Integration.Facts/App.Metrics.AspNetCore.Integration.Facts.csproj
@@ -28,8 +28,8 @@
     <PackageReference Include="xunit" Version="$(XunitVersion)" />
     <PackageReference Include="Moq" Version="$(MoqVersion)" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MicrosoftExtensionsVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/...tCore.Integration.Facts/DependencyInjection/MiddlewareAppMetricsBuilderExtensionsTests.cs b/...tCore.Integration.Facts/DependencyInjection/MiddlewareAppMetricsBuilderExtensionsTests.cs
@@ -26,8 +26,8 @@ public void Can_load_settings_from_configuration()
             Action resolveOptions = () => { trackingOptions = provider.GetRequiredService<IOptions<MetricsWebTrackingOptions>>().Value; };
             Action resolveEndpointsOptions = () => { endpointOptions = provider.GetRequiredService<IOptions<MetricEndpointsOptions>>().Value; };
 
-            resolveOptions.ShouldNotThrow();
-            resolveEndpointsOptions.ShouldNotThrow();
+            resolveOptions.Should().NotThrow();
+            resolveEndpointsOptions.Should().NotThrow();
 
             trackingOptions.ApdexTrackingEnabled.Should().Be(false);
             trackingOptions.ApdexTSeconds.Should().Be(0.8);
@@ -48,7 +48,7 @@ public void Can_override_settings_from_configuration()
 
             Action resolveOptions = () => { options = provider.GetRequiredService<IOptions<MetricsWebTrackingOptions>>().Value; };
 
-            resolveOptions.ShouldNotThrow();
+            resolveOptions.Should().NotThrow();
             options.ApdexTrackingEnabled.Should().Be(true);
             options.ApdexTSeconds.Should().Be(0.7);
         }