Clean up warnings in agent (#4622)

microsoft · Feb 9, 2024 · f25a7cd · f25a7cd
1 parent fdac1ad
commit f25a7cd
Show file tree

Hide file tree

Showing 36 changed files with 114 additions and 31 deletions.
diff --git a/src/Agent.Listener/CommandSettings.cs b/src/Agent.Listener/CommandSettings.cs
@@ -13,6 +13,7 @@
 using CommandLine;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json;
+using System.Runtime.Versioning;
 
 namespace Microsoft.VisualStudio.Services.Agent.Listener
 {
@@ -430,6 +431,7 @@ public string GetUserName()
                 validator: Validators.NonEmptyValidator);
         }
 
+        [SupportedOSPlatform("windows")]
         public string GetWindowsLogonAccount(string defaultValue, string descriptionMsg)
         {
             return GetArgOrPrompt(

diff --git a/src/Agent.Listener/Configuration.Linux/SystemdControlManager.cs b/src/Agent.Listener/Configuration.Linux/SystemdControlManager.cs
@@ -5,17 +5,21 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Runtime.Versioning;
 using System.Text;
 using Microsoft.VisualStudio.Services.Agent.Util;
 
 namespace Microsoft.VisualStudio.Services.Agent.Listener.Configuration
 {
     [ServiceLocator(Default = typeof(SystemDControlManager))]
+    [SupportedOSPlatform("linux")]
     public interface ILinuxServiceControlManager : IAgentService
     {
         void GenerateScripts(AgentSettings settings);
     }
 
+
+    [SupportedOSPlatform("linux")]
     public class SystemDControlManager : ServiceControlManager, ILinuxServiceControlManager
     {
         // This is the name you would see when you do `systemctl list-units | grep vsts`

diff --git a/src/Agent.Listener/Configuration.Windows/AutoLogonManager.cs b/src/Agent.Listener/Configuration.Windows/AutoLogonManager.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.Runtime.Versioning;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.TeamFoundation.DistributedTask.WebApi;
@@ -12,12 +13,14 @@
 namespace Microsoft.VisualStudio.Services.Agent.Listener.Configuration
 {
     [ServiceLocator(Default = typeof(AutoLogonManager))]
+    [SupportedOSPlatform("windows")]
     public interface IAutoLogonManager : IAgentService
     {
         Task ConfigureAsync(CommandSettings command);
         void Unconfigure();
     }
 
+    [SupportedOSPlatform("windows")]
     public class AutoLogonManager : AgentService, IAutoLogonManager
     {
         private ITerminal _terminal;

diff --git a/src/Agent.Listener/Configuration.Windows/AutoLogonRegistryManager.cs b/src/Agent.Listener/Configuration.Windows/AutoLogonRegistryManager.cs
@@ -7,10 +7,12 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
 
 namespace Microsoft.VisualStudio.Services.Agent.Listener.Configuration
 {
     [ServiceLocator(Default = typeof(AutoLogonRegistryManager))]
+    [SupportedOSPlatform("windows")]
     public interface IAutoLogonRegistryManager : IAgentService
     {
         void GetAutoLogonUserDetails(out string domainName, out string userName);
@@ -20,6 +22,7 @@ public interface IAutoLogonRegistryManager : IAgentService
         void DumpAutoLogonRegistrySettings();
     }
 
+    [SupportedOSPlatform("windows")]
     public class AutoLogonRegistryManager : AgentService, IAutoLogonRegistryManager
     {
         private IWindowsRegistryManager _registryManager;

diff --git a/src/Agent.Listener/Configuration.Windows/NativeWindowsServiceHelper.cs b/src/Agent.Listener/Configuration.Windows/NativeWindowsServiceHelper.cs
@@ -8,6 +8,7 @@
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
 using System.Security;
 using System.Security.AccessControl;
 using System.Security.Principal;
@@ -19,6 +20,7 @@
 namespace Microsoft.VisualStudio.Services.Agent.Listener.Configuration
 {
     [ServiceLocator(Default = typeof(NativeWindowsServiceHelper))]
+    [SupportedOSPlatform("windows")]
     public interface INativeWindowsServiceHelper : IAgentService
     {
         string GetUniqueBuildGroupName();
@@ -82,6 +84,7 @@ public interface INativeWindowsServiceHelper : IAgentService
         bool IsManagedServiceAccount(string accountName);
     }
 
+    [SupportedOSPlatform("windows")]
     public class NativeWindowsServiceHelper : AgentService, INativeWindowsServiceHelper
     {
         private const string AgentServiceLocalGroupPrefix = "VSTS_AgentService_G";

diff --git a/src/Agent.Listener/Configuration.Windows/RSAEncryptedFileKeyManager.cs b/src/Agent.Listener/Configuration.Windows/RSAEncryptedFileKeyManager.cs
@@ -2,12 +2,14 @@
 // Licensed under the MIT License.
 
 using System.IO;
+using System.Runtime.Versioning;
 using System.Security.Cryptography;
 using System.Text;
 using Microsoft.VisualStudio.Services.Agent.Util;
 
 namespace Microsoft.VisualStudio.Services.Agent.Listener.Configuration
 {
+    [SupportedOSPlatform("windows")]
     public class RSAEncryptedFileKeyManager : AgentService, IRSAKeyManager
     {
         private string _keyFile;

diff --git a/src/Agent.Listener/Configuration.Windows/WindowsRegistryManager.cs b/src/Agent.Listener/Configuration.Windows/WindowsRegistryManager.cs
@@ -1,12 +1,14 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using System.Runtime.Versioning;
 using Microsoft.Win32;
 
 
 namespace Microsoft.VisualStudio.Services.Agent.Listener.Configuration
 {
     [ServiceLocator(Default = typeof(WindowsRegistryManager))]
+    [SupportedOSPlatform("windows")]
     public interface IWindowsRegistryManager : IAgentService
     {
         string GetValue(RegistryHive hive, string subKeyName, string name);
@@ -15,6 +17,7 @@ public interface IWindowsRegistryManager : IAgentService
         bool SubKeyExists(RegistryHive hive, string subKeyName);
     }
 
+    [SupportedOSPlatform("windows")]
     public class WindowsRegistryManager : AgentService, IWindowsRegistryManager
     {
         public void DeleteValue(RegistryHive hive, string subKeyName, string name)

diff --git a/src/Agent.Listener/Configuration.Windows/WindowsServiceControlManager.cs b/src/Agent.Listener/Configuration.Windows/WindowsServiceControlManager.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.IO;
+using System.Runtime.Versioning;
 using System.Security;
 using System.Security.Principal;
 using System.Text;
@@ -11,13 +12,15 @@
 namespace Microsoft.VisualStudio.Services.Agent.Listener.Configuration
 {
     [ServiceLocator(Default = typeof(WindowsServiceControlManager))]
+    [SupportedOSPlatform("windows")]
     public interface IWindowsServiceControlManager : IAgentService
     {
         void ConfigureService(AgentSettings settings, CommandSettings command);
 
         void UnconfigureService();
     }
 
+    [SupportedOSPlatform("windows")]
     public class WindowsServiceControlManager : ServiceControlManager, IWindowsServiceControlManager
     {
         public const string WindowsServiceControllerName = "AgentService.exe";

diff --git a/src/Agent.Listener/Configuration.macOS/MacOSServiceControlManager.cs b/src/Agent.Listener/Configuration.macOS/MacOSServiceControlManager.cs
@@ -6,15 +6,18 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.VisualStudio.Services.Agent.Util;
+using System.Runtime.Versioning;
 
 namespace Microsoft.VisualStudio.Services.Agent.Listener.Configuration
 {
     [ServiceLocator(Default = typeof(MacOSServiceControlManager))]
+    [SupportedOSPlatform("macos")]
     public interface IMacOSServiceControlManager : IAgentService
     {
         void GenerateScripts(AgentSettings settings);
     }
 
+    [SupportedOSPlatform("macos")]
     public class MacOSServiceControlManager : ServiceControlManager, IMacOSServiceControlManager
     {
         // This is the name you would see when you do `systemctl list-units | grep vsts`

diff --git a/src/Agent.Listener/Configuration/ConfigurationManager.cs b/src/Agent.Listener/Configuration/ConfigurationManager.cs
@@ -8,7 +8,6 @@
 using Microsoft.VisualStudio.Services.Agent.Util;
 using Microsoft.VisualStudio.Services.Common;
 using Microsoft.VisualStudio.Services.OAuth;
-using Microsoft.VisualStudio.Services.WebApi;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -18,6 +17,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
 using System.Security.AccessControl;
 using System.Security.Principal;
 using Newtonsoft.Json;
@@ -120,11 +120,13 @@ public async Task ConfigureAsync(CommandSettings command)
                     break;
                 case PlatformUtil.OS.Windows:
                     // Warn and continue if .NET 4.6 is not installed.
+                    #pragma warning disable CA1416 // SupportedOSPlatformGuard not honored on enum members
                     if (!NetFrameworkUtil.Test(new Version(4, 6), Trace))
                     {
                         WriteSection(StringUtil.Loc("PrerequisitesSectionHeader")); // Section header.
                         _term.WriteLine(StringUtil.Loc("MinimumNetFrameworkTfvc")); // Warning.
                     }
+                    #pragma warning restore CA1416
 
                     break;
                 default:
@@ -699,6 +701,7 @@ private void WriteSection(string message)
             _term.WriteLine();
         }
 
+        [SupportedOSPlatform("windows")]
         private void CheckAgentRootDirectorySecure()
         {
             Trace.Info(nameof(CheckAgentRootDirectorySecure));

diff --git a/src/Agent.Listener/Configuration/CredentialProvider.cs b/src/Agent.Listener/Configuration/CredentialProvider.cs
@@ -174,7 +174,7 @@ private async Task<AuthenticationResult> GetTokenUsingDeviceCodeFlowAsync(IHostC
                         term.WriteLine($"Please finish AAD device code flow in browser ({deviceCodeCallback.VerificationUrl}), user code: {deviceCodeCallback.UserCode}"); return Task.FromResult(0);
                     }).ExecuteAsync().ConfigureAwait(false);
             }
-            catch (MsalServiceException ex)
+            catch (MsalServiceException)
             {
                 // AADSTS50059: No tenant-identifying information found in either the request or implied by any provided credentials.
                 // AADSTS90133: Device Code flow is not supported under /common or /consumers endpoint.

diff --git a/src/Agent.Listener/Configuration/Validators.cs b/src/Agent.Listener/Configuration/Validators.cs
@@ -4,6 +4,7 @@
 using Microsoft.VisualStudio.Services.Agent.Util;
 using System;
 using System.IO;
+using System.Runtime.Versioning;
 using System.Security.Principal;
 
 namespace Microsoft.VisualStudio.Services.Agent.Listener.Configuration
@@ -72,6 +73,7 @@ public static bool NonEmptyValidator(string value)
             return !string.IsNullOrEmpty(value);
         }
 
+        [SupportedOSPlatform("windows")]
         public static bool NTAccountValidator(string arg)
         {
             if (string.IsNullOrEmpty(arg) || String.IsNullOrEmpty(arg.TrimStart('.', '\\')))

diff --git a/src/Agent.Plugins/PipelineCache/FingerprintCreator.cs b/src/Agent.Plugins/PipelineCache/FingerprintCreator.cs
@@ -104,7 +104,7 @@ internal struct Enumeration
 
         internal class MatchedFile
         {
-            private static readonly SHA256Managed s_sha256 = new SHA256Managed();
+            private static readonly SHA256 s_sha256 = SHA256.Create();
 
             public MatchedFile(string displayPath, long fileLength, string hash)
             {

diff --git a/src/Agent.Plugins/PipelineCache/PipelineCacheServer.cs b/src/Agent.Plugins/PipelineCache/PipelineCacheServer.cs
@@ -321,7 +321,7 @@ await AsyncHttpRetryHelper.InvokeVoidAsync(
                     {
                         try
                         {
-                            IOUtil.DeleteFileWithRetry(manifestPath, cancellationToken);
+                            await IOUtil.DeleteFileWithRetry(manifestPath, cancellationToken);
                         }
                         catch (Exception ex)
                         {

diff --git a/src/Agent.Sdk/Util/NetFrameworkUtil.cs b/src/Agent.Sdk/Util/NetFrameworkUtil.cs
@@ -7,10 +7,12 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Runtime.Versioning;
 using System.Threading;
 
 namespace Microsoft.VisualStudio.Services.Agent.Util
 {
+    [SupportedOSPlatform("windows")]
     public static class NetFrameworkUtil
     {
         private static List<Version> _versions;