From bcb497a7b6e0c793749d1f7c06f6b0ac41e853a2 Mon Sep 17 00:00:00 2001
From: Sean Leonard <sean.leonard@microsoft.com>
Date: Tue, 1 Nov 2022 09:13:33 -0700
Subject: [PATCH 1/4] Update version variables and update nuget packages for HC

---
 src/Config/Azure.DataApiBuilder.Config.csproj                 | 2 +-
 src/Directory.Build.props                                     | 3 ++-
 .../Azure.DataApiBuilder.Service.GraphQLBuilder.csproj        | 2 +-
 src/Service.Tests/Azure.DataApiBuilder.Service.Tests.csproj   | 2 +-
 src/Service/Azure.DataApiBuilder.Service.csproj               | 4 ++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Config/Azure.DataApiBuilder.Config.csproj b/src/Config/Azure.DataApiBuilder.Config.csproj
index b7b0c0532a..9fa2cde216 100644
--- a/src/Config/Azure.DataApiBuilder.Config.csproj
+++ b/src/Config/Azure.DataApiBuilder.Config.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-      <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="$(NetCoreAutorizationVersion)" />
+      <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="6.0.10" />
       <PackageReference Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzerVersion)">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 8fc38b73c5..be29775c0c 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -6,10 +6,11 @@
 
  <!-- Dependency versions -->
  <PropertyGroup>
-    <HotChocolateVersion>12.8.2</HotChocolateVersion>
+    <HotChocolateVersion>12.15.0</HotChocolateVersion>
     <CosmosVersion>3.20.0</CosmosVersion>
     <SqlVersion>3.0.0</SqlVersion>
     <ConfigVersion>6.0.0-preview.3.21201.4</ConfigVersion>
+    <DotNetVersion>6.0.10</DotNetVersion>
     <PostgresVersion>5.0.10</PostgresVersion>
     <ODataVersion>7.9.0</ODataVersion>
     <MySQLVersion>2.1.5</MySQLVersion>
diff --git a/src/Service.GraphQLBuilder/Azure.DataApiBuilder.Service.GraphQLBuilder.csproj b/src/Service.GraphQLBuilder/Azure.DataApiBuilder.Service.GraphQLBuilder.csproj
index 98eb43535a..8f78ee81b6 100644
--- a/src/Service.GraphQLBuilder/Azure.DataApiBuilder.Service.GraphQLBuilder.csproj
+++ b/src/Service.GraphQLBuilder/Azure.DataApiBuilder.Service.GraphQLBuilder.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="HotChocolate" Version="$(HotChocolateVersion)" />
+    <PackageReference Include="HotChocolate" Version="12.15.0" />
     <PackageReference Include="HotChocolate.AspNetCore.Authorization" Version="$(HotChocolateVersion)" />
     <PackageReference Include="Humanizer" Version="$(HumanizerVersion)" />
     <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
diff --git a/src/Service.Tests/Azure.DataApiBuilder.Service.Tests.csproj b/src/Service.Tests/Azure.DataApiBuilder.Service.Tests.csproj
index 41f302be68..96d453e24e 100644
--- a/src/Service.Tests/Azure.DataApiBuilder.Service.Tests.csproj
+++ b/src/Service.Tests/Azure.DataApiBuilder.Service.Tests.csproj
@@ -18,7 +18,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="HotChocolate" Version="$(HotChocolateVersion)" />
+    <PackageReference Include="HotChocolate" Version="12.15.0" />
     <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
     <PackageReference Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzerVersion)">
       <PrivateAssets>all</PrivateAssets>
diff --git a/src/Service/Azure.DataApiBuilder.Service.csproj b/src/Service/Azure.DataApiBuilder.Service.csproj
index dec888a1fe..5346f75dc8 100644
--- a/src/Service/Azure.DataApiBuilder.Service.csproj
+++ b/src/Service/Azure.DataApiBuilder.Service.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -60,7 +60,7 @@
     <PackageReference Include="HotChocolate" Version="$(HotChocolateVersion)" />
     <PackageReference Include="HotChocolate.AspNetCore" Version="$(HotChocolateVersion)" />
     <PackageReference Include="HotChocolate.AspNetCore.Authorization" Version="$(HotChocolateVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.15" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(DotNetVersion)" />
     <PackageReference Include="Microsoft.Azure.Cosmos" Version="$(CosmosVersion)" />
     <PackageReference Include="Microsoft.Data.SqlClient" Version="$(SqlVersion)" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(ConfigVersion)" />

From dae062745c55bb1dbb96ae91434a48a254a74bc1 Mon Sep 17 00:00:00 2001
From: Sean Leonard <sean.leonard@microsoft.com>
Date: Wed, 2 Nov 2022 12:32:26 -0700
Subject: [PATCH 2/4] Update HC version

---
 src/Directory.Build.props                                     | 2 +-
 .../Azure.DataApiBuilder.Service.GraphQLBuilder.csproj        | 4 ++--
 src/Service.Tests/Azure.DataApiBuilder.Service.Tests.csproj   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index be29775c0c..ceae1b9a88 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -6,7 +6,7 @@
 
  <!-- Dependency versions -->
  <PropertyGroup>
-    <HotChocolateVersion>12.15.0</HotChocolateVersion>
+    <HotChocolateVersion>12.15.1</HotChocolateVersion>
     <CosmosVersion>3.20.0</CosmosVersion>
     <SqlVersion>3.0.0</SqlVersion>
     <ConfigVersion>6.0.0-preview.3.21201.4</ConfigVersion>
