diff --git a/Security.sln b/Security.sln index 61a335c030..0818558307 100644 --- a/Security.sln +++ b/Security.sln @@ -40,8 +40,6 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Authentica EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Authentication.Test", "test\Microsoft.AspNet.Authentication.Test\Microsoft.AspNet.Authentication.Test.xproj", "{8DA26CD1-1302-4CFD-9270-9FA1B7C6138B}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Authentication.OpenIdConnectBearer", "src\Microsoft.AspNet.Authentication.JwtBearer\Microsoft.AspNet.Authentication.OpenIdConnectBearer.xproj", "{2755BFE5-7421-4A31-A644-F817DF5CAA98}" -EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Authorization.Test", "test\Microsoft.AspNet.Authorization.Test\Microsoft.AspNet.Authorization.Test.xproj", "{7AF5AD96-EB6E-4D0E-8ABE-C0B543C0F4C2}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Authorization", "src\Microsoft.AspNet.Authorization\Microsoft.AspNet.Authorization.xproj", "{6AB3E514-5894-4131-9399-DC7D5284ADDB}" @@ -50,6 +48,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.CookiePoli EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.CookiePolicy.Test", "test\Microsoft.AspNet.CookiePolicy.Test\Microsoft.AspNet.CookiePolicy.Test.xproj", "{1790E052-646F-4529-B90E-6FEA95520D69}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Authentication.OpenIdConnectBearer", "src\Microsoft.AspNet.Authentication.OpenIdConnectBearer\Microsoft.AspNet.Authentication.OpenIdConnectBearer.xproj", "{2755BFE5-7421-4A31-A644-F817DF5CAA98}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -210,18 +210,6 @@ Global {8DA26CD1-1302-4CFD-9270-9FA1B7C6138B}.Release|Mixed Platforms.Build.0 = Release|Any CPU {8DA26CD1-1302-4CFD-9270-9FA1B7C6138B}.Release|x86.ActiveCfg = Release|Any CPU {8DA26CD1-1302-4CFD-9270-9FA1B7C6138B}.Release|x86.Build.0 = Release|Any CPU - {2755BFE5-7421-4A31-A644-F817DF5CAA98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2755BFE5-7421-4A31-A644-F817DF5CAA98}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2755BFE5-7421-4A31-A644-F817DF5CAA98}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {2755BFE5-7421-4A31-A644-F817DF5CAA98}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {2755BFE5-7421-4A31-A644-F817DF5CAA98}.Debug|x86.ActiveCfg = Debug|Any CPU - {2755BFE5-7421-4A31-A644-F817DF5CAA98}.Debug|x86.Build.0 = Debug|Any CPU - {2755BFE5-7421-4A31-A644-F817DF5CAA98}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2755BFE5-7421-4A31-A644-F817DF5CAA98}.Release|Any CPU.Build.0 = Release|Any CPU - {2755BFE5-7421-4A31-A644-F817DF5CAA98}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {2755BFE5-7421-4A31-A644-F817DF5CAA98}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {2755BFE5-7421-4A31-A644-F817DF5CAA98}.Release|x86.ActiveCfg = Release|Any CPU - {2755BFE5-7421-4A31-A644-F817DF5CAA98}.Release|x86.Build.0 = Release|Any CPU {7AF5AD96-EB6E-4D0E-8ABE-C0B543C0F4C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7AF5AD96-EB6E-4D0E-8ABE-C0B543C0F4C2}.Debug|Any CPU.Build.0 = Debug|Any CPU {7AF5AD96-EB6E-4D0E-8ABE-C0B543C0F4C2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -270,6 +258,18 @@ Global {1790E052-646F-4529-B90E-6FEA95520D69}.Release|Mixed Platforms.Build.0 = Release|Any CPU {1790E052-646F-4529-B90E-6FEA95520D69}.Release|x86.ActiveCfg = Release|Any CPU {1790E052-646F-4529-B90E-6FEA95520D69}.Release|x86.Build.0 = Release|Any CPU + {2755BFE5-7421-4A31-A644-F817DF5CAA98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2755BFE5-7421-4A31-A644-F817DF5CAA98}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2755BFE5-7421-4A31-A644-F817DF5CAA98}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {2755BFE5-7421-4A31-A644-F817DF5CAA98}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {2755BFE5-7421-4A31-A644-F817DF5CAA98}.Debug|x86.ActiveCfg = Debug|Any CPU + {2755BFE5-7421-4A31-A644-F817DF5CAA98}.Debug|x86.Build.0 = Debug|Any CPU + {2755BFE5-7421-4A31-A644-F817DF5CAA98}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2755BFE5-7421-4A31-A644-F817DF5CAA98}.Release|Any CPU.Build.0 = Release|Any CPU + {2755BFE5-7421-4A31-A644-F817DF5CAA98}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {2755BFE5-7421-4A31-A644-F817DF5CAA98}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {2755BFE5-7421-4A31-A644-F817DF5CAA98}.Release|x86.ActiveCfg = Release|Any CPU + {2755BFE5-7421-4A31-A644-F817DF5CAA98}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -288,10 +288,10 @@ Global {0330FFF6-B4B5-42DD-8C99-26A789569000} = {4D2B6A51-2F9F-44F5-8131-EA5CAC053652} {1657C79E-7755-4AEE-9D61-571295B69A30} = {4D2B6A51-2F9F-44F5-8131-EA5CAC053652} {8DA26CD1-1302-4CFD-9270-9FA1B7C6138B} = {7BF11F3A-60B6-4796-B504-579C67FFBA34} - {2755BFE5-7421-4A31-A644-F817DF5CAA98} = {4D2B6A51-2F9F-44F5-8131-EA5CAC053652} {7AF5AD96-EB6E-4D0E-8ABE-C0B543C0F4C2} = {7BF11F3A-60B6-4796-B504-579C67FFBA34} {6AB3E514-5894-4131-9399-DC7D5284ADDB} = {4D2B6A51-2F9F-44F5-8131-EA5CAC053652} {86183DC3-02A8-4A68-8B60-71ECEC066E79} = {4D2B6A51-2F9F-44F5-8131-EA5CAC053652} {1790E052-646F-4529-B90E-6FEA95520D69} = {7BF11F3A-60B6-4796-B504-579C67FFBA34} + {2755BFE5-7421-4A31-A644-F817DF5CAA98} = {4D2B6A51-2F9F-44F5-8131-EA5CAC053652} EndGlobalSection EndGlobal diff --git a/src/Microsoft.AspNet.Authentication.JwtBearer/Events/AuthenticationChallengeContext.cs b/src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/Events/AuthenticationChallengeContext.cs similarity index 100% rename from src/Microsoft.AspNet.Authentication.JwtBearer/Events/AuthenticationChallengeContext.cs rename to src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/Events/AuthenticationChallengeContext.cs diff --git a/src/Microsoft.AspNet.Authentication.JwtBearer/Events/AuthenticationFailedContext.cs b/src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/Events/AuthenticationFailedContext.cs similarity index 100% rename from src/Microsoft.AspNet.Authentication.JwtBearer/Events/AuthenticationFailedContext.cs rename to src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/Events/AuthenticationFailedContext.cs diff --git a/src/Microsoft.AspNet.Authentication.JwtBearer/Events/IOpenIdConnectBearerEvents.cs b/src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/Events/IOpenIdConnectBearerEvents.cs similarity index 100% rename from src/Microsoft.AspNet.Authentication.JwtBearer/Events/IOpenIdConnectBearerEvents.cs rename to src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/Events/IOpenIdConnectBearerEvents.cs diff --git a/src/Microsoft.AspNet.Authentication.JwtBearer/Events/MessageReceivedContext.cs b/src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/Events/MessageReceivedContext.cs similarity index 100% rename from src/Microsoft.AspNet.Authentication.JwtBearer/Events/MessageReceivedContext.cs rename to src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/Events/MessageReceivedContext.cs diff --git a/src/Microsoft.AspNet.Authentication.JwtBearer/Events/OpenIdConnectBearerEvents.cs b/src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/Events/OpenIdConnectBearerEvents.cs similarity index 100% rename from src/Microsoft.AspNet.Authentication.JwtBearer/Events/OpenIdConnectBearerEvents.cs rename to src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/Events/OpenIdConnectBearerEvents.cs diff --git a/src/Microsoft.AspNet.Authentication.JwtBearer/Events/SecurityTokenReceivedContext.cs b/src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/Events/SecurityTokenReceivedContext.cs similarity index 100% rename from src/Microsoft.AspNet.Authentication.JwtBearer/Events/SecurityTokenReceivedContext.cs rename to src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/Events/SecurityTokenReceivedContext.cs diff --git a/src/Microsoft.AspNet.Authentication.JwtBearer/Events/SecurityTokenValidatedContext.cs b/src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/Events/SecurityTokenValidatedContext.cs similarity index 100% rename from src/Microsoft.AspNet.Authentication.JwtBearer/Events/SecurityTokenValidatedContext.cs rename to src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/Events/SecurityTokenValidatedContext.cs diff --git a/src/Microsoft.AspNet.Authentication.JwtBearer/Microsoft.AspNet.Authentication.OpenIdConnectBearer.xproj b/src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/Microsoft.AspNet.Authentication.OpenIdConnectBearer.xproj similarity index 100% rename from src/Microsoft.AspNet.Authentication.JwtBearer/Microsoft.AspNet.Authentication.OpenIdConnectBearer.xproj rename to src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/Microsoft.AspNet.Authentication.OpenIdConnectBearer.xproj diff --git a/src/Microsoft.AspNet.Authentication.JwtBearer/OpenIdConnectBearerAppBuilderExtensions.cs b/src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/OpenIdConnectBearerAppBuilderExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Authentication.JwtBearer/OpenIdConnectBearerAppBuilderExtensions.cs rename to src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/OpenIdConnectBearerAppBuilderExtensions.cs diff --git a/src/Microsoft.AspNet.Authentication.JwtBearer/OpenIdConnectBearerDefaults.cs b/src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/OpenIdConnectBearerDefaults.cs similarity index 100% rename from src/Microsoft.AspNet.Authentication.JwtBearer/OpenIdConnectBearerDefaults.cs rename to src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/OpenIdConnectBearerDefaults.cs diff --git a/src/Microsoft.AspNet.Authentication.JwtBearer/OpenIdConnectBearerHandler.cs b/src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/OpenIdConnectBearerHandler.cs similarity index 100% rename from src/Microsoft.AspNet.Authentication.JwtBearer/OpenIdConnectBearerHandler.cs rename to src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/OpenIdConnectBearerHandler.cs diff --git a/src/Microsoft.AspNet.Authentication.JwtBearer/OpenIdConnectBearerMiddleware.cs b/src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/OpenIdConnectBearerMiddleware.cs similarity index 100% rename from src/Microsoft.AspNet.Authentication.JwtBearer/OpenIdConnectBearerMiddleware.cs rename to src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/OpenIdConnectBearerMiddleware.cs diff --git a/src/Microsoft.AspNet.Authentication.JwtBearer/OpenIdConnectBearerOptions.cs b/src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/OpenIdConnectBearerOptions.cs similarity index 100% rename from src/Microsoft.AspNet.Authentication.JwtBearer/OpenIdConnectBearerOptions.cs rename to src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/OpenIdConnectBearerOptions.cs diff --git a/src/Microsoft.AspNet.Authentication.JwtBearer/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.AspNet.Authentication.JwtBearer/Properties/AssemblyInfo.cs rename to src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.AspNet.Authentication.JwtBearer/Properties/Resources.Designer.cs b/src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/Properties/Resources.Designer.cs similarity index 100% rename from src/Microsoft.AspNet.Authentication.JwtBearer/Properties/Resources.Designer.cs rename to src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/Properties/Resources.Designer.cs diff --git a/src/Microsoft.AspNet.Authentication.JwtBearer/Resources.resx b/src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/Resources.resx similarity index 100% rename from src/Microsoft.AspNet.Authentication.JwtBearer/Resources.resx rename to src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/Resources.resx diff --git a/src/Microsoft.AspNet.Authentication.JwtBearer/project.json b/src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/project.json similarity index 100% rename from src/Microsoft.AspNet.Authentication.JwtBearer/project.json rename to src/Microsoft.AspNet.Authentication.OpenIdConnectBearer/project.json diff --git a/test/Microsoft.AspNet.Authentication.Test/JwtBearer/JwtBearerMiddlewareTests.cs b/test/Microsoft.AspNet.Authentication.Test/OpenIdConnectBearer/OpenIdConnectBearerMiddlewareTests.cs similarity index 100% rename from test/Microsoft.AspNet.Authentication.Test/JwtBearer/JwtBearerMiddlewareTests.cs rename to test/Microsoft.AspNet.Authentication.Test/OpenIdConnectBearer/OpenIdConnectBearerMiddlewareTests.cs