FIXME SR is private

test/yavscTests/Mandatory/BatchTests.cs

@@ -1,7 +1,7 @@
 using System;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Builder.Internal;
-using Microsoft.AspNet.Razor;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder.Internal;
+using Microsoft.AspNetCore.Razor;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
@@ -12,7 +12,7 @@ using Yavsc;
 using Yavsc.Models;
 using Yavsc.Services;
 using System.Runtime.Versioning;
-using Microsoft.AspNet.Mvc.Razor;
+using Microsoft.AspNetCore.Mvc.Razor;
 using System.Diagnostics;
 using Microsoft.Dnx.Compilation.CSharp;
 using Microsoft.Extensions.OptionsModel;

test/yavscTests/Mandatory/RegisterApi.cs

@@ -9,15 +9,15 @@ using System.Linq;
 using System.Net;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Hosting;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.PlatformAbstractions;
 using Xunit;
 using Xunit.Abstractions;
 using Yavsc.Authentication;
 using static OAuth.AspNet.AuthServer.Constants;
-using Microsoft.AspNet.Mvc;
-using Microsoft.AspNet.Mvc.Filters;
-using Microsoft.AspNet.Mvc.Razor;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Razor;
 
 namespace yavscTests
 {

test/yavscTests/Mandatory/Remoting.cs

@@ -9,7 +9,7 @@ using System.Linq;
 using System.Net;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Hosting;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.OptionsModel;
 using Microsoft.Extensions.PlatformAbstractions;
 using Xunit;

test/yavscTests/Mandatory/ServerSideFixture.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Data.Common;
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Hosting.Internal;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Hosting.Internal;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.OptionsModel;
 using Yavsc.Lib;

test/yavscTests/Startup.cs

@@ -3,9 +3,9 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.OptionsModel;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Razor;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Razor;
 using Microsoft.Extensions.PlatformAbstractions;
 using Yavsc;
 using Yavsc.Models;
@@ -13,15 +13,15 @@ using Yavsc.Services;
 using Microsoft.Data.Entity;
 using Microsoft.Extensions.WebEncoders;
 using yavscTests.Settings;
-using Microsoft.AspNet.Diagnostics;
+using Microsoft.AspNetCore.Diagnostics;
 using System.Net;
 using Yavsc.Extensions;
-using Microsoft.AspNet.Authentication.Cookies;
-using Microsoft.AspNet.Authentication.JwtBearer;
+using Microsoft.AspNetCore.Authentication.Cookies;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
 using OAuth.AspNet.Tokens;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Authentication.OAuth;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Authentication.OAuth;
 using Yavsc.Helpers.Auth;
 using Google.Apis.Util.Store;
 using System.Security.Claims;
@@ -29,23 +29,23 @@ using Google.Apis.Auth.OAuth2.Responses;
 using Constants = Yavsc.Constants;
 using OAuth.AspNet.AuthServer;
 using Yavsc.Models.Auth;
-using Microsoft.AspNet.Identity;
+using Microsoft.AspNetCore.Identity;
 using System.Collections.Concurrent;
 using System.Security.Principal;
 using System.Linq;
 using System.Collections.Generic;
-using Microsoft.AspNet.Mvc;
-using Microsoft.AspNet.Mvc.Filters;
-using Microsoft.AspNet.Mvc.Razor;
-using Microsoft.AspNet.Authentication;
-using Microsoft.AspNet.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authorization;
 using Yavsc.AuthorizationHandlers;
 using Yavsc.Formatters;
 using Microsoft.Net.Http.Headers;
 using static Yavsc.Startup;
-using Microsoft.AspNet.DataProtection.Infrastructure;
+using Microsoft.AspNetCore.DataProtection.Infrastructure;
 using System.IO;
-using Microsoft.AspNet.Identity.EntityFramework;
+using Microsoft.AspNetCore.Identity.EntityFramework;
 using Yavsc.Auth;
 using Yavsc.Lib;
 

test/yavscTests/WIP/NotWorking.cs

@@ -7,7 +7,7 @@ using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.OptionsModel;
 using Xunit;
 using Yavsc;
-using Microsoft.AspNet.Hosting;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.Dnx.TestHost.TestAdapter;
 using Xunit.Abstractions;
 

test/yavscTests/YavscServerFactory.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Hosting.Server;
-using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.AspNetCore.Http.Features;
 using Microsoft.Extensions.Configuration;
 
 namespace Yavsc.Server