diff --git a/src/EventGrid.Tests/EventGrid.Tests.csproj b/src/EventGrid.Tests/EventGrid.Tests.csproj
index d13f1f8..cf3fc94 100644
--- a/src/EventGrid.Tests/EventGrid.Tests.csproj
+++ b/src/EventGrid.Tests/EventGrid.Tests.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="xunit" Version="2.5.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/EventGrid/EventGrid.csproj b/src/EventGrid/EventGrid.csproj
index bee1269..6c3a1aa 100644
--- a/src/EventGrid/EventGrid.csproj
+++ b/src/EventGrid/EventGrid.csproj
@@ -21,7 +21,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CliWrap" Version="3.6.6" />
+    <PackageReference Include="CliWrap" Version="3.10.2" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.9" />
     <PackageReference Include="NuGetizer" Version="1.2.1" />
@@ -37,4 +37,12 @@
     <None Update="runtime/**/*.*" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
+  <Target Name="PreserveToolPackageSubdirectories" AfterTargets="PackTool" Condition="'$(PackAsTool)' == 'true'">
+    <ItemGroup>
+      <TfmSpecificPackageFile Update="@(TfmSpecificPackageFile)">
+        <PackagePath>%(TfmSpecificPackageFile.PackagePath)%(TfmSpecificPackageFile.RecursiveDir)</PackagePath>
+      </TfmSpecificPackageFile>
+    </ItemGroup>
+  </Target>
+
 </Project>
diff --git a/src/FunctionApp/FunctionApp.csproj b/src/FunctionApp/FunctionApp.csproj
index 0e848ab..2ae3b14 100644
--- a/src/FunctionApp/FunctionApp.csproj
+++ b/src/FunctionApp/FunctionApp.csproj
@@ -11,11 +11,11 @@
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.3.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.SignalRService" Version="1.13.0" />
-		<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.EventGrid" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.SignalRService" Version="2.1.0" />
+		<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.EventGrid" Version="3.5.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageReference Include="ThisAssembly.Project" Version="1.3.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
+    <PackageReference Include="ThisAssembly.Project" Version="2.1.2" />
   </ItemGroup>
 
 	<ItemGroup>