Skip to content

Commit e6b3a5b

Browse files
ryanbrandenburgryanbrandenburg
committed
Merge remote-tracking branch 'Session/rybrande/release21ToSrc' into rybrande/Mondo2.1
2 parents 9323838 + 95928c0 commit e6b3a5b

36 files changed

+3874
-0
lines changed

‎src/Session/.gitignore

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
[Oo]bj/
2+
[Bb]in/
3+
TestResults/
4+
.nuget/
5+
*.sln.ide/
6+
_ReSharper.*/
7+
packages/
8+
artifacts/
9+
PublishProfiles/
10+
*.user
11+
*.suo
12+
*.cache
13+
*.docstates
14+
_ReSharper.*
15+
nuget.exe
16+
*net45.csproj
17+
*net451.csproj
18+
*k10.csproj
19+
*.psess
20+
*.vsp
21+
*.pidb
22+
*.userprefs
23+
*DS_Store
24+
*.ncrunchsolution
25+
*.*sdf
26+
*.ipch
27+
.vs/
28+
.vscode/
29+
project.lock.json
30+
.build/
31+
.testPublish/
32+
launchSettings.json
33+
global.json

‎src/Session/Directory.Build.props

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<Project>
2+
<Import
3+
Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))\AspNetCoreSettings.props"
4+
Condition=" '$(CI)' != 'true' AND '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))' != '' " />
5+
6+
<Import Project="version.props" />
7+
<Import Project="build\dependencies.props" />
8+
<Import Project="build\sources.props" />
9+
10+
<PropertyGroup>
11+
<Product>Microsoft ASP.NET Core</Product>
12+
<RepositoryUrl>https://github.com/aspnet/Session</RepositoryUrl>
13+
<RepositoryType>git</RepositoryType>
14+
<RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
15+
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
16+
<SignAssembly>true</SignAssembly>
17+
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
18+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
19+
</PropertyGroup>
20+
21+
</Project>

‎src/Session/Directory.Build.targets

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project>
2+
<PropertyGroup>
3+
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
4+
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
5+
<NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
6+
</PropertyGroup>
7+
</Project>

‎src/Session/NuGetPackageVerifier.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"Default": {
3+
"rules": [
4+
"DefaultCompositeRule"
5+
]
6+
}
7+
}

