Skip to content

Commit 360a415

Browse files
filipwfilipw
committed
small improvements
1 parent 114aed0 commit 360a415

28 files changed

+692
-833
lines changed

‎build/Build.csx

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,12 @@ private void CreateChocoPackage()
5454

5555
private void CreateGlobalToolPackage()
5656
{
57-
using (var globalToolBuildFolder = new DisposableFolder())
58-
{
59-
Copy(solutionFolder, globalToolBuildFolder.Path);
60-
PatchPackAsTool(globalToolBuildFolder.Path);
61-
PatchPackageId(globalToolBuildFolder.Path, GlobalToolPackageId);
62-
PatchContent(globalToolBuildFolder.Path);
63-
Command.Execute("dotnet", $"pack --configuration release --output {nuGetArtifactsFolder}", Path.Combine(globalToolBuildFolder.Path, "Dotnet.Script"));
64-
}
57+
using var globalToolBuildFolder = new DisposableFolder();
58+
Copy(solutionFolder, globalToolBuildFolder.Path);
59+
PatchPackAsTool(globalToolBuildFolder.Path);
60+
PatchPackageId(globalToolBuildFolder.Path, GlobalToolPackageId);
61+
PatchContent(globalToolBuildFolder.Path);
62+
Command.Execute("dotnet", $"pack --configuration release --output {nuGetArtifactsFolder}", Path.Combine(globalToolBuildFolder.Path, "Dotnet.Script"));
6563
}
6664

6765
private void CreateNuGetPackages()

‎build/Choco.csx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ public static class Choco
5252
{
5353
version = versionPrefix;
5454
}
55-
var tags = projectFile.Descendants("PackageTags").SingleOrDefault()?.Value;
5655
var iconUrl = projectFile.Descendants("PackageIconUrl").SingleOrDefault()?.Value;
5756
var projectUrl = projectFile.Descendants("PackageProjectUrl").SingleOrDefault()?.Value;
5857
var repositoryUrl = projectFile.Descendants("RepositoryUrl").SingleOrDefault()?.Value;
@@ -80,10 +79,8 @@ public static class Choco
8079
var srcGlobPattern = $@"{pathToBinaries}\**\*";
8180
filesElement.Add(CreateFileElement(srcGlobPattern, packageId));
8281

83-
using (var fileStream = new FileStream("Chocolatey/chocolatey.nuspec", FileMode.Create))
84-
{
85-
new XDocument(packageElement).Save(fileStream);
86-
}
82+
using var fileStream = new FileStream("Chocolatey/chocolatey.nuspec", FileMode.Create);
83+
new XDocument(packageElement).Save(fileStream);
8784
}
8885

8986
private static XElement CreateFileElement(string src, string target)

‎src/Dotnet.Script.Core/Extensions.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ public static class Extensions
99

1010
public static SourceText ToSourceText(this string absoluteFilePath)
1111
{
12-
using (var filestream = File.OpenRead(absoluteFilePath))
13-
{
14-
return SourceText.From(filestream);
15-
}
12+
using var filestream = File.OpenRead(absoluteFilePath);
13+
return SourceText.From(filestream);
1614
}
1715
}
1816
}

