dotnet-script · seesharper · Mar 7, 2022 · Mar 7, 2022
diff --git a/build/Build.csx b/build/Build.csx
@@ -54,14 +54,12 @@ private void CreateChocoPackage()
 
 private void CreateGlobalToolPackage()
 {
-    using (var globalToolBuildFolder = new DisposableFolder())
-    {
-        Copy(solutionFolder, globalToolBuildFolder.Path);
-        PatchPackAsTool(globalToolBuildFolder.Path);
-        PatchPackageId(globalToolBuildFolder.Path, GlobalToolPackageId);
-        PatchContent(globalToolBuildFolder.Path);
-        Command.Execute("dotnet", $"pack --configuration release --output {nuGetArtifactsFolder}", Path.Combine(globalToolBuildFolder.Path, "Dotnet.Script"));
-    }
+    using var globalToolBuildFolder = new DisposableFolder();
+    Copy(solutionFolder, globalToolBuildFolder.Path);
+    PatchPackAsTool(globalToolBuildFolder.Path);
+    PatchPackageId(globalToolBuildFolder.Path, GlobalToolPackageId);
+    PatchContent(globalToolBuildFolder.Path);
+    Command.Execute("dotnet", $"pack --configuration release --output {nuGetArtifactsFolder}", Path.Combine(globalToolBuildFolder.Path, "Dotnet.Script"));
 }
 
 private void CreateNuGetPackages()

diff --git a/build/Choco.csx b/build/Choco.csx
@@ -52,7 +52,6 @@ public static class Choco
         {
             version = versionPrefix;
         }
-        var tags = projectFile.Descendants("PackageTags").SingleOrDefault()?.Value;
         var iconUrl = projectFile.Descendants("PackageIconUrl").SingleOrDefault()?.Value;
         var projectUrl = projectFile.Descendants("PackageProjectUrl").SingleOrDefault()?.Value;
         var repositoryUrl = projectFile.Descendants("RepositoryUrl").SingleOrDefault()?.Value;
@@ -80,10 +79,8 @@ public static class Choco
         var srcGlobPattern = $@"{pathToBinaries}\**\*";
         filesElement.Add(CreateFileElement(srcGlobPattern, packageId));
 
-        using (var fileStream = new FileStream("Chocolatey/chocolatey.nuspec", FileMode.Create))
-        {
-            new XDocument(packageElement).Save(fileStream);
-        }
+        using var fileStream = new FileStream("Chocolatey/chocolatey.nuspec", FileMode.Create);
+        new XDocument(packageElement).Save(fileStream);
     }
 
     private static XElement CreateFileElement(string src, string target)

diff --git a/src/Dotnet.Script.Core/Extensions.cs b/src/Dotnet.Script.Core/Extensions.cs
@@ -9,10 +9,8 @@ public static class Extensions
 
         public static SourceText ToSourceText(this string absoluteFilePath)
         {
-            using (var filestream = File.OpenRead(absoluteFilePath))
-            {
-                return SourceText.From(filestream);
-            }
+            using var filestream = File.OpenRead(absoluteFilePath);
+            return SourceText.From(filestream);
         }
     }
 }
diff --git a/src/Dotnet.Script.Core/ScriptDownloader.cs b/src/Dotnet.Script.Core/ScriptDownloader.cs
@@ -11,37 +11,31 @@ public class ScriptDownloader
     {
         public async Task<string> Download(string uri)
         {
-            using (HttpClient client = new HttpClient(new HttpClientHandler
+            using HttpClient client = new HttpClient(new HttpClientHandler
             {
                 // Avoid Deflate due to bugs. For more info, see:
                 // https://github.com/weblinq/WebLinq/issues/132
                 AutomaticDecompression = DecompressionMethods.GZip
-            }))
-            {
-                using (HttpResponseMessage response = await client.GetAsync(uri, HttpCompletionOption.ResponseHeadersRead))
-                {
-                    response.EnsureSuccessStatusCode();
+            });
+            using HttpResponseMessage response = await client.GetAsync(uri, HttpCompletionOption.ResponseHeadersRead);
+            response.EnsureSuccessStatusCode();
 
-                    using (HttpContent content = response.Content)
-                    {
-                        var mediaType = content.Headers.ContentType?.MediaType?.ToLowerInvariant().Trim();
-                        switch (mediaType)
-                        {
-                            case null:
-                            case "":
-                            case "text/plain":
-                                return await content.ReadAsStringAsync();
-                            case "application/gzip":
-                            case "application/x-gzip":
-                                using (var stream = await content.ReadAsStreamAsync())
-                                using (var gzip = new GZipStream(stream, CompressionMode.Decompress))
-                                using (var reader = new StreamReader(gzip))
-                                    return await reader.ReadToEndAsync();
-                            default:
-                                throw new NotSupportedException($"The media type '{mediaType}' is not supported when executing a script over http/https");
-                        }
-                    }
-                }
+            using HttpContent content = response.Content;
+            var mediaType = content.Headers.ContentType?.MediaType?.ToLowerInvariant().Trim();
+            switch (mediaType)
+            {
+                case null:
+                case "":
+                case "text/plain":
+                    return await content.ReadAsStringAsync();
+                case "application/gzip":
+                case "application/x-gzip":
+                    using (var stream = await content.ReadAsStreamAsync())
+                    using (var gzip = new GZipStream(stream, CompressionMode.Decompress))
+                    using (var reader = new StreamReader(gzip))
+                        return await reader.ReadToEndAsync();
+                default:
+                    throw new NotSupportedException($"The media type '{mediaType}' is not supported when executing a script over http/https");
             }
         }
     }

