Update dependencies (#156)

PSRule.build.ps1

@@ -23,7 +23,7 @@ param (
     [String]$ArtifactPath = (Join-Path -Path $PWD -ChildPath out/modules)
 )
 
-if ($Env:Coverage -eq 'true') {
+if ($Env:COVERAGE -eq 'true') {
     $CodeCoverage = $True;
 }
 
@@ -96,9 +96,7 @@ task BuildHelp BuildModule, PlatyPS, {
 }
 
 task ScaffoldHelp Build, {
-
     Import-Module (Join-Path -Path $PWD -ChildPath out/modules/PSRule) -Force;
-
     Update-MarkdownHelp -Path '.\docs\commands\PSRule\en-US';
 }
 
@@ -147,7 +145,6 @@ task VersionModule {
 }
 
 task ReleaseModule VersionModule, {
-
     if (![String]::IsNullOrEmpty($NuGetApiKey)) {
         # Publish to PowerShell Gallery
         Publish-Module -Path (Join-Path -Path $ArtifactPath -ChildPath PSRule) -NuGetApiKey $NuGetApiKey;
@@ -186,7 +183,6 @@ task PSScriptAnalyzer {
 }
 
 task TestModule TestDotNet, Pester, PSScriptAnalyzer, {
-
     # Run Pester tests
     $pesterParams = @{ Path = $PWD; OutputFile = 'reports/pester-unit.xml'; OutputFormat = 'NUnitXml'; PesterOption = @{ IncludeVSCodeMarker = $True }; PassThru = $True; };
 

src/PSRule.Benchmark/PSRule.Benchmark.csproj

@@ -11,20 +11,20 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.11.4" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
     <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
-    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.11.4" />
+    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.11.5" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
     <PackageReference Include="Microsoft.PowerShell.5.1.ReferenceAssemblies" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
-    <PackageReference Include="Microsoft.PowerShell.SDK" Version="6.1.1" />
+    <PackageReference Include="Microsoft.PowerShell.SDK" Version="6.2.1" />
   </ItemGroup>
 
   <ItemGroup>

src/PSRule.Benchmark/PSRule.cs

@@ -1,4 +1,4 @@
-using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Attributes;
 using PSRule.Pipeline;
 using PSRule.Rules;
 using System;
@@ -55,7 +55,7 @@ private void PrepareGetPipeline()
             var option = new PSRuleOption();
             option.Baseline.RuleName = new string[] { "Benchmark" };
             var builder = PipelineBuilder.Get().Configure(option);
-            builder.Source(new RuleSource[] { new RuleSource(Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "Benchmark.Rule.ps1"), null) });
+            builder.Source(new RuleSource[] { new RuleSource(path: GetSource(), moduleName: null) });
             _GetPipeline = builder.Build();
         }
 
@@ -64,7 +64,7 @@ private void PrepareInvokePipeline()
             var option = new PSRuleOption();
             option.Baseline.RuleName = new string[] { "Benchmark" };
             var builder = PipelineBuilder.Invoke().Configure(option);
-            builder.Source(new RuleSource[] { new RuleSource(Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "Benchmark.Rule.ps1"), null) });
+            builder.Source(new RuleSource[] { new RuleSource(path: GetSource(), moduleName: null) });
             _InvokePipeline = builder.Build();
         }
 
@@ -73,7 +73,7 @@ private void PrepareInvokeIfPipeline()
             var option = new PSRuleOption();
             option.Baseline.RuleName = new string[] { "BenchmarkIf" };
             var builder = PipelineBuilder.Invoke().Configure(option);
-            builder.Source(new RuleSource[] { new RuleSource(Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "Benchmark.Rule.ps1"), null) });
+            builder.Source(new RuleSource[] { new RuleSource(path: GetSource(), moduleName: null) });
             _InvokeIfPipeline = builder.Build();
         }
 
@@ -82,7 +82,7 @@ private void PrepareInvokeTypePipeline()
             var option = new PSRuleOption();
             option.Baseline.RuleName = new string[] { "BenchmarkType" };
             var builder = PipelineBuilder.Invoke().Configure(option);
-            builder.Source(new RuleSource[] { new RuleSource(Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "Benchmark.Rule.ps1"), null) });
+            builder.Source(new RuleSource[] { new RuleSource(path: GetSource(), moduleName: null) });
             _InvokeTypePipeline = builder.Build();
         }
 
