mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Applied expression bodies for methods to solution.

Browse source
This commit is contained in:
Michael Yanni 2023-11-10 17:08:10 -08:00
parent c9ab438e6c
commit 67cbc0dd65
36 changed files with 106 additions and 378 deletions
Download patch file Download diff file Expand all files Collapse all files

5
test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/CommandResultExtensions.cs
View file

@ -7,9 +7,6 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
{
public static class CommandResultExtensions
{
public static CommandResultAssertions Should(this CommandResult commandResult)
{
return new CommandResultAssertions(commandResult);
}
public static CommandResultAssertions Should(this CommandResult commandResult) => new CommandResultAssertions(commandResult);
}
}

25
test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/DirectoryInfoExtensions.cs
View file

@ -11,29 +11,14 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
{
public static class DirectoryInfoExtensions
{
public static DirectoryInfoAssertions Should(this DirectoryInfo dir)
{
return new DirectoryInfoAssertions(dir);
}
public static DirectoryInfoAssertions Should(this DirectoryInfo dir) => new DirectoryInfoAssertions(dir);
public static DirectoryInfo Sub(this DirectoryInfo dir, string name)
{
return new DirectoryInfo(Path.Combine(dir.FullName, name));
}
public static DirectoryInfo Sub(this DirectoryInfo dir, string name) => new DirectoryInfo(Path.Combine(dir.FullName, name));
public static bool Contains(this DirectoryInfo subject, FileSystemInfo target)
{
return target.FullName.StartsWith(subject.FullName);
}
public static bool Contains(this DirectoryInfo subject, FileSystemInfo target) => target.FullName.StartsWith(subject.FullName);
public static DirectoryInfo GetDirectory(this DirectoryInfo subject, params string [] directoryNames)
{
return new DirectoryInfo(Path.Combine(subject.FullName, Path.Combine(directoryNames)));
}
public static DirectoryInfo GetDirectory(this DirectoryInfo subject, params string[] directoryNames) => new DirectoryInfo(Path.Combine(subject.FullName, Path.Combine(directoryNames)));
public static FileInfo GetFile(this DirectoryInfo subject, string fileName)
{
return new FileInfo(Path.Combine(subject.FullName, fileName));
}
public static FileInfo GetFile(this DirectoryInfo subject, string fileName) => new FileInfo(Path.Combine(subject.FullName, fileName));
}
}

5
test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/FileInfoExtensions.FileInfoLock.cs
View file

@ -20,10 +20,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
_fileStream = fileInfo.Open(FileMode.Open, FileAccess.ReadWrite, FileShare.None);
}
public void Dispose()
{
_fileStream.Dispose();
}
public void Dispose() => _fileStream.Dispose();
}
}
}

20
test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/FileInfoExtensions.cs
View file

@ -11,24 +11,12 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
{
public static partial class FileInfoExtensions
{
public static FileInfoAssertions Should(this FileInfo file)
{
return new FileInfoAssertions(file);
}
public static FileInfoAssertions Should(this FileInfo file) => new FileInfoAssertions(file);
public static IDisposable Lock(this FileInfo subject)
{
return new FileInfoLock(subject);
}
public static IDisposable Lock(this FileInfo subject) => new FileInfoLock(subject);
public static IDisposable NuGetLock(this FileInfo subject)
{
return new FileInfoNuGetLock(subject);
}
public static IDisposable NuGetLock(this FileInfo subject) => new FileInfoNuGetLock(subject);
public static string ReadAllText(this FileInfo subject)
{
return File.ReadAllText(subject.FullName);
}
public static string ReadAllText(this FileInfo subject) => File.ReadAllText(subject.FullName);
}
}

5
test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/StringAssertionsExtensions.cs
View file

