From 6654e6761c1b63a2eaec8a46669ab835e5a6f42b Mon Sep 17 00:00:00 2001
From: Steve Molloy <smolloy@microsoft.com>
Date: Sun, 5 Mar 2023 12:00:14 -0800
Subject: [PATCH] Rev to 2.0; Fix nuget dependencies. (#82)

---
 ...t.SessionState.SqlSessionStateProviderAsync.csproj |  2 +-
 ...sionState.CosmosDBSessionStateProviderAsync.nuspec |  3 ++-
 ...t.SessionState.SqlSessionStateProviderAsync.nuspec |  7 ++++---
 ...CosmosDBSessionStateProviderAsync.settings.targets | 11 ++++++-----
 tools/MicrosoftAspNetSessionState.settings.targets    | 10 ++++++----
 tools/SessionStateModule.settings.targets             |  6 +++---
 tools/SqlSessionStateProviderAsync.settings.targets   |  9 +++++----
 7 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/SqlSessionStateProviderAsync/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.csproj b/src/SqlSessionStateProviderAsync/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.csproj
index bbdb06a..d21cd5d 100644
--- a/src/SqlSessionStateProviderAsync/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.csproj
+++ b/src/SqlSessionStateProviderAsync/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.csproj
@@ -92,7 +92,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Data.SqlClient">
-      <Version>5.1.0</Version>
+      <Version>5.0.0</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/src/packages/CosmosDBSessionStateProviderAsync.nupkg/Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.nuspec b/src/packages/CosmosDBSessionStateProviderAsync.nupkg/Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.nuspec
index 5020a57..779e235 100644
--- a/src/packages/CosmosDBSessionStateProviderAsync.nupkg/Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.nuspec
+++ b/src/packages/CosmosDBSessionStateProviderAsync.nupkg/Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.nuspec
@@ -21,6 +21,7 @@
     <dependencies>
       <dependency id="Microsoft.AspNet.SessionState.SessionStateModule" version="$SessionStateModuleNuGetPackageVersion$" />
       <dependency id="Microsoft.Azure.DocumentDB" version="$DocumentDBNuGetPackageVersion$" />
-    </dependencies>    
+      <dependency id="System.Text.Json" version="$SystemTextJsonPackageVersion$" />
+    </dependencies>
   </metadata>
 </package>
\ No newline at end of file
diff --git a/src/packages/SqlSessionStateProviderAsync.nupkg/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.nuspec b/src/packages/SqlSessionStateProviderAsync.nupkg/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.nuspec
index 129d9d6..13200b4 100644
--- a/src/packages/SqlSessionStateProviderAsync.nupkg/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.nuspec
+++ b/src/packages/SqlSessionStateProviderAsync.nupkg/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.nuspec
@@ -6,9 +6,6 @@
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>
     <copyright>&#169; Microsoft Corporation. All rights reserved.</copyright>
-    <dependencies>
-      <dependency id="Microsoft.AspNet.SessionState.SessionStateModule" version="$SessionStateModuleNuGetPackageVersion$" />
-    </dependencies>    
     <title>Microsoft ASP.NET Async SqlSessionState Provider</title>
     <description>In .Net 4.6.2, asp.net enables developer plug in async version of SessionState module which is a good fit for the non-in-memory SessionState data store. This SessionState provider uses SQL Server as the data store and leverages async database operation to provide better scability.</description>
     <summary>Async version SqlSessionState provider</summary>
@@ -20,5 +17,9 @@
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <readme>docs\Readme.md</readme>
     <tags>ASP.NET Async SessionState Provider</tags>
+    <dependencies>
+      <dependency id="Microsoft.AspNet.SessionState.SessionStateModule" version="$SessionStateModuleNuGetPackageVersion$" />
+      <dependency id="Microsoft.Data.SqlClient" version="$MicrosoftDataSqlClientPackageVersion$" />
+    </dependencies>
   </metadata>
 </package>
\ No newline at end of file
diff --git a/tools/CosmosDBSessionStateProviderAsync.settings.targets b/tools/CosmosDBSessionStateProviderAsync.settings.targets
index a9e0256..10d6cab 100644
--- a/tools/CosmosDBSessionStateProviderAsync.settings.targets
+++ b/tools/CosmosDBSessionStateProviderAsync.settings.targets
@@ -1,15 +1,16 @@
 <Project DefaultTargets="UnitTest" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <BuildQuality Condition="'$(BuildQuality)' == ''">rtm</BuildQuality>
-    <VersionMajor>1</VersionMajor>
-    <VersionMinor>1</VersionMinor>
+    <BuildQuality Condition="'$(BuildQuality)' == ''">preview1</BuildQuality>
+    <VersionMajor>2</VersionMajor>
+    <VersionMinor>0</VersionMinor>
     <VersionRelease>0</VersionRelease>
   </PropertyGroup>
 
   <PropertyGroup Label="NuGet package dependencies">
-    <SessionStateModuleNuGetPackageVersion>1.1.0</SessionStateModuleNuGetPackageVersion>
-    <DocumentDBNuGetPackageVersion>1.15.0</DocumentDBNuGetPackageVersion>
+    <SessionStateModuleNuGetPackageVersion>2.0.0</SessionStateModuleNuGetPackageVersion>
+    <DocumentDBNuGetPackageVersion>3.23.0</DocumentDBNuGetPackageVersion>
+    <SystemTextJsonPackageVersion>7.0.0</SystemTextJsonPackageVersion>
   </PropertyGroup>
 
   <Import Project="MicrosoftAspNetSessionState.settings.targets" />
diff --git a/tools/MicrosoftAspNetSessionState.settings.targets b/tools/MicrosoftAspNetSessionState.settings.targets
index b2f62b0..f6bf0a3 100644
--- a/tools/MicrosoftAspNetSessionState.settings.targets
+++ b/tools/MicrosoftAspNetSessionState.settings.targets
@@ -23,11 +23,11 @@
             Release:	Third for Info and Package.
          Update package and file without touching assembly, except for major releases.
 
-         Some of these are already set in each project's individual settings file.
+         Most of the interesting ones are already set in each project's individual settings file.
     -->
-    <BuildQuality Condition="'$(BuildQuality)' == ''">beta</BuildQuality>
+    <BuildQuality Condition="'$(BuildQuality)' == ''">rtm</BuildQuality>
     <VersionStartYear Condition="'$(VersionStartYear)' == ''">2023</VersionStartYear>
-    <VersionMajor Condition="'$(VersionMajor)' == ''">1</VersionMajor>
+    <VersionMajor Condition="'$(VersionMajor)' == ''">2</VersionMajor>
     <VersionMinor Condition="'$(VersionMinor)' == ''">0</VersionMinor>
     <VersionRevision Condition="'$(VersionRevision)' == ''">0</VersionRevision>
     <VersionRelease Condition="'$(VersionRelease)' == ''">0</VersionRelease>
@@ -86,7 +86,9 @@
           NuGetPackageVersion=$(NuGetPackageVersion);
           NuGetPackageId=$(NuGetPackageId);
           SessionStateModuleNuGetPackageVersion=$(SessionStateModuleNuGetPackageVersion);
-          DocumentDBNuGetPackageVersion=$(DocumentDBNuGetPackageVersion)
+          MicrosoftDataSqlClientPackageVersion=$(MicrosoftDataSqlClientPackageVersion);
+          DocumentDBNuGetPackageVersion=$(DocumentDBNuGetPackageVersion);
+          SystemTextJsonPackageVersion=$(SystemTextJsonPackageVersion)
       </NuSpecProperties>
     </PropertyGroup>
   </Target>
diff --git a/tools/SessionStateModule.settings.targets b/tools/SessionStateModule.settings.targets
index aa54d53..5f8c3ef 100644
--- a/tools/SessionStateModule.settings.targets
+++ b/tools/SessionStateModule.settings.targets
@@ -1,9 +1,9 @@
 <Project DefaultTargets="UnitTest" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <BuildQuality Condition="'$(BuildQuality)' == ''">rtm</BuildQuality>
-    <VersionMajor>1</VersionMajor>
-    <VersionMinor>1</VersionMinor>
+    <BuildQuality Condition="'$(BuildQuality)' == ''">preview1</BuildQuality>
+    <VersionMajor>2</VersionMajor>
+    <VersionMinor>0</VersionMinor>
     <VersionRelease>0</VersionRelease>
   </PropertyGroup>
 
diff --git a/tools/SqlSessionStateProviderAsync.settings.targets b/tools/SqlSessionStateProviderAsync.settings.targets
index 78f9f04..1e3aaf6 100644
--- a/tools/SqlSessionStateProviderAsync.settings.targets
+++ b/tools/SqlSessionStateProviderAsync.settings.targets
@@ -1,14 +1,15 @@
 <Project DefaultTargets="UnitTest" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <BuildQuality Condition="'$(BuildQuality)' == ''">rtm</BuildQuality>
-    <VersionMajor>1</VersionMajor>
-    <VersionMinor>1</VersionMinor>
+    <BuildQuality Condition="'$(BuildQuality)' == ''">preview1</BuildQuality>
+    <VersionMajor>2</VersionMajor>
+    <VersionMinor>0</VersionMinor>
     <VersionRelease>0</VersionRelease>
   </PropertyGroup>
 
   <PropertyGroup Label="NuGet package dependencies">
-    <SessionStateModuleNuGetPackageVersion>1.1.0</SessionStateModuleNuGetPackageVersion>
+    <SessionStateModuleNuGetPackageVersion>2.0.0</SessionStateModuleNuGetPackageVersion>
+    <MicrosoftDataSqlClientPackageVersion>5.0.0</MicrosoftDataSqlClientPackageVersion>
   </PropertyGroup>
 
   <Import Project="MicrosoftAspNetSessionState.settings.targets" />