Skip to content

Commit 3acdfb3

Browse files
JunTaoLuoJunTaoLuo
authored
Convert Session to use Reference and move to Middleware folder (#4576)
1 parent 5151e7b commit 3acdfb3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+113
-339
lines changed

‎build/buildorder.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<RepositoryBuildOrder Include="Razor" Order="6" RootPath="$(RepositoryRoot)src\Razor\" />
1111
<RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" />
1212
<RepositoryBuildOrder Include="IISIntegration" Order="10" RootPath="$(RepositoryRoot)src\IISIntegration\" />
13-
<RepositoryBuildOrder Include="Session" Order="11" RootPath="$(RepositoryRoot)src\Session\" />
1413
<RepositoryBuildOrder Include="ServerTests" Order="11" RootPath="$(RepositoryRoot)src\ServerTests\" />
1514
<RepositoryBuildOrder Include="Security" Order="13" RootPath="$(RepositoryRoot)src\Security\" />
1615
<RepositoryBuildOrder Include="MetaPackages" Order="13" RootPath="$(RepositoryRoot)src\MetaPackages\" />

‎build/submodules.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
<ShippedRepository Include="MvcPrecompilation" RootPath="$(RepositoryRoot)src\MvcPrecompilation\"/>
5959
<ShippedRepository Include="Razor" RootPath="$(RepositoryRoot)src\Razor\" />
6060
<ShippedRepository Include="Security" RootPath="$(RepositoryRoot)src\Security\" />
61-
<ShippedRepository Include="Session" RootPath="$(RepositoryRoot)src\Session\" />
6261
<ShippedRepository Include="SignalR" RootPath="$(RepositoryRoot)src\SignalR\" />
6362
</ItemGroup>
6463
</Project>

‎eng/Baseline.Designer.props‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -495,6 +495,17 @@
495495
<BaselinePackageReference Include="Microsoft.Win32.Registry" Version="[4.5.0, )" />
496496
<BaselinePackageReference Include="System.Security.Principal.Windows" Version="[4.5.0, )" />
497497
</ItemGroup>
498+
<!-- Package: Microsoft.AspNetCore.Session-->
499+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Session' ">
500+
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
501+
</PropertyGroup>
502+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Session' AND '$(TargetFramework)' == 'netstandard2.0' ">
503+
<BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[2.1.1, )" />
504+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="[2.1.1, )" />
505+
<BaselinePackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="[2.1.1, )" />
506+
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
507+
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
508+
</ItemGroup>
498509
<!-- Package: Microsoft.AspNetCore.StaticFiles-->
499510
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.StaticFiles' ">
500511
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>

‎eng/Baseline.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="2.1.3" />
5151
<Package Id="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.3" />
5252
<Package Id="Microsoft.AspNetCore.Server.HttpSys" Version="2.1.1" />
53+
<Package Id="Microsoft.AspNetCore.Session" Version="2.1.1" />
5354
<Package Id="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
5455
<Package Id="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
5556
<Package Id="Microsoft.AspNetCore.WebSockets" Version="2.1.1" />

‎eng/Dependencies.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<LatestPackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion)" />
1818
<LatestPackageReference Include="Microsoft.Extensions.ActivatorUtilities.Sources" Version="$(MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion)" />
1919
<LatestPackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryPackageVersion)" />
20+
<LatestPackageReference Include="Microsoft.Extensions.Caching.Redis" Version="$(MicrosoftExtensionsCachingRedisPackageVersion)" />
21+
<LatestPackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="$(MicrosoftExtensionsCachingSqlServerPackageVersion)" />
2022
<LatestPackageReference Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="$(MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion)" />
2123
<LatestPackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
2224
<LatestPackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />

‎eng/ProjectReferences.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" ProjectPath="$(RepositoryRoot)src\Servers\Kestrel\Transport.Abstractions\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj" />
3939
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" ProjectPath="$(RepositoryRoot)src\Servers\Kestrel\Transport.Libuv\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj" />
4040
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" ProjectPath="$(RepositoryRoot)src\Servers\Kestrel\Transport.Sockets\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj" />
41+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Session" ProjectPath="$(RepositoryRoot)src\Middleware\Session\src\Microsoft.AspNetCore.Session.csproj" />
4142
<ProjectReferenceProvider Include="dotnet-dev-certs" ProjectPath="$(RepositoryRoot)src\Tools\dotnet-dev-certs\src\dotnet-dev-certs.csproj" />
4243
<ProjectReferenceProvider Include="dotnet-sql-cache" ProjectPath="$(RepositoryRoot)src\Tools\dotnet-sql-cache\src\dotnet-sql-cache.csproj" />
4344
<ProjectReferenceProvider Include="dotnet-user-secrets" ProjectPath="$(RepositoryRoot)src\Tools\dotnet-user-secrets\src\dotnet-user-secrets.csproj" />