@ -10,10 +10,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
{
public static class StringAssertionsExtensions
{
private static string NormalizeLineEndings(string s)
{
return s.Replace("\r\n", "\n");
}
private static string NormalizeLineEndings(string s) => s.Replace("\r\n", "\n");
public static AndConstraint<StringAssertions> BeVisuallyEquivalentTo(this StringAssertions assertions, string expected, string because = "", params object[] becauseArgs)
{

15
test/Microsoft.DotNet.Tools.Tests.Utilities/BufferedReporter.cs
View file

@ -12,19 +12,10 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
public void WriteLine(string format, params object?[] args) => WriteLine(string.Format(format, args));
public void WriteLine(string message)
{
Lines.Add(message);
}
public void WriteLine(string message) => Lines.Add(message);
public void WriteLine()
{
Lines.Add("");
}
public void WriteLine() => Lines.Add("");
public void Write(string message)
{
throw new NotImplementedException();
}
public void Write(string message) => throw new NotImplementedException();
}
}

10
test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/BuildServerCommand.cs
View file

@ -7,14 +7,8 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
{
public sealed class BuildServerCommand : DotnetCommand
{
public override CommandResult Execute(string args = "")
{
return base.Execute($"build-server {args}");
}
public override CommandResult Execute(string args = "") => base.Execute($"build-server {args}");
public override CommandResult ExecuteWithCapturedOutput(string args = "")
{
return base.ExecuteWithCapturedOutput($"build-server {args}");
}
public override CommandResult ExecuteWithCapturedOutput(string args = "") => base.ExecuteWithCapturedOutput($"build-server {args}");
}
}

15
test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/HelpCommand.cs
View file

@ -7,19 +7,10 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
{
public sealed class HelpCommand : DotnetCommand
{
public override CommandResult Execute(string args = "")
{
return base.Execute(AppendHelp(args));
}
public override CommandResult Execute(string args = "") => base.Execute(AppendHelp(args));
public override CommandResult ExecuteWithCapturedOutput(string args = "")
{
return base.ExecuteWithCapturedOutput(AppendHelp(args));
}
public override CommandResult ExecuteWithCapturedOutput(string args = "") => base.ExecuteWithCapturedOutput(AppendHelp(args));
private string AppendHelp(string args)
{
return args = $"help {args}";
}
private string AppendHelp(string args) => args = $"help {args}";
}
}

5
test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/PackCommand.cs
View file

@ -76,9 +76,6 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
return base.ExecuteWithCapturedOutput(args);
}
private string BuildArgs()
{
return $"{_projectPath} {OutputOption} {BuildBasePathOption} {TempOutputOption} {ConfigurationOption} {VersionSuffixOption} {ServiceableOption}";
}
private string BuildArgs() => $"{_projectPath} {OutputOption} {BuildBasePathOption} {TempOutputOption} {ConfigurationOption} {VersionSuffixOption} {ServiceableOption}";
}
}

10
test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/PublishCommand.cs
View file

