#47 dotnet core 2.1.0 preview 2 update. Full framework conditional on…

… windows and dependency updates
AppMetrics · Apr 13, 2018 · 38cd541 · 38cd541
1 parent cb300b7
commit 38cd541
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 21 deletions.
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/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
+  - cmd: curl -O https://download.microsoft.com/download/3/7/C/37C0D2E3-2056-4F9A-A67C-14DEFBD70F06/dotnet-sdk-2.1.300-preview2-008530-win-x64.exe
+  - cmd: dotnet-sdk-2.1.300-preview2-008530-win-x64.exe /install /quiet /norestart /log install.log
 skip_commits:
   files:    
     - '**/*.md'
diff --git a/build/dependencies.props b/build/dependencies.props
@@ -2,12 +2,12 @@
   <PropertyGroup>
     <AppMetricsCoreVersion>2.1.0-*</AppMetricsCoreVersion>
     <AppMetricsAspNetCoreVersion>2.1.0-*</AppMetricsAspNetCoreVersion>
-    <AspNetCoreVersion>2.1.0-preview1-final</AspNetCoreVersion>
-    <CoreFxVersion>4.4.0-*</CoreFxVersion>
-    <DependencyModelVersion>2.1.0-*</DependencyModelVersion>
+    <AspNetCoreVersion>2.1.0-preview2-final</AspNetCoreVersion>
+    <CoreFxVersion>4.4.0</CoreFxVersion>
+    <DependencyModelVersion>2.1.0-preview2-final</DependencyModelVersion>
     <MoqVersion>4.8.2</MoqVersion>
     <NewtonsoftVersion>11.0.2</NewtonsoftVersion>
-    <TestSdkVersion>15.7.0-preview-20180320-02</TestSdkVersion>
+    <TestSdkVersion>15.7.0</TestSdkVersion>
     <XunitVersion>2.4.0-beta.1.build3958</XunitVersion>
     <FluentAssertionsVersion>5.2.0</FluentAssertionsVersion>
     <FluentAssertionsJsonVersion>5.0.0</FluentAssertionsJsonVersion>

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "projects": [ "src", "test", "sandbox" ],
   "sdk": {
-    "version": "2.1.300-preview1"
+    "version": "2.1.300-preview2"
   }
 }
diff --git a/sandbox/MetricsReceiveSanboxApi/MetricsReceiveSanboxApi.csproj b/sandbox/MetricsReceiveSanboxApi/MetricsReceiveSanboxApi.csproj
@@ -3,8 +3,8 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -15,9 +15,9 @@
     <PackageReference Include="App.Metrics" Version="$(AppMetricsCoreVersion)" />
     <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="4.0.0" />
-    <PackageReference Include="Serilog.AspNetCore " Version="2.1.0" />
+    <PackageReference Include="Serilog.Sinks.Literate" Version="3.0.1-dev-00044" />
+    <PackageReference Include="Serilog.Sinks.Seq" Version="4.0.1-dev-00154" />
+    <PackageReference Include="Serilog.AspNetCore " Version="2.1.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/sandbox/ReportingSandbox/ReportingSandbox.csproj b/sandbox/ReportingSandbox/ReportingSandbox.csproj
@@ -3,18 +3,18 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="App.Metrics" Version="$(AppMetricsCoreVersion)" />
     <PackageReference Include="App.Metrics.AspNetCore.Reporting" Version="$(AppMetricsAspNetCoreVersion)" />
     <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="4.0.0" />
-    <PackageReference Include="Serilog.AspNetCore " Version="2.1.0" />
+    <PackageReference Include="Serilog.Sinks.Literate" Version="3.0.1-dev-00044" />
+    <PackageReference Include="Serilog.Sinks.Seq" Version="4.0.1-dev-00154" />
+    <PackageReference Include="Serilog.AspNetCore " Version="2.1.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/App.Metrics.Reporting.Console/App.Metrics.Reporting.Console.csproj b/src/App.Metrics.Reporting.Console/App.Metrics.Reporting.Console.csproj
@@ -3,7 +3,8 @@
   <PropertyGroup>
     <Description>Provides console reporting capability to App Metrics</Description>
     <AssemblyTitle>App.Metrics.Reporting.Console</AssemblyTitle>
-    <TargetFrameworks>netstandard1.6;net452</TargetFrameworks>
+    <TargetFrameworks>netstandard1.6</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net452</TargetFrameworks>
     <PackageTags>appmetrics;reporting;console</PackageTags>    
   </PropertyGroup>
 

diff --git a/src/App.Metrics.Reporting.Http/App.Metrics.Reporting.Http.csproj b/src/App.Metrics.Reporting.Http/App.Metrics.Reporting.Http.csproj
@@ -3,7 +3,8 @@
   <PropertyGroup>
     <Description>Provides HTTP reporting capability to App Metrics</Description>
     <AssemblyTitle>App.Metrics.Reporting.Http</AssemblyTitle>
-    <TargetFrameworks>netstandard1.6;net452</TargetFrameworks>
+    <TargetFrameworks>netstandard1.6</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net452</TargetFrameworks>
     <PackageTags>appmetrics;reporting;http</PackageTags>    
   </PropertyGroup>
 

diff --git a/src/App.Metrics.Reporting.TextFile/App.Metrics.Reporting.TextFile.csproj b/src/App.Metrics.Reporting.TextFile/App.Metrics.Reporting.TextFile.csproj
@@ -3,7 +3,8 @@
   <PropertyGroup>
     <Description>Provides text file reporting capability to App Metrics</Description>
     <AssemblyTitle>App.Metrics.Reporting.TextFile</AssemblyTitle>
-    <TargetFrameworks>netstandard1.6;net452</TargetFrameworks>
+    <TargetFrameworks>netstandard1.6</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net452</TargetFrameworks>
     <PackageTags>appmetrics;reporting;influxdb</PackageTags>    
   </PropertyGroup>
 

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -3,7 +3,7 @@
   <Import Project="..\build\common.props" />
 
   <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>