‎src/Dotnet.Script.Core/ScriptDownloader.cs

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,31 @@ public class ScriptDownloader
1111
{
1212
public async Task<string> Download(string uri)
1313
{
14-
using (HttpClient client = new HttpClient(new HttpClientHandler
14+
using HttpClient client = new HttpClient(new HttpClientHandler
1515
{
1616
// Avoid Deflate due to bugs. For more info, see:
1717
// https://github.com/weblinq/WebLinq/issues/132
1818
AutomaticDecompression = DecompressionMethods.GZip
19-
}))
20-
{
21-
using (HttpResponseMessage response = await client.GetAsync(uri, HttpCompletionOption.ResponseHeadersRead))
22-
{
23-
response.EnsureSuccessStatusCode();
19+
});
20+
using HttpResponseMessage response = await client.GetAsync(uri, HttpCompletionOption.ResponseHeadersRead);
21+
response.EnsureSuccessStatusCode();
2422

25-
using (HttpContent content = response.Content)
26-
{
27-
var mediaType = content.Headers.ContentType?.MediaType?.ToLowerInvariant().Trim();
28-
switch (mediaType)
29-
{
30-
case null:
31-
case "":
32-
case "text/plain":
33-
return await content.ReadAsStringAsync();
34-
case "application/gzip":
35-
case "application/x-gzip":
36-
using (var stream = await content.ReadAsStreamAsync())
37-
using (var gzip = new GZipStream(stream, CompressionMode.Decompress))
38-
using (var reader = new StreamReader(gzip))
39-
return await reader.ReadToEndAsync();
40-
default:
41-
throw new NotSupportedException($"The media type '{mediaType}' is not supported when executing a script over http/https");
42-
}
43-
}
44-
}
23+
using HttpContent content = response.Content;
24+
var mediaType = content.Headers.ContentType?.MediaType?.ToLowerInvariant().Trim();
25+
switch (mediaType)
26+
{
27+
case null:
28+
case "":
29+
case "text/plain":
30+
return await content.ReadAsStringAsync();
31+
case "application/gzip":
32+
case "application/x-gzip":
33+
using (var stream = await content.ReadAsStreamAsync())
34+
using (var gzip = new GZipStream(stream, CompressionMode.Decompress))
35+
using (var reader = new StreamReader(gzip))
36+
return await reader.ReadToEndAsync();
37+
default:
38+
throw new NotSupportedException($"The media type '{mediaType}' is not supported when executing a script over http/https");
4539
}
4640
}
4741
}

‎src/Dotnet.Script.Core/ScriptPublisher.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void CreateExecutable<TReturn, THost>(ScriptContext context, LogFactory l
6868
throw new ArgumentNullException(nameof(runtimeIdentifier));
6969
}
7070

71-
executableFileName = executableFileName ?? Path.GetFileNameWithoutExtension(context.FilePath);
71+
executableFileName ??= Path.GetFileNameWithoutExtension(context.FilePath);
7272
const string AssemblyName = "scriptAssembly";
7373

7474
var tempProjectPath = ScriptProjectProvider.GetPathToProjectFile(Path.GetDirectoryName(context.FilePath), _scriptEnvironment.TargetFramework);

‎src/Dotnet.Script.Core/Templates/TemplateLoader.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@ public static class TemplateLoader
88
public static string ReadTemplate(string name)
99
{
1010
var resourceStream = typeof(TemplateLoader).GetTypeInfo().Assembly.GetManifestResourceStream($"Dotnet.Script.Core.Templates.{name}");
11-
using (var streamReader = new StreamReader(resourceStream))
12-
{
13-
return streamReader.ReadToEnd();
14-
}
11+
using var streamReader = new StreamReader(resourceStream);
12+
return streamReader.ReadToEnd();
1513
}
1614
}
1715
}