diff --git a/src/Dotnet.Script.Core/ScriptPublisher.cs b/src/Dotnet.Script.Core/ScriptPublisher.cs
@@ -68,7 +68,7 @@ public void CreateExecutable<TReturn, THost>(ScriptContext context, LogFactory l
                 throw new ArgumentNullException(nameof(runtimeIdentifier));
             }
 
-            executableFileName = executableFileName ?? Path.GetFileNameWithoutExtension(context.FilePath);
+            executableFileName ??= Path.GetFileNameWithoutExtension(context.FilePath);
             const string AssemblyName = "scriptAssembly";
 
             var tempProjectPath = ScriptProjectProvider.GetPathToProjectFile(Path.GetDirectoryName(context.FilePath), _scriptEnvironment.TargetFramework);

diff --git a/src/Dotnet.Script.Core/Templates/TemplateLoader.cs b/src/Dotnet.Script.Core/Templates/TemplateLoader.cs
@@ -8,10 +8,8 @@ public static class TemplateLoader
         public static string ReadTemplate(string name)
         {
             var resourceStream = typeof(TemplateLoader).GetTypeInfo().Assembly.GetManifestResourceStream($"Dotnet.Script.Core.Templates.{name}");
-            using (var streamReader = new StreamReader(resourceStream))
-            {
-                return streamReader.ReadToEnd();
-            }
+            using var streamReader = new StreamReader(resourceStream);
+            return streamReader.ReadToEnd();
         }
     }
 }