‎src/Middleware/Middleware.sln‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Respon
165165
EndProject
166166
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCaching.Abstractions", "ResponseCaching.Abstractions\src\Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj", "{D0204B45-8528-4504-9FC1-D229F3A33896}"
167167
EndProject
168+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Session", "Session", "{D1394339-B3BE-4F42-8EC0-6E02CC0165EE}"
169+
EndProject
170+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SessionSample", "Session\samples\SessionSample.csproj", "{3AD7A532-59FC-46BC-8257-D0E6F9533B73}"
171+
EndProject
172+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Session", "Session\src\Microsoft.AspNetCore.Session.csproj", "{0FBCB5C7-B212-4BEE-B9AE-0BF653BBAD24}"
173+
EndProject
174+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Session.Tests", "Session\test\Microsoft.AspNetCore.Session.Tests.csproj", "{20C89A12-96B6-4F2B-9CA8-62891DCA2549}"
175+
EndProject
168176
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "..\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{FD1C2473-5485-4105-87CB-617158F90FCA}"
169177
EndProject
170178
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
865873
{D0204B45-8528-4504-9FC1-D229F3A33896}.Release|x64.Build.0 = Release|Any CPU
866874
{D0204B45-8528-4504-9FC1-D229F3A33896}.Release|x86.ActiveCfg = Release|Any CPU
867875
{D0204B45-8528-4504-9FC1-D229F3A33896}.Release|x86.Build.0 = Release|Any CPU
876+
{3AD7A532-59FC-46BC-8257-D0E6F9533B73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
877+
{3AD7A532-59FC-46BC-8257-D0E6F9533B73}.Debug|Any CPU.Build.0 = Debug|Any CPU
878+
{3AD7A532-59FC-46BC-8257-D0E6F9533B73}.Debug|x64.ActiveCfg = Debug|Any CPU
879+
{3AD7A532-59FC-46BC-8257-D0E6F9533B73}.Debug|x64.Build.0 = Debug|Any CPU
880+
{3AD7A532-59FC-46BC-8257-D0E6F9533B73}.Debug|x86.ActiveCfg = Debug|Any CPU
881+
{3AD7A532-59FC-46BC-8257-D0E6F9533B73}.Debug|x86.Build.0 = Debug|Any CPU
882+
{3AD7A532-59FC-46BC-8257-D0E6F9533B73}.Release|Any CPU.ActiveCfg = Release|Any CPU
883+
{3AD7A532-59FC-46BC-8257-D0E6F9533B73}.Release|Any CPU.Build.0 = Release|Any CPU
884+
{3AD7A532-59FC-46BC-8257-D0E6F9533B73}.Release|x64.ActiveCfg = Release|Any CPU
885+
{3AD7A532-59FC-46BC-8257-D0E6F9533B73}.Release|x64.Build.0 = Release|Any CPU
886+
{3AD7A532-59FC-46BC-8257-D0E6F9533B73}.Release|x86.ActiveCfg = Release|Any CPU
887+
{3AD7A532-59FC-46BC-8257-D0E6F9533B73}.Release|x86.Build.0 = Release|Any CPU
888+
{0FBCB5C7-B212-4BEE-B9AE-0BF653BBAD24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
889+
{0FBCB5C7-B212-4BEE-B9AE-0BF653BBAD24}.Debug|Any CPU.Build.0 = Debug|Any CPU
890+
{0FBCB5C7-B212-4BEE-B9AE-0BF653BBAD24}.Debug|x64.ActiveCfg = Debug|Any CPU
891+
{0FBCB5C7-B212-4BEE-B9AE-0BF653BBAD24}.Debug|x64.Build.0 = Debug|Any CPU
892+
{0FBCB5C7-B212-4BEE-B9AE-0BF653BBAD24}.Debug|x86.ActiveCfg = Debug|Any CPU
893+
{0FBCB5C7-B212-4BEE-B9AE-0BF653BBAD24}.Debug|x86.Build.0 = Debug|Any CPU
894+
{0FBCB5C7-B212-4BEE-B9AE-0BF653BBAD24}.Release|Any CPU.ActiveCfg = Release|Any CPU
895+
{0FBCB5C7-B212-4BEE-B9AE-0BF653BBAD24}.Release|Any CPU.Build.0 = Release|Any CPU
896+
{0FBCB5C7-B212-4BEE-B9AE-0BF653BBAD24}.Release|x64.ActiveCfg = Release|Any CPU
897+
{0FBCB5C7-B212-4BEE-B9AE-0BF653BBAD24}.Release|x64.Build.0 = Release|Any CPU
898+
{0FBCB5C7-B212-4BEE-B9AE-0BF653BBAD24}.Release|x86.ActiveCfg = Release|Any CPU
899+
{0FBCB5C7-B212-4BEE-B9AE-0BF653BBAD24}.Release|x86.Build.0 = Release|Any CPU
900+
{20C89A12-96B6-4F2B-9CA8-62891DCA2549}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
901+
{20C89A12-96B6-4F2B-9CA8-62891DCA2549}.Debug|Any CPU.Build.0 = Debug|Any CPU
902+
{20C89A12-96B6-4F2B-9CA8-62891DCA2549}.Debug|x64.ActiveCfg = Debug|Any CPU
903+
{20C89A12-96B6-4F2B-9CA8-62891DCA2549}.Debug|x64.Build.0 = Debug|Any CPU
904+
{20C89A12-96B6-4F2B-9CA8-62891DCA2549}.Debug|x86.ActiveCfg = Debug|Any CPU
905+
{20C89A12-96B6-4F2B-9CA8-62891DCA2549}.Debug|x86.Build.0 = Debug|Any CPU
906+
{20C89A12-96B6-4F2B-9CA8-62891DCA2549}.Release|Any CPU.ActiveCfg = Release|Any CPU
907+
{20C89A12-96B6-4F2B-9CA8-62891DCA2549}.Release|Any CPU.Build.0 = Release|Any CPU
908+
{20C89A12-96B6-4F2B-9CA8-62891DCA2549}.Release|x64.ActiveCfg = Release|Any CPU
909+
{20C89A12-96B6-4F2B-9CA8-62891DCA2549}.Release|x64.Build.0 = Release|Any CPU
910+
{20C89A12-96B6-4F2B-9CA8-62891DCA2549}.Release|x86.ActiveCfg = Release|Any CPU
911+
{20C89A12-96B6-4F2B-9CA8-62891DCA2549}.Release|x86.Build.0 = Release|Any CPU
868912
{FD1C2473-5485-4105-87CB-617158F90FCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
869913
{FD1C2473-5485-4105-87CB-617158F90FCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
870914
{FD1C2473-5485-4105-87CB-617158F90FCA}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1031,6 +1075,9 @@ Global
10311075
{D8239A8C-F692-460A-B204-5CF05502BEE2} = {EDF56413-B406-4200-B4D4-0EE3F9CB8F7C}
10321076
{9F973483-5D32-4093-88F0-761C9BEAEE04} = {EDF56413-B406-4200-B4D4-0EE3F9CB8F7C}
10331077
{D0204B45-8528-4504-9FC1-D229F3A33896} = {7A493DEA-32F2-4AB1-9113-828D44F5DDA2}
1078+
{3AD7A532-59FC-46BC-8257-D0E6F9533B73} = {D1394339-B3BE-4F42-8EC0-6E02CC0165EE}
1079+
{0FBCB5C7-B212-4BEE-B9AE-0BF653BBAD24} = {D1394339-B3BE-4F42-8EC0-6E02CC0165EE}
1080+
{20C89A12-96B6-4F2B-9CA8-62891DCA2549} = {D1394339-B3BE-4F42-8EC0-6E02CC0165EE}
10341081
{FD1C2473-5485-4105-87CB-617158F90FCA} = {ACA6DDB9-7592-47CE-A740-D15BF307E9E0}
10351082
{6F6A7E3D-D883-494D-8C61-E75D7EBFE3F4} = {ACA6DDB9-7592-47CE-A740-D15BF307E9E0}
10361083
{9D3062AB-5B11-4FFE-BEAF-304CF7F19AA5} = {ACA6DDB9-7592-47CE-A740-D15BF307E9E0}

‎src/Middleware/Session/samples/SessionSample.csproj‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
2+
3+
<PropertyGroup>
4+
<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<Reference Include="Microsoft.AspNetCore.Session" />
9+
<Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
10+
<Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
11+
<Reference Include="Microsoft.Extensions.Caching.Memory" />
12+
<Reference Include="Microsoft.Extensions.Caching.Redis" />
13+
<Reference Include="Microsoft.Extensions.Caching.SqlServer" />
14+
<Reference Include="Microsoft.Extensions.Logging.Console" />
15+
</ItemGroup>
16+
17+
</Project>

‎src/Session/samples/SessionSample/Startup.cs‎ renamed to ‎src/Middleware/Session/samples/Startup.cs‎

File renamed without changes.

‎src/Session/src/Microsoft.AspNetCore.Session/CookieProtection.cs‎ renamed to ‎src/Middleware/Session/src/CookieProtection.cs‎

File renamed without changes.

0 commit comments

Comments
 (0)