@ -21,10 +21,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
return this;
}
public PublishCommand WithFramework(NuGetFramework framework)
{
return WithFramework(framework.GetShortFolderName());
}
public PublishCommand WithFramework(NuGetFramework framework) => WithFramework(framework.GetShortFolderName());
public PublishCommand WithOutput(string output)
{
@ -62,15 +59,12 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
return base.ExecuteWithCapturedOutput(args);
}
private string BuildArgs()
{
return string.Join(" ",
private string BuildArgs() => string.Join(" ",
FrameworkOption,
OutputOption,
TargetOption,
RuntimeOption,
SelfContainedOption);
}
private string FrameworkOption => string.IsNullOrEmpty(_framework) ? "" : $"-f {_framework}";

10
test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/StoreCommand.cs
View file

@ -28,10 +28,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
return this;
}
public StoreCommand WithFramework(NuGetFramework framework)
{
return WithFramework(framework.GetShortFolderName());
}
public StoreCommand WithFramework(NuGetFramework framework) => WithFramework(framework.GetShortFolderName());
public StoreCommand WithOutput(string output)
{
@ -69,16 +66,13 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
return base.ExecuteWithCapturedOutput(args);
}
private string BuildArgs()
{
return string.Join(" ",
private string BuildArgs() => string.Join(" ",
ProfileProjectOption,
FrameworkOption,
OutputOption,
IntermediateWorkingDirectoryOption,
RuntimeOption,
FrameworkVersionOption);
}
private string ProfileProjectOption => string.Join(" ", _profileProject) ;

12
test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs
View file

@ -48,10 +48,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
CurrentProcess.KillTree();
}
public virtual CommandResult Execute(string args = "")
{
return Task.Run(async () => await ExecuteAsync(args)).Result;
}
public virtual CommandResult Execute(string args = "") => Task.Run(async () => await ExecuteAsync(args)).Result;
public async virtual Task<CommandResult> ExecuteAsync(string args = "")
{
@ -194,14 +191,13 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
}
}
private string GetBaseDirectory()
{
private string GetBaseDirectory() =>
#if NET451
return AppDomain.CurrentDomain.BaseDirectory;
#else
return AppContext.BaseDirectory;
AppContext.BaseDirectory;
#endif
}
private void ResolveCommand(ref string executable, ref string args)
{

10
test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/ToolCommand.cs
View file

@ -7,14 +7,8 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
{
public sealed class ToolCommand : DotnetCommand
{
public override CommandResult Execute(string args = "")
{
return base.Execute($"tool {args}");
}
public override CommandResult Execute(string args = "") => base.Execute($"tool {args}");
public override CommandResult ExecuteWithCapturedOutput(string args = "")
{
return base.ExecuteWithCapturedOutput($"tool {args}");
}
public override CommandResult ExecuteWithCapturedOutput(string args = "") => base.ExecuteWithCapturedOutput($"tool {args}");
}
}

15
test/Microsoft.DotNet.Tools.Tests.Utilities/Extensions/DirectoryInfoExtensions.cs
View file

@ -7,20 +7,11 @@ namespace Microsoft.DotNet.TestFramework
{
internal static class DirectoryInfoExtensions
{
public static bool Contains(this DirectoryInfo subject, FileSystemInfo target)
{
return target.FullName.StartsWith(subject.FullName);
}
public static bool Contains(this DirectoryInfo subject, FileSystemInfo target) => target.FullName.StartsWith(subject.FullName);
public static DirectoryInfo GetDirectory(this DirectoryInfo subject, params string [] directoryNames)
{
return new DirectoryInfo(Path.Combine(subject.FullName, Path.Combine(directoryNames)));
}
public static DirectoryInfo GetDirectory(this DirectoryInfo subject, params string[] directoryNames) => new DirectoryInfo(Path.Combine(subject.FullName, Path.Combine(directoryNames)));
public static FileInfo GetFile(this DirectoryInfo subject, string fileName)
{
return new FileInfo(Path.Combine(subject.FullName, fileName));
}
public static FileInfo GetFile(this DirectoryInfo subject, string fileName) => new FileInfo(Path.Combine(subject.FullName, fileName));
public static void EnsureExistsAndEmpty(this DirectoryInfo subject)
{

5
test/Microsoft.DotNet.Tools.Tests.Utilities/Extensions/ProcessExtensions.cs
View file

@ -19,10 +19,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
#endif
private static readonly TimeSpan _defaultTimeout = TimeSpan.FromSeconds(30);
public static void KillTree(this Process process)
{
process.KillTree(_defaultTimeout);
}
public static void KillTree(this Process process) => process.KillTree(_defaultTimeout);
public static void KillTree(this Process process, TimeSpan timeout)
{

5
test/Microsoft.DotNet.Tools.Tests.Utilities/TempFileSystem/FileNameUtilities.cs
View file

@ -25,10 +25,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
/// <returns>
/// True if <paramref name="path"/> is a simple file name, false if it is null or includes a directory specification.
/// </returns>
internal static bool IsFileName(string path)
{
return IndexOfFileName(path) == 0;
}
internal static bool IsFileName(string path) => IndexOfFileName(path) == 0;
/// <summary>
/// Returns the offset in <paramref name="path"/> where the dot that starts an extension is, or -1 if the path doesn't have an extension.

25
test/Microsoft.DotNet.Tools.Tests.Utilities/TempFileSystem/PathUtilities.cs
View file

@ -21,10 +21,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
private static bool IsUnixLikePlatform => Path.DirectorySeparatorChar == '/';
internal static bool IsDirectorySeparator(char c)
{
return c == DirectorySeparatorChar || c == AltDirectorySeparatorChar;
}
internal static bool IsDirectorySeparator(char c) => c == DirectorySeparatorChar || c == AltDirectorySeparatorChar;
internal static string TrimTrailingSeparators(string s)
{
@ -42,25 +39,13 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
return s;
}
internal static string GetExtension(string path)
{
return FileNameUtilities.GetExtension(path);
}
internal static string GetExtension(string path) => FileNameUtilities.GetExtension(path);
internal static string ChangeExtension(string path, string extension)
{
return FileNameUtilities.ChangeExtension(path, extension);
}
internal static string ChangeExtension(string path, string extension) => FileNameUtilities.ChangeExtension(path, extension);
internal static string RemoveExtension(string path)
{
return FileNameUtilities.ChangeExtension(path, extension: null);
}
internal static string RemoveExtension(string path) => FileNameUtilities.ChangeExtension(path, extension: null);
internal static string GetFileName(string path)
{
return FileNameUtilities.GetFileName(path);
}
internal static string GetFileName(string path) => FileNameUtilities.GetFileName(path);
/// <summary>
/// Get directory name from path.

12
test/Microsoft.DotNet.Tools.Tests.Utilities/TempFileSystem/TempDirectory.cs
View file

@ -105,14 +105,8 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
return new TempDirectory(dirPath, _root);
}
public void SetCurrentDirectory()
{
Directory.SetCurrentDirectory(_path);
}
public override string ToString()
{
return _path;
}
public void SetCurrentDirectory() => Directory.SetCurrentDirectory(_path);
public override string ToString() => _path;
}
}

37
test/Microsoft.DotNet.Tools.Tests.Utilities/TempFileSystem/TempFile.cs
View file

@ -50,11 +50,8 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
}
}
}
public FileStream Open(FileAccess access = FileAccess.ReadWrite)
{
return new FileStream(_path, FileMode.Open, access);
}
public FileStream Open(FileAccess access = FileAccess.ReadWrite) => new FileStream(_path, FileMode.Open, access);
public string Path => _path;
@ -79,12 +76,9 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
return this;
}
public Task<TempFile> WriteAllTextAsync(string content)
{
return WriteAllTextAsync(content, Encoding.UTF8);
}
public Task<TempFile> WriteAllTextAsync(string content) => WriteAllTextAsync(content, Encoding.UTF8);
public TempFile WriteAllBytes(byte[] content)
{
File.WriteAllBytes(_path, content);
@ -96,20 +90,11 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
content.WriteToFile(_path);
return this;
}
public string ReadAllText()
{
return File.ReadAllText(_path);
}
public TempFile CopyContentFrom(string path)
{
return WriteAllBytes(File.ReadAllBytes(path));
}
public override string ToString()
{
return _path;
}
public string ReadAllText() => File.ReadAllText(_path);
public TempFile CopyContentFrom(string path) => WriteAllBytes(File.ReadAllBytes(path));
public override string ToString() => _path;
}
}

