Skip to content

Commit

Permalink
test:Dotty instrumentation library updates for 2024-Nov-15 (#2884)
Browse files Browse the repository at this point in the history
* test:Dotty instrumentation library updates for 2024-Nov-15

* Reverted RabbitMQ update, added Dotty exclusion

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Marty Tippin <[email protected]>
  • Loading branch information
github-actions[bot] and tippmar-nr authored Nov 15, 2024
1 parent b2e8a16 commit 228a1a2
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,11 @@
"packageName": "nservicebus"
},
{
"packageName": "rabbitmq.client"
"packageName": "rabbitmq.client",
"ignorePatch": true,
"ignoreMinor": true,
"ignoreMajor": true,
"ignoreReason": "Breaking major update. See https://github.com/newrelic/newrelic-dotnet-agent/issues/2885"
},
{
"packageName": "restsharp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<None Include="local.settings.json" />
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.23.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.0.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.2.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="1.3.2" Condition="'$(TargetFramework)' == 'net8.0'" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="2.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Storage.Queues" Version="5.5.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.18.1" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.0" />
</ItemGroup>
<ItemGroup>
<None Update="host.json">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@
<ProjectReference Include="..\..\ApplicationHelperLibraries\ApplicationLifecycle\ApplicationLifecycle.csproj" />
</ItemGroup>

</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="AWSSDK.SQS" Version="3.7.400.33" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.402" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.403.2" />
<PackageReference Include="NewRelic.Agent.Api" Version="10.26.0" />
</ItemGroup>
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@



</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
<PackageReference Include="EnyimMemcachedCore" Version="3.2.3" Condition="'$(TargetFramework)' == 'net8.0'" />
</ItemGroup>

</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
<PackageReference Include="NewRelic.Agent.Api" Version="10.20.0" />
</ItemGroup>

</Project>
</Project>
1 change: 1 addition & 0 deletions tests/Agent/IntegrationTests/ContainerIntegrationTests.sln
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ContainerIntegrationTests",
ProjectSection(ProjectDependencies) = postProject
{0EECB18A-4350-4D17-AB0D-F7647B4E3B58} = {0EECB18A-4350-4D17-AB0D-F7647B4E3B58}
{1F7402D8-E345-480C-BBA6-6313A1DEEB23} = {1F7402D8-E345-480C-BBA6-6313A1DEEB23}
{3D46F286-A19A-4942-8E3F-8999E953A6F2} = {3D46F286-A19A-4942-8E3F-8999E953A6F2}
{70731828-AFC8-4262-9076-3FB39E224D10} = {70731828-AFC8-4262-9076-3FB39E224D10}
{FBA07795-8066-4641-88E5-05DD272D333A} = {FBA07795-8066-4641-88E5-05DD272D333A}
EndProjectSection
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" Condition="'$(TargetFramework)' == 'net481'" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" Condition="'$(TargetFramework)' == 'net8.0'" />

<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" Condition="'$(TargetFramework)' == 'net481'" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" Condition="'$(TargetFramework)' == 'net8.0'" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" Condition="'$(TargetFramework)' == 'net481'" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />

<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.1" Condition="'$(TargetFramework)' == 'net481'" />
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.1" Condition="'$(TargetFramework)' == 'net8.0'" />
Expand All @@ -50,8 +50,8 @@
<PackageReference Include="MySql.Data" Version="9.0.0" Condition="'$(TargetFramework)' == 'net481'" />
<PackageReference Include="MySql.Data" Version="9.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />

<PackageReference Include="MySqlConnector" Version="2.3.7" Condition="'$(TargetFramework)' == 'net481'" />
<PackageReference Include="MySqlConnector" Version="2.3.7" Condition="'$(TargetFramework)' == 'net8.0'" />
<PackageReference Include="MySqlConnector" Version="2.4.0" Condition="'$(TargetFramework)' == 'net481'" />
<PackageReference Include="MySqlConnector" Version="2.4.0" Condition="'$(TargetFramework)' == 'net8.0'" />

<PackageReference Include="NEST" Version="7.17.5" Condition="'$(TargetFramework)' == 'net481'" />
<PackageReference Include="NEST" Version="7.17.5" Condition="'$(TargetFramework)' == 'net8.0'" />
Expand All @@ -66,15 +66,16 @@
<PackageReference Include="npgsql" Version="7.0.7" Condition="'$(TargetFramework)' == 'net481'" />
<PackageReference Include="npgsql" Version="7.0.7" Condition="'$(TargetFramework)' == 'net8.0'" />

<!-- NServiceBus v9+ only supports .NET8+, so constraint FW target to the latest 8.x version -->
<PackageReference Include="NServiceBus" Version="8.2.2" Condition="'$(TargetFramework)' == 'net481'" />
<PackageReference Include="NServiceBus" Version="9.2.2" Condition="'$(TargetFramework)' == 'net8.0'" />
<!-- NServiceBus v9+ only supports .NET8+, so constrain FW target to the latest 8.x version -->
<PackageReference Include="NServiceBus" Version="8.2.4" Condition="'$(TargetFramework)' == 'net481'" />
<PackageReference Include="NServiceBus" Version="9.2.3" Condition="'$(TargetFramework)' == 'net8.0'" />


<!-- modern oracle only supports net472+ and net6.0+ -->
<PackageReference Include="Oracle.ManagedDataAccess" Version="23.6.0" Condition="'$(TargetFramework)' == 'net481'" />
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="23.6.0" Condition="'$(TargetFramework)' == 'net8.0'" />


<!-- RabbitMQ v8+ only supports .NET+, so constrain FW target to the latest 6.x version -->
<PackageReference Include="RabbitMQ.Client" Version="6.8.1" Condition="'$(TargetFramework)' == 'net481'" />
<PackageReference Include="RabbitMQ.Client" Version="6.8.1" Condition="'$(TargetFramework)' == 'net8.0'" />

Expand Down

0 comments on commit 228a1a2

Please sign in to comment.