diff --git a/Abc.MoqComplete/Abc.MoqComplete.Tests/Abc.MoqComplete.Tests.csproj b/Abc.MoqComplete/Abc.MoqComplete.Tests/Abc.MoqComplete.Tests.csproj
index 007dbad..5b18289 100644
--- a/Abc.MoqComplete/Abc.MoqComplete.Tests/Abc.MoqComplete.Tests.csproj
+++ b/Abc.MoqComplete/Abc.MoqComplete.Tests/Abc.MoqComplete.Tests.csproj
@@ -5,25 +5,22 @@
 	<Copyright>Copyright © ABC arbitrage Asset Management 2021</Copyright>
 	<IsPackable>False</IsPackable>
  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Abc.MoqComplete\Abc.MoqComplete.csproj" />
   </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="JetBrains.ReSharper.SDK.Tests" Version="$(SdkVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="Moq">
-      <Version>4.13.1</Version>
-    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Moq" Version="4.13.1" />
     <PackageReference Include="Moq.AutoMock" Version="2.0.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
+
   <ItemGroup>
     <Compile Remove="data\**\*" />
     <Content Include="data\**\*" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="data\AutoMockerSuspiciousCallback" />
-    <Folder Include="data\MockVariableNameCompletion\" />
-  </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Abc.MoqComplete/Abc.MoqComplete/Abc.MoqComplete.Rider.csproj b/Abc.MoqComplete/Abc.MoqComplete/Abc.MoqComplete.Rider.csproj
index eb20dee..a18aa90 100644
--- a/Abc.MoqComplete/Abc.MoqComplete/Abc.MoqComplete.Rider.csproj
+++ b/Abc.MoqComplete/Abc.MoqComplete/Abc.MoqComplete.Rider.csproj
@@ -7,15 +7,16 @@
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <RootNamespace>Abc.MoqComplete</RootNamespace>
  </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="JetBrains.Rider.SDK">
-      <Version>$(SdkVersion)</Version>
-    </PackageReference>
+    <PackageReference Include="JetBrains.Rider.SDK" Version="$(SdkVersion)" />
   </ItemGroup>
+
   <ItemGroup>
     <Content Include="bin\Abc.MoqComplete.Rider\$(Configuration)\Abc.MoqComplete.Rider.*" PackagePath="dotnet" Pack="true" />
     <Content Include="Resources\plugin.xml" PackagePath="META-INF" Pack="true" />
     <Content Include="Resources\pluginIcon.svg" PackagePath="META-INF" Pack="true" />
     <Content Include="Resources\pluginIcon_dark.svg" PackagePath="META-INF" Pack="true" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/Abc.MoqComplete/Abc.MoqComplete/Abc.MoqComplete.csproj b/Abc.MoqComplete/Abc.MoqComplete/Abc.MoqComplete.csproj
index c6b27d7..2fcc965 100644
--- a/Abc.MoqComplete/Abc.MoqComplete/Abc.MoqComplete.csproj
+++ b/Abc.MoqComplete/Abc.MoqComplete/Abc.MoqComplete.csproj
@@ -6,18 +6,18 @@
 	<IsPackable>True</IsPackable>
     <IncludeBuildOutput>false</IncludeBuildOutput>
   </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="JetBrains.ReSharper.SDK" Version="$(SdkVersion)">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
+    <PackageReference Include="JetBrains.ReSharper.SDK" Version="$(SdkVersion)" PrivateAssets="all" />
     <PackageReference Include="Wave" Version="$(WaveVersion)" />
   </ItemGroup>
+
   <ItemGroup>
     <None Remove="*\plugin.xml" />
   </ItemGroup>
+
   <ItemGroup>
     <Content Include="bin\Abc.MoqComplete\$(Configuration)\Abc.MoqComplete.*" PackagePath="dotFiles" Pack="true" />
   </ItemGroup>
- <ItemGroup>
- </ItemGroup>
-</Project>
\ No newline at end of file
+
+</Project>