#30 updating sdk to 2.1.0 preview1 final

AppMetrics · Apr 3, 2018 · 5ac817a · 5ac817a
1 parent d2dfecf
commit 5ac817a
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 45 deletions.
diff --git a/InfluxDB.sln b/InfluxDB.sln
@@ -19,6 +19,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{DD2E4647-7125-4CE3-9BA5-B45A26113A31}"
+	ProjectSection(SolutionItems) = preProject
+		test\Directory.Build.props = test\Directory.Build.props
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cake", "Cake", "{E1A943F7-5493-4B64-A448-3E9EEA582E20}"
 	ProjectSection(SolutionItems) = preProject

diff --git a/appveyor.yml b/appveyor.yml
@@ -33,8 +33,8 @@ deploy:
   skip_symbols: true
   symbol_server: https://www.myget.org/F/appmetrics/symbol
 install:
-  - cmd: curl -O https://download.microsoft.com/download/0/F/D/0FD852A4-7EA1-4E2A-983A-0484AC19B92C/dotnet-sdk-2.0.0-win-x64.exe
-  - cmd: dotnet-sdk-2.0.0-win-x64.exe /install /quiet /norestart /log install.log
+  - cmd: curl -O https://download.microsoft.com/download/D/7/8/D788D3CD-44C4-487D-829B-413E914FB1C3/dotnet-sdk-2.1.300-preview1-008174-win-x64.exe
+  - cmd: dotnet-sdk-2.1.300-preview1-008174-win-x64.exe /install /quiet /norestart /log install.log
 skip_commits:
   files:    
     - '**/*.md'
diff --git a/build/dependencies.props b/build/dependencies.props
@@ -2,19 +2,16 @@
   <PropertyGroup>
     <AppMetricsCoreVersion>2.1.0-*</AppMetricsCoreVersion>
     <AppMetricsAspNetCoreVersion>2.1.0-*</AppMetricsAspNetCoreVersion>
-    <AspNetCoreVersion>2.0.1</AspNetCoreVersion>    
-    <AspNetCoreMvcVersion>2.0.2</AspNetCoreMvcVersion>
-    <MicrosoftExtensionsVersion>2.0.0</MicrosoftExtensionsVersion>
-    <BenchmarkDotNetVersion>0.10.12</BenchmarkDotNetVersion>
-    <CoreFxVersion>4.4.0</CoreFxVersion>
-    <DependencyModelVersion>2.0.4</DependencyModelVersion>
-    <MoqVersion>4.8.1</MoqVersion>
-    <NewtonsoftVersion>10.0.3</NewtonsoftVersion>
-    <NETStandardLibraryNETFrameworkVersion>2.0.0-*</NETStandardLibraryNETFrameworkVersion>
-    <RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0-*</RuntimeFrameworkVersion>
-    <TestSdkVersion>15.5.0</TestSdkVersion>
-    <XunitVersion>2.3.1</XunitVersion>
-    <FluentAssertionsVersion>5.0.0</FluentAssertionsVersion>
+    <AspNetCoreVersion>2.1.0-preview1-final</AspNetCoreVersion>
+    <AspNetCoreMvcVersion>2.1.0-preview1-final</AspNetCoreMvcVersion>
+    <MicrosoftExtensionsVersion>2.1.0-preview1-final</MicrosoftExtensionsVersion>
+    <CoreFxVersion>4.4.0-*</CoreFxVersion>
+    <DependencyModelVersion>2.1.0-*</DependencyModelVersion>
+    <MoqVersion>4.8.2</MoqVersion>
+    <NewtonsoftVersion>11.0.2</NewtonsoftVersion>
+    <TestSdkVersion>15.7.0-preview-20180320-02</TestSdkVersion>
+    <XunitVersion>2.4.0-beta.1.build3958</XunitVersion>
+    <FluentAssertionsVersion>5.2.0</FluentAssertionsVersion>
     <FluentAssertionsJsonVersion>5.0.0</FluentAssertionsJsonVersion>
     <StyleCopAnalyzersVersion>1.0.0</StyleCopAnalyzersVersion>
 </PropertyGroup>

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "projects": [ "src", "test", "sandbox" ],
   "sdk": {
-    "version": "2.0.0"
+    "version": "2.1.300-preview1"
   }
 }
diff --git a/sandbox/MetricsInfluxDBSandbox/MetricsInfluxDBSandbox.csproj b/sandbox/MetricsInfluxDBSandbox/MetricsInfluxDBSandbox.csproj
@@ -3,26 +3,26 @@
 	<Import Project="..\..\build\common.props" />
 
 	<PropertyGroup>
-	  <OutputType>Exe</OutputType>
-		<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
-		<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
+		<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
+		<OutputType>exe</OutputType>
+		<LangVersion>latest</LangVersion>
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <Content Include="appsettings.json" />
+		<Content Include="appsettings.json" />
 	</ItemGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="App.Metrics" Version="$(AppMetricsCoreVersion)" />
