From ca213a0bb14b43af135effae9c5cac67dee52abf Mon Sep 17 00:00:00 2001 From: Alex Hemsath Date: Wed, 20 Nov 2024 10:17:47 -0800 Subject: [PATCH 1/2] Update MultiVerseScanner projects to net8.0 --- .../ConsoleScanner/ConsoleScanner.csproj | 2 +- .../MultiverseScanner/MultiverseScanner.csproj | 2 +- .../MultiverseTesting/ReportBuilder/Program.cs | 13 ++++++------- .../ReportBuilder/ReportBuilder.csproj | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/tests/Agent/MultiverseTesting/ConsoleScanner/ConsoleScanner.csproj b/tests/Agent/MultiverseTesting/ConsoleScanner/ConsoleScanner.csproj index d6ee55f460..42f372e8a4 100644 --- a/tests/Agent/MultiverseTesting/ConsoleScanner/ConsoleScanner.csproj +++ b/tests/Agent/MultiverseTesting/ConsoleScanner/ConsoleScanner.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net8.0 NewRelic.Agent.ConsoleScanner diff --git a/tests/Agent/MultiverseTesting/MultiverseScanner/MultiverseScanner.csproj b/tests/Agent/MultiverseTesting/MultiverseScanner/MultiverseScanner.csproj index 64a9d18a53..0aa67d91a0 100644 --- a/tests/Agent/MultiverseTesting/MultiverseScanner/MultiverseScanner.csproj +++ b/tests/Agent/MultiverseTesting/MultiverseScanner/MultiverseScanner.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + net8.0 NewRelic.Agent.MultiverseScanner diff --git a/tests/Agent/MultiverseTesting/ReportBuilder/Program.cs b/tests/Agent/MultiverseTesting/ReportBuilder/Program.cs index 982a5eff50..8fedc3849c 100644 --- a/tests/Agent/MultiverseTesting/ReportBuilder/Program.cs +++ b/tests/Agent/MultiverseTesting/ReportBuilder/Program.cs @@ -1,4 +1,4 @@ -// Copyright 2020 New Relic, Inc. All rights reserved. +// Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 @@ -6,15 +6,14 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using System.Text; using NewRelic.Agent.MultiverseScanner.Reporting; namespace ReportBuilder { - class Program - { - static void Main(string[] args) - { + class Program + { + static void Main(string[] args) + { if (args.Length != 3 || string.IsNullOrWhiteSpace(args[0]) || string.IsNullOrWhiteSpace(args[1])) { Console.WriteLine("ERROR Missing argument: Must supply agent version, path to report, and an output path."); @@ -112,5 +111,5 @@ private static InstrumentationOverview TransformReport(List Exe - netcoreapp3.1 + net8.0 From 2c8f0feb2d50d06c3a18b18fefaa9515e2e11dc8 Mon Sep 17 00:00:00 2001 From: Alex Hemsath Date: Wed, 20 Nov 2024 10:22:07 -0800 Subject: [PATCH 2/2] Fix workflow --- .github/workflows/multiverse_run.yml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/.github/workflows/multiverse_run.yml b/.github/workflows/multiverse_run.yml index eebf2e3ed1..1bf6541960 100644 --- a/.github/workflows/multiverse_run.yml +++ b/.github/workflows/multiverse_run.yml @@ -30,8 +30,8 @@ jobs: env: multiverse_path: ${{ github.workspace }}/tests/Agent/MultiverseTesting multiverse_solution: ${{ github.workspace }}/tests/Agent/MultiverseTesting/MultiverseTesting.sln - multiverse_consolescanner_path: ${{ github.workspace }}/tests/Agent/MultiverseTesting/ConsoleScanner/bin/Release/netcoreapp3.1 - multiverse_reportbuilder_path: ${{ github.workspace }}/tests/Agent/MultiverseTesting/ReportBuilder/bin/Release/netcoreapp3.1 + multiverse_consolescanner_path: ${{ github.workspace }}/tests/Agent/MultiverseTesting/ConsoleScanner/bin/Release/net8.0 + multiverse_reportbuilder_path: ${{ github.workspace }}/tests/Agent/MultiverseTesting/ReportBuilder/bin/Release/net8.0 MVS_XML_PATH: ${{ github.workspace }}/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper steps: @@ -61,11 +61,6 @@ jobs: dotnet build ${{ env.multiverse_solution }} --configuration Release shell: bash - - name: Setup .NET Core 3.1.100 - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0 - with: - dotnet-version: '3.1.100' - - name: Run ConsoleScanner run: | cd ${{ env.multiverse_consolescanner_path }} @@ -96,8 +91,8 @@ jobs: env: multiverse_path: ${{ github.workspace }}/tests/Agent/MultiverseTesting multiverse_solution: ${{ github.workspace }}/tests/Agent/MultiverseTesting/MultiverseTesting.sln - multiverse_consolescanner_path: ${{ github.workspace }}/tests/Agent/MultiverseTesting/ConsoleScanner/bin/Release/netcoreapp3.1 - multiverse_reportbuilder_path: ${{ github.workspace }}/tests/Agent/MultiverseTesting/ReportBuilder/bin/Release/netcoreapp3.1 + multiverse_consolescanner_path: ${{ github.workspace }}/tests/Agent/MultiverseTesting/ConsoleScanner/bin/Release/net8.0 + multiverse_reportbuilder_path: ${{ github.workspace }}/tests/Agent/MultiverseTesting/ReportBuilder/bin/Release/net8.0 MVS_XML_PATH: ${{ github.workspace }}/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper steps: @@ -106,11 +101,6 @@ jobs: with: egress-policy: audit - - name: Setup .NET Core 3.1.100 - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0 - with: - dotnet-version: '3.1.100' - - name: Checkout uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: