Skip to content

Commit cbd79ba

Browse files
StephenMolloyStephenMolloy
authored
Fix version handling in nupkg config transforms; RTM CosmosDB 1.1. (#27)
1 parent a5e4433 commit cbd79ba

File tree

7 files changed

+26
-13
lines changed

7 files changed

+26
-13
lines changed

‎Readme.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@ Information on contributing to this repo is in the [Contributing Guide](CONTRIBU
1414
Before you can specify one of these custom providers. You need to remove the existing session state module from your web.config file. In addition, you must register the new module to take its place.
1515

1616
```
17-
<system.webServer>
18-
<modules>
19-
<!-- remove the existing Session state module -->
20-
<remove name="Session" />
21-
<add name="Session" preCondition="integratedMode" type="Microsoft.AspNet.SessionState.SessionStateModuleAsync, Microsoft.AspNet.SessionState.SessionStateModule, Version=1.0.0.0, Culture=neutral" />
22-
</modules>
17+
<system.webServer>
18+
<modules>
19+
<!-- remove the existing Session state module -->
20+
<remove name="Session" />
21+
<add name="Session" preCondition="integratedMode" type="Microsoft.AspNet.SessionState.SessionStateModuleAsync, Microsoft.AspNet.SessionState.SessionStateModule, Version=1.1.0.0, Culture=neutral" />
22+
</modules>
23+
</system.webServer>
2324
```
2425

2526
## Settings of the module and providers
@@ -65,7 +66,7 @@ Before you can specify one of these custom providers. You need to remove the exi
6566
databaseId="[DataBaseId]" collectionId="[CollectionId]" offerThroughput="5000" connectionMode="Direct" connectionProtocol="Tcp" requestTimeout="5"
6667
maxConnectionLimit="50" maxRetryAttemptsOnThrottledRequests="10" maxRetryWaitTimeInSeconds="10" preferredLocations="" partitionKey="pKey"
6768
partitionNumUsedByProvider="*"
68-
type="Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync, Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
69+
type="Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync, Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
6970
</providers>
7071
</sessionState>
7172
```

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
-->
3737
<add name="CosmosDBSessionStateProviderAsync" cosmosDBEndPointSettingKey="cosmosDBEndPointSetting" cosmosDBAuthKeySettingKey="cosmosDBAuthKeySetting" databaseId="[DataBaseId]" collectionId="[CollectionId]" offerThroughput="5000"
3838
connectionMode="Direct" connectionProtocol="Tcp" requestTimeout="5" maxConnectionLimit="50" maxRetryAttemptsOnThrottledRequests="10" maxRetryWaitTimeInSeconds="10" preferredLocations="" partitionKey="" partitionNumUsedByProvider=""
39-
type="Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync, Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
39+
type="Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync, Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
4040
xdt:Transform="InsertIfMissing" />
4141
</providers>
4242
</sessionState>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<sessionState cookieless="false" regenerateExpiredSessionId="true"
99
mode="Custom" customProvider="CosmosDBSessionStateProviderAsync" xdt:Transform="Remove">
1010
<providers>
11-
<add name="SqlSessionStateAsyncProvider" connectionStringName="DefaultConnection"
12-
type="Microsoft.AspNet.SessionState.SqlSessionStateAsyncProvider, Microsoft.AspNet.SessionState.SqlSessionStateAsyncProvider, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
11+
<add name="CosmosDBSessionStateProviderAsync"
12+
type="Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync, Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
1313
xdt:Transform="Remove" xdt:Locator="Match(type)" />
1414
</providers>
1515
</sessionState>

‎src/packages/Packages.csproj

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,18 @@
2222
<NuGetProject Include="SqlSessionStateProviderAsync.nupkg\Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.nuproj" />
2323
<NuGetProject Include="CosmosDBSessionStateProviderAsync.nupkg\Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.nuproj" />
2424
</ItemGroup>
25+
<ItemGroup />
26+
<ItemGroup>
27+
<None Include="CosmosDBSessionStateProviderAsync.nupkg\content\Net462\web.config.install.xdt" />
28+
<None Include="CosmosDBSessionStateProviderAsync.nupkg\content\Net462\web.config.uninstall.xdt" />
29+
<None Include="CosmosDBSessionStateProviderAsync.nupkg\Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.nuspec" />
30+
<None Include="SessionStateModule.nupkg\content\Net462\web.config.install.xdt" />
31+
<None Include="SessionStateModule.nupkg\content\Net462\web.config.uninstall.xdt" />
32+
<None Include="SessionStateModule.nupkg\Microsoft.AspNet.SessionState.SessionStateModule.nuspec" />
33+
<None Include="SqlSessionStateProviderAsync.nupkg\content\Net462\web.config.install.xdt" />
34+
<None Include="SqlSessionStateProviderAsync.nupkg\content\Net462\web.config.uninstall.xdt" />
35+
<None Include="SqlSessionStateProviderAsync.nupkg\Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.nuspec" />
36+
</ItemGroup>
2537
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
2638
<Target Name="Build">
2739
<MSBuild Projects="@(NuGetProject)" Targets="Build" />

‎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, PublicKeyToken=31bf3856ad364e35"
13+
type="Microsoft.AspNet.SessionState.SessionStateModuleAsync, Microsoft.AspNet.SessionState.SessionStateModule, Version=1.1.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, PublicKeyToken=31bf3856ad364e35"
8+
type="Microsoft.AspNet.SessionState.SessionStateModuleAsync, Microsoft.AspNet.SessionState.SessionStateModule, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
99
preCondition="integratedMode" xdt:Transform="Remove" xdt:Locator="Match(type)" />
1010
</modules>
1111
</system.webServer>

‎tools/CosmosDBSessionStateProviderAsync.settings.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project DefaultTargets="UnitTest" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22

33
<PropertyGroup>
4-
<BuildQuality Condition="'$(BuildQuality)' == ''">preview</BuildQuality>
4+
<BuildQuality Condition="'$(BuildQuality)' == ''">rtm</BuildQuality>
55
<VersionMajor>1</VersionMajor>
66
<VersionMinor>1</VersionMinor>
77
<VersionRelease>0</VersionRelease>

0 commit comments

Comments
 (0)