Skip to content

Commit

Permalink
Applied cleanup for IDE0002 to the solution.
Browse files Browse the repository at this point in the history
  • Loading branch information
@MiYanni
MiYanni committed Sep 22, 2023
1 parent bb86103 commit 9797fbb
Show file tree
Hide file tree
Showing 102 changed files with 409 additions and 409 deletions.
2 changes: 1 addition & 1 deletion src/BlazorWasmSdk/Tasks/GZipCompress.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public override bool Execute()

Directory.CreateDirectory(OutputDirectory);

System.Threading.Tasks.Parallel.For(0, FilesToCompress.Length, i =>
Parallel.For(0, FilesToCompress.Length, i =>
{
var file = FilesToCompress[i];
var inputFullPath = file.GetMetadata("FullPath");
Expand Down
2 changes: 1 addition & 1 deletion src/BlazorWasmSdk/Tasks/GenerateServiceWorkerAssetsManifest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public override bool Execute()
internal string GenerateAssetManifest(Stream stream)
{
var assets = new AssetsManifestFileEntry[Assets.Length];
System.Threading.Tasks.Parallel.For(0, assets.Length, i =>
Parallel.For(0, assets.Length, i =>
{
var item = Assets[i];
var hash = item.GetMetadata("FileHash");
Expand Down
4 changes: 2 additions & 2 deletions src/Cli/Microsoft.DotNet.Cli.Sln.Internal/SlnFile.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -804,13 +804,13 @@ public void SetValue(string name, string value, string defaultValue = null, bool

public void SetValue(string name, object value, object defaultValue = null)
{
var isDefault = object.Equals(value, defaultValue);
var isDefault = Equals(value, defaultValue);
if (isDefault)
{
// if the value is default, only remove the property if it was not already the default
// to avoid unnecessary project file churn
if (ContainsKey(name) && (defaultValue == null ||
!object.Equals(defaultValue, GetValue(name, defaultValue.GetType(), null))))
!Equals(defaultValue, GetValue(name, defaultValue.GetType(), null))))
{
Remove(name);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Cli/Microsoft.DotNet.Cli.Utils/ExponentialRetry.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public static async Task<T> ExecuteWithRetryOnFailure<T>(Func<Task<T>> action,
int maxRetryCount = 3,
Func<IEnumerable<Task>> timer = null)
{
timer = timer == null ? () => ExponentialRetry.Timer(ExponentialRetry.Intervals) : timer;
timer = timer == null ? () => Timer(Intervals) : timer;
return await ExecuteAsyncWithRetry(action, result => result != null && !result.Equals(default), maxRetryCount, timer);
}

Expand Down
2 changes: 1 addition & 1 deletion src/Cli/Microsoft.DotNet.Cli.Utils/ForwardingAppImplementation.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public ForwardingAppImplementation WithEnvironmentVariable(string name, string v
private string GetHostExeName()
{
// Should instead make this a full path to dotnet
return System.Environment.ProcessPath;
return Environment.ProcessPath;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ public int ExecuteInProc(string[] arguments)
try
{
// Execute MSBuild in the current process by calling its Main method.
return Microsoft.Build.CommandLine.MSBuildApp.Main(arguments);
return Build.CommandLine.MSBuildApp.Main(arguments);
}
catch (Exception exception)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Cli/Microsoft.DotNet.Cli.Utils/Uuid.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public static Guid Create(string name)

using (SHA1 hasher = SHA1.Create())
{
var nameBytes = System.Text.Encoding.UTF8.GetBytes(name ?? string.Empty);
var nameBytes = Encoding.UTF8.GetBytes(name ?? string.Empty);
var namespaceBytes = namespaceId.ToByteArray();

SwapGuidByteOrder(namespaceBytes);
Expand Down
6 changes: 3 additions & 3 deletions src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ private static void SuggestTypoCorrections(InstantiateCommandArgs instantiateArg
foreach (string possibleMatch in possibleTemplateMatches)
{
Example example = useInstantiateCommand
? Example.For<InstantiateCommand>(instantiateArgs.ParseResult).WithArgument(InstantiateCommand.ShortNameArgument, possibleMatch)
? Example.For<InstantiateCommand>(instantiateArgs.ParseResult).WithArgument(ShortNameArgument, possibleMatch)
: Example.For<NewCommand>(instantiateArgs.ParseResult).WithArgument(NewCommand.ShortNameArgument, possibleMatch);
if (helpOption)
{
Expand Down Expand Up @@ -511,7 +511,7 @@ private static void WriteListCommandExample(InstantiateCommandArgs instantiateAr
Example
.For<NewCommand>(instantiateArgs.ParseResult)
.WithSubcommand<ListCommand>()
.WithArgument(ListCommand.NameArgument, instantiateArgs.ShortName));
.WithArgument(BaseListCommand.NameArgument, instantiateArgs.ShortName));
}
else
{
Expand All @@ -532,7 +532,7 @@ private static void WriteSearchCommandExample(InstantiateCommandArgs instantiate
Example
.For<NewCommand>(instantiateArgs.ParseResult)
.WithSubcommand<SearchCommand>()
.WithArgument(SearchCommand.NameArgument, instantiateArgs.ShortName));
.WithArgument(BaseSearchCommand.NameArgument, instantiateArgs.ShortName));
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/Cli/Microsoft.TemplateEngine.Cli/Commands/install/InstallCommandArgs.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ internal class InstallCommandArgs : GlobalArgs
{
public InstallCommandArgs(BaseInstallCommand installCommand, ParseResult parseResult) : base(installCommand, parseResult)
{
var nameResult = parseResult.GetResult(InstallCommand.NameArgument);
var nameResult = parseResult.GetResult(BaseInstallCommand.NameArgument);
if (nameResult is null || nameResult.Errors.Any())
{
throw new ArgumentException($"{nameof(parseResult)} should contain at least one argument for {nameof(InstallCommand.NameArgument)}", nameof(parseResult));
throw new ArgumentException($"{nameof(parseResult)} should contain at least one argument for {nameof(BaseInstallCommand.NameArgument)}", nameof(parseResult));
}

TemplatePackages = parseResult.GetValue(InstallCommand.NameArgument)!;
TemplatePackages = parseResult.GetValue(BaseInstallCommand.NameArgument)!;

//workaround for --install source1 --install source2 case
if (installCommand is LegacyInstallCommand && (TemplatePackages.Contains(installCommand.Name) || installCommand.Aliases.Any(alias => TemplatePackages.Contains(alias))))
Expand All @@ -25,7 +25,7 @@ public InstallCommandArgs(BaseInstallCommand installCommand, ParseResult parseRe

if (!TemplatePackages.Any())
{
throw new ArgumentException($"{nameof(parseResult)} should contain at least one argument for {nameof(InstallCommand.NameArgument)}", nameof(parseResult));
throw new ArgumentException($"{nameof(parseResult)} should contain at least one argument for {nameof(BaseInstallCommand.NameArgument)}", nameof(parseResult));
}

Interactive = parseResult.GetValue(installCommand.InteractiveOption);
Expand Down
2 changes: 1 addition & 1 deletion src/Cli/Microsoft.TemplateEngine.Cli/Commands/list/LegacyListCommand.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ protected override Task<NewCommandStatus> ExecuteAsync(ListCommandArgs args, IEn
private void ValidateParentCommandArguments(CommandResult commandResult)
{
var nameArgumentResult = commandResult.Children.FirstOrDefault(
symbol => symbol is ArgumentResult argumentResult && argumentResult.Argument == ListCommand.NameArgument);
symbol => symbol is ArgumentResult argumentResult && argumentResult.Argument == NameArgument);
if (nameArgumentResult == null)
{
return;
Expand Down
4 changes: 2 additions & 2 deletions src/Cli/Microsoft.TemplateEngine.Cli/Commands/list/ListCommandArgs.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ internal class ListCommandArgs : BaseFilterableArgs, ITabularOutputArgs
{
internal ListCommandArgs(BaseListCommand command, ParseResult parseResult) : base(command, parseResult)
{
string? nameCriteria = parseResult.GetValue(ListCommand.NameArgument);
string? nameCriteria = parseResult.GetValue(BaseListCommand.NameArgument);
if (!string.IsNullOrWhiteSpace(nameCriteria))
{
ListNameCriteria = nameCriteria;
Expand All @@ -28,7 +28,7 @@ internal ListCommandArgs(BaseListCommand command, ParseResult parseResult) : bas
{
Language = GetFilterValue(FilterOptionDefinition.LanguageFilter);
}
IgnoreConstraints = parseResult.GetValue(ListCommand.IgnoreConstraintsOption);
IgnoreConstraints = parseResult.GetValue(BaseListCommand.IgnoreConstraintsOption);
}

public bool DisplayAllColumns { get; }
Expand Down
4 changes: 2 additions & 2 deletions src/Cli/Microsoft.TemplateEngine.Cli/JExtensions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ internal static IReadOnlyList<string> ArrayAsStrings(this JToken? token, string?
internal static JObject ReadObject(this IPhysicalFileSystem fileSystem, string path)
{
using (Stream fileStream = fileSystem.OpenRead(path))
using (var textReader = new StreamReader(fileStream, System.Text.Encoding.UTF8, true))
using (var textReader = new StreamReader(fileStream, Encoding.UTF8, true))
using (var jsonReader = new JsonTextReader(textReader))
{
return JObject.Load(jsonReader);
Expand All @@ -218,7 +218,7 @@ internal static JObject ReadObject(this IPhysicalFileSystem fileSystem, string p
internal static void WriteObject(this IPhysicalFileSystem fileSystem, string path, object obj)
{
using (Stream fileStream = fileSystem.CreateFile(path))
using (var textWriter = new StreamWriter(fileStream, System.Text.Encoding.UTF8))
using (var textWriter = new StreamWriter(fileStream, Encoding.UTF8))
using (var jsonWriter = new JsonTextWriter(textWriter))
{
var serializer = new JsonSerializer();
Expand Down
4 changes: 2 additions & 2 deletions src/Cli/Microsoft.TemplateEngine.Cli/TemplateInvoker.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,10 +250,10 @@ private async Task<NewCommandStatus> CreateTemplateAsync(TemplateCommandArgs tem
if (templatePackage != null)
{
Reporter.Output.WriteLine(LocalizableStrings.TemplateCreator_Hint_Uninstall);
Reporter.Output.WriteCommand(Example.For<UninstallCommand>(templateArgs.ParseResult).WithArgument(UninstallCommand.NameArgument, templatePackage.DisplayName));
Reporter.Output.WriteCommand(Example.For<UninstallCommand>(templateArgs.ParseResult).WithArgument(BaseUninstallCommand.NameArgument, templatePackage.DisplayName));
Reporter.Output.WriteLine();
Reporter.Output.WriteLine(LocalizableStrings.TemplateCreator_Hint_Install);
Reporter.Output.WriteCommand(Example.For<InstallCommand>(templateArgs.ParseResult).WithArgument(InstallCommand.NameArgument, templatePackage.DisplayName));
Reporter.Output.WriteCommand(Example.For<InstallCommand>(templateArgs.ParseResult).WithArgument(BaseInstallCommand.NameArgument, templatePackage.DisplayName));
Reporter.Output.WriteLine();
}
return NewCommandStatus.NotFound;
Expand Down
10 changes: 5 additions & 5 deletions src/Cli/Microsoft.TemplateEngine.Cli/TemplateListCoordinator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ internal async Task<NewCommandStatus> DisplayTemplateGroupListAsync(
Example
.For<NewCommand>(args.ParseResult)
.WithSubcommand<SearchCommand>()
.WithArgument(SearchCommand.NameArgument));
.WithArgument(BaseSearchCommand.NameArgument));
Reporter.Output.WriteLine();
return NewCommandStatus.Success;
}
Expand Down Expand Up @@ -109,7 +109,7 @@ internal async Task<NewCommandStatus> DisplayTemplateGroupListAsync(
string.Format(
LocalizableStrings.TemplateListCoordinator_Error_FailedConstraints,
resolutionResult.ContraintsMismatchGroupCount,
ListCommand.IgnoreConstraintsOption.Name)
BaseListCommand.IgnoreConstraintsOption.Name)
.Bold().Red());
}

Expand All @@ -122,15 +122,15 @@ internal async Task<NewCommandStatus> DisplayTemplateGroupListAsync(
Example
.For<NewCommand>(args.ParseResult)
.WithSubcommand<SearchCommand>()
.WithArgument(SearchCommand.NameArgument));
.WithArgument(BaseSearchCommand.NameArgument));
}
else
{
Reporter.Error.WriteCommand(
Example
.For<NewCommand>(args.ParseResult)
.WithSubcommand<SearchCommand>()
.WithArgument(SearchCommand.NameArgument, args.ListNameCriteria));
.WithArgument(BaseSearchCommand.NameArgument, args.ListNameCriteria));
}
Reporter.Error.WriteLine();
return NewCommandStatus.NotFound;
Expand Down Expand Up @@ -187,7 +187,7 @@ internal async Task<NewCommandStatus> DisplayCommandDescriptionAsync(
Example
.For<NewCommand>(args.ParseResult)
.WithSubcommand<SearchCommand>()
.WithArgument(SearchCommand.NameArgument, "web"));
.WithArgument(BaseSearchCommand.NameArgument, "web"));

Reporter.Output.WriteLine();

Expand Down
20 changes: 10 additions & 10 deletions src/Cli/Microsoft.TemplateEngine.Cli/TemplatePackageCoordinator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ internal void DisplayUpdateCheckResult(CheckUpdateResult versionCheckResult, ICo
Example
.For<NewCommand>(args.ParseResult)
.WithSubcommand<InstallCommand>()
.WithArgument(InstallCommand.NameArgument, $"{versionCheckResult.TemplatePackage?.Identifier}::{versionCheckResult.LatestVersion}"));
.WithArgument(BaseInstallCommand.NameArgument, $"{versionCheckResult.TemplatePackage?.Identifier}::{versionCheckResult.LatestVersion}"));
Reporter.Output.WriteLine();
}
}
Expand All @@ -171,7 +171,7 @@ internal void DisplayBuiltInPackagesCheckResult(string packageId, string version
Example
.For<NewCommand>(args.ParseResult)
.WithSubcommand<UninstallCommand>()
.WithArgument(UninstallCommand.NameArgument, packageId));
.WithArgument(BaseUninstallCommand.NameArgument, packageId));
}

/// <summary>
Expand Down Expand Up @@ -635,7 +635,7 @@ private async Task<bool> ValidateInstallationRequestsAsync(InstallCommandArgs ar
reporter.WriteCommand(
Example
.For<InstallCommand>(args.ParseResult)
.WithArgument(InstallCommand.NameArgument, installRequests.Select(ir => ir.DisplayName).ToArray())
.WithArgument(BaseInstallCommand.NameArgument, installRequests.Select(ir => ir.DisplayName).ToArray())
.WithOption(SharedOptions.ForceOption));
return false;
}
Expand Down Expand Up @@ -736,15 +736,15 @@ private async Task<bool> ValidateInstallationRequestsAsync(InstallCommandArgs ar
Example
.For<NewCommand>(commandArgs.ParseResult)
.WithSubcommand<UninstallCommand>()
.WithArgument(UninstallCommand.NameArgument));
.WithArgument(BaseUninstallCommand.NameArgument));
}
else
{
Reporter.Error.WriteCommand(
Example
.For<NewCommand>(commandArgs.ParseResult)
.WithSubcommand<UninstallCommand>()
.WithArgument(UninstallCommand.NameArgument, managedPackages.First().Identifier));
.WithArgument(BaseUninstallCommand.NameArgument, managedPackages.First().Identifier));
}

//TODO:
Expand Down Expand Up @@ -839,12 +839,12 @@ private void DisplayUpdateCheckResults(IEnumerable<CheckUpdateResult> versionChe
Example
.For<NewCommand>(args.ParseResult)
.WithSubcommand<InstallCommand>()
.WithArgument(InstallCommand.NameArgument, $"<package>::<version>"));
.WithArgument(BaseInstallCommand.NameArgument, $"<package>::<version>"));
Reporter.Output.WriteCommand(
Example
.For<NewCommand>(args.ParseResult)
.WithSubcommand<InstallCommand>()
.WithArgument(InstallCommand.NameArgument, $"{displayableResults.First().Identifier}::{displayableResults.First().LatestVersion}"));
.WithArgument(BaseInstallCommand.NameArgument, $"{displayableResults.First().Identifier}::{displayableResults.First().LatestVersion}"));
Reporter.Output.WriteLine();
Reporter.Output.WriteLine(LocalizableStrings.TemplatePackageCoordinator_Update_Info_UpdateAllCommandHeader);
Reporter.Output.WriteCommand(
Expand Down Expand Up @@ -916,7 +916,7 @@ private async Task DisplayInstalledTemplatePackagesAsync(GlobalArgs args, Cancel
Example
.For<NewCommand>(args.ParseResult)
.WithSubcommand<UninstallCommand>()
.WithArgument(UninstallCommand.NameArgument, managedSource.Identifier),
.WithArgument(BaseUninstallCommand.NameArgument, managedSource.Identifier),
indentLevel: 2);

Reporter.Output.WriteLine();
Expand Down Expand Up @@ -998,7 +998,7 @@ private async Task DisplayInstallResultAsync(string packageToInstall, InstallerO
string.Format(
LocalizableStrings.TemplatePackageCoordinator_lnstall_Error_AlreadyInstalled,
packageToInstall).Bold().Red());
Reporter.Error.WriteLine(LocalizableStrings.TemplatePackageCoordinator_lnstall_Error_AlreadyInstalled_Hint, InstallCommand.ForceOption.Aliases.First());
Reporter.Error.WriteLine(LocalizableStrings.TemplatePackageCoordinator_lnstall_Error_AlreadyInstalled_Hint, BaseInstallCommand.ForceOption.Aliases.First());
Reporter.Error.WriteCommand(Example.For<InstallCommand>(parseResult).WithArgument(BaseInstallCommand.NameArgument, packageToInstall).WithOption(BaseInstallCommand.ForceOption));

break;
Expand Down Expand Up @@ -1091,7 +1091,7 @@ private IEnumerable<PackageSource> LoadNuGetSources(IEnumerable<string>? additio
try
{
currentDirectory = Directory.GetCurrentDirectory();
ISettings settings = global::NuGet.Configuration.Settings.LoadDefaultSettings(currentDirectory);
ISettings settings = Settings.LoadDefaultSettings(currentDirectory);
PackageSourceProvider packageSourceProvider = new PackageSourceProvider(settings);
defaultSources = packageSourceProvider.LoadPackageSources().Where(source => source.IsEnabled);
if (includeNuGetFeed)
Expand Down
Loading

0 comments on commit 9797fbb

Please sign in to comment.