Tweaks

newrelic · Jul 24, 2024 · 5e1956f · 5e1956f
1 parent ce81e38
commit 5e1956f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/...ent/IntegrationTests/SharedApplications/Common/MFALatestPackages/MFALatestPackages.csproj b/...ent/IntegrationTests/SharedApplications/Common/MFALatestPackages/MFALatestPackages.csproj
@@ -17,8 +17,9 @@
     <PackageReference Include="log4net" Version="*" Condition="'$(TargetFramework)' == 'net8.0'" />
     <PackageReference Include="log4net.Ext.Json" Version="*" Condition="'$(TargetFramework)' == 'net8.0'" />
 
-    <PackageReference Include="npgsql" Version="*" Condition="'$(TargetFramework)' == 'net481'" />
-    <PackageReference Include="npgsql" Version="*" Condition="'$(TargetFramework)' == 'net8.0'" />
+    <!-- npgsql is on version 8, but we don't (currently) support it, so use the latest v7 release -->
+    <PackageReference Include="npgsql" Version="7.*" Condition="'$(TargetFramework)' == 'net481'" />
+    <PackageReference Include="npgsql" Version="7.*" Condition="'$(TargetFramework)' == 'net8.0'" />
 
     <PackageReference Include="Microsoft.Data.SqlClient" Version="*" Condition="'$(TargetFramework)' == 'net481'" />
     <PackageReference Include="Microsoft.Data.SqlClient" Version="*" Condition="'$(TargetFramework)' == 'net8.0'" />
@@ -56,6 +57,8 @@
     <PackageReference Include="RabbitMQ.Client" Version="*" Condition="'$(TargetFramework)' == 'net481'" />
     <PackageReference Include="RabbitMQ.Client" Version="*" Condition="'$(TargetFramework)' == 'net8.0'" />
 
+    <!-- NServiceBus v9+ only supports .NET, so constraint FW target to the latest 8.x version -->
+    <PackageReference Include="NServiceBus" Version="8.*" Condition="'$(TargetFramework)' == 'net481'" />
     <PackageReference Include="NServiceBus" Version="*" Condition="'$(TargetFramework)' == 'net8.0'" />
 
     <PackageReference Include="Microsoft.Extensions.Logging" Version="*" Condition="'$(TargetFramework)' == 'net481'" />

diff --git a/...pplications/Common/MultiFunctionApplicationHelpers/MultiFunctionApplicationHelpers.csproj b/...pplications/Common/MultiFunctionApplicationHelpers/MultiFunctionApplicationHelpers.csproj
@@ -173,7 +173,6 @@
     <PackageReference Include="NServiceBus" Version="6.5.10" Condition="'$(TargetFramework)' == 'net471'" />
     <PackageReference Include="NServiceBus" Version="7.5.0" Condition="'$(TargetFramework)' == 'net48'" />
     <PackageReference Include="NServiceBus" Version="8.2.0" Condition="'$(TargetFramework)' == 'net6.0'" />
-    <PackageReference Include="NServiceBus" Version="[8.0,9.0)" Condition="'$(TargetFramework)' == 'net481'" />
   </ItemGroup>
 
   <ItemGroup>