-	  <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsVersion)" />
-    <PackageReference Include="Serilog.Sinks.Literate" Version="3.0.0" />
-	  <PackageReference Include="Serilog.Sinks.Seq" Version="4.0.0" />
+		<PackageReference Include="App.Metrics" Version="$(AppMetricsCoreVersion)" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsVersion)" />
+		<PackageReference Include="Serilog.Sinks.Literate" Version="3.0.1-dev-00044" />
+		<PackageReference Include="Serilog.Sinks.Seq" Version="4.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\..\src\App.Metrics.Reporting.InfluxDB\App.Metrics.Reporting.InfluxDB.csproj" />
+		<ProjectReference Include="..\..\src\App.Metrics.Reporting.InfluxDB\App.Metrics.Reporting.InfluxDB.csproj" />
 	</ItemGroup>
-  
+	
 	<ItemGroup>
 		<Content Update="appsettings.json">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>

diff --git a/sandbox/MetricsInfluxDBSandboxMvc/MetricsInfluxDBSandboxMvc.csproj b/sandbox/MetricsInfluxDBSandboxMvc/MetricsInfluxDBSandboxMvc.csproj
@@ -3,16 +3,17 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
+    <OutputType>exe</OutputType>
+    <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>        
     <PackageReference Include="App.Metrics.AspNetCore.Mvc" Version="$(AppMetricsAspNetCoreVersion)" />
     <PackageReference Include="Microsoft.AspNetCore" 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.Literate" Version="3.0.1-dev-00044" />
     <PackageReference Include="Serilog.Sinks.Seq" Version="4.0.0" />
     <PackageReference Include="Serilog.AspNetCore " Version="2.1.0" />
   </ItemGroup>

diff --git a/sandbox/MetricsInfluxDBSandboxMvc/appsettings.json b/sandbox/MetricsInfluxDBSandboxMvc/appsettings.json
@@ -18,11 +18,11 @@
   },
   "MetricsReportingInfluxDbOptions": {
     "InfluxDb": {
-      "BaseUri": "http://127.0.0.1:8086",
+      "BaseUri": "http://localhost:32768",
       "Database": "appmetricssandbox"
       //"Consistenency": "",
-      //"UserName": "", 
-      //"Password": "", 
+      //"UserName": "",
+      //"Password": "",
       //"RetensionPolicy": ""
     },
     "HttpPolicy": {

diff --git a/src/App.Metrics.Formatters.InfluxDB/App.Metrics.Formatters.InfluxDB.csproj b/src/App.Metrics.Formatters.InfluxDB/App.Metrics.Formatters.InfluxDB.csproj
@@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\build\common.props" />
-
   <PropertyGroup>
     <Description>App Metrics Formatting, formatting metrics data to InfluxDB formats e.g. Line Protocol</Description>
     <TargetFrameworks>netstandard1.6;net452</TargetFrameworks>

diff --git a/src/App.Metrics.Reporting.InfluxDB/App.Metrics.Reporting.InfluxDB.csproj b/src/App.Metrics.Reporting.InfluxDB/App.Metrics.Reporting.InfluxDB.csproj
@@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<Import Project="..\..\build\common.props" />
-
   <PropertyGroup>
     <Description>Provides InfluxDB reporting capability to App Metrics</Description>
     <TargetFrameworks>netstandard1.6;net452</TargetFrameworks>

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,5 +1,9 @@
 <Project>
+
+  <Import Project="..\build\common.props" />
+
   <ItemGroup>
     <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.0" PrivateAssets="All" /> 
   </ItemGroup>
+
 </Project>
diff --git a/test/App.Metrics.Reporting.InfluxDB.Facts/App.Metrics.Reporting.InfluxDB.Facts.csproj b/test/App.Metrics.Reporting.InfluxDB.Facts/App.Metrics.Reporting.InfluxDB.Facts.csproj
@@ -1,23 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\build\common.props" />
-
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>$(StandardTest)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\App.Metrics.Reporting.InfluxDB\App.Metrics.Reporting.InfluxDB.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsVersion)" />
-    <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
-    <PackageReference Include="Moq" Version="$(MoqVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -0,0 +1,19 @@
+<Project>
+  <Import Project="..\build\common.props" />
+
+  <PropertyGroup>
+    <DeveloperBuildTest>netcoreapp2.1</DeveloperBuildTest>
+    <StandardTest>$(DeveloperBuildTest)</StandardTest>
+    <StandardTest Condition=" '$(DeveloperBuild)' != 'true' ">$(StandardTest);netcoreapp2.0</StandardTest>
+    <StandardTest Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(StandardTest);net461</StandardTest>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
+    <PackageReference Include="Moq" Version="$(MoqVersion)" />
+    <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
+    <PackageReference Include="FluentAssertions.Json" Version="$(FluentAssertionsJsonVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
+  </ItemGroup>
+</Project>