diff --git a/src/Dotnet.Script.DependencyModel/Context/ScriptDependencyContextReader.cs b/src/Dotnet.Script.DependencyModel/Context/ScriptDependencyContextReader.cs
@@ -138,7 +138,7 @@ private string[] GetScriptPaths(FallbackPackagePathResolver packagePathResolver,
 
         private string[] GetNativeAssetPaths(FallbackPackagePathResolver packagePathResolver, LockFileTargetLibrary targetLibrary)
         {
-            List<string> nativeAssetPaths = new List<string>();
+            var nativeAssetPaths = new List<string>();
             foreach (var runtimeTarget in targetLibrary.NativeLibraries.Where(lfi => !lfi.Path.EndsWith("_._")))
             {
                 var fullPath = ResolveFullPath(packagePathResolver, targetLibrary.Name, targetLibrary.Version.ToString(), runtimeTarget.Path);
@@ -150,7 +150,7 @@ private string[] GetNativeAssetPaths(FallbackPackagePathResolver packagePathReso
 
         private static string[] GetRuntimeDependencyPaths(FallbackPackagePathResolver packagePathResolver, LockFileTargetLibrary targetLibrary)
         {
-            List<string> runtimeDependencyPaths = new List<string>();
+            var runtimeDependencyPaths = new List<string>();
 
             foreach (var lockFileItem in targetLibrary.RuntimeAssemblies.Where(lfi => !lfi.Path.EndsWith("_._")))
             {

diff --git a/src/Dotnet.Script.DependencyModel/ProjectSystem/ProjectFile.cs b/src/Dotnet.Script.DependencyModel/ProjectSystem/ProjectFile.cs
@@ -83,19 +83,15 @@ public void Save(string pathToProjectFile)
             var targetFrameworkElement = projectFileDocument.Descendants("TargetFramework").Single();
             targetFrameworkElement.Value = TargetFramework;
 
-            using (var fileStream = new FileStream(pathToProjectFile, FileMode.Create, FileAccess.Write))
-            {
-                projectFileDocument.Save(fileStream);
-            }
+            using var fileStream = new FileStream(pathToProjectFile, FileMode.Create, FileAccess.Write);
+            projectFileDocument.Save(fileStream);
         }
 
         private static string ReadTemplate(string name)
         {
             var resourceStream = typeof(ProjectFile).GetTypeInfo().Assembly.GetManifestResourceStream($"Dotnet.Script.DependencyModel.ProjectSystem.{name}");
-            using (var streamReader = new StreamReader(resourceStream))
-            {
-                return streamReader.ReadToEnd();
-            }
+            using var streamReader = new StreamReader(resourceStream);
+            return streamReader.ReadToEnd();
         }
 
         /// <inheritdoc/>

diff --git a/src/Dotnet.Script.DependencyModel/ProjectSystem/ScriptProjectProvider.cs b/src/Dotnet.Script.DependencyModel/ProjectSystem/ScriptProjectProvider.cs
@@ -14,19 +14,17 @@ public class ScriptProjectProvider
         private readonly ScriptParser _scriptParser;
         private readonly ScriptFilesResolver _scriptFilesResolver;
         private readonly ScriptEnvironment _scriptEnvironment;
-        private readonly CommandRunner _commandRunner;
         private readonly Logger _logger;
 
-        private ScriptProjectProvider(ScriptParser scriptParser, ScriptFilesResolver scriptFilesResolver, LogFactory logFactory, ScriptEnvironment scriptEnvironment, CommandRunner commandRunner)
+        private ScriptProjectProvider(ScriptParser scriptParser, ScriptFilesResolver scriptFilesResolver, LogFactory logFactory, ScriptEnvironment scriptEnvironment)
         {
             _logger = logFactory.CreateLogger<ScriptProjectProvider>();
             _scriptParser = scriptParser;
             _scriptFilesResolver = scriptFilesResolver;
             _scriptEnvironment = scriptEnvironment;
-            _commandRunner = commandRunner;
         }
 
-        public ScriptProjectProvider(LogFactory logFactory) : this(new ScriptParser(logFactory), new ScriptFilesResolver(), logFactory, ScriptEnvironment.Default, new CommandRunner(logFactory))
+        public ScriptProjectProvider(LogFactory logFactory) : this(new ScriptParser(logFactory), new ScriptFilesResolver(), logFactory, ScriptEnvironment.Default)
         {
         }
 

diff --git a/src/Dotnet.Script.DependencyModel/ScriptPackage/ScriptFilesDependencyResolver.cs b/src/Dotnet.Script.DependencyModel/ScriptPackage/ScriptFilesDependencyResolver.cs
@@ -109,9 +109,9 @@ private static IDictionary<string, List<string>> GetScriptFilesPerTargetFramewor
                 if (match.Success)
                 {
                     var targetFramework = match.Groups[1].Value;
-                    if (!result.TryGetValue(targetFramework, out var files))
+                    if (!result.TryGetValue(targetFramework, out _))
                     {
-                        files = new List<string>();
+                        var files = new List<string>();
                         result.Add(targetFramework, files);
                     }
                     result[targetFramework].Add(match.Groups[0].Value);

diff --git a/src/Dotnet.Script.Shared.Tests/TestPathUtils.cs b/src/Dotnet.Script.Shared.Tests/TestPathUtils.cs
@@ -34,14 +34,14 @@ public static string GetPathToTestFixture(string fixture)
 
         public static string GetPathToGlobalPackagesFolder()
         {
-            var result = ProcessHelper.RunAndCaptureOutput("dotnet", "nuget locals global-packages --list");
-            var match = Regex.Match(result.output, @"^.*global-packages:\s*(.*)$");
+            var (output, _) = ProcessHelper.RunAndCaptureOutput("dotnet", "nuget locals global-packages --list");
+            var match = Regex.Match(output, @"^.*global-packages:\s*(.*)$");
             return match.Groups[1].Value;
         }
 
         public static void RemovePackageFromGlobalNugetCache(string packageName)
         {
-            var pathToGlobalPackagesFolder = TestPathUtils.GetPathToGlobalPackagesFolder();
+            var pathToGlobalPackagesFolder = GetPathToGlobalPackagesFolder();
             var pathToPackage = Directory.GetDirectories(pathToGlobalPackagesFolder).SingleOrDefault(d => d.Contains(packageName, StringComparison.OrdinalIgnoreCase));
             if (pathToPackage != null)
             {