From 2b65d34d29914e9dc0fd7016c0478d0e118931e7 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 11 Dec 2018 11:43:51 -0800 Subject: [PATCH 1/2] Convert Session to use Reference and move to Middleware folder --- build/buildorder.props | 1 - build/repo.props | 1 - build/submodules.props | 1 - eng/Baseline.Designer.props | 11 +++ eng/Baseline.xml | 1 + eng/ProjectReferences.props | 1 + src/Middleware/Middleware.sln | 47 +++++++++++ .../Session/samples/SessionSample.csproj | 17 ++++ .../Session/samples}/Startup.cs | 0 .../Session/src}/CookieProtection.cs | 0 .../Session/src}/DistributedSession.cs | 0 .../Session/src}/DistributedSessionStore.cs | 0 .../Session/src}/EncodedKey.cs | 0 .../Session/src}/ISessionStore.cs | 0 .../Session/src}/LoggingExtensions.cs | 0 .../src/Microsoft.AspNetCore.Session.csproj | 20 +++++ .../Session/src}/NoOpSessionStore.cs | 0 .../src}/Properties/Resources.Designer.cs | 0 .../Session/src}/Resources.resx | 0 .../Session/src}/SessionDefaults.cs | 0 .../Session/src}/SessionFeature.cs | 0 .../Session/src}/SessionMiddleware.cs | 0 .../src}/SessionMiddlewareExtensions.cs | 0 .../Session/src}/SessionOptions.cs | 0 .../SessionServiceCollectionExtensions.cs | 0 .../Session/src}/SipHash.cs | 0 .../Session/src}/baseline.netcore.json | 0 .../Microsoft.AspNetCore.Session.Tests.csproj | 14 ++++ .../Session/test}/SessionTests.cs | 0 src/Session/.gitignore | 33 -------- src/Session/Directory.Build.props | 21 ----- src/Session/Directory.Build.targets | 7 -- src/Session/NuGetPackageVerifier.json | 7 -- src/Session/README.md | 12 --- src/Session/Session.sln | 74 ------------------ src/Session/build/Key.snk | Bin 596 -> 0 bytes src/Session/build/dependencies.props | 36 --------- src/Session/build/repo.props | 8 -- src/Session/build/sources.props | 17 ---- .../Properties/launchSettings.json | 27 ------- .../SessionSample/SessionSample.csproj | 20 ----- src/Session/src/Directory.Build.props | 7 -- .../Microsoft.AspNetCore.Session.csproj | 20 ----- src/Session/test/Directory.Build.props | 14 ---- .../Microsoft.AspNetCore.Session.Tests.csproj | 22 ------ src/Session/version.props | 12 --- 46 files changed, 111 insertions(+), 340 deletions(-) create mode 100644 src/Middleware/Session/samples/SessionSample.csproj rename src/{Session/samples/SessionSample => Middleware/Session/samples}/Startup.cs (100%) rename src/{Session/src/Microsoft.AspNetCore.Session => Middleware/Session/src}/CookieProtection.cs (100%) rename src/{Session/src/Microsoft.AspNetCore.Session => Middleware/Session/src}/DistributedSession.cs (100%) rename src/{Session/src/Microsoft.AspNetCore.Session => Middleware/Session/src}/DistributedSessionStore.cs (100%) rename src/{Session/src/Microsoft.AspNetCore.Session => Middleware/Session/src}/EncodedKey.cs (100%) rename src/{Session/src/Microsoft.AspNetCore.Session => Middleware/Session/src}/ISessionStore.cs (100%) rename src/{Session/src/Microsoft.AspNetCore.Session => Middleware/Session/src}/LoggingExtensions.cs (100%) create mode 100644 src/Middleware/Session/src/Microsoft.AspNetCore.Session.csproj rename src/{Session/src/Microsoft.AspNetCore.Session => Middleware/Session/src}/NoOpSessionStore.cs (100%) rename src/{Session/src/Microsoft.AspNetCore.Session => Middleware/Session/src}/Properties/Resources.Designer.cs (100%) rename src/{Session/src/Microsoft.AspNetCore.Session => Middleware/Session/src}/Resources.resx (100%) rename src/{Session/src/Microsoft.AspNetCore.Session => Middleware/Session/src}/SessionDefaults.cs (100%) rename src/{Session/src/Microsoft.AspNetCore.Session => Middleware/Session/src}/SessionFeature.cs (100%) rename src/{Session/src/Microsoft.AspNetCore.Session => Middleware/Session/src}/SessionMiddleware.cs (100%) rename src/{Session/src/Microsoft.AspNetCore.Session => Middleware/Session/src}/SessionMiddlewareExtensions.cs (100%) rename src/{Session/src/Microsoft.AspNetCore.Session => Middleware/Session/src}/SessionOptions.cs (100%) rename src/{Session/src/Microsoft.AspNetCore.Session => Middleware/Session/src}/SessionServiceCollectionExtensions.cs (100%) rename src/{Session/src/Microsoft.AspNetCore.Session => Middleware/Session/src}/SipHash.cs (100%) rename src/{Session/src/Microsoft.AspNetCore.Session => Middleware/Session/src}/baseline.netcore.json (100%) create mode 100644 src/Middleware/Session/test/Microsoft.AspNetCore.Session.Tests.csproj rename src/{Session/test/Microsoft.AspNetCore.Session.Tests => Middleware/Session/test}/SessionTests.cs (100%) delete mode 100644 src/Session/.gitignore delete mode 100644 src/Session/Directory.Build.props delete mode 100644 src/Session/Directory.Build.targets delete mode 100644 src/Session/NuGetPackageVerifier.json delete mode 100644 src/Session/README.md delete mode 100644 src/Session/Session.sln delete mode 100644 src/Session/build/Key.snk delete mode 100644 src/Session/build/dependencies.props delete mode 100644 src/Session/build/repo.props delete mode 100644 src/Session/build/sources.props delete mode 100644 src/Session/samples/SessionSample/Properties/launchSettings.json delete mode 100644 src/Session/samples/SessionSample/SessionSample.csproj delete mode 100644 src/Session/src/Directory.Build.props delete mode 100644 src/Session/src/Microsoft.AspNetCore.Session/Microsoft.AspNetCore.Session.csproj delete mode 100644 src/Session/test/Directory.Build.props delete mode 100644 src/Session/test/Microsoft.AspNetCore.Session.Tests/Microsoft.AspNetCore.Session.Tests.csproj delete mode 100644 src/Session/version.props diff --git a/build/buildorder.props b/build/buildorder.props index 25c647ca230c..21999af70f01 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -10,7 +10,6 @@ - diff --git a/build/repo.props b/build/repo.props index 35e1ed077b78..a107d1c96ffc 100644 --- a/build/repo.props +++ b/build/repo.props @@ -66,7 +66,6 @@ - diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 2a6bc069982a..03f9802505a5 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -495,6 +495,17 @@ + + + 2.1.1 + + + + + + + + 2.1.1 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 1a1f29b25155..dc0f2f0b136b 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -50,6 +50,7 @@ + diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index 15849673eaaa..bb785afb7d80 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -38,6 +38,7 @@ + diff --git a/src/Middleware/Middleware.sln b/src/Middleware/Middleware.sln index 4967def70b45..e861bd87a8f6 100644 --- a/src/Middleware/Middleware.sln +++ b/src/Middleware/Middleware.sln @@ -165,6 +165,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Respon EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCaching.Abstractions", "ResponseCaching.Abstractions\src\Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj", "{D0204B45-8528-4504-9FC1-D229F3A33896}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Session", "Session", "{D1394339-B3BE-4F42-8EC0-6E02CC0165EE}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SessionSample", "Session\samples\SessionSample.csproj", "{3AD7A532-59FC-46BC-8257-D0E6F9533B73}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Session", "Session\src\Microsoft.AspNetCore.Session.csproj", "{0FBCB5C7-B212-4BEE-B9AE-0BF653BBAD24}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Session.Tests", "Session\test\Microsoft.AspNetCore.Session.Tests.csproj", "{20C89A12-96B6-4F2B-9CA8-62891DCA2549}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "..\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{FD1C2473-5485-4105-87CB-617158F90FCA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.TestHost", "..\Hosting\TestHost\src\Microsoft.AspNetCore.TestHost.csproj", "{6F6A7E3D-D883-494D-8C61-E75D7EBFE3F4}" @@ -865,6 +873,42 @@ Global {D0204B45-8528-4504-9FC1-D229F3A33896}.Release|x64.Build.0 = Release|Any CPU {D0204B45-8528-4504-9FC1-D229F3A33896}.Release|x86.ActiveCfg = Release|Any CPU {D0204B45-8528-4504-9FC1-D229F3A33896}.Release|x86.Build.0 = Release|Any CPU + {3AD7A532-59FC-46BC-8257-D0E6F9533B73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3AD7A532-59FC-46BC-8257-D0E6F9533B73}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3AD7A532-59FC-46BC-8257-D0E6F9533B73}.Debug|x64.ActiveCfg = Debug|Any CPU + {3AD7A532-59FC-46BC-8257-D0E6F9533B73}.Debug|x64.Build.0 = Debug|Any CPU + {3AD7A532-59FC-46BC-8257-D0E6F9533B73}.Debug|x86.ActiveCfg = Debug|Any CPU + {3AD7A532-59FC-46BC-8257-D0E6F9533B73}.Debug|x86.Build.0 = Debug|Any CPU + {3AD7A532-59FC-46BC-8257-D0E6F9533B73}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3AD7A532-59FC-46BC-8257-D0E6F9533B73}.Release|Any CPU.Build.0 = Release|Any CPU + {3AD7A532-59FC-46BC-8257-D0E6F9533B73}.Release|x64.ActiveCfg = Release|Any CPU + {3AD7A532-59FC-46BC-8257-D0E6F9533B73}.Release|x64.Build.0 = Release|Any CPU + {3AD7A532-59FC-46BC-8257-D0E6F9533B73}.Release|x86.ActiveCfg = Release|Any CPU + {3AD7A532-59FC-46BC-8257-D0E6F9533B73}.Release|x86.Build.0 = Release|Any CPU + {0FBCB5C7-B212-4BEE-B9AE-0BF653BBAD24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0FBCB5C7-B212-4BEE-B9AE-0BF653BBAD24}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0FBCB5C7-B212-4BEE-B9AE-0BF653BBAD24}.Debug|x64.ActiveCfg = Debug|Any CPU + {0FBCB5C7-B212-4BEE-B9AE-0BF653BBAD24}.Debug|x64.Build.0 = Debug|Any CPU + {0FBCB5C7-B212-4BEE-B9AE-0BF653BBAD24}.Debug|x86.ActiveCfg = Debug|Any CPU + {0FBCB5C7-B212-4BEE-B9AE-0BF653BBAD24}.Debug|x86.Build.0 = Debug|Any CPU + {0FBCB5C7-B212-4BEE-B9AE-0BF653BBAD24}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0FBCB5C7-B212-4BEE-B9AE-0BF653BBAD24}.Release|Any CPU.Build.0 = Release|Any CPU + {0FBCB5C7-B212-4BEE-B9AE-0BF653BBAD24}.Release|x64.ActiveCfg = Release|Any CPU + {0FBCB5C7-B212-4BEE-B9AE-0BF653BBAD24}.Release|x64.Build.0 = Release|Any CPU + {0FBCB5C7-B212-4BEE-B9AE-0BF653BBAD24}.Release|x86.ActiveCfg = Release|Any CPU + {0FBCB5C7-B212-4BEE-B9AE-0BF653BBAD24}.Release|x86.Build.0 = Release|Any CPU + {20C89A12-96B6-4F2B-9CA8-62891DCA2549}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {20C89A12-96B6-4F2B-9CA8-62891DCA2549}.Debug|Any CPU.Build.0 = Debug|Any CPU + {20C89A12-96B6-4F2B-9CA8-62891DCA2549}.Debug|x64.ActiveCfg = Debug|Any CPU + {20C89A12-96B6-4F2B-9CA8-62891DCA2549}.Debug|x64.Build.0 = Debug|Any CPU + {20C89A12-96B6-4F2B-9CA8-62891DCA2549}.Debug|x86.ActiveCfg = Debug|Any CPU + {20C89A12-96B6-4F2B-9CA8-62891DCA2549}.Debug|x86.Build.0 = Debug|Any CPU + {20C89A12-96B6-4F2B-9CA8-62891DCA2549}.Release|Any CPU.ActiveCfg = Release|Any CPU + {20C89A12-96B6-4F2B-9CA8-62891DCA2549}.Release|Any CPU.Build.0 = Release|Any CPU + {20C89A12-96B6-4F2B-9CA8-62891DCA2549}.Release|x64.ActiveCfg = Release|Any CPU + {20C89A12-96B6-4F2B-9CA8-62891DCA2549}.Release|x64.Build.0 = Release|Any CPU + {20C89A12-96B6-4F2B-9CA8-62891DCA2549}.Release|x86.ActiveCfg = Release|Any CPU + {20C89A12-96B6-4F2B-9CA8-62891DCA2549}.Release|x86.Build.0 = Release|Any CPU {FD1C2473-5485-4105-87CB-617158F90FCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FD1C2473-5485-4105-87CB-617158F90FCA}.Debug|Any CPU.Build.0 = Debug|Any CPU {FD1C2473-5485-4105-87CB-617158F90FCA}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -1031,6 +1075,9 @@ Global {D8239A8C-F692-460A-B204-5CF05502BEE2} = {EDF56413-B406-4200-B4D4-0EE3F9CB8F7C} {9F973483-5D32-4093-88F0-761C9BEAEE04} = {EDF56413-B406-4200-B4D4-0EE3F9CB8F7C} {D0204B45-8528-4504-9FC1-D229F3A33896} = {7A493DEA-32F2-4AB1-9113-828D44F5DDA2} + {3AD7A532-59FC-46BC-8257-D0E6F9533B73} = {D1394339-B3BE-4F42-8EC0-6E02CC0165EE} + {0FBCB5C7-B212-4BEE-B9AE-0BF653BBAD24} = {D1394339-B3BE-4F42-8EC0-6E02CC0165EE} + {20C89A12-96B6-4F2B-9CA8-62891DCA2549} = {D1394339-B3BE-4F42-8EC0-6E02CC0165EE} {FD1C2473-5485-4105-87CB-617158F90FCA} = {ACA6DDB9-7592-47CE-A740-D15BF307E9E0} {6F6A7E3D-D883-494D-8C61-E75D7EBFE3F4} = {ACA6DDB9-7592-47CE-A740-D15BF307E9E0} {9D3062AB-5B11-4FFE-BEAF-304CF7F19AA5} = {ACA6DDB9-7592-47CE-A740-D15BF307E9E0} diff --git a/src/Middleware/Session/samples/SessionSample.csproj b/src/Middleware/Session/samples/SessionSample.csproj new file mode 100644 index 000000000000..e56bbdefff07 --- /dev/null +++ b/src/Middleware/Session/samples/SessionSample.csproj @@ -0,0 +1,17 @@ + + + + netcoreapp2.1;net461 + + + + + + + + + + + + + diff --git a/src/Session/samples/SessionSample/Startup.cs b/src/Middleware/Session/samples/Startup.cs similarity index 100% rename from src/Session/samples/SessionSample/Startup.cs rename to src/Middleware/Session/samples/Startup.cs diff --git a/src/Session/src/Microsoft.AspNetCore.Session/CookieProtection.cs b/src/Middleware/Session/src/CookieProtection.cs similarity index 100% rename from src/Session/src/Microsoft.AspNetCore.Session/CookieProtection.cs rename to src/Middleware/Session/src/CookieProtection.cs diff --git a/src/Session/src/Microsoft.AspNetCore.Session/DistributedSession.cs b/src/Middleware/Session/src/DistributedSession.cs similarity index 100% rename from src/Session/src/Microsoft.AspNetCore.Session/DistributedSession.cs rename to src/Middleware/Session/src/DistributedSession.cs diff --git a/src/Session/src/Microsoft.AspNetCore.Session/DistributedSessionStore.cs b/src/Middleware/Session/src/DistributedSessionStore.cs similarity index 100% rename from src/Session/src/Microsoft.AspNetCore.Session/DistributedSessionStore.cs rename to src/Middleware/Session/src/DistributedSessionStore.cs diff --git a/src/Session/src/Microsoft.AspNetCore.Session/EncodedKey.cs b/src/Middleware/Session/src/EncodedKey.cs similarity index 100% rename from src/Session/src/Microsoft.AspNetCore.Session/EncodedKey.cs rename to src/Middleware/Session/src/EncodedKey.cs diff --git a/src/Session/src/Microsoft.AspNetCore.Session/ISessionStore.cs b/src/Middleware/Session/src/ISessionStore.cs similarity index 100% rename from src/Session/src/Microsoft.AspNetCore.Session/ISessionStore.cs rename to src/Middleware/Session/src/ISessionStore.cs diff --git a/src/Session/src/Microsoft.AspNetCore.Session/LoggingExtensions.cs b/src/Middleware/Session/src/LoggingExtensions.cs similarity index 100% rename from src/Session/src/Microsoft.AspNetCore.Session/LoggingExtensions.cs rename to src/Middleware/Session/src/LoggingExtensions.cs diff --git a/src/Middleware/Session/src/Microsoft.AspNetCore.Session.csproj b/src/Middleware/Session/src/Microsoft.AspNetCore.Session.csproj new file mode 100644 index 000000000000..787ee561e5a4 --- /dev/null +++ b/src/Middleware/Session/src/Microsoft.AspNetCore.Session.csproj @@ -0,0 +1,20 @@ + + + + ASP.NET Core session state middleware. + netstandard2.0 + $(NoWarn);CS1591 + true + true + aspnetcore;session;sessionstate + + + + + + + + + + + diff --git a/src/Session/src/Microsoft.AspNetCore.Session/NoOpSessionStore.cs b/src/Middleware/Session/src/NoOpSessionStore.cs similarity index 100% rename from src/Session/src/Microsoft.AspNetCore.Session/NoOpSessionStore.cs rename to src/Middleware/Session/src/NoOpSessionStore.cs diff --git a/src/Session/src/Microsoft.AspNetCore.Session/Properties/Resources.Designer.cs b/src/Middleware/Session/src/Properties/Resources.Designer.cs similarity index 100% rename from src/Session/src/Microsoft.AspNetCore.Session/Properties/Resources.Designer.cs rename to src/Middleware/Session/src/Properties/Resources.Designer.cs diff --git a/src/Session/src/Microsoft.AspNetCore.Session/Resources.resx b/src/Middleware/Session/src/Resources.resx similarity index 100% rename from src/Session/src/Microsoft.AspNetCore.Session/Resources.resx rename to src/Middleware/Session/src/Resources.resx diff --git a/src/Session/src/Microsoft.AspNetCore.Session/SessionDefaults.cs b/src/Middleware/Session/src/SessionDefaults.cs similarity index 100% rename from src/Session/src/Microsoft.AspNetCore.Session/SessionDefaults.cs rename to src/Middleware/Session/src/SessionDefaults.cs diff --git a/src/Session/src/Microsoft.AspNetCore.Session/SessionFeature.cs b/src/Middleware/Session/src/SessionFeature.cs similarity index 100% rename from src/Session/src/Microsoft.AspNetCore.Session/SessionFeature.cs rename to src/Middleware/Session/src/SessionFeature.cs diff --git a/src/Session/src/Microsoft.AspNetCore.Session/SessionMiddleware.cs b/src/Middleware/Session/src/SessionMiddleware.cs similarity index 100% rename from src/Session/src/Microsoft.AspNetCore.Session/SessionMiddleware.cs rename to src/Middleware/Session/src/SessionMiddleware.cs diff --git a/src/Session/src/Microsoft.AspNetCore.Session/SessionMiddlewareExtensions.cs b/src/Middleware/Session/src/SessionMiddlewareExtensions.cs similarity index 100% rename from src/Session/src/Microsoft.AspNetCore.Session/SessionMiddlewareExtensions.cs rename to src/Middleware/Session/src/SessionMiddlewareExtensions.cs diff --git a/src/Session/src/Microsoft.AspNetCore.Session/SessionOptions.cs b/src/Middleware/Session/src/SessionOptions.cs similarity index 100% rename from src/Session/src/Microsoft.AspNetCore.Session/SessionOptions.cs rename to src/Middleware/Session/src/SessionOptions.cs diff --git a/src/Session/src/Microsoft.AspNetCore.Session/SessionServiceCollectionExtensions.cs b/src/Middleware/Session/src/SessionServiceCollectionExtensions.cs similarity index 100% rename from src/Session/src/Microsoft.AspNetCore.Session/SessionServiceCollectionExtensions.cs rename to src/Middleware/Session/src/SessionServiceCollectionExtensions.cs diff --git a/src/Session/src/Microsoft.AspNetCore.Session/SipHash.cs b/src/Middleware/Session/src/SipHash.cs similarity index 100% rename from src/Session/src/Microsoft.AspNetCore.Session/SipHash.cs rename to src/Middleware/Session/src/SipHash.cs diff --git a/src/Session/src/Microsoft.AspNetCore.Session/baseline.netcore.json b/src/Middleware/Session/src/baseline.netcore.json similarity index 100% rename from src/Session/src/Microsoft.AspNetCore.Session/baseline.netcore.json rename to src/Middleware/Session/src/baseline.netcore.json diff --git a/src/Middleware/Session/test/Microsoft.AspNetCore.Session.Tests.csproj b/src/Middleware/Session/test/Microsoft.AspNetCore.Session.Tests.csproj new file mode 100644 index 000000000000..4c3e5f74200c --- /dev/null +++ b/src/Middleware/Session/test/Microsoft.AspNetCore.Session.Tests.csproj @@ -0,0 +1,14 @@ + + + + $(StandardTestTfms) + + + + + + + + + + diff --git a/src/Session/test/Microsoft.AspNetCore.Session.Tests/SessionTests.cs b/src/Middleware/Session/test/SessionTests.cs similarity index 100% rename from src/Session/test/Microsoft.AspNetCore.Session.Tests/SessionTests.cs rename to src/Middleware/Session/test/SessionTests.cs diff --git a/src/Session/.gitignore b/src/Session/.gitignore deleted file mode 100644 index f332e76e0f75..000000000000 --- a/src/Session/.gitignore +++ /dev/null @@ -1,33 +0,0 @@ -[Oo]bj/ -[Bb]in/ -TestResults/ -.nuget/ -*.sln.ide/ -_ReSharper.*/ -packages/ -artifacts/ -PublishProfiles/ -*.user -*.suo -*.cache -*.docstates -_ReSharper.* -nuget.exe -*net45.csproj -*net451.csproj -*k10.csproj -*.psess -*.vsp -*.pidb -*.userprefs -*DS_Store -*.ncrunchsolution -*.*sdf -*.ipch -.vs/ -.vscode/ -project.lock.json -.build/ -.testPublish/ -launchSettings.json -global.json diff --git a/src/Session/Directory.Build.props b/src/Session/Directory.Build.props deleted file mode 100644 index 2883c9cc0ace..000000000000 --- a/src/Session/Directory.Build.props +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - Microsoft ASP.NET Core - https://github.com/aspnet/AspNetCore - git - $(MSBuildThisFileDirectory) - $(MSBuildThisFileDirectory)build\Key.snk - true - true - true - - - diff --git a/src/Session/Directory.Build.targets b/src/Session/Directory.Build.targets deleted file mode 100644 index 53b3f6e1daba..000000000000 --- a/src/Session/Directory.Build.targets +++ /dev/null @@ -1,7 +0,0 @@ - - - $(MicrosoftNETCoreApp20PackageVersion) - $(MicrosoftNETCoreApp21PackageVersion) - $(NETStandardLibrary20PackageVersion) - - diff --git a/src/Session/NuGetPackageVerifier.json b/src/Session/NuGetPackageVerifier.json deleted file mode 100644 index b153ab15150d..000000000000 --- a/src/Session/NuGetPackageVerifier.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "Default": { - "rules": [ - "DefaultCompositeRule" - ] - } -} \ No newline at end of file diff --git a/src/Session/README.md b/src/Session/README.md deleted file mode 100644 index 976f9f21cf88..000000000000 --- a/src/Session/README.md +++ /dev/null @@ -1,12 +0,0 @@ -Session -================ - -AppVeyor: [![AppVeyor](https://ci.appveyor.com/api/projects/status/yyivj6uwu3uj2x40/branch/dev?svg=true)](https://ci.appveyor.com/project/aspnetci/Session/branch/dev) - -Travis: [![Travis](https://travis-ci.org/aspnet/Session.svg?branch=dev)](https://travis-ci.org/aspnet/Session) - -Contains libraries for session state middleware for ASP.NET Core. - -For ASP.NET 4.x session state, please go to https://github.com/aspnet/AspNetSessionState. - -This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/home) repo. diff --git a/src/Session/Session.sln b/src/Session/Session.sln deleted file mode 100644 index d8d95dc295fc..000000000000 --- a/src/Session/Session.sln +++ /dev/null @@ -1,74 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26621.2 -MinimumVisualStudioVersion = 15.0.26730.03 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{E9D63F97-6078-42AD-BFD3-F956BF921BB5}" - ProjectSection(SolutionItems) = preProject - test\Directory.Build.props = test\Directory.Build.props - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A189F10C-3A9C-4F81-83D0-32E5FE50DAD8}" - ProjectSection(SolutionItems) = preProject - src\Directory.Build.props = src\Directory.Build.props - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Session", "src\Microsoft.AspNetCore.Session\Microsoft.AspNetCore.Session.csproj", "{71802736-F640-4733-9671-02D267EDD76A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Session.Tests", "test\Microsoft.AspNetCore.Session.Tests\Microsoft.AspNetCore.Session.Tests.csproj", "{8C131A0A-BC1A-4CF3-8B77-8813FBFE5639}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{94E80ED2-9F27-40AC-A9EF-C707BDFAA3BE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SessionSample", "samples\SessionSample\SessionSample.csproj", "{FE0B9969-3BDE-4A7D-BE1B-47EAE8DBF365}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{3B45F658-5BF1-4E07-BE9C-6F5110AC2277}" - ProjectSection(SolutionItems) = preProject - .appveyor.yml = .appveyor.yml - .gitattributes = .gitattributes - .gitignore = .gitignore - .travis.yml = .travis.yml - Directory.Build.props = Directory.Build.props - Directory.Build.targets = Directory.Build.targets - NuGet.config = NuGet.config - NuGetPackageVerifier.json = NuGetPackageVerifier.json - README.md = README.md - version.xml = version.xml - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{4F21221F-2813-41B7-AAFC-E03FD52971CC}" - ProjectSection(SolutionItems) = preProject - build\common.props = build\common.props - build\dependencies.props = build\dependencies.props - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {71802736-F640-4733-9671-02D267EDD76A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71802736-F640-4733-9671-02D267EDD76A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71802736-F640-4733-9671-02D267EDD76A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71802736-F640-4733-9671-02D267EDD76A}.Release|Any CPU.Build.0 = Release|Any CPU - {8C131A0A-BC1A-4CF3-8B77-8813FBFE5639}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8C131A0A-BC1A-4CF3-8B77-8813FBFE5639}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8C131A0A-BC1A-4CF3-8B77-8813FBFE5639}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8C131A0A-BC1A-4CF3-8B77-8813FBFE5639}.Release|Any CPU.Build.0 = Release|Any CPU - {FE0B9969-3BDE-4A7D-BE1B-47EAE8DBF365}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FE0B9969-3BDE-4A7D-BE1B-47EAE8DBF365}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FE0B9969-3BDE-4A7D-BE1B-47EAE8DBF365}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FE0B9969-3BDE-4A7D-BE1B-47EAE8DBF365}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {71802736-F640-4733-9671-02D267EDD76A} = {A189F10C-3A9C-4F81-83D0-32E5FE50DAD8} - {8C131A0A-BC1A-4CF3-8B77-8813FBFE5639} = {E9D63F97-6078-42AD-BFD3-F956BF921BB5} - {FE0B9969-3BDE-4A7D-BE1B-47EAE8DBF365} = {94E80ED2-9F27-40AC-A9EF-C707BDFAA3BE} - {4F21221F-2813-41B7-AAFC-E03FD52971CC} = {3B45F658-5BF1-4E07-BE9C-6F5110AC2277} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {6AE224B9-B604-4E47-9617-9D114DAE9BE5} - EndGlobalSection -EndGlobal diff --git a/src/Session/build/Key.snk b/src/Session/build/Key.snk deleted file mode 100644 index e10e4889c125d3120cd9e81582243d70f7cbb806..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50098=Iw=HCsnz~#iVhm& zj%TU(_THUee?3yHBjk$37ysB?i5#7WD$={H zV4B!OxRPrb|8)HPg~A}8P>^=#y<)56#=E&NzcjOtPK~<4n6GHt=K$ro*T(lhby_@U zEk(hLzk1H)0yXj{A_5>fk-TgNoP|q6(tP2xo8zt8i%212CWM#AeCd?`hS|4~L({h~Moo(~vy&3Z z1uI}`fd^*>o=rwbAGymj6RM^pZm(*Kfhs+Y1#`-2JPWZMK8@;ZWCk2+9bX4YP);~fj-BU*R zQPvWv$89!{Rl9wM+zR>_TSkn^voYxA?2G iKnV#iZ6Ah`K>b=@=IjYJXrxL124zR(38)nxe+&q_$QXwJ diff --git a/src/Session/build/dependencies.props b/src/Session/build/dependencies.props deleted file mode 100644 index 6e86d21f9011..000000000000 --- a/src/Session/build/dependencies.props +++ /dev/null @@ -1,36 +0,0 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - - - 2.1.3-rtm-15802 - 2.0.0 - 2.1.2 - 15.6.1 - 2.0.3 - 2.3.1 - 2.4.0-beta.1.build3945 - - - - - - - - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.2 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - - \ No newline at end of file diff --git a/src/Session/build/repo.props b/src/Session/build/repo.props deleted file mode 100644 index 1dc8b8100d75..000000000000 --- a/src/Session/build/repo.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/Session/build/sources.props b/src/Session/build/sources.props deleted file mode 100644 index 9215df9751b4..000000000000 --- a/src/Session/build/sources.props +++ /dev/null @@ -1,17 +0,0 @@ - - - - - $(DotNetRestoreSources) - - $(RestoreSources); - https://dotnet.myget.org/F/dotnet-core/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; - - - $(RestoreSources); - https://api.nuget.org/v3/index.json; - - - diff --git a/src/Session/samples/SessionSample/Properties/launchSettings.json b/src/Session/samples/SessionSample/Properties/launchSettings.json deleted file mode 100644 index 6bab3d3602be..000000000000 --- a/src/Session/samples/SessionSample/Properties/launchSettings.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:2481/", - "sslPort": 0 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "SessionSample": { - "commandName": "Project", - "launchBrowser": true, - "launchUrl": "http://localhost:5000", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - } - } -} \ No newline at end of file diff --git a/src/Session/samples/SessionSample/SessionSample.csproj b/src/Session/samples/SessionSample/SessionSample.csproj deleted file mode 100644 index 67abefae09c4..000000000000 --- a/src/Session/samples/SessionSample/SessionSample.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - netcoreapp2.1;net461 - - - - - - - - - - - - - - - - diff --git a/src/Session/src/Directory.Build.props b/src/Session/src/Directory.Build.props deleted file mode 100644 index 1e0980f66331..000000000000 --- a/src/Session/src/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/Session/src/Microsoft.AspNetCore.Session/Microsoft.AspNetCore.Session.csproj b/src/Session/src/Microsoft.AspNetCore.Session/Microsoft.AspNetCore.Session.csproj deleted file mode 100644 index 3da00b90320d..000000000000 --- a/src/Session/src/Microsoft.AspNetCore.Session/Microsoft.AspNetCore.Session.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - ASP.NET Core session state middleware. - netstandard2.0 - $(NoWarn);CS1591 - true - true - aspnetcore;session;sessionstate - - - - - - - - - - - diff --git a/src/Session/test/Directory.Build.props b/src/Session/test/Directory.Build.props deleted file mode 100644 index 270e1fa20975..000000000000 --- a/src/Session/test/Directory.Build.props +++ /dev/null @@ -1,14 +0,0 @@ - - - - - netcoreapp2.1 - $(DeveloperBuildTestTfms) - netcoreapp2.1;netcoreapp2.0 - $(StandardTestTfms);net461 - - - - - - diff --git a/src/Session/test/Microsoft.AspNetCore.Session.Tests/Microsoft.AspNetCore.Session.Tests.csproj b/src/Session/test/Microsoft.AspNetCore.Session.Tests/Microsoft.AspNetCore.Session.Tests.csproj deleted file mode 100644 index 9dc11b9d2fad..000000000000 --- a/src/Session/test/Microsoft.AspNetCore.Session.Tests/Microsoft.AspNetCore.Session.Tests.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - $(StandardTestTfms) - true - true - - - - - - - - - - - - - - - - diff --git a/src/Session/version.props b/src/Session/version.props deleted file mode 100644 index 669c874829da..000000000000 --- a/src/Session/version.props +++ /dev/null @@ -1,12 +0,0 @@ - - - 2.1.1 - rtm - $(VersionPrefix) - $(VersionPrefix)-$(VersionSuffix)-final - t000 - a- - $(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) - $(VersionSuffix)-$(BuildNumber) - - From 1042b27779cc49add0181334226b2037faf37cc1 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 11 Dec 2018 14:33:21 -0800 Subject: [PATCH 2/2] Fixup --- build/repo.props | 1 + eng/Dependencies.props | 2 ++ 2 files changed, 3 insertions(+) diff --git a/build/repo.props b/build/repo.props index a107d1c96ffc..35e1ed077b78 100644 --- a/build/repo.props +++ b/build/repo.props @@ -66,6 +66,7 @@ + +