Update to .NET Core 2

folkelib · Nov 4, 2017 · ac44866 · ac44866
1 parent 0a00d37
commit ac44866
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 17 deletions.
diff --git a/src/Folke.Core/ApplicationBuilderExtensions.cs b/src/Folke.Core/ApplicationBuilderExtensions.cs
@@ -25,7 +25,7 @@ public static class ApplicationBuilderExtensions
             ApplicationPartManager applicationPartManager,
             Action<FolkeCoreApplicationOptions> optionsAction)
         {
-            app.UseIdentity();
+            app.UseAuthentication();
             app.UseDefaultFiles();
             app.UseStaticFiles();
             app.UseMvc();

diff --git a/src/Folke.Core/Folke.Core.csproj b/src/Folke.Core/Folke.Core.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>1.4.0</VersionPrefix>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Folke.Core</AssemblyName>
     <PackageId>Folke.Core</PackageId>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -11,10 +11,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Folke.CsTsService" Version="2.0.0.5" />
-    <PackageReference Include="Folke.Identity.Elm" Version="2.0.0.3" />
-    <PackageReference Include="Folke.Identity.Server" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.2" />
+    <PackageReference Include="Folke.CsTsService" Version="3.0.0" />
+    <PackageReference Include="Folke.Identity.Elm" Version="3.0.0" />
+    <PackageReference Include="Folke.Identity.Server" Version="3.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Folke.Core/ServiceCollectionExtensions.cs b/src/Folke.Core/ServiceCollectionExtensions.cs
@@ -4,6 +4,7 @@
 using Folke.Elm;
 using Microsoft.Extensions.DependencyInjection;
 using System;
+using Microsoft.AspNetCore.Identity;
 
 namespace Folke.Core
 {

diff --git a/test/Folke.Core.Tests/Folke.Core.Tests.csproj b/test/Folke.Core.Tests/Folke.Core.Tests.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>    
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Folke.Elm.Sqlite" Version="1.4.0.4" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="1.1.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+    <PackageReference Include="Folke.Elm.Sqlite" Version="2.0.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
+    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/Folke.Core.Tests/IntegrationTest.cs b/test/Folke.Core.Tests/IntegrationTest.cs
@@ -1,11 +1,8 @@
-using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
-using Folke.Core.Entities;
 using Folke.Elm;
 using Folke.Elm.Sqlite;
 using Microsoft.AspNetCore.Builder;
@@ -16,18 +13,18 @@
 using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json;
 using Xunit;
+using Folke.Core.Entities;
 
 namespace Folke.Core.Tests
 {
     public class IntegrationTest
     {
         private readonly HttpClient client;
-        private readonly TestServer server;
 
         public IntegrationTest()
         {
             // Arrange
-            server = new TestServer(new WebHostBuilder()
+            var server = new TestServer(new WebHostBuilder()
                 .UseStartup<SampleStartup>());
             client = server.CreateClient();
         }