Merge pull request #152 from WebApiContrib/damienbod/release_2_0_6

Damienbod/release 2 0 6

Author: filipw

samples/WebApiContrib.Core.Samples/Startup.cs

@@ -11,7 +11,6 @@
 using WebApiContrib.Core.Versioning;
 using WebApiContrib.Core.Samples.Services;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Server.Kestrel.Core;
 
 namespace WebApiContrib.Core.Samples
 {

samples/WebApiContrib.Core.WebPages.Samples/Program.cs

@@ -1,20 +1,17 @@
-using System.IO;
+using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 
 namespace WebApiContrib.Core.WebPages.Samples
 {
     public class Program
     {
-        public static void Main(string[] args)
-        {
-            var host = new WebHostBuilder()
-                .UseKestrel()
-                .UseContentRoot(Directory.GetCurrentDirectory())
-                .UseIISIntegration()
-                .UseStartup<Startup>()
-                .Build();
-
-            host.Run();
-        }
+        public static void Main(string[] args)
+        {
+            CreateWebHostBuilder(args).Build().Run();
+        }
+
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+            WebHost.CreateDefaultBuilder(args)
+                .UseStartup<Startup>();
     }
 }

samples/WebApiContrib.Core.WebPages.Samples/WebApiContrib.Core.WebPages.Samples.csproj

@@ -1,26 +1,26 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>WebApiContrib.Core.WebPages.Samples</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>WebApiContrib.Core.WebPages.Samples</PackageId>
-  </PropertyGroup>
-
+  </PropertyGroup>
+
   <ItemGroup>
     <Content Update="wwwroot\**\*;Views\**\*;appsettings.json;web.config">
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
     </Content>
-  </ItemGroup>
-
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\WebApiContrib.Core.WebPages\WebApiContrib.Core.WebPages.csproj" />
     <ProjectReference Include="..\..\src\WebApiContrib.Core.TagHelpers.Markdown\WebApiContrib.Core.TagHelpers.Markdown.csproj" />
-  </ItemGroup>
-
+  </ItemGroup>
+
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
-  </ItemGroup>
-
-</Project>
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.4" />
+  </ItemGroup>
+
+</Project>

samples/WebApiContrib.Core.WebPages.Samples/runtimeconfig.template.json

@@ -4,6 +4,7 @@ WebApiContrib.Core.Formatter.Csv [![NuGet Status](http://img.shields.io/nuget/v/
 
 # History
 
+2018.09.14: Added correct usage of CanRead/CanReadType
 2018.05.31: Adding support for ignoring propeties in the CSV DTO
 2018.04.18: Adding support for customization of the header with the display attribute
 2018.04.12: Using the encoding from the options in the CsvOutputFormatter, Don't buffer CSV 

src/WebApiContrib.Core.Formatter.Csv/README.md

@@ -2,24 +2,25 @@
 
   <PropertyGroup>
     <Description>ASP.NET Core InputFormatter, OutputFormatter for IList CSV data</Description>
-    <VersionPrefix>2.0.4</VersionPrefix>
+    <VersionPrefix>2.0.6</VersionPrefix>
     <Authors>damienbod;WebApiContrib Contributors</Authors>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <AssemblyName>WebApiContrib.Core.Formatter.Csv</AssemblyName>
     <PackageId>WebApiContrib.Core.Formatter.Csv</PackageId>
     <PackageTags>ASP.NET Core;InputFormatter;OutputFormatter;MediaFormatter;CSV;Content-Type;aspnetcore</PackageTags>
-    <PackageReleaseNotes>Adding support for ignoring properties</PackageReleaseNotes>
+    <PackageReleaseNotes>Added correct usage of CanRead/CanReadType</PackageReleaseNotes>
     <PackageIconUrl>https://avatars1.githubusercontent.com/u/1561645?s=140</PackageIconUrl>
     <PackageProjectUrl>https://github.com/damienbod/WebAPIContrib.Core/tree/master/src/WebApiContrib.Core.Formatter.Csv</PackageProjectUrl>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/WebApiContrib/WebAPIContrib.Core.git</RepositoryUrl>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <Version>2.0.5</Version>
-    <AssemblyVersion>2.0.5</AssemblyVersion>
-    <FileVersion>2.0.5</FileVersion>
+    <Version>2.0.6</Version>
+    <AssemblyVersion>2.0.6</AssemblyVersion>
+    <FileVersion>2.0.6</FileVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageLicenseUrl>https://github.com/WebApiContrib/WebAPIContrib.Core/blob/master/LICENSE</PackageLicenseUrl>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">