dependency updates

AppMetrics · Dec 2, 2018 · 8548650 · 8548650
1 parent a430813
commit 8548650
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 23 deletions.
diff --git a/build/dependencies.props b/build/dependencies.props
@@ -2,15 +2,15 @@
   <PropertyGroup>
     <AppMetricsCoreVersion>3.0.0-*</AppMetricsCoreVersion>
     <AppMetricsMicrosoftExtensionsVersion>3.0.0-*</AppMetricsMicrosoftExtensionsVersion>
-    <AspNetCoreVersion>2.1.1</AspNetCoreVersion>
-    <AspNetCoreMvcVersion>2.1.1</AspNetCoreMvcVersion>
+    <AspNetCoreVersion>2.1.6</AspNetCoreVersion>
+    <AspNetCoreMvcVersion>2.1.3</AspNetCoreMvcVersion>
     <MicrosoftExtensionsVersion>2.1.1</MicrosoftExtensionsVersion>
     <CoreFxVersion>4.4.0</CoreFxVersion>
     <DependencyModelVersion>2.1.1</DependencyModelVersion>
-    <MoqVersion>4.8.3</MoqVersion>
-    <TestSdkVersion>15.8.0-preview-20180610-02</TestSdkVersion>
-    <XunitVersion>2.4.0-rc.1.build4038</XunitVersion>
-    <FluentAssertionsVersion>5.4.1</FluentAssertionsVersion>
+    <MoqVersion>4.10.0</MoqVersion>
+    <TestSdkVersion>15.9.0</TestSdkVersion>
+    <XunitVersion>2.4.1</XunitVersion>
+    <FluentAssertionsVersion>5.5.3</FluentAssertionsVersion>
     <FluentAssertionsJsonVersion>5.0.0</FluentAssertionsJsonVersion>
     <StyleCopAnalyzersVersion>1.0.0</StyleCopAnalyzersVersion>
   </PropertyGroup>

diff --git a/sandbox/MetricsReportingSandboxMvc/MetricsReportingSandboxMvc.csproj b/sandbox/MetricsReportingSandboxMvc/MetricsReportingSandboxMvc.csproj
@@ -11,8 +11,4 @@
     </Content>
   </ItemGroup>
 
-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="2.0.0" />
-  </ItemGroup>
-
 </Project>
diff --git a/sandbox/MetricsSandboxMvc/MetricsSandboxMvc.csproj b/sandbox/MetricsSandboxMvc/MetricsSandboxMvc.csproj
@@ -10,8 +10,4 @@
     </Content>
   </ItemGroup>
 
-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="2.0.0" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/App.Metrics.AspNetCore.Abstractions/App.Metrics.AspNetCore.Abstractions.csproj b/src/App.Metrics.AspNetCore.Abstractions/App.Metrics.AspNetCore.Abstractions.csproj
@@ -10,8 +10,8 @@
 
 	<ItemGroup>
 		<PackageReference Include="App.Metrics.Abstractions" Version="$(AppMetricsCoreVersion)" />
-		<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="$(AspNetCoreVersion)" />
-		<PackageReference Include="Microsoft.AspNetCore.Routing.Abstractions" Version="$(AspNetCoreVersion)" />
+		<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="$(MicrosoftExtensionsVersion)" />
+		<PackageReference Include="Microsoft.AspNetCore.Routing.Abstractions" Version="$(MicrosoftExtensionsVersion)" />
 	</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
@@ -12,7 +12,7 @@
     <PackageReference Include="App.Metrics.Core" Version="$(AppMetricsCoreVersion)" />
     <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.AspNetCore.Http.Extensions" Version="$(MicrosoftExtensionsVersion)" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsVersion)" />
   </ItemGroup>

diff --git a/src/App.Metrics.AspNetCore.Hosting/App.Metrics.AspNetCore.Hosting.csproj b/src/App.Metrics.AspNetCore.Hosting/App.Metrics.AspNetCore.Hosting.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="$(MicrosoftExtensionsVersion)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/App.Metrics.AspNetCore.Mvc.Core/App.Metrics.AspNetCore.Mvc.Core.csproj b/src/App.Metrics.AspNetCore.Mvc.Core/App.Metrics.AspNetCore.Mvc.Core.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="$(AspNetCoreMvcVersion)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/App.Metrics.AspNetCore.Mvc/App.Metrics.AspNetCore.Mvc.csproj b/src/App.Metrics.AspNetCore.Mvc/App.Metrics.AspNetCore.Mvc.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreMvcVersion)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/App.Metrics.AspNetCore.Reporting/App.Metrics.AspNetCore.Reporting.csproj b/src/App.Metrics.AspNetCore.Reporting/App.Metrics.AspNetCore.Reporting.csproj
@@ -8,7 +8,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="$(AspNetCoreVersion)" />
+		<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="$(MicrosoftExtensionsVersion)" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/App.Metrics.AspNetCore.Routing/App.Metrics.AspNetCore.Routing.csproj b/src/App.Metrics.AspNetCore.Routing/App.Metrics.AspNetCore.Routing.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Routing" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Routing" Version="$(MicrosoftExtensionsVersion)" />
   </ItemGroup>
 
   <ItemGroup>

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
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftExtensionsVersion)" />
     <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MicrosoftExtensionsVersion)" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsVersion)" />
   </ItemGroup>