From 9ecb84a3c635b2fd7435d54346acbbdcc8c62947 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Mon, 9 Oct 2023 17:44:30 -0700 Subject: [PATCH] Applied cleanup for IDE0036 to the solution. --- .../FileManipulation/FileUtil.cs | 2 +- .../Extensions/ProcessExtensions.cs | 2 +- .../Commands/details/DetailsCommand.cs | 2 +- .../install/WorkloadManifestUpdater.cs | 2 +- .../Microsoft.NET.Build.Containers/Layer.cs | 2 +- src/RazorSdk/Tool/Client.cs | 2 +- src/RazorSdk/Tool/ConnectionHost.cs | 4 +- src/RazorSdk/Tool/ShutdownCommand.cs | 2 +- .../WorkloadManifestFormatException.cs | 2 +- .../ProjectContext.cs | 2 +- .../ProjectInitializer.cs | 2 +- .../DockerAvailableUtils.cs | 2 +- .../FilesCopiedToPublishDirTests.cs | 2 +- .../PublishItemsOutputGroupOutputsTests.cs | 2 +- .../PublishItemsOutputGroupTests.cs | 2 +- .../Publish/Tasks/MsDeploy/CommonUtility.cs | 56 +++++++++---------- .../Publish/Tasks/MsDeploy/DynamicAssembly.cs | 6 +- .../Publish/Tasks/Tasks/Kudu/KuduDeploy.cs | 2 +- .../Publish/Tasks/Tasks/MsDeploy/MSDeploy.cs | 20 +++---- .../Tasks/MsDeploy/NormalizeServiceUrl.cs | 2 +- .../Tasks/Tasks/MsDeploy/VsMsdeploy.cs | 26 ++++----- 21 files changed, 72 insertions(+), 72 deletions(-) diff --git a/src/Cli/Microsoft.DotNet.Cli.Sln.Internal/FileManipulation/FileUtil.cs b/src/Cli/Microsoft.DotNet.Cli.Sln.Internal/FileManipulation/FileUtil.cs index e6351a48d996..504eba093dcc 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Sln.Internal/FileManipulation/FileUtil.cs +++ b/src/Cli/Microsoft.DotNet.Cli.Sln.Internal/FileManipulation/FileUtil.cs @@ -28,7 +28,7 @@ namespace Microsoft.DotNet.Cli.Sln.Internal.FileManipulation { - static internal class FileUtil + internal static class FileUtil { internal static TextFormatInfo GetTextFormatInfo(string file) { diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs index 0074bd96c92a..2bdea2698f1a 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs @@ -33,7 +33,7 @@ public static Process GetParentProcess(this Process process) /// /// The process component. /// The process ID of the parent process, or -1 if the parent process could not be found. - public unsafe static int GetParentProcessId(this Process process) + public static unsafe int GetParentProcessId(this Process process) { SafeProcessHandle handle = process.SafeHandle; NativeMethods.Windows.PROCESS_BASIC_INFORMATION info; diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/details/DetailsCommand.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/details/DetailsCommand.cs index 64cfc94c3c85..8a73099ea518 100644 --- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/details/DetailsCommand.cs +++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/details/DetailsCommand.cs @@ -38,7 +38,7 @@ internal DetailsCommand( internal virtual CliOption AddSourceOption { get; } = SharedOptionsFactory.CreateAddSourceOption(); - protected async override Task ExecuteAsync( + protected override async Task ExecuteAsync( DetailsCommandArgs args, IEngineEnvironmentSettings environmentSettings, TemplatePackageManager templatePackageManager, diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs index 9a883f0b9ba7..3714d78a7165 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs @@ -84,7 +84,7 @@ await Task.WhenAll(manifests.Select(manifest => UpdateAdvertisingManifestAsync(m WriteUpdatableWorkloadsFile(); } - public async static Task BackgroundUpdateAdvertisingManifestsAsync(string userProfileDir) + public static async Task BackgroundUpdateAdvertisingManifestsAsync(string userProfileDir) { try { diff --git a/src/Containers/Microsoft.NET.Build.Containers/Layer.cs b/src/Containers/Microsoft.NET.Build.Containers/Layer.cs index 49d17728cbf6..35b00bb58424 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Layer.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Layer.cs @@ -205,7 +205,7 @@ static UnixFileMode DetermineFileMode(FileSystemInfo file) internal virtual Stream OpenBackingFile() => File.OpenRead(BackingFile); - private readonly static char[] PathSeparators = new char[] { Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar }; + private static readonly char[] PathSeparators = new char[] { Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar }; /// /// A stream capable of computing the hash digest of raw uncompressed data while also compressing it. diff --git a/src/RazorSdk/Tool/Client.cs b/src/RazorSdk/Tool/Client.cs index 954252694e38..3a0436aa8bac 100644 --- a/src/RazorSdk/Tool/Client.cs +++ b/src/RazorSdk/Tool/Client.cs @@ -153,7 +153,7 @@ public NamedPipeClient(NamedPipeClientStream stream, string identifier) public override string Identifier { get; } - public async override Task WaitForDisconnectAsync(CancellationToken cancellationToken) + public override async Task WaitForDisconnectAsync(CancellationToken cancellationToken) { if (!(Stream is PipeStream pipeStream)) { diff --git a/src/RazorSdk/Tool/ConnectionHost.cs b/src/RazorSdk/Tool/ConnectionHost.cs index 5fd5b73c0607..d1c557dea936 100644 --- a/src/RazorSdk/Tool/ConnectionHost.cs +++ b/src/RazorSdk/Tool/ConnectionHost.cs @@ -42,7 +42,7 @@ public NamedPipeConnectionHost(string pipeName) public string PipeName { get; } - public async override Task WaitForConnectionAsync(CancellationToken cancellationToken) + public override async Task WaitForConnectionAsync(CancellationToken cancellationToken) { // Create the pipe and begin waiting for a connection. This doesn't block, but could fail // in certain circumstances, such as the OS refusing to create the pipe for some reason @@ -91,7 +91,7 @@ public NamedPipeConnection(NamedPipeServerStream stream, string identifier) Identifier = identifier; } - public async override Task WaitForDisconnectAsync(CancellationToken cancellationToken) + public override async Task WaitForDisconnectAsync(CancellationToken cancellationToken) { if (!(Stream is PipeStream pipeStream)) { diff --git a/src/RazorSdk/Tool/ShutdownCommand.cs b/src/RazorSdk/Tool/ShutdownCommand.cs index 29349cf9891b..4d06b47f119c 100644 --- a/src/RazorSdk/Tool/ShutdownCommand.cs +++ b/src/RazorSdk/Tool/ShutdownCommand.cs @@ -29,7 +29,7 @@ protected override bool ValidateArguments() return true; } - protected async override Task ExecuteCoreAsync() + protected override async Task ExecuteCoreAsync() { if (!IsServerRunning()) { diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadManifestFormatException.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadManifestFormatException.cs index b6d816dbd7a3..e63e7812a7a5 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadManifestFormatException.cs +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadManifestFormatException.cs @@ -19,7 +19,7 @@ public WorkloadManifestCompositionException(string message) : base(message) { } public WorkloadManifestCompositionException(string message, Exception inner) : base(message, inner) { } } - abstract public class WorkloadManifestException : Exception + public abstract class WorkloadManifestException : Exception { protected WorkloadManifestException() { } protected WorkloadManifestException(string messageFormat, params object?[] args) : base(string.Format(messageFormat, args)) { } diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs index 55397bff9712..efa46295cdf0 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs @@ -182,7 +182,7 @@ public IEnumerable GetTopLevelDependencies() return GetTopLevelDependencies(LockFile, LockFileTarget); } - static public IEnumerable GetTopLevelDependencies(LockFile lockFile, LockFileTarget lockFileTarget) + public static IEnumerable GetTopLevelDependencies(LockFile lockFile, LockFileTarget lockFileTarget) { Dictionary libraryLookup = lockFileTarget.Libraries.ToDictionary(l => l.Name, StringComparer.OrdinalIgnoreCase); diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ProjectInitializer.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ProjectInitializer.cs index 54ccc335886f..3759d46158da 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ProjectInitializer.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ProjectInitializer.cs @@ -9,7 +9,7 @@ namespace Microsoft.NET.Build.Containers.IntegrationTests; public sealed class ProjectInitializer { - private readonly static string _combinedTargetsLocation; + private static readonly string _combinedTargetsLocation; static ProjectInitializer() { diff --git a/src/Tests/Microsoft.NET.Build.Containers.UnitTests/DockerAvailableUtils.cs b/src/Tests/Microsoft.NET.Build.Containers.UnitTests/DockerAvailableUtils.cs index 74184ec675b1..c1386312e803 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.UnitTests/DockerAvailableUtils.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.UnitTests/DockerAvailableUtils.cs @@ -41,7 +41,7 @@ public DockerAvailableFactAttribute(bool skipPodman = false) // tiny optimization - since there are many instances of this attribute we should only get // the daemon status once -file static class DockerCliStatus +static file class DockerCliStatus { public static readonly bool IsAvailable; public static readonly string? Command; diff --git a/src/Tests/Microsoft.NET.Publish.Tests/FilesCopiedToPublishDirTests.cs b/src/Tests/Microsoft.NET.Publish.Tests/FilesCopiedToPublishDirTests.cs index 192667b35a3b..c2e061b70635 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/FilesCopiedToPublishDirTests.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/FilesCopiedToPublishDirTests.cs @@ -11,7 +11,7 @@ public FilesCopiedToPublishDirTests(ITestOutputHelper log) : base(log) { } - private readonly static List FrameworkAssemblies = new() + private static readonly List FrameworkAssemblies = new() { "api-ms-win-core-console-l1-1-0.dll", "System.Runtime.dll", diff --git a/src/Tests/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupOutputsTests.cs b/src/Tests/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupOutputsTests.cs index b458b4250926..1f43014335f3 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupOutputsTests.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupOutputsTests.cs @@ -11,7 +11,7 @@ public PublishItemsOutputGroupOutputsTests(ITestOutputHelper log) : base(log) { } - private readonly static List FrameworkAssemblies = new() + private static readonly List FrameworkAssemblies = new() { "api-ms-win-core-console-l1-1-0.dll", "System.Runtime.dll", diff --git a/src/Tests/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupTests.cs b/src/Tests/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupTests.cs index fd496c0bd519..778334e557ac 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupTests.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupTests.cs @@ -11,7 +11,7 @@ public PublishItemsOutputGroupTests(ITestOutputHelper log) : base(log) { } - private readonly static List FrameworkAssemblies = new() + private static readonly List FrameworkAssemblies = new() { "api-ms-win-core-console-l1-1-0.dll", "System.Runtime.dll", diff --git a/src/WebSdk/Publish/Tasks/MsDeploy/CommonUtility.cs b/src/WebSdk/Publish/Tasks/MsDeploy/CommonUtility.cs index ab7a0a0fc624..1e3926e5295f 100644 --- a/src/WebSdk/Publish/Tasks/MsDeploy/CommonUtility.cs +++ b/src/WebSdk/Publish/Tasks/MsDeploy/CommonUtility.cs @@ -617,7 +617,7 @@ public static string GetNodeFromProjectFile(Xml.XmlDocument doc, Xml.XmlNamespac /// /// /// - static internal void BuildArgumentsBaseOnEnumTypeName(Framework.ITaskItem item, System.Collections.Generic.List arguments, System.Type enumType, string valueQuote) + internal static void BuildArgumentsBaseOnEnumTypeName(Framework.ITaskItem item, System.Collections.Generic.List arguments, System.Type enumType, string valueQuote) { string[] enumNames = Enum.GetNames(enumType); foreach (string enumName in enumNames) @@ -635,7 +635,7 @@ static internal void BuildArgumentsBaseOnEnumTypeName(Framework.ITaskItem item, } } - static internal string AlternativeQuote(string valueQuote) + internal static string AlternativeQuote(string valueQuote) { if (string.IsNullOrEmpty(valueQuote) || valueQuote == "\"") { @@ -647,8 +647,8 @@ static internal string AlternativeQuote(string valueQuote) } } - static public char[] s_specialCharactersForCmd = @"&()[]{}^=;!'+,`~".ToArray(); - static internal string PutValueInQuote(string value, string quote) + public static char[] s_specialCharactersForCmd = @"&()[]{}^=;!'+,`~".ToArray(); + internal static string PutValueInQuote(string value, string quote) { if (string.IsNullOrEmpty(quote)) { @@ -827,7 +827,7 @@ public static void MsDeployEndOfExecuteMessage(bool bSuccess, string destType, s } } - static public string ConvertAbsPhysicalPathToAbsUriPath(string physicalPath) + public static string ConvertAbsPhysicalPathToAbsUriPath(string physicalPath) { string absUriPath = string.Empty; try @@ -841,7 +841,7 @@ static public string ConvertAbsPhysicalPathToAbsUriPath(string physicalPath) } // utility function to add the replace rule for the option - static public void AddReplaceRulesToOptions(/*Deployment.DeploymentRuleCollection*/ dynamic syncConfigRules, Framework.ITaskItem[] replaceRuleItems) + public static void AddReplaceRulesToOptions(/*Deployment.DeploymentRuleCollection*/ dynamic syncConfigRules, Framework.ITaskItem[] replaceRuleItems) { if (syncConfigRules != null && replaceRuleItems != null)// Dev10 bug 496639 foreach will throw the exception if the replaceRuleItem is null { @@ -879,7 +879,7 @@ static public void AddReplaceRulesToOptions(/*Deployment.DeploymentRuleCollectio /// /// /// - static internal void AdjsutSkipDirectives(/*Deployment.DeploymentBaseOptions*/ dynamic baseOptions, Generic.List stringList, bool enabled, Utilities.TaskLoggingHelper log) + internal static void AdjsutSkipDirectives(/*Deployment.DeploymentBaseOptions*/ dynamic baseOptions, Generic.List stringList, bool enabled, Utilities.TaskLoggingHelper log) { if (stringList != null && baseOptions != null) { @@ -903,7 +903,7 @@ static internal void AdjsutSkipDirectives(/*Deployment.DeploymentBaseOptions*/ d } // utility function to add the skip rule for the option - static public void AddSkipDirectiveToBaseOptions(/*Deployment.DeploymentBaseOptions*/ dynamic baseOptions, + public static void AddSkipDirectiveToBaseOptions(/*Deployment.DeploymentBaseOptions*/ dynamic baseOptions, Framework.ITaskItem[] skipRuleItems, Generic.List enableSkipDirectiveList, Generic.List disableSkipDirectiveList, @@ -938,7 +938,7 @@ static public void AddSkipDirectiveToBaseOptions(/*Deployment.DeploymentBaseOpti /// /// /// - static public void AddDeclarParameterToOptions(/*VSMSDeploySyncOption*/ dynamic vSMSDeploySyncOption, Framework.ITaskItem item) + public static void AddDeclarParameterToOptions(/*VSMSDeploySyncOption*/ dynamic vSMSDeploySyncOption, Framework.ITaskItem item) { if (item != null && vSMSDeploySyncOption != null) { @@ -1026,7 +1026,7 @@ static public void AddDeclarParameterToOptions(/*VSMSDeploySyncOption*/ dynamic /// /// /// - static public void SetDynamicProperty(dynamic thisObj, string propertyName, object value) + public static void SetDynamicProperty(dynamic thisObj, string propertyName, object value) { thisObj.GetType().GetProperty(propertyName).SetValue(thisObj, value, null); } @@ -1037,7 +1037,7 @@ static public void SetDynamicProperty(dynamic thisObj, string propertyName, obje /// /// /// - static public void AddDeclareParametersToOptions(/*VSMSDeploySyncOption*/ dynamic vSMSDeploySyncOption, Framework.ITaskItem[] originalItems, bool fOptimisticPickNextDefaultValue) + public static void AddDeclareParametersToOptions(/*VSMSDeploySyncOption*/ dynamic vSMSDeploySyncOption, Framework.ITaskItem[] originalItems, bool fOptimisticPickNextDefaultValue) { System.Collections.Generic.IList items = SortParametersTaskItems(originalItems, fOptimisticPickNextDefaultValue, DeclareParameterMetadata.DefaultValue.ToString()); if (vSMSDeploySyncOption != null && items != null) @@ -1056,7 +1056,7 @@ static public void AddDeclareParametersToOptions(/*VSMSDeploySyncOption*/ dynami ///// ///// ///// - static public void AddImportDeclareParametersFileOptions(/*VSMSDeploySyncOption*/ dynamic vSMSDeploySyncOption, Framework.ITaskItem[] items) + public static void AddImportDeclareParametersFileOptions(/*VSMSDeploySyncOption*/ dynamic vSMSDeploySyncOption, Framework.ITaskItem[] items) { if (vSMSDeploySyncOption != null && items != null) { @@ -1068,7 +1068,7 @@ static public void AddImportDeclareParametersFileOptions(/*VSMSDeploySyncOption* } } - static public void AddSetParametersFilesToObject(/*Deployment.DeploymentObject*/ dynamic deploymentObject, Generic.IList filenames, IVSMSDeployHost host) + public static void AddSetParametersFilesToObject(/*Deployment.DeploymentObject*/ dynamic deploymentObject, Generic.IList filenames, IVSMSDeployHost host) { if (deploymentObject != null && filenames != null) { @@ -1097,7 +1097,7 @@ static public void AddSetParametersFilesToObject(/*Deployment.DeploymentObject*/ /// /// /// - static public void AddSimpleSetParametersVsMsDeployObject(MsDeploy.VSMSDeployObject srcVsMsDeployobject, Framework.ITaskItem[] originalItems, bool fOptimisticPickNextDefaultValue) + public static void AddSimpleSetParametersVsMsDeployObject(MsDeploy.VSMSDeployObject srcVsMsDeployobject, Framework.ITaskItem[] originalItems, bool fOptimisticPickNextDefaultValue) { System.Collections.Generic.IList items = SortParametersTaskItems(originalItems, fOptimisticPickNextDefaultValue, SimpleSyncParameterMetadata.Value.ToString()); if (srcVsMsDeployobject != null && items != null) @@ -1116,7 +1116,7 @@ static public void AddSimpleSetParametersVsMsDeployObject(MsDeploy.VSMSDeployObj } } - static public void AddProviderOptions(/*Deployment.DeploymentProviderOptions*/ dynamic deploymentProviderOptions, Generic.IList providerOptions, IVSMSDeployHost host) + public static void AddProviderOptions(/*Deployment.DeploymentProviderOptions*/ dynamic deploymentProviderOptions, Generic.IList providerOptions, IVSMSDeployHost host) { if (deploymentProviderOptions != null && providerOptions != null) { @@ -1148,7 +1148,7 @@ static public void AddProviderOptions(/*Deployment.DeploymentProviderOptions*/ d /// /// /// - static public void AddSimpleSetParametersToObject(/*Deployment.DeploymentObject*/ dynamic deploymentObject, Generic.IList parameters, IVSMSDeployHost host) + public static void AddSimpleSetParametersToObject(/*Deployment.DeploymentObject*/ dynamic deploymentObject, Generic.IList parameters, IVSMSDeployHost host) { if (deploymentObject != null && parameters != null) { @@ -1200,7 +1200,7 @@ static public void AddSimpleSetParametersToObject(/*Deployment.DeploymentObject* /// /// /// - static public void AddSetParametersToObject(/*Deployment.DeploymentObject*/ dynamic deploymentObject, Generic.IList parameters, IVSMSDeployHost host) + public static void AddSetParametersToObject(/*Deployment.DeploymentObject*/ dynamic deploymentObject, Generic.IList parameters, IVSMSDeployHost host) { if (deploymentObject != null && parameters != null) { @@ -1320,7 +1320,7 @@ static public void AddSetParametersToObject(/*Deployment.DeploymentObject*/ dyna /// /// /// - static public void AddSetParametersVsMsDeployObject(MsDeploy.VSMSDeployObject srcVsMsDeployobject, Framework.ITaskItem[] originalItems, bool fOptimisticPickNextDefaultValue) + public static void AddSetParametersVsMsDeployObject(MsDeploy.VSMSDeployObject srcVsMsDeployobject, Framework.ITaskItem[] originalItems, bool fOptimisticPickNextDefaultValue) { System.Collections.Generic.IList items = SortParametersTaskItems(originalItems, fOptimisticPickNextDefaultValue, SyncParameterMetadata.DefaultValue.ToString()); if (srcVsMsDeployobject != null && items != null) @@ -1352,7 +1352,7 @@ static public void AddSetParametersVsMsDeployObject(MsDeploy.VSMSDeployObject sr } } - static public void AddSetParametersFilesVsMsDeployObject(VSMSDeployObject srcVsMsDeployobject, Framework.ITaskItem[] items) + public static void AddSetParametersFilesVsMsDeployObject(VSMSDeployObject srcVsMsDeployobject, Framework.ITaskItem[] items) { if (srcVsMsDeployobject != null && items != null) { @@ -1367,7 +1367,7 @@ static public void AddSetParametersFilesVsMsDeployObject(VSMSDeployObject srcVsM - static public string DumpITeaskItem(Framework.ITaskItem iTaskItem) + public static string DumpITeaskItem(Framework.ITaskItem iTaskItem) { Text.StringBuilder sb = CleanStringBuilder; string itemspec = iTaskItem.ItemSpec; @@ -1537,7 +1537,7 @@ internal static PriorityIndexComparer ParameterTaskComparer static string strMsdeployFwlink3 = @"http://go.microsoft.com/fwlink/?LinkId=178036"; static string strMsdeployFwlink4 = @"http://go.microsoft.com/fwlink/?LinkId=178587"; static string strMsdeployFwlink5 = @"http://go.microsoft.com/fwlink/?LinkId=178589"; - static internal string strMsdeployInstallationFwdLink = @"http://go.microsoft.com/?linkid=9278654"; + internal static string strMsdeployInstallationFwdLink = @"http://go.microsoft.com/?linkid=9278654"; static string[] strMsdeployFwlinks = { strMsdeployFwlink1, strMsdeployFwlink2, strMsdeployFwlink3, strMsdeployFwlink4, strMsdeployFwlink5 }; @@ -1778,7 +1778,7 @@ public int Compare(System.Collections.Generic.KeyValuePair x, System.C #endregion } - static public string StripOffTrailingSlashes(string str) + public static string StripOffTrailingSlashes(string str) { if (!string.IsNullOrEmpty(str)) { @@ -1789,7 +1789,7 @@ static public string StripOffTrailingSlashes(string str) return str; } - static public string EnsureTrailingSlashes(string rootPath, char slash) + public static string EnsureTrailingSlashes(string rootPath, char slash) { string directorySeparator = new(slash, 1); string rootPathWithSlash = string.Concat(rootPath, rootPath.EndsWith(directorySeparator, StringComparison.Ordinal) ? string.Empty : directorySeparator); @@ -1797,7 +1797,7 @@ static public string EnsureTrailingSlashes(string rootPath, char slash) } - static public string GetFilePathResolution(string source, string sourceRootPath) + public static string GetFilePathResolution(string source, string sourceRootPath) { if (Path.IsPathRooted(source) || string.IsNullOrEmpty(sourceRootPath)) return source; @@ -1812,7 +1812,7 @@ static public string GetFilePathResolution(string source, string sourceRootPath) /// /// /// - static internal string GetIPAddressString(System.Net.IPAddress iPAddress) + internal static string GetIPAddressString(System.Net.IPAddress iPAddress) { if (iPAddress != null) { @@ -1836,7 +1836,7 @@ static internal string GetIPAddressString(System.Net.IPAddress iPAddress) /// /// /// - static internal bool MatchOneOfIPAddress(string IISBindingIPString, System.Net.IPAddress[] iPAddresses) + internal static bool MatchOneOfIPAddress(string IISBindingIPString, System.Net.IPAddress[] iPAddresses) { if (!string.IsNullOrEmpty(IISBindingIPString)) { @@ -1852,7 +1852,7 @@ static internal bool MatchOneOfIPAddress(string IISBindingIPString, System.Net.I return false; } - static internal void SetupMSWebDeployDynamicAssemblies(string strVersionsToTry, Utilities.Task task) + internal static void SetupMSWebDeployDynamicAssemblies(string strVersionsToTry, Utilities.Task task) { // Mark the assembly version. // System.Version version1_1 = new System.Version("7.1"); @@ -1907,7 +1907,7 @@ static internal void SetupMSWebDeployDynamicAssemblies(string strVersionsToTry, } - static public string EscapeTextForMSBuildVariable(string text) + public static string EscapeTextForMSBuildVariable(string text) { if (!string.IsNullOrEmpty(text) && text.IndexOfAny(@"$%".ToArray()) >= 0) { diff --git a/src/WebSdk/Publish/Tasks/MsDeploy/DynamicAssembly.cs b/src/WebSdk/Publish/Tasks/MsDeploy/DynamicAssembly.cs index 7b0f1e5bde22..d5d8a51cb0f9 100644 --- a/src/WebSdk/Publish/Tasks/MsDeploy/DynamicAssembly.cs +++ b/src/WebSdk/Publish/Tasks/MsDeploy/DynamicAssembly.cs @@ -161,7 +161,7 @@ internal static System.Delegate CreateEventHandlerDelegate(System.Ref #endif } - static public System.Delegate AddEventDeferHandler(dynamic obj, string eventName, System.Delegate deferEventHandler) + public static System.Delegate AddEventDeferHandler(dynamic obj, string eventName, System.Delegate deferEventHandler) { EventInfo eventinfo = obj.GetType().GetEvent(eventName); System.Delegate eventHandler = CreateEventHandlerDelegate(eventinfo, deferEventHandler); @@ -169,13 +169,13 @@ static public System.Delegate AddEventDeferHandler(dynamic obj, string eventName return eventHandler; } - static public void AddEventHandler(dynamic obj, string eventName, System.Delegate eventHandler) + public static void AddEventHandler(dynamic obj, string eventName, System.Delegate eventHandler) { EventInfo eventinfo = obj.GetType().GetEvent(eventName); eventinfo.AddEventHandler(obj, eventHandler); } - static public void RemoveEventHandler(dynamic obj, string eventName, System.Delegate eventHandler) + public static void RemoveEventHandler(dynamic obj, string eventName, System.Delegate eventHandler) { EventInfo eventinfo = obj.GetType().GetEvent(eventName); eventinfo.RemoveEventHandler(obj, eventHandler); diff --git a/src/WebSdk/Publish/Tasks/Tasks/Kudu/KuduDeploy.cs b/src/WebSdk/Publish/Tasks/Tasks/Kudu/KuduDeploy.cs index 5e442d4f6894..5edacb6f6a2c 100644 --- a/src/WebSdk/Publish/Tasks/Tasks/Kudu/KuduDeploy.cs +++ b/src/WebSdk/Publish/Tasks/Tasks/Kudu/KuduDeploy.cs @@ -15,7 +15,7 @@ namespace Microsoft.NET.Sdk.Publish.Tasks.Kudu { - sealed public class KuduDeploy : Utilities.Task + public sealed class KuduDeploy : Utilities.Task { public static readonly int TimeoutMilliseconds = 180000; [Framework.Required] diff --git a/src/WebSdk/Publish/Tasks/Tasks/MsDeploy/MSDeploy.cs b/src/WebSdk/Publish/Tasks/Tasks/MsDeploy/MSDeploy.cs index a70b2a1cd1ef..a6bfb6a4f5fa 100644 --- a/src/WebSdk/Publish/Tasks/Tasks/MsDeploy/MSDeploy.cs +++ b/src/WebSdk/Publish/Tasks/Tasks/MsDeploy/MSDeploy.cs @@ -601,7 +601,7 @@ public override bool Execute() // utility function to add the replace rule for the option - static public void AddReplaceRulesToOptions(Utilities.CommandLineBuilder commandLineBuilder, Framework.ITaskItem[] replaceRuleItems, string valueQuoteChar) + public static void AddReplaceRulesToOptions(Utilities.CommandLineBuilder commandLineBuilder, Framework.ITaskItem[] replaceRuleItems, string valueQuoteChar) { if (commandLineBuilder != null && replaceRuleItems != null)// Dev10 bug 496639 foreach will throw the exception if the replaceRuleItem is null @@ -617,7 +617,7 @@ static public void AddReplaceRulesToOptions(Utilities.CommandLineBuilder command } } - static public void AddSkipDirectiveToBaseOptions(Utilities.CommandLineBuilder commandLineBuilder, Framework.ITaskItem[] skipRuleItems, string valueQuoteChar) + public static void AddSkipDirectiveToBaseOptions(Utilities.CommandLineBuilder commandLineBuilder, Framework.ITaskItem[] skipRuleItems, string valueQuoteChar) { if (commandLineBuilder != null && skipRuleItems != null)// Dev10 bug 496639 foreach will throw the exception if the replaceRuleItem is null @@ -634,7 +634,7 @@ static public void AddSkipDirectiveToBaseOptions(Utilities.CommandLineBuilder co } - static public void AddDeclareParameterToCommandArgument(System.Collections.Generic.List arguments, + public static void AddDeclareParameterToCommandArgument(System.Collections.Generic.List arguments, Framework.ITaskItem item, string valueQuote, System.Collections.Generic.Dictionary lookupDictionary) @@ -684,7 +684,7 @@ static public void AddDeclareParameterToCommandArgument(System.Collections.Gener /// /// /// - static public void AddDeclareParametersOptions(Utilities.CommandLineBuilder commandLineBuilder, Framework.ITaskItem[] originalItems, string valueQuote, bool foptimisticParameterDefaultValue) + public static void AddDeclareParametersOptions(Utilities.CommandLineBuilder commandLineBuilder, Framework.ITaskItem[] originalItems, string valueQuote, bool foptimisticParameterDefaultValue) { System.Collections.Generic.IList items = Utility.SortParametersTaskItems(originalItems, foptimisticParameterDefaultValue, DeclareParameterMetadata.DefaultValue.ToString()); if (commandLineBuilder != null && items != null) @@ -701,17 +701,17 @@ static public void AddDeclareParametersOptions(Utilities.CommandLineBuilder comm } - static public void AddImportDeclareParametersFilesOptions(Utilities.CommandLineBuilder commandLineBuilder, Framework.ITaskItem[] items) + public static void AddImportDeclareParametersFilesOptions(Utilities.CommandLineBuilder commandLineBuilder, Framework.ITaskItem[] items) { AddImportParametersFilesOptions(commandLineBuilder, "-declareParamFile:", items); } - static public void AddImportSetParametersFilesOptions(Utilities.CommandLineBuilder commandLineBuilder, Framework.ITaskItem[] items) + public static void AddImportSetParametersFilesOptions(Utilities.CommandLineBuilder commandLineBuilder, Framework.ITaskItem[] items) { AddImportParametersFilesOptions(commandLineBuilder, "-setParamFile:", items); } - static internal void AddImportParametersFilesOptions(Utilities.CommandLineBuilder commandLineBuilder, string parameterFlag, Framework.ITaskItem[] items) + internal static void AddImportParametersFilesOptions(Utilities.CommandLineBuilder commandLineBuilder, string parameterFlag, Framework.ITaskItem[] items) { if (commandLineBuilder != null && !string.IsNullOrEmpty(parameterFlag) @@ -735,7 +735,7 @@ static internal void AddImportParametersFilesOptions(Utilities.CommandLineBuilde /// /// /// - static public void AddSimpleSetParametersToObject(Utilities.CommandLineBuilder commandLineBuilder, Framework.ITaskItem[] originalItems, string valueQuoteChar, bool foptimisticParameterDefaultValue) + public static void AddSimpleSetParametersToObject(Utilities.CommandLineBuilder commandLineBuilder, Framework.ITaskItem[] originalItems, string valueQuoteChar, bool foptimisticParameterDefaultValue) { System.Collections.Generic.IList items = Utility.SortParametersTaskItems(originalItems, foptimisticParameterDefaultValue, SimpleSyncParameterMetadata.Value.ToString()); if (commandLineBuilder != null && items != null) @@ -765,7 +765,7 @@ static public void AddSimpleSetParametersToObject(Utilities.CommandLineBuilder c /// /// /// - static public void AddSetParametersToObject(Utilities.CommandLineBuilder commandLineBuilder, Framework.ITaskItem[] originalItems, string valueQuote, bool foptimisticParameterDefaultValue) + public static void AddSetParametersToObject(Utilities.CommandLineBuilder commandLineBuilder, Framework.ITaskItem[] originalItems, string valueQuote, bool foptimisticParameterDefaultValue) { System.Collections.Generic.IList items = Utility.SortParametersTaskItems(originalItems, foptimisticParameterDefaultValue, ExistingSyncParameterMetadata.Value.ToString()); if (commandLineBuilder != null && items != null) @@ -840,7 +840,7 @@ static public void AddSetParametersToObject(Utilities.CommandLineBuilder command - static public void AddDestinationProviderSettingToObject(Utilities.CommandLineBuilder commandLineBuilder, string dest, Framework.ITaskItem[] items, string valueQuoteChar, + public static void AddDestinationProviderSettingToObject(Utilities.CommandLineBuilder commandLineBuilder, string dest, Framework.ITaskItem[] items, string valueQuoteChar, Framework.ITaskItem[] additionalProviderItems, MSDeploy msdeploy) { //commandLineBuilder.AppendSwitchUnquotedIfNotNull("-source:", m_source); diff --git a/src/WebSdk/Publish/Tasks/Tasks/MsDeploy/NormalizeServiceUrl.cs b/src/WebSdk/Publish/Tasks/Tasks/MsDeploy/NormalizeServiceUrl.cs index 30016b47a521..cdc0b9423454 100644 --- a/src/WebSdk/Publish/Tasks/Tasks/MsDeploy/NormalizeServiceUrl.cs +++ b/src/WebSdk/Publish/Tasks/Tasks/MsDeploy/NormalizeServiceUrl.cs @@ -15,7 +15,7 @@ namespace Microsoft.NET.Sdk.Publish.Tasks.MsDeploy /// So VS's behavior conforms to webmatrix and wdeploy as much as possible /// ///----------------------------------------------------------------------------- - sealed public class NormalizeServiceUrl : Task + public sealed class NormalizeServiceUrl : Task { private string _serviceUrl = string.Empty; private string _resultUrl = string.Empty; diff --git a/src/WebSdk/Publish/Tasks/Tasks/MsDeploy/VsMsdeploy.cs b/src/WebSdk/Publish/Tasks/Tasks/MsDeploy/VsMsdeploy.cs index 3d10608132d1..0dea2fd10263 100644 --- a/src/WebSdk/Publish/Tasks/Tasks/MsDeploy/VsMsdeploy.cs +++ b/src/WebSdk/Publish/Tasks/Tasks/MsDeploy/VsMsdeploy.cs @@ -22,9 +22,9 @@ public MSWebDeploymentAssembly(System.Version verToLoad) : { } - static public string AssemblyName { get { return "Microsoft.Web.Deployment"; } } - static public MSWebDeploymentAssembly DynamicAssembly { get; set; } - static public void SetVersion(System.Version version) + public static string AssemblyName { get { return "Microsoft.Web.Deployment"; } } + public static MSWebDeploymentAssembly DynamicAssembly { get; set; } + public static void SetVersion(System.Version version) { if (DynamicAssembly == null || DynamicAssembly.Version != version) { @@ -39,7 +39,7 @@ static public void SetVersion(System.Version version) /// /// /// - static public bool DeploymentTryGetValueForEach(dynamic deploymentCollection, string name, out dynamic foundObject) + public static bool DeploymentTryGetValueForEach(dynamic deploymentCollection, string name, out dynamic foundObject) { foundObject = null; if (deploymentCollection != null) @@ -57,7 +57,7 @@ static public bool DeploymentTryGetValueForEach(dynamic deploymentCollection, st } - static public bool DeploymentTryGetValueContains(dynamic deploymentCollection, string name, out dynamic foundObject) + public static bool DeploymentTryGetValueContains(dynamic deploymentCollection, string name, out dynamic foundObject) { foundObject = null; if (deploymentCollection != null) @@ -82,10 +82,10 @@ public MSWebDelegationAssembly(System.Version verToLoad) : { } - static public string AssemblyName { get { return "Microsoft.Web.Delegation"; } } + public static string AssemblyName { get { return "Microsoft.Web.Delegation"; } } - static public MSWebDelegationAssembly DynamicAssembly { get; set; } - static public void SetVersion(System.Version version) + public static MSWebDelegationAssembly DynamicAssembly { get; set; } + public static void SetVersion(System.Version version) { if (DynamicAssembly == null || DynamicAssembly.Version != version) { @@ -282,17 +282,17 @@ public void SyncThruMSDeploy() /// /// Encapsulate the things be done before invoke MSDeploy /// - abstract protected void BeforeSync(); + protected abstract void BeforeSync(); /// /// Encapsulate the approach to invoke the MSDeploy (same thread or in a seperate thread; ui or without ui) /// - abstract protected void StartSync(); + protected abstract void StartSync(); /// /// Encapsulate the approach to wait for the MSDeploy done /// - abstract protected void WaitForDone(); + protected abstract void WaitForDone(); /// /// Encapsulate how to report the Trace information @@ -300,12 +300,12 @@ public void SyncThruMSDeploy() /// // abstract protected void LogTrace(Deployment.DeploymentTraceEventArgs e); - abstract protected void LogTrace(dynamic e, System.Collections.Generic.IDictionary customTypeLoging); + protected abstract void LogTrace(dynamic e, System.Collections.Generic.IDictionary customTypeLoging); /// /// Encapsulate the things to be done after the deploy is done /// - abstract protected void AfterSync(); + protected abstract void AfterSync(); /// /// constructor