Update to netcore 2.1

yevhen · Jul 13, 2018 · 427d80f · 427d80f
1 parent c17d0f4
commit 427d80f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -5,6 +5,11 @@
         <SourceRoot>$(MSBuildThisFileDirectory)</SourceRoot>
     </PropertyGroup>
 
+    <PropertyGroup>
+        <Configurations>Debug;Release</Configurations>    
+        <Platforms>AnyCPU</Platforms>
+    </PropertyGroup>
+
     <!-- Set common properties regarding assembly information and nuget packages -->
     <PropertyGroup>    
         <Authors>Yevhen Bobrov</Authors>
@@ -23,6 +28,8 @@
 
     <!-- Common compile parameters -->
     <PropertyGroup>
+        <PlatformTarget>AnyCPU</PlatformTarget>
+        <Prefer32Bit>false</Prefer32Bit>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <NoWarn>$(NoWarn);1591</NoWarn>
         <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -36,17 +43,18 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <ConsoleProjectTargetFramework>netcoreapp2.0</ConsoleProjectTargetFramework>
+        <LibProjectTargetFramework>netstandard2.0</LibProjectTargetFramework>
+        <ConsoleProjectTargetFramework>netcoreapp2.1</ConsoleProjectTargetFramework>
         <TestProjectTargetFramework>$(ConsoleProjectTargetFramework)</TestProjectTargetFramework>
     </PropertyGroup>
 
     <!-- Shared Package Versions -->
     <PropertyGroup>
 
         <!-- Testing packages -->
-        <NUnitVersion>3.9.0</NUnitVersion>
-        <NUnit3TestAdapterVersion>3.9.0</NUnit3TestAdapterVersion>
-        <MicrosoftNETTestSdkVersion>15.6.0</MicrosoftNETTestSdkVersion>
+        <NUnitVersion>3.10.0</NUnitVersion>
+        <NUnit3TestAdapterVersion>3.10.0</NUnit3TestAdapterVersion>
+        <MicrosoftNETTestSdkVersion>15.7.2</MicrosoftNETTestSdkVersion>
         <ExpectedObjectsVersion>2.3.4</ExpectedObjectsVersion>
 
         <!-- 3rd party packages -->

diff --git a/Source/Streamstone/Streamstone.csproj b/Source/Streamstone/Streamstone.csproj
@@ -4,13 +4,13 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <DocumentationFile>$(OutDir)\Streamstone.xml</DocumentationFile>
-    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+    <TargetFramework>$(LibProjectTargetFramework)</TargetFramework>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-    <TargetFramework>netstandard2.0</TargetFramework>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'">
+    <DocumentationFile>$(OutDir)\Streamstone.xml</DocumentationFile>
+    <TargetFrameworks>$(LibProjectTargetFramework);net46</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>