Skip to content

Commit 2305aa2

Browse files
JinhuafeiJinhuafei
committed
update snk key and fix a bug in sqlsessionstate provider
1 parent d69dc1a commit 2305aa2

File tree

11 files changed

+39
-8
lines changed

11 files changed

+39
-8
lines changed

‎.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[Oo]bj/
2+
[Bb]in/
3+
.vs/
4+
msbuild.*
5+
obj/
6+
packages/

‎src/SessionStateModule/Microsoft.AspNet.SessionState.SessionStateModule.csproj

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,15 @@
3333
<WarningLevel>4</WarningLevel>
3434
<BaseIntermediateOutputPath>..\obj\</BaseIntermediateOutputPath>
3535
</PropertyGroup>
36+
<PropertyGroup>
37+
<SignAssembly>true</SignAssembly>
38+
</PropertyGroup>
39+
<PropertyGroup>
40+
<AssemblyOriginatorKeyFile>$(RepositoryRoot)tools\35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
41+
</PropertyGroup>
42+
<PropertyGroup>
43+
<DelaySign>true</DelaySign>
44+
</PropertyGroup>
3645
<ItemGroup>
3746
<Reference Include="System" />
3847
<Reference Include="System.Configuration" />
@@ -67,6 +76,9 @@
6776
<LastGenOutput>SR.Designer.cs</LastGenOutput>
6877
</EmbeddedResource>
6978
</ItemGroup>
79+
<ItemGroup>
80+
<None Include="35MSSharedLib1024.snk" />
81+
</ItemGroup>
7082
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7183
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
7284
Other similar extension points exist, see Microsoft.Common.targets.

‎src/SqlSessionStateProviderAsync/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.csproj

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,15 @@
4242
<WarningLevel>4</WarningLevel>
4343
<BaseIntermediateOutputPath>..\obj\</BaseIntermediateOutputPath>
4444
</PropertyGroup>
45+
<PropertyGroup>
46+
<SignAssembly>true</SignAssembly>
47+
</PropertyGroup>
48+
<PropertyGroup>
49+
<AssemblyOriginatorKeyFile>$(RepositoryRoot)tools\35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
50+
</PropertyGroup>
51+
<PropertyGroup>
52+
<DelaySign>true</DelaySign>
53+
</PropertyGroup>
4554
<ItemGroup>
4655
<Reference Include="EntityFramework">
4756
<HintPath>..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
@@ -74,6 +83,7 @@
7483
<Compile Include="SqlSessionStateProviderAsync.cs" />
7584
</ItemGroup>
7685
<ItemGroup>
86+
<None Include="35MSSharedLib1024.snk" />
7787
<None Include="App.config">
7888
<SubType>Designer</SubType>
7989
</None>

‎src/SqlSessionStateProviderAsync/SqlSessionStateProviderAsync.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ private static Session NewSession(string id, int timeout, SessionStateActions ac
335335
s.Locked = false;
336336
s.LockDate = now;
337337
s.LockCookie = 0;
338-
s.Flags = (int)SessionStateActions.InitializeItem;
338+
s.Flags = (int)action;
339339
return s;
340340
}
341341

‎src/TestKey.snk

-596 Bytes
Binary file not shown.

‎src/packages/SessionStateModule.nupkg/content/Net462/web.config.install.xdt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<modules>
1111
<remove name="Session" xdt:Transform="InsertIfMissing" xdt:Locator="Match(name)" />
1212
<add name="Session"
13-
type="Microsoft.AspNet.SessionState.SessionStateModuleAsync, Microsoft.AspNet.SessionState.SessionStateModule, Version=1.0.0.0, Culture=neutral"
13+
type="Microsoft.AspNet.SessionState.SessionStateModuleAsync, Microsoft.AspNet.SessionState.SessionStateModule, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
1414
preCondition="integratedMode" xdt:Transform="Insert" />
1515
</modules>
1616
</system.webServer>

‎src/packages/SessionStateModule.nupkg/content/Net462/web.config.uninstall.xdt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modules>
66
<remove name="Session" xdt:Transform="Remove" xdt:Locator="Match(name)" />
77
<add name="Session"
8-
type="Microsoft.AspNet.SessionState.SessionStateModuleAsync, Microsoft.AspNet.SessionState.SessionStateModule, Version=1.0.0.0, Culture=neutral"
8+
type="Microsoft.AspNet.SessionState.SessionStateModuleAsync, Microsoft.AspNet.SessionState.SessionStateModule, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
99
preCondition="integratedMode" xdt:Transform="Remove" xdt:Locator="Match(type)" />
1010
</modules>
1111
</system.webServer>

‎src/packages/SqlSessionStateProviderAsync.nupkg/content/Net462/web.config.install.xdt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
of SQL Server which you will use as the data store.
1515
-->
1616
<add name="SqlSessionStateProviderAsync" connectionStringName="DefaultConnection"
17-
type="Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync, Microsoft.AspNet.SessionState.AsyncProviders.SqlSessionStateProviderAsync, Version=1.0.0.0, Culture=neutral"
17+
type="Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync, Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
1818
xdt:Transform="InsertIfMissing" />
1919
</providers>
2020
</sessionState>

‎src/packages/SqlSessionStateProviderAsync.nupkg/content/Net462/web.config.uninstall.xdt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
mode="Custom" customProvider="SqlSessionStateAsyncProvider" xdt:Transform="Remove">
77
<providers>
88
<add name="SqlSessionStateAsyncProvider" connectionStringName="DefaultConnection"
9-
type="Microsoft.AspNet.SessionState.SqlSessionStateAsyncProvider, Microsoft.AspNet.SessionState.SqlSessionStateAsyncProvider, Version=1.0.0.0, Culture=neutral"
9+
type="Microsoft.AspNet.SessionState.SqlSessionStateAsyncProvider, Microsoft.AspNet.SessionState.SqlSessionStateAsyncProvider, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
1010
xdt:Transform="Remove" xdt:Locator="Match(type)" />
1111
</providers>
1212
</sessionState>

‎test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test.csproj

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,13 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<PropertyGroup>
35-
<SignAssembly>false</SignAssembly>
35+
<SignAssembly>true</SignAssembly>
3636
</PropertyGroup>
3737
<PropertyGroup>
38-
<AssemblyOriginatorKeyFile>
39-
</AssemblyOriginatorKeyFile>
38+
<AssemblyOriginatorKeyFile>$(RepositoryRoot)tools\35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
39+
</PropertyGroup>
40+
<PropertyGroup>
41+
<DelaySign>true</DelaySign>
4042
</PropertyGroup>
4143
<ItemGroup>
4244
<Reference Include="Moq, Version=4.5.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
@@ -73,6 +75,7 @@
7375
<Compile Include="Properties\AssemblyInfo.cs" />
7476
</ItemGroup>
7577
<ItemGroup>
78+
<None Include="35MSSharedLib1024.snk" />
7679
<None Include="packages.config" />
7780
</ItemGroup>
7881
<ItemGroup>

0 commit comments

Comments
 (0)