Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Update multiverse scanner solution to .NET 8 #2895

Merged
merged 2 commits into from
Nov 20, 2024
Merged

chore: Update multiverse scanner solution to .NET 8 #2895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca213a0
Update MultiVerseScanner projects to net8.0
nr-ahemsath Nov 20, 2024
2c8f0fe
Fix workflow
nr-ahemsath Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 4 additions & 14 deletions .github/workflows/multiverse_run.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/Agent/MultiverseTesting/ConsoleScanner/ConsoleScanner.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>NewRelic.Agent.ConsoleScanner</RootNamespace>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion tests/Agent/MultiverseTesting/MultiverseScanner/MultiverseScanner.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>NewRelic.Agent.MultiverseScanner</RootNamespace>
</PropertyGroup>

Expand Down
13 changes: 6 additions & 7 deletions tests/Agent/MultiverseTesting/ReportBuilder/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
// Copyright 2020 New Relic, Inc. All rights reserved.
// Copyright 2020 New Relic, Inc. All rights reserved.
// SPDX-License-Identifier: Apache-2.0


using System;
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.");
Expand Down Expand Up @@ -112,5 +111,5 @@ private static InstrumentationOverview TransformReport(List<InstrumentationRepor

return overview;
}
}
}
}
2 changes: 1 addition & 1 deletion tests/Agent/MultiverseTesting/ReportBuilder/ReportBuilder.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
Loading