9
test/Microsoft.DotNet.Tools.Tests.Utilities/TempFileSystem/TempRoot.cs
View file

@ -61,12 +61,9 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
_temps.Add(dir);
return dir;
}
public TempFile CreateFile(string prefix = null, string extension = null, string directory = null, [CallerFilePath]string callerSourcePath = null, [CallerLineNumber]int callerLineNumber = 0)
{
return AddFile(new DisposableFile(prefix, extension, directory, callerSourcePath, callerLineNumber));
}
public TempFile CreateFile(string prefix = null, string extension = null, string directory = null, [CallerFilePath] string callerSourcePath = null, [CallerLineNumber] int callerLineNumber = 0) => AddFile(new DisposableFile(prefix, extension, directory, callerSourcePath, callerLineNumber));
public DisposableFile AddFile(DisposableFile file)
{
_temps.Add(file);

5
test/Microsoft.DotNet.Tools.Tests.Utilities/TestAssetInfo.cs
View file

@ -68,10 +68,7 @@ namespace Microsoft.DotNet.TestFramework
.Where(f => !FilesToExclude.Contains(f.Name));
}
private DirectoryInfo GetTestDestinationDirectory(string callingMethod, string identifier)
{
return _testAssets.CreateTestDirectory(AssetName, callingMethod, identifier);
}
private DirectoryInfo GetTestDestinationDirectory(string callingMethod, string identifier) => _testAssets.CreateTestDirectory(AssetName, callingMethod, identifier);
private void ThrowIfTestAssetDoesNotExist()
{

10
test/Microsoft.DotNet.Tools.Tests.Utilities/TestAssetInstance.cs
View file

@ -129,10 +129,7 @@ namespace Microsoft.DotNet.TestFramework
return this;
}
public TestAssetInstance WithProjectChanges(Action<XDocument> xmlAction)
{
return WithProjectChanges((path, project) => xmlAction(project));
}
public TestAssetInstance WithProjectChanges(Action<XDocument> xmlAction) => WithProjectChanges((path, project) => xmlAction(project));
public TestAssetInstance WithProjectChanges(Action<string, XDocument> xmlAction)
{
@ -211,10 +208,7 @@ namespace Microsoft.DotNet.TestFramework
}
}
private IEnumerable<FileInfo> GetProjectFiles()
{
return Root.GetFiles(TestAssetInfo.ProjectFilePattern, SearchOption.AllDirectories);
}
private IEnumerable<FileInfo> GetProjectFiles() => Root.GetFiles(TestAssetInfo.ProjectFilePattern, SearchOption.AllDirectories);
private void Restore(FileInfo projectFile)
{

5
test/Microsoft.DotNet.Tools.Tests.Utilities/TestAssets.cs
View file

@ -49,10 +49,7 @@ namespace Microsoft.DotNet.TestFramework
_testWorkingFolder = testWorkingFolder;
}
public TestAssetInfo Get(string name)
{
return Get(TestAssetKinds.TestProjects, name);
}
public TestAssetInfo Get(string name) => Get(TestAssetKinds.TestProjects, name);
public TestAssetInfo Get(string kind, string name)
{

15
test/Microsoft.DotNet.Tools.Tests.Utilities/TestBase.cs
View file

@ -58,10 +58,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
{
}
public static string GetUniqueName()
{
return Guid.NewGuid().ToString("D");
}
public static string GetUniqueName() => Guid.NewGuid().ToString("D");
public TempRoot Temp
{
@ -126,15 +123,9 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
string outputDir,
string executableName,
string expectedOutput,
bool native = false)
{
TestExecutable(GetCompilationOutputPath(outputDir, native), executableName, expectedOutput);
}
bool native = false) => TestExecutable(GetCompilationOutputPath(outputDir, native), executableName, expectedOutput);
protected void TestNativeOutputExecutable(string outputDir, string executableName, string expectedOutput)
{
TestOutputExecutable(outputDir, executableName, expectedOutput, true);
}
protected void TestNativeOutputExecutable(string outputDir, string executableName, string expectedOutput) => TestOutputExecutable(outputDir, executableName, expectedOutput, true);
protected string GetCompilationOutputPath(string outputDir, bool native)
{