#6 dotnet core 2.1.0 preview 2 update. Full framework conditional on windows and dependency updates in sample projects

alhardy · alhardy · commit b21db7676196 · 2018-04-14T01:06:50.000+10:00
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,15 +2,14 @@
     <PropertyGroup>
         <AppMetricsCoreVersion>2.1.0-*</AppMetricsCoreVersion>
         <AppMetricsHealthCoreVersion>2.1.0-*</AppMetricsHealthCoreVersion>
-        <AspNetCoreVersion>2.1.0-preview1-final</AspNetCoreVersion>
-        <MicrosoftExtensionsVersion>2.1.0-preview1-final</MicrosoftExtensionsVersion>
-        <CoreFxVersion>4.4.0-*</CoreFxVersion>
+        <MicrosoftExtensionsVersion>2.1.0-preview2-final</MicrosoftExtensionsVersion>
+        <CoreFxVersion>4.4.0</CoreFxVersion>
         <DependencyModelVersion>2.1.0-*</DependencyModelVersion>
         <LibLogVersion>4.2.6</LibLogVersion>
         <MicrosoftCSharpVersion>4.4.0</MicrosoftCSharpVersion>
         <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-008174-win-x64"
+    "version": "2.1.300-preview2"
   }
 }
diff --git a/sandbox/HealthHostingMicrosoftExtensionsSandbox/HealthHostingMicrosoftExtensionsSandbox.csproj b/sandbox/HealthHostingMicrosoftExtensionsSandbox/HealthHostingMicrosoftExtensionsSandbox.csproj
@@ -3,8 +3,9 @@
 	<Import Project="..\..\build\common.props" />
 
 	<PropertyGroup>
-		<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
-		<OutputType>exe</OutputType>
+		<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
+	  <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461</TargetFrameworks>
+    <OutputType>exe</OutputType>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/sandbox/HealthMicrosoftExtensionsSandbox/HealthMicrosoftExtensionsSandbox.csproj b/sandbox/HealthMicrosoftExtensionsSandbox/HealthMicrosoftExtensionsSandbox.csproj
@@ -3,8 +3,9 @@
 	<Import Project="..\..\build\common.props" />
 
 	<PropertyGroup>
-		<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
-	  <OutputType>exe</OutputType>
+		<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
+	  <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461</TargetFrameworks>
+    <OutputType>exe</OutputType>
   </PropertyGroup>
 
 	<ItemGroup>
diff --git a/sandbox/MetricsHostingMicrosoftExtensionsSandbox/MetricsHostingMicrosoftExtensionsSandbox.csproj b/sandbox/MetricsHostingMicrosoftExtensionsSandbox/MetricsHostingMicrosoftExtensionsSandbox.csproj
@@ -3,8 +3,9 @@
 	<Import Project="..\..\build\common.props" />
 
 	<PropertyGroup>
-		<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
-		<OutputType>exe</OutputType>
+		<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
+	  <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461</TargetFrameworks>
+    <OutputType>exe</OutputType>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/sandbox/MetricsMicrosoftExtensionsSandbox/MetricsMicrosoftExtensionsSandbox.csproj b/sandbox/MetricsMicrosoftExtensionsSandbox/MetricsMicrosoftExtensionsSandbox.csproj
@@ -3,8 +3,9 @@
 	<Import Project="..\..\build\common.props" />
 
 	<PropertyGroup>
-		<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
-		<OutputType>exe</OutputType>
+		<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
+	  <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461</TargetFrameworks>
+    <OutputType>exe</OutputType>
 	</PropertyGroup>
 
 	<ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"projects": [ "src", "test", "sandbox" ],`
`3`	`3`	`"sdk": {`
`4`		`- "version": "2.1.300-preview1-008174-win-x64"`
	`4`	`+ "version": "2.1.300-preview2"`
`5`	`5`	`}`
`6`	`6`	`}`