ASP.NET Core 3.0 preparation

.gitignore

@@ -16,6 +16,7 @@ project.lock.json
 
 # Build results
 
+artifacts/
 [Dd]ebug/
 [Rr]elease/
 x64/

.travis.yml

@@ -1,6 +1,6 @@
 language: csharp
 sudo: false
-dist: trusty
+dist: xenial
 addons:
   apt:
     packages:
@@ -9,17 +9,15 @@ addons:
     - libicu-dev
     - libssl-dev
     - libunwind8
-    - zlib1g
 env:
   global:
     - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
     - DOTNET_CLI_TELEMETRY_OPTOUT: 1
+    - NUGET_XMLDOC_MODE: skip
 mono: none
 os:
   - linux
   - osx
-osx_image: xcode8.2
-before_install:
-  - if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/; fi
+osx_image: xcode8.3
 script:
-  - ./build.sh
+  - ./build.sh

AspNet.Security.OpenId.Providers.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26228.4
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28803.156
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{74A61C02-16BE-4F6F-B378-4CBB7E743A37}"
 	ProjectSection(SolutionItems) = preProject

build/dependencies.props

@@ -6,8 +6,6 @@
     <IdentityModelCoreVersion>2.1.4</IdentityModelCoreVersion>
     <JetBrainsVersion>11.0.0</JetBrainsVersion>
     <JsonNetVersion>10.0.3</JsonNetVersion>
-    <NetStandardImplicitPackageVersion>2.0.0</NetStandardImplicitPackageVersion>
-    <RuntimeFrameworkVersion>2.0.0</RuntimeFrameworkVersion>
   </PropertyGroup>
 
 </Project>

build/packages.props

@@ -15,7 +15,7 @@
     <Product>aspnet-contrib</Product>
     <PackageIconUrl>https://avatars3.githubusercontent.com/u/7998081?s=64</PackageIconUrl>
     <PackageProjectUrl>https://github.com/aspnet-contrib/AspNet.Security.OpenId.Providers</PackageProjectUrl>
-    <PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0.html</PackageLicenseUrl>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>git://github.com/aspnet-contrib/AspNet.Security.OpenId.Providers</RepositoryUrl>
   </PropertyGroup>

global.json

@@ -0,0 +1,8 @@
+{
+    "sdk": {
+        "version": "2.2.106"
+    },
+    "msbuild-sdks": {
+        "Internal.AspNetCore.Sdk": "2.2.1-build-20190508.1"
+    }
+}

korebuild-lock.txt

@@ -1,2 +1,2 @@
-version:2.1.0-rtm-15783
-commithash:5fc2b2f607f542a2ffde11c19825e786fc1a3774
+version:2.2.1-build-20190508.1
+commithash:c3299b1979b3cdae35844bcbaa8b9d753c4d2737

korebuild.json

@@ -1,4 +1,4 @@
 {
-  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.1/tools/korebuild.schema.json",
-  "channel": "release/2.1"
+  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.2/tools/korebuild.schema.json",
+  "channel": "release/2.2"
 }

samples/Mvc.Client/Mvc.Client.csproj

@@ -3,25 +3,16 @@
   <Import Project="..\..\build\dependencies.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
+    <AspNetCoreVersion>2.2.4</AspNetCoreVersion>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\AspNet.Security.OpenId.Steam\AspNet.Security.OpenId.Steam.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="$(AspNetCoreVersion)" />
   </ItemGroup>
 
 </Project>

samples/Mvc.Client/Program.cs

@@ -7,12 +7,11 @@ public static class Program
     {
         public static void Main(string[] args)
         {
-            BuildWebHost(args).Run();
+            CreateWebHostBuilder(args).Build().Run();
         }
 
-        public static IWebHost BuildWebHost(string[] args) =>
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>()
-                .Build();
+                   .UseStartup<Startup>();
     }
 }

samples/Mvc.Client/Properties/launchSettings.json

@@ -16,10 +16,12 @@
       }
     },
     "web": {
-      "commandName": "web",
+      "commandName": "Project",
+      "launchBrowser": true,
+      "launchUrl": "http://localhost:5000/",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     }
   }
-}
+}

samples/Mvc.Client/Startup.cs

@@ -9,6 +9,7 @@
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Mvc.Client
@@ -51,7 +52,7 @@ public void ConfigureServices(IServiceCollection services)
 
             .AddSteam();
 
-            services.AddMvc();
+            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
         }
 
         public void Configure(IApplicationBuilder app)
@@ -63,4 +64,4 @@ public void Configure(IApplicationBuilder app)
             app.UseMvc();
         }
     }
-}
+}

samples/Mvc.Client/web.config

@@ -2,8 +2,8 @@
 <configuration>
   <system.webServer>
     <handlers>
-      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified"/>
+      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified"/>
     </handlers>
     <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false"/>
   </system.webServer>
-</configuration>
+</configuration>

src/AspNet.Security.OpenId.Steam/SteamAuthenticationDefaults.cs

@@ -4,7 +4,6 @@
  * for more information concerning the license and the contributors participating to this project.
  */
 
-using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Authentication;
 
 namespace AspNet.Security.OpenId.Steam

src/AspNet.Security.OpenId.Steam/SteamAuthenticationExtensions.cs

@@ -13,7 +13,7 @@ namespace Microsoft.Extensions.DependencyInjection
 {
     /// <summary>
     /// Exposes convenient extensions that can be used to add an instance
-    /// of the Steam authentication middleware in an ASP.NET 5 pipeline.
+    /// of the Steam authentication middleware in an ASP.NET Core pipeline.
     /// </summary>
     public static class SteamAuthenticationExtensions
     {

src/AspNet.Security.OpenId/OpenIdAuthenticationConfiguration.cs

@@ -48,18 +48,8 @@ public class Retriever : IConfigurationRetriever<OpenIdAuthenticationConfigurati
             /// <param name="parser">The HTML parser used to parse the discovery documents.</param>
             public Retriever([NotNull] HttpClient client, [NotNull] HtmlParser parser)
             {
-                if (client == null)
-                {
-                    throw new ArgumentNullException(nameof(client));
-                }
-
-                if (parser == null)
-                {
-                    throw new ArgumentNullException(nameof(parser));
-                }
-
-                HttpClient = client;
-                HtmlParser = parser;
+                HttpClient = client ?? throw new ArgumentNullException(nameof(client));
+                HtmlParser = parser ?? throw new ArgumentNullException(nameof(parser));
             }
 
             /// <summary>