Skip to content

Upgrade to supported .NET8 (from .NET 3.1 for UT and LTTngDriver). Upgrade to latest supported Perf SDK point release #122

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

Merged
ivberg merged 2 commits into from
May 15, 2024
Merged

Upgrade to supported .NET8 (from .NET 3.1 for UT and LTTngDriver). Upgrade to latest supported Perf SDK point release #122

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
d1e1333
Upgrade to supported .NET8 (from .NET 3.1 for UT and LTTngDriver). Up…
ivberg May 15, 2024
c57ff82
Also upgrade .NET version in YAML
ivberg May 15, 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
2 changes: 1 addition & 1 deletion CtfUnitTest/CtfUnitTest.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>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion LTTngCds/LTTngCds.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.16" />
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.27" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion LTTngCdsUnitTest/LTTngCdsUnitTest.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>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>

<IsPackable>false</IsPackable>
Expand Down
6 changes: 3 additions & 3 deletions LTTngDataExtUnitTest/LTTngDataExtUnitTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.16" />
<PackageReference Include="Microsoft.Performance.SDK.Runtime" Version="1.0.16" />
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.27" />
<PackageReference Include="Microsoft.Performance.SDK.Runtime" Version="1.0.27" />
<PackageReference Include="Microsoft.Performance.Toolkit.Engine" Version="1.0.16" />
<PackageReference Include="Moq" Version="4.18.3" />
<PackageReference Include="MSTest.TestAdapter" Version="3.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion LTTngDataExtensions/LTTngDataExtensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.16" />
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.27" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions LTTngDriver/LTTngDriver.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>netcoreapp8.0</TargetFramework>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<Version>1.2.1</Version>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
Expand All @@ -18,7 +18,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.16" />
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.27" />
<PackageReference Include="Microsoft.Performance.Toolkit.Engine" Version="1.0.16" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion LinuxLogParsers/LinuxLogParser/LinuxLogParser.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.16" />
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.27" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion LinuxLogParsers/LinuxLogParserCore/LinuxLogParserCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.16" />
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.27" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions LinuxLogParsers/LinuxLogParsersUnitTest/LinuxLogParsersUnitTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>netcoreapp8.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.16" />
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.27" />
<PackageReference Include="Microsoft.Performance.Toolkit.Engine" Version="1.0.16" />
<PackageReference Include="Moq" Version="4.18.3" />
<PackageReference Include="MSTest.TestAdapter" Version="3.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion LinuxLogParsers/LinuxPlugins-MicrosoftPerformanceToolkSDK/AndroidLogCat/AndroidLogcat.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.16" />
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.27" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion LinuxLogParsers/LinuxPlugins-MicrosoftPerformanceToolkSDK/Cloud-init/Cloud-Init.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.16" />
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.27" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion LinuxLogParsers/LinuxPlugins-MicrosoftPerformanceToolkSDK/DmesgIsoLog/Dmesg.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.16" />
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.27" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion LinuxLogParsers/LinuxPlugins-MicrosoftPerformanceToolkSDK/WaLinuxAgent/WaLinuxAgent.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.16" />
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.27" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion PerfDataExtension/PerfDataExtension.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Performance.SDK" Version="1.1.13" />
<PackageReference Include="Microsoft.Performance.SDK" Version="1.1.24" />

<PackageReference Include="Microsoft.LinuxTracepoints.Types" Version="0.1.2.*" PrivateAssets="all" GeneratePathProperty="true" />
<CopyToTargetDir Include="$(PkgMicrosoft_LinuxTracepoints_Types)\lib\netstandard2.1\Microsoft.LinuxTracepoints.Types.dll" />
Expand Down
2 changes: 1 addition & 1 deletion PerfDataTxtExtension/PerfDataTxtExtension.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.0.6" GeneratePathProperty="true">
<IncludeAssets>compile</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.16" />
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.27" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion PerfDataUnitTest/PerfDataUnitTest.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>netcoreapp3.1</TargetFramework>
<TargetFramework>netcoreapp8.0</TargetFramework>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions PerfUnitTest/PerfUnitTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>netcoreapp8.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.0.6" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.16" />
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.27" />
<PackageReference Include="Microsoft.Performance.Toolkit.Engine" Version="1.0.16" />
<PackageReference Include="Moq" Version="4.18.3" />
<PackageReference Include="MSTest.TestAdapter" Version="3.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion PerfettoCds/PerfettoCds.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<PackageReference Include="Google.Protobuf" Version="3.25.0">
<GeneratePathProperty>true</GeneratePathProperty>
</PackageReference>
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.16" />
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.27" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions PerfettoUnitTest/PerfettoUnitTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>netcoreapp8.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.16" />
<PackageReference Include="Microsoft.Performance.SDK.Runtime" Version="1.0.16" />
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.27" />
<PackageReference Include="Microsoft.Performance.SDK.Runtime" Version="1.0.27" />
<PackageReference Include="Microsoft.Performance.Toolkit.Engine" Version="1.0.16" />
<PackageReference Include="Moq" Version="4.18.3" />
<PackageReference Include="MSTest.TestAdapter" Version="3.0.0" />
Expand Down
4 changes: 2 additions & 2 deletions UnitTestCommon/UnitTestCommon.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>netcoreapp8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.16" />
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.27" />
<PackageReference Include="Microsoft.Performance.Toolkit.Engine" Version="1.0.16" />
<PackageReference Include="MSTest.TestFramework" Version="3.0.0" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Utilities/Utilities.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.16" />
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.27" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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'

Expand Down