‎src/Session/README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Session
2+
================
3+
4+
AppVeyor: [![AppVeyor](https://ci.appveyor.com/api/projects/status/yyivj6uwu3uj2x40/branch/dev?svg=true)](https://ci.appveyor.com/project/aspnetci/Session/branch/dev)
5+
6+
Travis: [![Travis](https://travis-ci.org/aspnet/Session.svg?branch=dev)](https://travis-ci.org/aspnet/Session)
7+
8+
Contains libraries for session state middleware for ASP.NET Core.
9+
10+
For ASP.NET 4.x session state, please go to https://github.com/aspnet/AspNetSessionState.
11+
12+
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.

‎src/Session/Session.sln

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
Microsoft Visual Studio Solution File, Format Version 12.00
2+
# Visual Studio 15
3+
VisualStudioVersion = 15.0.26621.2
4+
MinimumVisualStudioVersion = 15.0.26730.03
5+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{E9D63F97-6078-42AD-BFD3-F956BF921BB5}"
6+
ProjectSection(SolutionItems) = preProject
7+
test\Directory.Build.props = test\Directory.Build.props
8+
EndProjectSection
9+
EndProject
10+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A189F10C-3A9C-4F81-83D0-32E5FE50DAD8}"
11+
ProjectSection(SolutionItems) = preProject
12+
src\Directory.Build.props = src\Directory.Build.props
13+
EndProjectSection
14+
EndProject
15+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Session", "src\Microsoft.AspNetCore.Session\Microsoft.AspNetCore.Session.csproj", "{71802736-F640-4733-9671-02D267EDD76A}"
16+
EndProject
17+
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}"
18+
EndProject
19+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{94E80ED2-9F27-40AC-A9EF-C707BDFAA3BE}"
20+
EndProject
21+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SessionSample", "samples\SessionSample\SessionSample.csproj", "{FE0B9969-3BDE-4A7D-BE1B-47EAE8DBF365}"
22+
EndProject
23+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{3B45F658-5BF1-4E07-BE9C-6F5110AC2277}"
24+
ProjectSection(SolutionItems) = preProject
25+
.appveyor.yml = .appveyor.yml
26+
.gitattributes = .gitattributes
27+
.gitignore = .gitignore
28+
.travis.yml = .travis.yml
29+
Directory.Build.props = Directory.Build.props
30+
Directory.Build.targets = Directory.Build.targets
31+
NuGet.config = NuGet.config
32+
NuGetPackageVerifier.json = NuGetPackageVerifier.json
33+
README.md = README.md
34+
version.xml = version.xml
35+
EndProjectSection
36+
EndProject
37+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{4F21221F-2813-41B7-AAFC-E03FD52971CC}"
38+
ProjectSection(SolutionItems) = preProject
39+
build\common.props = build\common.props
40+
build\dependencies.props = build\dependencies.props
41+
EndProjectSection
42+
EndProject
43+
Global
44+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
45+
Debug|Any CPU = Debug|Any CPU
46+
Release|Any CPU = Release|Any CPU
47+
EndGlobalSection
48+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
49+
{71802736-F640-4733-9671-02D267EDD76A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50+
{71802736-F640-4733-9671-02D267EDD76A}.Debug|Any CPU.Build.0 = Debug|Any CPU
51+
{71802736-F640-4733-9671-02D267EDD76A}.Release|Any CPU.ActiveCfg = Release|Any CPU
52+
{71802736-F640-4733-9671-02D267EDD76A}.Release|Any CPU.Build.0 = Release|Any CPU
53+
{8C131A0A-BC1A-4CF3-8B77-8813FBFE5639}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54+
{8C131A0A-BC1A-4CF3-8B77-8813FBFE5639}.Debug|Any CPU.Build.0 = Debug|Any CPU
55+
{8C131A0A-BC1A-4CF3-8B77-8813FBFE5639}.Release|Any CPU.ActiveCfg = Release|Any CPU
56+
{8C131A0A-BC1A-4CF3-8B77-8813FBFE5639}.Release|Any CPU.Build.0 = Release|Any CPU
57+
{FE0B9969-3BDE-4A7D-BE1B-47EAE8DBF365}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
58+
{FE0B9969-3BDE-4A7D-BE1B-47EAE8DBF365}.Debug|Any CPU.Build.0 = Debug|Any CPU
59+
{FE0B9969-3BDE-4A7D-BE1B-47EAE8DBF365}.Release|Any CPU.ActiveCfg = Release|Any CPU
60+
{FE0B9969-3BDE-4A7D-BE1B-47EAE8DBF365}.Release|Any CPU.Build.0 = Release|Any CPU
61+
EndGlobalSection
62+
GlobalSection(SolutionProperties) = preSolution
63+
HideSolutionNode = FALSE
64+
EndGlobalSection
65+
GlobalSection(NestedProjects) = preSolution
66+
{71802736-F640-4733-9671-02D267EDD76A} = {A189F10C-3A9C-4F81-83D0-32E5FE50DAD8}
67+
{8C131A0A-BC1A-4CF3-8B77-8813FBFE5639} = {E9D63F97-6078-42AD-BFD3-F956BF921BB5}
68+
{FE0B9969-3BDE-4A7D-BE1B-47EAE8DBF365} = {94E80ED2-9F27-40AC-A9EF-C707BDFAA3BE}
69+
{4F21221F-2813-41B7-AAFC-E03FD52971CC} = {3B45F658-5BF1-4E07-BE9C-6F5110AC2277}
70+
EndGlobalSection
71+
GlobalSection(ExtensibilityGlobals) = postSolution
72+
SolutionGuid = {6AE224B9-B604-4E47-9617-9D114DAE9BE5}
73+
EndGlobalSection
74+
EndGlobal

‎src/Session/build/Key.snk

596 Bytes
Binary file not shown.

‎src/Session/build/dependencies.props

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<Project>
2+
<PropertyGroup>
3+
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
4+
</PropertyGroup>
5+
6+
<!-- These package versions may be overridden or updated by automation. -->
7+
<PropertyGroup Label="Package Versions: Auto">
8+
<InternalAspNetCoreSdkPackageVersion>2.1.3-rtm-15802</InternalAspNetCoreSdkPackageVersion>
9+
<MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
10+
<MicrosoftNETCoreApp21PackageVersion>2.1.2</MicrosoftNETCoreApp21PackageVersion>
11+
<MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
12+
<NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
13+
<XunitPackageVersion>2.3.1</XunitPackageVersion>
14+
<XunitRunnerVisualStudioPackageVersion>2.4.0-beta.1.build3945</XunitRunnerVisualStudioPackageVersion>
15+
</PropertyGroup>
16+
17+
<!-- This may import a generated file which may override the variables above. -->
18+
<Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
19+
20+
<!-- These are package versions that should not be overridden or updated by automation. -->
21+
<PropertyGroup Label="Package Versions: Pinned">
22+
<MicrosoftAspNetCoreDataProtectionPackageVersion>2.1.1</MicrosoftAspNetCoreDataProtectionPackageVersion>
23+
<MicrosoftAspNetCoreHttpAbstractionsPackageVersion>2.1.1</MicrosoftAspNetCoreHttpAbstractionsPackageVersion>
24+
<MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.1.1</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
25+
<MicrosoftAspNetCoreServerKestrelPackageVersion>2.1.2</MicrosoftAspNetCoreServerKestrelPackageVersion>
26+
<MicrosoftAspNetCoreTestHostPackageVersion>2.1.1</MicrosoftAspNetCoreTestHostPackageVersion>
27+
<MicrosoftExtensionsCachingAbstractionsPackageVersion>2.1.1</MicrosoftExtensionsCachingAbstractionsPackageVersion>
28+
<MicrosoftExtensionsCachingMemoryPackageVersion>2.1.1</MicrosoftExtensionsCachingMemoryPackageVersion>
29+
<MicrosoftExtensionsCachingRedisPackageVersion>2.1.1</MicrosoftExtensionsCachingRedisPackageVersion>
30+
<MicrosoftExtensionsCachingSqlServerPackageVersion>2.1.1</MicrosoftExtensionsCachingSqlServerPackageVersion>
31+
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>2.1.1</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
32+
<MicrosoftExtensionsLoggingConsolePackageVersion>2.1.1</MicrosoftExtensionsLoggingConsolePackageVersion>
33+
<MicrosoftExtensionsLoggingTestingPackageVersion>2.1.1</MicrosoftExtensionsLoggingTestingPackageVersion>
34+
<MicrosoftExtensionsOptionsPackageVersion>2.1.1</MicrosoftExtensionsOptionsPackageVersion>
35+
</PropertyGroup>
36+
</Project>

‎src/Session/build/repo.props

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<Project>
2+
<Import Project="dependencies.props" />
3+
4+
<PropertyGroup>
5+
<!-- These properties are use by the automation that updates dependencies.props -->
6+
<LineupPackageId>Internal.AspNetCore.Universe.Lineup</LineupPackageId>
7+
<LineupPackageVersion>2.1.0-rc1-*</LineupPackageVersion>
8+
<LineupPackageRestoreSource>https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json</LineupPackageRestoreSource>
9+
</PropertyGroup>
10+
11+
<ItemGroup>
12+
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" />
13+
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)" />
14+
</ItemGroup>
15+
</Project>

‎src/Session/build/sources.props

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<Project>
2+
<Import Project="$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''"/>
3+
4+
<PropertyGroup Label="RestoreSources">
5+
<RestoreSources>$(DotNetRestoreSources)</RestoreSources>
6+
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
7+
$(RestoreSources);
8+
https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
9+
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
10+
https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
11+
</RestoreSources>
12+
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
13+
$(RestoreSources);
14+
https://api.nuget.org/v3/index.json;
15+
</RestoreSources>
16+
</PropertyGroup>
17+
</Project>

0 commit comments

Comments
 (0)