‎src/Dotnet.Script.DependencyModel/Context/ScriptDependencyContextReader.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ private string[] GetScriptPaths(FallbackPackagePathResolver packagePathResolver,
138138

139139
private string[] GetNativeAssetPaths(FallbackPackagePathResolver packagePathResolver, LockFileTargetLibrary targetLibrary)
140140
{
141-
List<string> nativeAssetPaths = new List<string>();
141+
var nativeAssetPaths = new List<string>();
142142
foreach (var runtimeTarget in targetLibrary.NativeLibraries.Where(lfi => !lfi.Path.EndsWith("_._")))
143143
{
144144
var fullPath = ResolveFullPath(packagePathResolver, targetLibrary.Name, targetLibrary.Version.ToString(), runtimeTarget.Path);
@@ -150,7 +150,7 @@ private string[] GetNativeAssetPaths(FallbackPackagePathResolver packagePathReso
150150

151151
private static string[] GetRuntimeDependencyPaths(FallbackPackagePathResolver packagePathResolver, LockFileTargetLibrary targetLibrary)
152152
{
153-
List<string> runtimeDependencyPaths = new List<string>();
153+
var runtimeDependencyPaths = new List<string>();
154154

155155
foreach (var lockFileItem in targetLibrary.RuntimeAssemblies.Where(lfi => !lfi.Path.EndsWith("_._")))
156156
{

‎src/Dotnet.Script.DependencyModel/ProjectSystem/ProjectFile.cs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,19 +83,15 @@ public void Save(string pathToProjectFile)
8383
var targetFrameworkElement = projectFileDocument.Descendants("TargetFramework").Single();
8484
targetFrameworkElement.Value = TargetFramework;
8585

86-
using (var fileStream = new FileStream(pathToProjectFile, FileMode.Create, FileAccess.Write))
87-
{
88-
projectFileDocument.Save(fileStream);
89-
}
86+
using var fileStream = new FileStream(pathToProjectFile, FileMode.Create, FileAccess.Write);
87+
projectFileDocument.Save(fileStream);
9088
}
9189

9290
private static string ReadTemplate(string name)
9391
{
9492
var resourceStream = typeof(ProjectFile).GetTypeInfo().Assembly.GetManifestResourceStream($"Dotnet.Script.DependencyModel.ProjectSystem.{name}");
95-
using (var streamReader = new StreamReader(resourceStream))
96-
{
97-
return streamReader.ReadToEnd();
98-
}
93+
using var streamReader = new StreamReader(resourceStream);
94+
return streamReader.ReadToEnd();
9995
}
10096

10197
/// <inheritdoc/>

‎src/Dotnet.Script.DependencyModel/ProjectSystem/ScriptProjectProvider.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,17 @@ public class ScriptProjectProvider
1414
private readonly ScriptParser _scriptParser;
1515
private readonly ScriptFilesResolver _scriptFilesResolver;
1616
private readonly ScriptEnvironment _scriptEnvironment;
17-
private readonly CommandRunner _commandRunner;
1817
private readonly Logger _logger;
1918

20-
private ScriptProjectProvider(ScriptParser scriptParser, ScriptFilesResolver scriptFilesResolver, LogFactory logFactory, ScriptEnvironment scriptEnvironment, CommandRunner commandRunner)
19+
private ScriptProjectProvider(ScriptParser scriptParser, ScriptFilesResolver scriptFilesResolver, LogFactory logFactory, ScriptEnvironment scriptEnvironment)
2120
{
2221
_logger = logFactory.CreateLogger<ScriptProjectProvider>();
2322
_scriptParser = scriptParser;
2423
_scriptFilesResolver = scriptFilesResolver;
2524
_scriptEnvironment = scriptEnvironment;
26-
_commandRunner = commandRunner;
2725
}
2826

29-
public ScriptProjectProvider(LogFactory logFactory) : this(new ScriptParser(logFactory), new ScriptFilesResolver(), logFactory, ScriptEnvironment.Default, new CommandRunner(logFactory))
27+
public ScriptProjectProvider(LogFactory logFactory) : this(new ScriptParser(logFactory), new ScriptFilesResolver(), logFactory, ScriptEnvironment.Default)
3028
{
3129
}
3230

‎src/Dotnet.Script.DependencyModel/ScriptPackage/ScriptFilesDependencyResolver.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ private static IDictionary<string, List<string>> GetScriptFilesPerTargetFramewor
109109
if (match.Success)
110110
{
111111
var targetFramework = match.Groups[1].Value;
112-
if (!result.TryGetValue(targetFramework, out var files))
112+
if (!result.TryGetValue(targetFramework, out _))
113113
{
114-
files = new List<string>();
114+
var files = new List<string>();
115115
result.Add(targetFramework, files);
116116
}
117117
result[targetFramework].Add(match.Groups[0].Value);

‎src/Dotnet.Script.Shared.Tests/TestPathUtils.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ public static string GetPathToTestFixture(string fixture)
3434

3535
public static string GetPathToGlobalPackagesFolder()
3636
{
37-
var result = ProcessHelper.RunAndCaptureOutput("dotnet", "nuget locals global-packages --list");
38-
var match = Regex.Match(result.output, @"^.*global-packages:\s*(.*)$");
37+
var (output, _) = ProcessHelper.RunAndCaptureOutput("dotnet", "nuget locals global-packages --list");
38+
var match = Regex.Match(output, @"^.*global-packages:\s*(.*)$");
3939
return match.Groups[1].Value;
4040
}
4141

4242
public static void RemovePackageFromGlobalNugetCache(string packageName)
4343
{
44-
var pathToGlobalPackagesFolder = TestPathUtils.GetPathToGlobalPackagesFolder();
44+
var pathToGlobalPackagesFolder = GetPathToGlobalPackagesFolder();
4545
var pathToPackage = Directory.GetDirectories(pathToGlobalPackagesFolder).SingleOrDefault(d => d.Contains(packageName, StringComparison.OrdinalIgnoreCase));
4646
if (pathToPackage != null)
4747
{

0 commit comments

Comments
 (0)