Merge branch 'feature/multi_target_netstandard2' into develop

Jericho · May 24, 2018 · dd1b7e0 · dd1b7e0
2 parents 363494a + 1c70552
commit dd1b7e0
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 16 deletions.
diff --git a/Source/Picton.Messaging.IntegrationTests/Picton.Messaging.IntegrationTests.csproj b/Source/Picton.Messaging.IntegrationTests/Picton.Messaging.IntegrationTests.csproj
@@ -1,12 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyName>Picton.Messaging.IntegrationTests</AssemblyName>
     <RootNamespace>Picton.Messaging.IntegrationTests</RootNamespace>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="App.Metrics.Reporting.Http" Version="2.0.0" />
   </ItemGroup>

diff --git a/Source/Picton.Messaging.UnitTests/Picton.Messaging.UnitTests.csproj b/Source/Picton.Messaging.UnitTests/Picton.Messaging.UnitTests.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFrameworks>net452;netcoreapp1.0;netcoreapp2.0</TargetFrameworks>
     <AssemblyName>Picton.Messaging.UnitTests</AssemblyName>
     <RootNamespace>Picton.Messaging.UnitTests</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Include="Moq" Version="4.8.2" />
     <PackageReference Include="Shouldly" Version="3.0.0" />
     <PackageReference Include="xunit" Version="2.3.1" />

diff --git a/Source/Picton.Messaging/App_Packages/LibLog.4.2/LibLog.cs b/Source/Picton.Messaging/App_Packages/LibLog.4.2/LibLog.cs
@@ -1,9 +1,4 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-// This tag ensures the content of this file is not analyzed by StyleCop.Analyzers
-// </auto-generated>
-//------------------------------------------------------------------------------
-
+// <auto-generated />
 //===============================================================================
 // LibLog
 //
@@ -504,6 +499,7 @@ interface ILogProvider
 		/// </summary>
 		/// <param name="key">A key.</param>
 		/// <param name="value">A value.</param>
+		/// <param name="destructure">???</param>
 		/// <returns>A disposable that when disposed removes the map from the context.</returns>
 		IDisposable OpenMappedContext(string key, object value, bool destructure = false);
 	}
@@ -669,6 +665,7 @@ static IDisposable OpenNestedContext(string message)
 		/// </summary>
 		/// <param name="key">A key.</param>
 		/// <param name="value">A value.</param>
+		/// <param name="destructure">???</param>
 		/// <returns>An <see cref="IDisposable"/> that closes context when disposed.</returns>
 		[SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "SetCurrentLogProvider")]
 #if LIBLOG_PUBLIC
@@ -785,7 +782,9 @@ internal class LoggerExecutionWrapper : ILog
 		private readonly Func<bool> _getIsDisabled;
 		internal const string FailedToGenerateLogMessage = "Failed to generate log message";
 
+#if !LIBLOG_PORTABLE
 		Func<string> _lastExtensionMethod;
+#endif
 
 		internal LoggerExecutionWrapper(Logger logger, Func<bool> getIsDisabled = null)
 		{

diff --git a/Source/Picton.Messaging/Picton.Messaging.csproj b/Source/Picton.Messaging/Picton.Messaging.csproj
@@ -1,12 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net452;netstandard1.6</TargetFrameworks>
+    <TargetFrameworks>net452;netstandard1.6;netstandard2.0</TargetFrameworks>
     <PlatformTarget>anycpu</PlatformTarget>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <OutputType>Library</OutputType>
-    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
-    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.1</NetStandardImplicitPackageVersion>
     <Version>$(SemVer)</Version>
     <DebugType>full</DebugType>
   </PropertyGroup>
@@ -28,7 +26,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="App.Metrics" Version="2.0.0" />
+    <PackageReference Include="App.Metrics" Version="2.1.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.0.4" />
     <PackageReference Include="Picton" Version="3.0.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta004">
@@ -41,14 +39,22 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net452' ">
+  <ItemGroup Condition="'$(TargetFramework)' != 'net452'">
+    <PackageReference Include="Microsoft.CSharp" Version="4.4.1" />
+  </ItemGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net452' ">
     <DefineConstants>$(DefineConstants);NETFULL;LIBLOG_PORTABLE</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
+  <PropertyGroup Condition="'$(TargetFramework)' != 'net452' ">
     <DefineConstants>$(DefineConstants);NETSTANDARD;LIBLOG_PORTABLE</DefineConstants>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)' == 'Release' ">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
   <ItemGroup>
     <AdditionalFiles Include="$(SolutionDir)\stylecop.json" Link="stylecop.json" />
   </ItemGroup>