BuildTools: Update to .NET6 and VS2022

Author: dmex

tools/CustomBuildTool/Build.cs

@@ -26,8 +26,6 @@
 using System.Net.Http;
 using System.Text;
 using System.Text.Json;
-using System.Security.Cryptography.X509Certificates;
-using Microsoft.Win32;
 
 namespace CustomBuildTool
 {
@@ -169,7 +167,7 @@ public static void SetupBuildEnvironment(bool ShowBuildInfo)
             if (ShowBuildInfo)
             {
                 Program.PrintColorMessage("Windows: ", ConsoleColor.DarkGray, false);
-                Program.PrintColorMessage("Windows NT " + Environment.OSVersion.Version.ToString(), ConsoleColor.Green, true);
+                Program.PrintColorMessage(Win32.GetKernelVersion(), ConsoleColor.Green, true);
 
                 var instance = VisualStudio.GetVisualStudioInstance();
                 if (instance != null)
@@ -824,6 +822,7 @@ public static bool BuildSolution(string Solution, BuildFlags Flags)
             if ((Flags & BuildFlags.Build32bit) == BuildFlags.Build32bit)
             {
                 StringBuilder compilerOptions = new StringBuilder();
+                StringBuilder commandLine = new StringBuilder();
                 Program.PrintColorMessage(BuildTimeStamp(), ConsoleColor.DarkGray, false, Flags);
                 Program.PrintColorMessage("Building " + Path.GetFileNameWithoutExtension(Solution) + " (", ConsoleColor.Cyan, false, Flags);
                 Program.PrintColorMessage("x32", ConsoleColor.Green, false, Flags);
@@ -838,13 +837,17 @@ public static bool BuildSolution(string Solution, BuildFlags Flags)
                 if (!string.IsNullOrEmpty(BuildCount))
                     compilerOptions.Append($"PHAPP_VERSION_BUILD=\"{BuildCount}\"");
 
+                commandLine.Append("/m /nologo /nodereuse:false /verbosity:quiet ");
+                commandLine.Append("/p:Configuration=" + (Flags.HasFlag(BuildFlags.BuildDebug) ? "Debug " : "Release "));
+                commandLine.Append("/p:Platform=Win32 ");
+                commandLine.Append("/p:ExternalCompilerOptions=\"" + compilerOptions.ToString() + "\" ");
+                if (File.Exists("tools\\versioning\\version.res"))
+                    commandLine.Append($"/p:ExternalAdditionalDependencies=\"{Path.GetFullPath("tools\\versioning\\version.res")}\" ");
+                commandLine.Append(Solution);
+
                 int errorcode = Win32.CreateProcess(
                     msbuildExePath,
-                    "/m /nologo /nodereuse:false /verbosity:quiet " +
-                    "/p:Configuration=" + (Flags.HasFlag(BuildFlags.BuildDebug) ? "Debug " : "Release ") +
-                    "/p:Platform=Win32 " +
-                    "/p:ExternalCompilerOptions=\"" + compilerOptions.ToString() + "\" " +
-                    Solution,
+                    commandLine.ToString(),
                     out string errorstring
                     );
 
@@ -858,6 +861,7 @@ out string errorstring
             if ((Flags & BuildFlags.Build64bit) == BuildFlags.Build64bit)
             {
                 StringBuilder compilerOptions = new StringBuilder();
+                StringBuilder commandLine = new StringBuilder();
                 Program.PrintColorMessage(BuildTimeStamp(), ConsoleColor.DarkGray, false, Flags);
                 Program.PrintColorMessage("Building " + Path.GetFileNameWithoutExtension(Solution) + " (", ConsoleColor.Cyan, false, Flags);
                 Program.PrintColorMessage("x64", ConsoleColor.Green, false, Flags);
@@ -872,13 +876,17 @@ out string errorstring
                 if (!string.IsNullOrEmpty(BuildCount))
                     compilerOptions.Append($"PHAPP_VERSION_BUILD=\"{BuildCount}\"");
 
+                commandLine.Append("/m /nologo /nodereuse:false /verbosity:quiet ");
+                commandLine.Append("/p:Configuration=" + (Flags.HasFlag(BuildFlags.BuildDebug) ? "Debug " : "Release "));
+                commandLine.Append("/p:Platform=x64 ");
+                commandLine.Append("/p:ExternalCompilerOptions=\"" + compilerOptions.ToString() + "\" ");
+                if (File.Exists("tools\\versioning\\version.res"))
+                    commandLine.Append($"/p:ExternalAdditionalDependencies=\"{Path.GetFullPath("tools\\versioning\\version.res")}\" ");
+                commandLine.Append(Solution);
+
                 int errorcode = Win32.CreateProcess(
                     msbuildExePath,
-                    "/m /nologo /nodereuse:false /verbosity:quiet " +
-                    "/p:Configuration=" + (Flags.HasFlag(BuildFlags.BuildDebug) ? "Debug " : "Release ") +
-                    "/p:Platform=x64 " +
-                    "/p:ExternalCompilerOptions=\"" + compilerOptions.ToString() + "\" " +
-                    Solution,
+                    commandLine.ToString(),
                     out string errorstring
                     );
 
@@ -892,6 +900,51 @@ out string errorstring
             return true;
         }
 
+        public static bool BuildVersionInfo(BuildFlags Flags)
+        {
+            if (!File.Exists("tools\\versioning\\version.rc"))
+                return true;
+
+            string windowsSdkPath = VisualStudio.GetWindowsSdkPath();
+            string windowsSdkIncludePath = VisualStudio.GetWindowsSdkIncludePath();
+            string resIncludePath = Path.GetFullPath("processhacker");
+            StringBuilder commandLine = new StringBuilder("/nologo /v ");
+            string rcExePath = windowsSdkPath + "\\x64\\rc.exe";
+
+            if (!File.Exists(rcExePath))
+            {
+                Program.PrintColorMessage("Unable to find the resource compiler.", ConsoleColor.Red);
+                return false;
+            }
+
+            commandLine.Append($"/i \"{windowsSdkIncludePath}\\um\" /i \"{windowsSdkIncludePath}\\shared\" /i \"{resIncludePath}\" ");
+
+            if (Flags.HasFlag(BuildFlags.BuildApi))
+                commandLine.Append(" /d \"PH_BUILD_API\" ");
+            if (!string.IsNullOrEmpty(BuildCommit))
+                commandLine.Append($"/d \"PHAPP_VERSION_COMMITHASH=\"{BuildCommit.Substring(0, 7)}\"\" ");
+            if (!string.IsNullOrEmpty(BuildRevision))
+                commandLine.Append($"/d \"PHAPP_VERSION_REVISION=\"{BuildRevision}\"\" ");
+            if (!string.IsNullOrEmpty(BuildCount))
+                commandLine.Append($"/d \"PHAPP_VERSION_BUILD=\"{BuildCount}\"\" ");
+
+            commandLine.Append("/fo tools\\versioning\\version.res tools\\versioning\\version.rc");
+
+            int errorcode = Win32.CreateProcess(
+                rcExePath,
+                commandLine.ToString(),
+                out string errorstring
+                );
+
+            if (errorcode != 0)
+            {
+                Program.PrintColorMessage("[ERROR] (" + errorcode + ") " + errorstring, ConsoleColor.Red, true, Flags | BuildFlags.BuildVerbose);
+                return false;
+            }
+
+
+            return true;
+        }
         public static bool BuildDeployUpdateConfig()
         {
             string buildBuildId;
@@ -900,7 +953,6 @@ public static bool BuildDeployUpdateConfig()
             string buildPostApiKey;
             string buildPostSfUrl;
             string buildPostSfApiKey;
-            string buildPostString;
             string buildFilename;
             string buildBinHash;
             string buildSetupHash;
@@ -1021,7 +1073,7 @@ public static bool BuildDeployUpdateConfig()
 
             try
             {
-                buildPostString = JsonSerializer.Serialize(new BuildUpdateRequest
+                BuildUpdateRequest buildUpdateRequest = new BuildUpdateRequest
                 {
                     BuildUpdated = TimeStart.ToString("o"),
                     BuildVersion = BuildVersion,
@@ -1035,62 +1087,72 @@ public static bool BuildDeployUpdateConfig()
                     SetupLength = buildSetupFileLength.ToString(),
                     SetupHash = buildSetupHash,
                     SetupSig = BuildSetupSig,
-                }, new JsonSerializerOptions { IgnoreNullValues = true, PropertyNameCaseInsensitive = true });
+                };
+
+                byte[] buildPostString = JsonSerializer.SerializeToUtf8Bytes(buildUpdateRequest, BuildUpdateRequestContext.Default.BuildUpdateRequest);
 
-                if (string.IsNullOrEmpty(buildPostString))
+                if (buildPostString == null || buildPostString.LongLength == 0)
                     return false;
 
                 using (HttpClientHandler httpClientHandler = new HttpClientHandler())
                 {
                     httpClientHandler.AutomaticDecompression = DecompressionMethods.All;
 
                     using (HttpClient httpClient = new HttpClient(httpClientHandler))
-                    using (StringContent httpContent = new StringContent(buildPostString, Encoding.UTF8, "application/json"))
                     {
                         httpClient.DefaultRequestHeaders.Add("X-ApiKey", buildPostApiKey);
 
-                        var httpTask = httpClient.PostAsync(buildPostUrl, httpContent);
-                        httpTask.Wait();
-
-                        if (!httpTask.Result.IsSuccessStatusCode)
+                        using (ByteArrayContent httpContent = new ByteArrayContent(buildPostString))
                         {
-                            Program.PrintColorMessage("[UpdateBuildWebService] " + httpTask.Result, ConsoleColor.Red);
-                            return false;
+                            httpContent.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json");
+
+                            var httpTask = httpClient.PostAsync(buildPostUrl, httpContent);
+                            httpTask.Wait();
+
+                            if (!httpTask.Result.IsSuccessStatusCode)
+                            {
+                                Program.PrintColorMessage("[UpdateBuildWebService] " + httpTask.Result, ConsoleColor.Red);
+                                return false;
+                            }
                         }
                     }
                 }
-            }
-            catch (Exception ex)
-            {
-                Program.PrintColorMessage("[UpdateBuildWebService] " + ex, ConsoleColor.Red);
-                return false;
-            }
 
-            try
-            {
-                using (HttpClientHandler httpClientHandler = new HttpClientHandler())
+                try
                 {
-                    httpClientHandler.AutomaticDecompression = DecompressionMethods.All;
-
-                    using (HttpClient httpClient = new HttpClient(httpClientHandler))
-                    using (StringContent httpContent = new StringContent(buildPostString, Encoding.UTF8, "application/json"))
+                    using (HttpClientHandler httpClientHandler = new HttpClientHandler())
                     {
-                        httpClient.DefaultRequestHeaders.Add("X-ApiKey", buildPostSfApiKey);
+                        httpClientHandler.AutomaticDecompression = DecompressionMethods.All;
 
-                        var httpTask = httpClient.PostAsync(buildPostSfUrl, httpContent);
-                        httpTask.Wait();
-
-                        if (!httpTask.Result.IsSuccessStatusCode)
+                        using (HttpClient httpClient = new HttpClient(httpClientHandler))
                         {
-                            Program.PrintColorMessage("[UpdateBuildWebService-SF] " + httpTask.Result, ConsoleColor.Red);
-                            return false;
+                            httpClient.DefaultRequestHeaders.Add("X-ApiKey", buildPostSfApiKey);
+
+                            using (ByteArrayContent httpContent = new ByteArrayContent(buildPostString))
+                            {
+                                httpContent.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json");
+
+                                var httpTask = httpClient.PostAsync(buildPostSfUrl, httpContent);
+                                httpTask.Wait();
+
+                                if (!httpTask.Result.IsSuccessStatusCode)
+                                {
+                                    Program.PrintColorMessage("[UpdateBuildWebService-SF] " + httpTask.Result, ConsoleColor.Red);
+                                    return false;
+                                }
+                            }
                         }
                     }
                 }
+                catch (Exception ex)
+                {
+                    Program.PrintColorMessage("[UpdateBuildWebService-SF] " + ex, ConsoleColor.Red);
+                    return false;
+                }
             }
             catch (Exception ex)
             {
-                Program.PrintColorMessage("[UpdateBuildWebService-SF] " + ex, ConsoleColor.Red);
+                Program.PrintColorMessage("[UpdateBuildWebService] " + ex, ConsoleColor.Red);
                 return false;
             }
 
@@ -1138,7 +1200,9 @@ public static bool BuildDeployUploadArtifacts()
                         filename = Path.GetFileName(sourceFile);
                         //filename = filename.Replace("-build-", $"-{BuildVersion}-", StringComparison.OrdinalIgnoreCase);
 
+                        #pragma warning disable SYSLIB0014 // Type or member is obsolete
                         request = (FtpWebRequest)WebRequest.Create(buildPostUrl + filename);
+                        #pragma warning restore SYSLIB0014 // Type or member is obsolete
                         request.Credentials = new NetworkCredential(buildPostKey, buildPostName);
                         request.Method = WebRequestMethods.Ftp.UploadFile;
                         request.Timeout = System.Threading.Timeout.Infinite;

tools/CustomBuildTool/CustomBuildTool.csproj

@@ -1,17 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <Platforms>x64;x86</Platforms>
-    <PublishTrimmed>true</PublishTrimmed>
-    <PublishReadyToRun>true</PublishReadyToRun>
-    <PublishSingleFile>true</PublishSingleFile>
-    <PublishReadyToRunShowWarnings>true</PublishReadyToRunShowWarnings>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
     <TrimUnusedDependencies>true</TrimUnusedDependencies>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <OldToolsVersion>Current</OldToolsVersion>
     <Version>1.0</Version>
+    <CodePage>65001</CodePage>
     <ProjectGuid>{CD644DF2-A658-4CBC-9497-CA5DD13CFEC3}</ProjectGuid>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Platform)'=='x86'">

tools/CustomBuildTool/Program.cs

@@ -159,6 +159,10 @@ public static void Main(string[] args)
             {
                 Build.SetupBuildEnvironment(true);
 
+                Build.BuildVersionInfo(
+                    BuildFlags.Build32bit | BuildFlags.Build64bit | BuildFlags.BuildVerbose
+                    );
+
                 if (!Build.BuildSolution("ProcessHacker.sln",
                     BuildFlags.Build32bit | BuildFlags.Build64bit |
                     BuildFlags.BuildDebug | BuildFlags.BuildVerbose |
@@ -205,6 +209,10 @@ public static void Main(string[] args)
             {
                 Build.SetupBuildEnvironment(true);
 
+                Build.BuildVersionInfo(
+                    BuildFlags.Build32bit | BuildFlags.Build64bit | BuildFlags.BuildVerbose
+                    );
+
                 if (!Build.BuildSolution("ProcessHacker.sln",
                     BuildFlags.Build32bit | BuildFlags.Build64bit |
                     BuildFlags.BuildVerbose | BuildFlags.BuildApi
@@ -253,6 +261,10 @@ public static void Main(string[] args)
             {
                 Build.SetupBuildEnvironment(true);
 
+                Build.BuildVersionInfo(
+                    BuildFlags.Build32bit | BuildFlags.Build64bit | BuildFlags.BuildVerbose
+                    );
+
                 if (!Build.BuildSolution("ProcessHacker.sln",
                     BuildFlags.Build32bit | BuildFlags.Build64bit |
                     BuildFlags.BuildVerbose | BuildFlags.BuildApi

tools/CustomBuildTool/Properties/PublishProfiles/32bit.pubxml

@@ -7,13 +7,15 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Configuration>Release</Configuration>
     <Platform>x86</Platform>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <TrimUnusedDependencies>true</TrimUnusedDependencies>
     <PublishDir>bin\Release</PublishDir>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
-    <PublishSingleFile>True</PublishSingleFile>
-    <PublishReadyToRun>True</PublishReadyToRun>
-    <PublishTrimmed>True</PublishTrimmed>
+    <PublishSingleFile>true</PublishSingleFile>
+    <PublishReadyToRun>true</PublishReadyToRun>
+    <PublishTrimmed>true</PublishTrimmed>
+    <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
+    <EventSourceSupport>false</EventSourceSupport>
   </PropertyGroup>
 </Project>