From d1e133398906ea8e1504c7e5b31a517d1fca287b Mon Sep 17 00:00:00 2001 From: Ivan Berg Date: Wed, 15 May 2024 13:28:06 -0700 Subject: [PATCH 1/2] Upgrade to supported .NET8 (from .NET 3.1 for UT and LTTngDriver). Upgrade to latest supported Perf SDK point release --- CtfUnitTest/CtfUnitTest.csproj | 2 +- LTTngCds/LTTngCds.csproj | 2 +- LTTngCdsUnitTest/LTTngCdsUnitTest.csproj | 2 +- LTTngDataExtUnitTest/LTTngDataExtUnitTest.csproj | 6 +++--- LTTngDataExtensions/LTTngDataExtensions.csproj | 2 +- LTTngDriver/LTTngDriver.csproj | 4 ++-- LinuxLogParsers/LinuxLogParser/LinuxLogParser.csproj | 2 +- .../LinuxLogParserCore/LinuxLogParserCore.csproj | 2 +- .../LinuxLogParsersUnitTest/LinuxLogParsersUnitTest.csproj | 4 ++-- .../AndroidLogCat/AndroidLogcat.csproj | 2 +- .../Cloud-init/Cloud-Init.csproj | 2 +- .../DmesgIsoLog/Dmesg.csproj | 2 +- .../WaLinuxAgent/WaLinuxAgent.csproj | 2 +- PerfDataExtension/PerfDataExtension.csproj | 2 +- PerfDataTxtExtension/PerfDataTxtExtension.csproj | 2 +- PerfDataUnitTest/PerfDataUnitTest.csproj | 2 +- PerfUnitTest/PerfUnitTest.csproj | 4 ++-- PerfettoCds/PerfettoCds.csproj | 2 +- PerfettoUnitTest/PerfettoUnitTest.csproj | 6 +++--- UnitTestCommon/UnitTestCommon.csproj | 4 ++-- Utilities/Utilities.csproj | 2 +- azure-pipelines.yml | 2 +- 22 files changed, 30 insertions(+), 30 deletions(-) diff --git a/CtfUnitTest/CtfUnitTest.csproj b/CtfUnitTest/CtfUnitTest.csproj index 72e5ca6..2503e57 100644 --- a/CtfUnitTest/CtfUnitTest.csproj +++ b/CtfUnitTest/CtfUnitTest.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net8.0 false diff --git a/LTTngCds/LTTngCds.csproj b/LTTngCds/LTTngCds.csproj index 7f43870..dc9d128 100644 --- a/LTTngCds/LTTngCds.csproj +++ b/LTTngCds/LTTngCds.csproj @@ -28,7 +28,7 @@ - + diff --git a/LTTngCdsUnitTest/LTTngCdsUnitTest.csproj b/LTTngCdsUnitTest/LTTngCdsUnitTest.csproj index 3856a7e..7257748 100644 --- a/LTTngCdsUnitTest/LTTngCdsUnitTest.csproj +++ b/LTTngCdsUnitTest/LTTngCdsUnitTest.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net8.0 enable false diff --git a/LTTngDataExtUnitTest/LTTngDataExtUnitTest.csproj b/LTTngDataExtUnitTest/LTTngDataExtUnitTest.csproj index 9c90e83..b9d1464 100644 --- a/LTTngDataExtUnitTest/LTTngDataExtUnitTest.csproj +++ b/LTTngDataExtUnitTest/LTTngDataExtUnitTest.csproj @@ -1,14 +1,14 @@  - netcoreapp3.1;net6.0;net7.0 + net8.0 false - - + + diff --git a/LTTngDataExtensions/LTTngDataExtensions.csproj b/LTTngDataExtensions/LTTngDataExtensions.csproj index 65525e8..419ec5f 100644 --- a/LTTngDataExtensions/LTTngDataExtensions.csproj +++ b/LTTngDataExtensions/LTTngDataExtensions.csproj @@ -63,7 +63,7 @@ - + diff --git a/LTTngDriver/LTTngDriver.csproj b/LTTngDriver/LTTngDriver.csproj index 3433700..ad2a61c 100644 --- a/LTTngDriver/LTTngDriver.csproj +++ b/LTTngDriver/LTTngDriver.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + netcoreapp8.0 false 1.2.1 true @@ -18,7 +18,7 @@ - + diff --git a/LinuxLogParsers/LinuxLogParser/LinuxLogParser.csproj b/LinuxLogParsers/LinuxLogParser/LinuxLogParser.csproj index 7711296..db3d941 100644 --- a/LinuxLogParsers/LinuxLogParser/LinuxLogParser.csproj +++ b/LinuxLogParsers/LinuxLogParser/LinuxLogParser.csproj @@ -16,7 +16,7 @@ - + diff --git a/LinuxLogParsers/LinuxLogParserCore/LinuxLogParserCore.csproj b/LinuxLogParsers/LinuxLogParserCore/LinuxLogParserCore.csproj index cdb761f..4d68692 100644 --- a/LinuxLogParsers/LinuxLogParserCore/LinuxLogParserCore.csproj +++ b/LinuxLogParsers/LinuxLogParserCore/LinuxLogParserCore.csproj @@ -16,7 +16,7 @@ - + diff --git a/LinuxLogParsers/LinuxLogParsersUnitTest/LinuxLogParsersUnitTest.csproj b/LinuxLogParsers/LinuxLogParsersUnitTest/LinuxLogParsersUnitTest.csproj index dae1437..8206ab1 100644 --- a/LinuxLogParsers/LinuxLogParsersUnitTest/LinuxLogParsersUnitTest.csproj +++ b/LinuxLogParsers/LinuxLogParsersUnitTest/LinuxLogParsersUnitTest.csproj @@ -1,14 +1,14 @@ - netcoreapp3.1 + netcoreapp8.0 false - + diff --git a/LinuxLogParsers/LinuxPlugins-MicrosoftPerformanceToolkSDK/AndroidLogCat/AndroidLogcat.csproj b/LinuxLogParsers/LinuxPlugins-MicrosoftPerformanceToolkSDK/AndroidLogCat/AndroidLogcat.csproj index a4721d9..e182c01 100644 --- a/LinuxLogParsers/LinuxPlugins-MicrosoftPerformanceToolkSDK/AndroidLogCat/AndroidLogcat.csproj +++ b/LinuxLogParsers/LinuxPlugins-MicrosoftPerformanceToolkSDK/AndroidLogCat/AndroidLogcat.csproj @@ -17,7 +17,7 @@ - + diff --git a/LinuxLogParsers/LinuxPlugins-MicrosoftPerformanceToolkSDK/Cloud-init/Cloud-Init.csproj b/LinuxLogParsers/LinuxPlugins-MicrosoftPerformanceToolkSDK/Cloud-init/Cloud-Init.csproj index 0c5678d..378cee6 100644 --- a/LinuxLogParsers/LinuxPlugins-MicrosoftPerformanceToolkSDK/Cloud-init/Cloud-Init.csproj +++ b/LinuxLogParsers/LinuxPlugins-MicrosoftPerformanceToolkSDK/Cloud-init/Cloud-Init.csproj @@ -20,7 +20,7 @@ - + diff --git a/LinuxLogParsers/LinuxPlugins-MicrosoftPerformanceToolkSDK/DmesgIsoLog/Dmesg.csproj b/LinuxLogParsers/LinuxPlugins-MicrosoftPerformanceToolkSDK/DmesgIsoLog/Dmesg.csproj index 0a8d7ad..535e979 100644 --- a/LinuxLogParsers/LinuxPlugins-MicrosoftPerformanceToolkSDK/DmesgIsoLog/Dmesg.csproj +++ b/LinuxLogParsers/LinuxPlugins-MicrosoftPerformanceToolkSDK/DmesgIsoLog/Dmesg.csproj @@ -17,7 +17,7 @@ - + diff --git a/LinuxLogParsers/LinuxPlugins-MicrosoftPerformanceToolkSDK/WaLinuxAgent/WaLinuxAgent.csproj b/LinuxLogParsers/LinuxPlugins-MicrosoftPerformanceToolkSDK/WaLinuxAgent/WaLinuxAgent.csproj index 95e8146..04318d0 100644 --- a/LinuxLogParsers/LinuxPlugins-MicrosoftPerformanceToolkSDK/WaLinuxAgent/WaLinuxAgent.csproj +++ b/LinuxLogParsers/LinuxPlugins-MicrosoftPerformanceToolkSDK/WaLinuxAgent/WaLinuxAgent.csproj @@ -19,7 +19,7 @@ - + diff --git a/PerfDataExtension/PerfDataExtension.csproj b/PerfDataExtension/PerfDataExtension.csproj index 41efdce..0e02089 100644 --- a/PerfDataExtension/PerfDataExtension.csproj +++ b/PerfDataExtension/PerfDataExtension.csproj @@ -42,7 +42,7 @@ - + diff --git a/PerfDataTxtExtension/PerfDataTxtExtension.csproj b/PerfDataTxtExtension/PerfDataTxtExtension.csproj index a414764..5eb3984 100644 --- a/PerfDataTxtExtension/PerfDataTxtExtension.csproj +++ b/PerfDataTxtExtension/PerfDataTxtExtension.csproj @@ -52,7 +52,7 @@ compile - + diff --git a/PerfDataUnitTest/PerfDataUnitTest.csproj b/PerfDataUnitTest/PerfDataUnitTest.csproj index 70b19e6..2dd2797 100644 --- a/PerfDataUnitTest/PerfDataUnitTest.csproj +++ b/PerfDataUnitTest/PerfDataUnitTest.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + netcoreapp8.0 false true diff --git a/PerfUnitTest/PerfUnitTest.csproj b/PerfUnitTest/PerfUnitTest.csproj index d0e9499..fb8dba8 100644 --- a/PerfUnitTest/PerfUnitTest.csproj +++ b/PerfUnitTest/PerfUnitTest.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + netcoreapp8.0 false @@ -9,7 +9,7 @@ - + diff --git a/PerfettoCds/PerfettoCds.csproj b/PerfettoCds/PerfettoCds.csproj index 7b87890..0dcb0d9 100644 --- a/PerfettoCds/PerfettoCds.csproj +++ b/PerfettoCds/PerfettoCds.csproj @@ -19,7 +19,7 @@ true - + diff --git a/PerfettoUnitTest/PerfettoUnitTest.csproj b/PerfettoUnitTest/PerfettoUnitTest.csproj index c37effc..56f4e4e 100644 --- a/PerfettoUnitTest/PerfettoUnitTest.csproj +++ b/PerfettoUnitTest/PerfettoUnitTest.csproj @@ -1,15 +1,15 @@  - netcoreapp3.1 + netcoreapp8.0 false - - + + diff --git a/UnitTestCommon/UnitTestCommon.csproj b/UnitTestCommon/UnitTestCommon.csproj index 96eec8e..b41f16f 100644 --- a/UnitTestCommon/UnitTestCommon.csproj +++ b/UnitTestCommon/UnitTestCommon.csproj @@ -1,11 +1,11 @@  - netcoreapp3.1 + netcoreapp8.0 - + diff --git a/Utilities/Utilities.csproj b/Utilities/Utilities.csproj index 7ad8b60..8733d16 100644 --- a/Utilities/Utilities.csproj +++ b/Utilities/Utilities.csproj @@ -16,7 +16,7 @@ - + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4da4141..0739dba 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -119,7 +119,7 @@ extends: - task: CopyFiles@2 displayName: Copy LTTngDriver Build to Output Artifacts inputs: - SourceFolder: 'LTTngDriver/bin/$(BuildConfiguration)/netcoreapp3.1' + SourceFolder: 'LTTngDriver/bin/$(BuildConfiguration)/netcoreapp8.0' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/Microsoft-Performance-Tools-Linux/LTTngDriver' From c57ff820f42c36a27a8e2564f7fb91a72d74a280 Mon Sep 17 00:00:00 2001 From: Ivan Berg Date: Wed, 15 May 2024 13:39:02 -0700 Subject: [PATCH 2/2] Also upgrade .NET version in YAML --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0739dba..389ed12 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,7 +17,7 @@ variables: buildPlatform: 'Any CPU' buildConfiguration: 'Release' # The version of dotnet core to use. - Build.DotNetCoreVersion: 3.x + Build.DotNetCoreVersion: 8.x resources: repositories: