From 8c201f49d920d5506a67f67c88de0c89161b17ed Mon Sep 17 00:00:00 2001
From: Luke Bordonaro <lukebo@microsoft.com>
Date: Tue, 4 Jun 2024 11:39:10 -0700
Subject: [PATCH 1/2] Include required properties on all ProcessingSourceInfo
 instances returned by processing sources

---
 LTTngCds/LTTngCds.csproj                      |  1 +
 LTTngCds/LTTngDataSource.cs                   | 33 +++++-----
 PerfDataExtension/PerfDataExtension.csproj    |  4 ++
 PerfDataExtension/PerfDataProcessingSource.cs | 17 +++--
 .../PerfDataProcessingSource.cs               |  8 +--
 PerfettoCds/Pipeline/PerfettoDataSource.cs    | 65 ++++++++++---------
 Utilities/ProcessingSourceInfoGenerator.cs    | 23 +++++++
 7 files changed, 94 insertions(+), 57 deletions(-)
 create mode 100644 Utilities/ProcessingSourceInfoGenerator.cs

diff --git a/LTTngCds/LTTngCds.csproj b/LTTngCds/LTTngCds.csproj
index dc9d128..9791f09 100644
--- a/LTTngCds/LTTngCds.csproj
+++ b/LTTngCds/LTTngCds.csproj
@@ -33,6 +33,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\CtfPlayback\CtfPlayback.csproj" />
+    <ProjectReference Include="..\Utilities\Utilities.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/LTTngCds/LTTngDataSource.cs b/LTTngCds/LTTngDataSource.cs
index 98c2598..ca4855a 100644
--- a/LTTngCds/LTTngDataSource.cs
+++ b/LTTngCds/LTTngDataSource.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using Microsoft.Performance.SDK;
 using Microsoft.Performance.SDK.Processing;
+using Utilities;
 
 namespace LTTngCds
 {
@@ -22,7 +23,7 @@ public class LTTngDataSource
         private IApplicationEnvironment applicationEnvironment;
 
         /// <inheritdoc />
-        public override IEnumerable<Option> CommandLineOptions => new List<Option> { new Option("LTTngOffsetTime", "offsetTime", 1, 1) };
+        public override IEnumerable<Option> CommandLineOptions => new List<Option> { new Option("LTTngOffsetTime", "offsetTime", 1, 1) };
 
         protected override bool IsDataSourceSupportedCore(IDataSource dataSource)
         {
@@ -36,23 +37,23 @@ protected override bool IsDataSourceSupportedCore(IDataSource dataSource)
 
         public override ProcessingSourceInfo GetAboutInfo()
         {
-            return new ProcessingSourceInfo()
+            var info = ProcessingSourceInfoGenerator.GetEmpty();
+            info.ProjectInfo = new ProjectInfo() { Uri = "https://aka.ms/linuxperftools" };
+            info.CopyrightNotice = "Copyright (C) " + DateTime.UtcNow.Year;
+            info.AdditionalInformation = new[]
             {
-                ProjectInfo = new ProjectInfo() { Uri = "https://aka.ms/linuxperftools" },
-                CopyrightNotice = "Copyright (C) " + DateTime.UtcNow.Year,
-                AdditionalInformation = new[]
-                {
-                    "Built using Antlr 4\n" +
-                    "Copyright (c) 2012 Terence Parr and Sam Harwell\n" +
-                    "All rights reserved.\n" +
-                    "Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\n" +
-                    "\n" +
-                    "Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\n" +
-                    "Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\n" +
-                    "Neither the name of the author nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.\n" +
-                    "THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n",
-                },
+                "Built using Antlr 4\n" +
+                "Copyright (c) 2012 Terence Parr and Sam Harwell\n" +
+                "All rights reserved.\n" +
+                "Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\n" +
+                "\n" +
+                "Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\n" +
+                "Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\n" +
+                "Neither the name of the author nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.\n" +
+                "THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n",
             };
+
+            return info;
         }
 
         /// <inheritdoc />
diff --git a/PerfDataExtension/PerfDataExtension.csproj b/PerfDataExtension/PerfDataExtension.csproj
index 0e02089..766a7af 100644
--- a/PerfDataExtension/PerfDataExtension.csproj
+++ b/PerfDataExtension/PerfDataExtension.csproj
@@ -59,6 +59,10 @@
     </Compile>
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\Utilities\Utilities.csproj" />
+  </ItemGroup>
+
   <Target Name="CopyToTargetDirTarget" AfterTargets="Build">
     <Copy SourceFiles="@(CopyToTargetDir)" DestinationFolder="$(TargetDir)" />
   </Target>
diff --git a/PerfDataExtension/PerfDataProcessingSource.cs b/PerfDataExtension/PerfDataProcessingSource.cs
index 1918829..dc1abad 100644
--- a/PerfDataExtension/PerfDataProcessingSource.cs
+++ b/PerfDataExtension/PerfDataProcessingSource.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+using Utilities;
+
 namespace Microsoft.Performance.Toolkit.Plugins.PerfDataExtension
 {
     using Microsoft.LinuxTracepoints.Decode;
@@ -21,13 +23,14 @@ public sealed class PerfDataProcessingSource
     {
         public override ProcessingSourceInfo GetAboutInfo()
         {
-            return new ProcessingSourceInfo
-            {
-                CopyrightNotice = "Copyright (c) Microsoft Corporation. All rights reserved.",
-                LicenseInfo = new LicenseInfo { Name = "MIT" },
-                Owners = Array.Empty<ContactInfo>(),
-                ProjectInfo = new ProjectInfo { Uri = "https://github.com/microsoft/LinuxTracepoints-Net" },
-            };
+            var info = ProcessingSourceInfoGenerator.GetEmpty();
+
+            info.CopyrightNotice = "Copyright (c) Microsoft Corporation. All rights reserved.";
+            info.LicenseInfo = new LicenseInfo { Name = "MIT" };
+            info.Owners = Array.Empty<ContactInfo>();
+            info.ProjectInfo = new ProjectInfo { Uri = "https://github.com/microsoft/LinuxTracepoints-Net" };
+
+            return info;
         }
 
         protected override bool IsDataSourceSupportedCore(IDataSource dataSource)
diff --git a/PerfDataTxtExtension/SourceDataCookers/PerfDataProcessingSource.cs b/PerfDataTxtExtension/SourceDataCookers/PerfDataProcessingSource.cs
index da166b3..1ba3202 100644
--- a/PerfDataTxtExtension/SourceDataCookers/PerfDataProcessingSource.cs
+++ b/PerfDataTxtExtension/SourceDataCookers/PerfDataProcessingSource.cs
@@ -6,6 +6,7 @@
 using System.IO;
 using System.Linq;
 using Microsoft.Performance.SDK.Processing;
+using Utilities;
 
 namespace PerfDataProcessingSource
 {
@@ -44,10 +45,9 @@ public class PerfDataProcessingSource
 
         public override ProcessingSourceInfo GetAboutInfo()
         {
-            return new ProcessingSourceInfo()
-            {
-                ProjectInfo = new ProjectInfo() { Uri = "https://aka.ms/linuxperftools" },
-            };
+            var info = ProcessingSourceInfoGenerator.GetEmpty();
+            info.ProjectInfo = new ProjectInfo() { Uri = "https://aka.ms/linuxperftools" };
+            return info;
         }
 
         protected override void SetApplicationEnvironmentCore(IApplicationEnvironment applicationEnvironment)
diff --git a/PerfettoCds/Pipeline/PerfettoDataSource.cs b/PerfettoCds/Pipeline/PerfettoDataSource.cs
index 4d56cb7..1281b65 100644
--- a/PerfettoCds/Pipeline/PerfettoDataSource.cs
+++ b/PerfettoCds/Pipeline/PerfettoDataSource.cs
@@ -5,13 +5,14 @@
 using System.IO;
 using System.Linq;
 using Microsoft.Performance.SDK.Processing;
+using Utilities;
 
 namespace PerfettoCds
 {
-    public static class PerfettoCds
-    {
-        public static string[] PerfettoCopyrightLicense = new string[]
-        {
+    public static class PerfettoCds
+    {
+        public static string[] PerfettoCopyrightLicense = new string[]
+        {
             "Built using Google Perfetto 4\n" +
             "Copyright (C) 2020 The Android Open Source Project\n" +
             "\n" +
@@ -25,8 +26,8 @@ public static class PerfettoCds
             "distributed under the License is distributed on an \"AS IS\" BASIS,\n" +
             "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n" +
             "See the License for the specific language governing permissions and\n" +
-            "limitations under the License.\n"
-        };
+            "limitations under the License.\n"
+        };
     }
 
     [ProcessingSource("9fc8515e-9206-4690-b14a-3e7b54745c5f", "PerfettoTraceDataSource", "Processes Perfetto trace files")]
@@ -47,12 +48,13 @@ protected override ICustomDataProcessor CreateProcessorCore(IEnumerable<IDataSou
 
         public override ProcessingSourceInfo GetAboutInfo()
         {
-            return new ProcessingSourceInfo()
-            {
-                ProjectInfo = new ProjectInfo() { Uri = "https://aka.ms/linuxperftools" },
-                CopyrightNotice = "Copyright (C) " + DateTime.UtcNow.Year,
-                AdditionalInformation = PerfettoCds.PerfettoCopyrightLicense,
-            };
+            var info = ProcessingSourceInfoGenerator.GetEmpty();
+
+            info.ProjectInfo = new ProjectInfo() { Uri = "https://aka.ms/linuxperftools" };
+            info.CopyrightNotice = "Copyright (C) " + DateTime.UtcNow.Year;
+            info.AdditionalInformation = PerfettoCds.PerfettoCopyrightLicense;
+
+            return info;
         }
 
         protected override bool IsDataSourceSupportedCore(IDataSource dataSource)
@@ -91,12 +93,13 @@ protected override ICustomDataProcessor CreateProcessorCore(IEnumerable<IDataSou
 
         public override ProcessingSourceInfo GetAboutInfo()
         {
-            return new ProcessingSourceInfo()
-            {
-                ProjectInfo = new ProjectInfo() { Uri = "https://aka.ms/linuxperftools" },
-                CopyrightNotice = "Copyright (C) " + DateTime.UtcNow.Year,
-                AdditionalInformation = PerfettoCds.PerfettoCopyrightLicense,
-            };
+            var info = ProcessingSourceInfoGenerator.GetEmpty();
+
+            info.ProjectInfo = new ProjectInfo() { Uri = "https://aka.ms/linuxperftools" };
+            info.CopyrightNotice = "Copyright (C) " + DateTime.UtcNow.Year;
+            info.AdditionalInformation = PerfettoCds.PerfettoCopyrightLicense;
+
+            return info;
         }
 
         protected override bool IsDataSourceSupportedCore(IDataSource dataSource)
@@ -135,12 +138,13 @@ protected override ICustomDataProcessor CreateProcessorCore(IEnumerable<IDataSou
 
         public override ProcessingSourceInfo GetAboutInfo()
         {
-            return new ProcessingSourceInfo()
-            {
-                ProjectInfo = new ProjectInfo() { Uri = "https://aka.ms/linuxperftools" },
-                CopyrightNotice = "Copyright (C) " + DateTime.UtcNow.Year,
-                AdditionalInformation = PerfettoCds.PerfettoCopyrightLicense,
-            };
+            var info = ProcessingSourceInfoGenerator.GetEmpty();
+
+            info.ProjectInfo = new ProjectInfo() { Uri = "https://aka.ms/linuxperftools" };
+            info.CopyrightNotice = "Copyright (C) " + DateTime.UtcNow.Year;
+            info.AdditionalInformation = PerfettoCds.PerfettoCopyrightLicense;
+
+            return info;
         }
 
         protected override bool IsDataSourceSupportedCore(IDataSource dataSource)
@@ -179,12 +183,13 @@ protected override ICustomDataProcessor CreateProcessorCore(IEnumerable<IDataSou
 
         public override ProcessingSourceInfo GetAboutInfo()
         {
-            return new ProcessingSourceInfo()
-            {
-                ProjectInfo = new ProjectInfo() { Uri = "https://aka.ms/linuxperftools" },
-                CopyrightNotice = "Copyright (C) " + DateTime.UtcNow.Year,
-                AdditionalInformation = PerfettoCds.PerfettoCopyrightLicense,
-            };
+            var info = ProcessingSourceInfoGenerator.GetEmpty();
+
+            info.ProjectInfo = new ProjectInfo() { Uri = "https://aka.ms/linuxperftools" };
+            info.CopyrightNotice = "Copyright (C) " + DateTime.UtcNow.Year;
+            info.AdditionalInformation = PerfettoCds.PerfettoCopyrightLicense;
+
+            return info;
         }
 
         protected override bool IsDataSourceSupportedCore(IDataSource dataSource)
diff --git a/Utilities/ProcessingSourceInfoGenerator.cs b/Utilities/ProcessingSourceInfoGenerator.cs
new file mode 100644
index 0000000..04e96d4
--- /dev/null
+++ b/Utilities/ProcessingSourceInfoGenerator.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System;
+using Microsoft.Performance.SDK.Processing;
+
+namespace Utilities
+{
+    public static class ProcessingSourceInfoGenerator
+    {
+        public static ProcessingSourceInfo GetEmpty()
+        {
+            return new ProcessingSourceInfo()
+            {
+                Owners = Array.Empty<ContactInfo>(),
+                ProjectInfo = null,
+                LicenseInfo = null,
+                CopyrightNotice = null,
+                AdditionalInformation = Array.Empty<string>(),
+            };
+        }
+    }
+}
\ No newline at end of file

From 2dc3f20664bc77a2f2a731a6dffc187349d6d1d4 Mon Sep 17 00:00:00 2001
From: Luke Bordonaro <lukebo@microsoft.com>
Date: Tue, 4 Jun 2024 12:32:15 -0700
Subject: [PATCH 2/2] Bump versions

---
 LTTngCds/LTTngCds.csproj                         |  2 +-
 LTTngDataExtensions/LTTngDataExtensions.csproj   |  6 +++---
 LTTngDataExtensions/pluginManifest.json          |  2 +-
 PerfDataExtension/PerfDataExtension.csproj       |  2 +-
 PerfDataExtension/pluginManifest.json            |  2 +-
 PerfDataTxtExtension/PerfDataTxtExtension.csproj |  6 +++---
 PerfDataTxtExtension/pluginManifest.json         |  2 +-
 PerfettoCds/PerfettoCds.csproj                   | 10 +++++-----
 PerfettoCds/pluginManifest.json                  |  2 +-
 PerfettoProcessor/PerfettoProcessor.csproj       |  2 +-
 Utilities/Utilities.csproj                       |  2 +-
 11 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/LTTngCds/LTTngCds.csproj b/LTTngCds/LTTngCds.csproj
index 9791f09..6ab3930 100644
--- a/LTTngCds/LTTngCds.csproj
+++ b/LTTngCds/LTTngCds.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-	<Version>1.3.0</Version>
+	<Version>1.3.1</Version>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <Authors>Microsoft</Authors>
     <Company>Microsoft Corp.</Company>
diff --git a/LTTngDataExtensions/LTTngDataExtensions.csproj b/LTTngDataExtensions/LTTngDataExtensions.csproj
index 419ec5f..04edfc8 100644
--- a/LTTngDataExtensions/LTTngDataExtensions.csproj
+++ b/LTTngDataExtensions/LTTngDataExtensions.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-	<Version>1.3.0</Version>
+	<Version>1.3.1</Version>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <Authors>Microsoft</Authors>
     <Company>Microsoft Corp.</Company>
@@ -72,8 +72,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="pluginManifest.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Update="pluginManifest.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="Resources\DiskActivityPrebuiltConfiguration.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/LTTngDataExtensions/pluginManifest.json b/LTTngDataExtensions/pluginManifest.json
index 0a34f79..618e0d9 100644
--- a/LTTngDataExtensions/pluginManifest.json
+++ b/LTTngDataExtensions/pluginManifest.json
@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/microsoft/microsoft-performance-toolkit-sdk/main/src/PluginsSystem/Tools/Microsoft.Performance.Toolkit.Plugins.Cli/Manifest/PluginManifestSchema.json",
   "identity": {
     "id": "Microsoft.Performance.Toolkit.Plugins.LTTngDataExtensions",
-    "version": "1.3.0"
+    "version": "1.3.1"
   },
   "displayName": "Linux - LTTng",
   "description": "Enables processing LTTng performance trace files that contain key Linux performance indicators, such as kernel CPU scheduling, system calls, file events, and userspace applications",
diff --git a/PerfDataExtension/PerfDataExtension.csproj b/PerfDataExtension/PerfDataExtension.csproj
index 766a7af..d2dc815 100644
--- a/PerfDataExtension/PerfDataExtension.csproj
+++ b/PerfDataExtension/PerfDataExtension.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <OutputType>Library</OutputType>
-    <Version>0.1.2</Version>
+    <Version>0.1.3</Version>
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
     <Authors>Microsoft</Authors>
     <Company>Microsoft</Company>
diff --git a/PerfDataExtension/pluginManifest.json b/PerfDataExtension/pluginManifest.json
index a746cfe..5531ebb 100644
--- a/PerfDataExtension/pluginManifest.json
+++ b/PerfDataExtension/pluginManifest.json
@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/microsoft/microsoft-performance-toolkit-sdk/main/src/PluginsSystem/Tools/Microsoft.Performance.Toolkit.Plugins.Cli/Manifest/PluginManifestSchema.json",
   "identity": {
     "id": "Microsoft.Performance.Toolkit.Plugins.PerfDataExtension",
-    "version": "0.1.2"
+    "version": "0.1.3"
   },
   "displayName": "Linux - Perf",
   "description": "Enables loading Linux events from perf.data files (e.g. generated by the perf tool)",
diff --git a/PerfDataTxtExtension/PerfDataTxtExtension.csproj b/PerfDataTxtExtension/PerfDataTxtExtension.csproj
index 5eb3984..555d2a5 100644
--- a/PerfDataTxtExtension/PerfDataTxtExtension.csproj
+++ b/PerfDataTxtExtension/PerfDataTxtExtension.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-	<Version>1.2.3</Version>
+	<Version>1.2.5</Version>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <Authors>Microsoft</Authors>
     <Company>Microsoft Corp.</Company>
@@ -60,8 +60,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="pluginManifest.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Update="pluginManifest.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="Resources\DiskActivityPrebuiltConfiguration.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/PerfDataTxtExtension/pluginManifest.json b/PerfDataTxtExtension/pluginManifest.json
index ff099c9..0c7e3b0 100644
--- a/PerfDataTxtExtension/pluginManifest.json
+++ b/PerfDataTxtExtension/pluginManifest.json
@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/microsoft/microsoft-performance-toolkit-sdk/main/src/PluginsSystem/Tools/Microsoft.Performance.Toolkit.Plugins.Cli/Manifest/PluginManifestSchema.json",
   "identity": {
     "id": "Microsoft.Performance.Toolkit.Plugins.PerfDataTxtExtension",
-    "version": "1.2.4"
+    "version": "1.2.5"
   },
   "displayName": "Linux - Perf",
   "description": "Enables viewing Linux CPU Sampling events recorded with the kernel perf profiling utility",
diff --git a/PerfettoCds/PerfettoCds.csproj b/PerfettoCds/PerfettoCds.csproj
index 0dcb0d9..17c674d 100644
--- a/PerfettoCds/PerfettoCds.csproj
+++ b/PerfettoCds/PerfettoCds.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-	<Version>1.5.5</Version>
+	<Version>1.5.6</Version>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <Authors>Microsoft</Authors>
     <Company>Microsoft Corp.</Company>
@@ -50,10 +50,10 @@
       <PackagePath></PackagePath>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <None Update="pluginManifest.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+  <ItemGroup>
+    <None Update="pluginManifest.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
   <Target Name="CopyRulesToTarget" AfterTargets="Build">
diff --git a/PerfettoCds/pluginManifest.json b/PerfettoCds/pluginManifest.json
index f20abdd..d9f987f 100644
--- a/PerfettoCds/pluginManifest.json
+++ b/PerfettoCds/pluginManifest.json
@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/microsoft/microsoft-performance-toolkit-sdk/main/src/PluginsSystem/Tools/Microsoft.Performance.Toolkit.Plugins.Cli/Manifest/PluginManifestSchema.json",
   "identity": {
     "id": "Microsoft.Performance.Toolkit.Plugins.PerfettoPlugin",
-    "version": "1.5.5"
+    "version": "1.5.6"
   },
   "displayName": "Perfetto for Android and Chromium",
   "description": "Processes Android system and user traces, as well as Chromium based browser performance trace files",
diff --git a/PerfettoProcessor/PerfettoProcessor.csproj b/PerfettoProcessor/PerfettoProcessor.csproj
index fe9f136..8485efb 100644
--- a/PerfettoProcessor/PerfettoProcessor.csproj
+++ b/PerfettoProcessor/PerfettoProcessor.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-	  <Version>1.5.5</Version>
+	  <Version>1.5.6</Version>
       <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
       <Authors>Microsoft</Authors>
       <Company>Microsoft Corp.</Company>
diff --git a/Utilities/Utilities.csproj b/Utilities/Utilities.csproj
index 8733d16..2dd304b 100644
--- a/Utilities/Utilities.csproj
+++ b/Utilities/Utilities.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-	<Version>1.2.2</Version>
+	<Version>1.2.3</Version>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <Authors>Microsoft</Authors>
     <Company>Microsoft Corp.</Company>