@@ -92,10 +92,15 @@ private void PrepareInvokeSummaryPipeline()
             option.Baseline.RuleName = new string[] { "Benchmark" };
             option.Output.As = ResultFormat.Summary;
             var builder = PipelineBuilder.Invoke().Configure(option);
-            builder.Source(new RuleSource[] { new RuleSource(Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "Benchmark.Rule.ps1"), null) });
+            builder.Source(new RuleSource[] { new RuleSource(path: GetSource(), moduleName: null) });
             _InvokeSummaryPipeline = builder.Build();
         }
 
+        private string GetSource()
+        {
+            return Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "Benchmark.Rule.ps1");
+        }
+
         private void PrepareTargetObjects()
         {
             var r = new Random();

src/PSRule.Benchmark/Program.cs

@@ -53,7 +53,7 @@ private static void RunProfile(CommandLineApplication app)
                     }
 
                     // Do benchmarks
-                    var summary = BenchmarkRunner.Run<PSRule>(config);
+                    BenchmarkRunner.Run<PSRule>(config);
 
                     return 0;
                 });

src/PSRule/Annotations/BlockMetadata.cs

@@ -5,6 +5,6 @@
     /// </summary>
     public sealed class BlockMetadata
     {
-        public string Description { get; set; }
+        public string Description;
     }
 }

src/PSRule/Pipeline/NUnit3Serializer.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using PSRule.Rules;
 
 namespace PSRule.Pipeline
 {

src/PSRule/Pipeline/PipelineReciever.cs

@@ -147,7 +147,7 @@ public static IEnumerable<PSObject> ConvertFromYaml(PSObject sourceObject, Visit
                 }
             }
 
-            var parser = new Parser(reader);
+            var parser = new YamlDotNet.Core.Parser(reader);
 
             parser.Expect<StreamStart>();
 

src/PSRule/Pipeline/PowerShellPipelineStream.cs

@@ -131,17 +131,21 @@ private void WriteObject(object o, bool expandCollection)
 
         private void WriteObjectJson(IEnumerable<RuleRecord> o)
         {
-            var settings = new JsonSerializerSettings();
-            settings.NullValueHandling = NullValueHandling.Ignore;
+            var settings = new JsonSerializerSettings
+            {
+                NullValueHandling = NullValueHandling.Ignore
+            };
             var json = JsonConvert.SerializeObject(o, settings: settings);
 
             _OutputVisitor(json, false);
         }
 
         private void WriteObjectJson(IEnumerable<RuleSummaryRecord> o)
         {
-            var settings = new JsonSerializerSettings();
-            settings.NullValueHandling = NullValueHandling.Ignore;
+            var settings = new JsonSerializerSettings
+            {
+                NullValueHandling = NullValueHandling.Ignore
+            };
             var json = JsonConvert.SerializeObject(o, settings: settings);
 
             _OutputVisitor(json, false);
@@ -173,21 +177,12 @@ private void WriteObjectYaml(IEnumerable<RuleSummaryRecord> o)
 
         private void WriteObjectNUnit3(IEnumerable<InvokeResult> o)
         {
-            var sb = new StringBuilder();
             var s = new NUnit3Serializer();
             var xml = s.Serialize(o);
 
             _OutputVisitor(xml, false);
         }
 
-        private void WriteObjectNUnit(IEnumerable<RuleSummaryRecord> o)
-        {
-            var sb = new StringBuilder();
-            var xml = sb.ToString();
-
-            _OutputVisitor(xml, false);
-        }
-
         private RuleRecord[] GetRecords()
         {
             var results = _Results.SelectMany(r => r.AsRecord()).ToArray();

src/PSRule/Rules/TagSet.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Dynamic;
@@ -22,13 +22,7 @@ private TagSet(Dictionary<string, string> tag)
             _Tag = tag;
         }
 
-        public int Count
-        {
-            get
-            {
-                return _Tag.Count;
-            }
-        }
+        public int Count => _Tag.Count;
 
         public bool Contains(object key, object value)
         {

tests/PSRule.Tests/PSRule.Tests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
@@ -9,9 +9,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeCoverage" Version="16.0.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
-    <PackageReference Include="Microsoft.PowerShell.SDK" Version="6.1.1" />
+    <PackageReference Include="Microsoft.CodeCoverage" Version="16.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" />
+    <PackageReference Include="Microsoft.PowerShell.SDK" Version="6.2.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>