diff --git a/src/Service.GraphQLBuilder/Azure.DataApiBuilder.Service.GraphQLBuilder.csproj b/src/Service.GraphQLBuilder/Azure.DataApiBuilder.Service.GraphQLBuilder.csproj
index 8f78ee81b6..e1e3a5a4bf 100644
--- a/src/Service.GraphQLBuilder/Azure.DataApiBuilder.Service.GraphQLBuilder.csproj
+++ b/src/Service.GraphQLBuilder/Azure.DataApiBuilder.Service.GraphQLBuilder.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="HotChocolate" Version="12.15.0" />
+    <PackageReference Include="HotChocolate" Version="$(HotChocolateVersion)" />
     <PackageReference Include="HotChocolate.AspNetCore.Authorization" Version="$(HotChocolateVersion)" />
     <PackageReference Include="Humanizer" Version="$(HumanizerVersion)" />
     <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
diff --git a/src/Service.Tests/Azure.DataApiBuilder.Service.Tests.csproj b/src/Service.Tests/Azure.DataApiBuilder.Service.Tests.csproj
index 96d453e24e..41f302be68 100644
--- a/src/Service.Tests/Azure.DataApiBuilder.Service.Tests.csproj
+++ b/src/Service.Tests/Azure.DataApiBuilder.Service.Tests.csproj
@@ -18,7 +18,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="HotChocolate" Version="12.15.0" />
+    <PackageReference Include="HotChocolate" Version="$(HotChocolateVersion)" />
     <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
     <PackageReference Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzerVersion)">
       <PrivateAssets>all</PrivateAssets>

From 79ad071e9236de0984b50a5f1123c4c151078282 Mon Sep 17 00:00:00 2001
From: Sean Leonard <sean.leonard@microsoft.com>
Date: Wed, 2 Nov 2022 12:37:12 -0700
Subject: [PATCH 3/4] Update build props vars and update HC to 12.15.1

---
 src/Config/Azure.DataApiBuilder.Config.csproj   | 2 +-
 src/Directory.Build.props                       | 2 +-
 src/Service/Azure.DataApiBuilder.Service.csproj | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Config/Azure.DataApiBuilder.Config.csproj b/src/Config/Azure.DataApiBuilder.Config.csproj
index 9fa2cde216..b7b0c0532a 100644
--- a/src/Config/Azure.DataApiBuilder.Config.csproj
+++ b/src/Config/Azure.DataApiBuilder.Config.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-      <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="6.0.10" />
+      <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="$(NetCoreAutorizationVersion)" />
       <PackageReference Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzerVersion)">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index ceae1b9a88..b14ed5e078 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -10,7 +10,7 @@
     <CosmosVersion>3.20.0</CosmosVersion>
     <SqlVersion>3.0.0</SqlVersion>
     <ConfigVersion>6.0.0-preview.3.21201.4</ConfigVersion>
-    <DotNetVersion>6.0.10</DotNetVersion>
+    <DotNetVersion>5.0.15</DotNetVersion>
     <PostgresVersion>5.0.10</PostgresVersion>
     <ODataVersion>7.9.0</ODataVersion>
     <MySQLVersion>2.1.5</MySQLVersion>
diff --git a/src/Service/Azure.DataApiBuilder.Service.csproj b/src/Service/Azure.DataApiBuilder.Service.csproj
index 5346f75dc8..dd8f8a7a47 100644
--- a/src/Service/Azure.DataApiBuilder.Service.csproj
+++ b/src/Service/Azure.DataApiBuilder.Service.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>

From 7656b2320fa94bf6d4b0c24f45c64f0b865d42d9 Mon Sep 17 00:00:00 2001
From: Sean Leonard <sean.leonard@microsoft.com>
Date: Wed, 2 Nov 2022 12:49:47 -0700
Subject: [PATCH 4/4] remove irrelevant changes

---
 src/Directory.Build.props                       | 1 -
 src/Service/Azure.DataApiBuilder.Service.csproj | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index b14ed5e078..cc7e7619d2 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -10,7 +10,6 @@
     <CosmosVersion>3.20.0</CosmosVersion>
     <SqlVersion>3.0.0</SqlVersion>
     <ConfigVersion>6.0.0-preview.3.21201.4</ConfigVersion>
-    <DotNetVersion>5.0.15</DotNetVersion>
     <PostgresVersion>5.0.10</PostgresVersion>
     <ODataVersion>7.9.0</ODataVersion>
     <MySQLVersion>2.1.5</MySQLVersion>
diff --git a/src/Service/Azure.DataApiBuilder.Service.csproj b/src/Service/Azure.DataApiBuilder.Service.csproj
index dd8f8a7a47..dec888a1fe 100644
--- a/src/Service/Azure.DataApiBuilder.Service.csproj
+++ b/src/Service/Azure.DataApiBuilder.Service.csproj
@@ -60,7 +60,7 @@
     <PackageReference Include="HotChocolate" Version="$(HotChocolateVersion)" />
     <PackageReference Include="HotChocolate.AspNetCore" Version="$(HotChocolateVersion)" />
     <PackageReference Include="HotChocolate.AspNetCore.Authorization" Version="$(HotChocolateVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(DotNetVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.15" />
     <PackageReference Include="Microsoft.Azure.Cosmos" Version="$(CosmosVersion)" />
     <PackageReference Include="Microsoft.Data.SqlClient" Version="$(SqlVersion)" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(ConfigVersion)" />