Merge branch 'main' into net7

danielpalme · danielpalme · commit 88566e94799d · 2022-10-23T21:25:36.000+02:00
diff --git a/src/AngularComponents/package-lock.json b/src/AngularComponents/package-lock.json
diff --git a/src/AngularComponents/package.json b/src/AngularComponents/package.json
@@ -9,22 +9,22 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^14.2.0",
-    "@angular/common": "^14.2.0",
-    "@angular/compiler": "^14.2.0",
-    "@angular/core": "^14.2.0",
-    "@angular/forms": "^14.2.0",
-    "@angular/platform-browser": "^14.2.0",
-    "@angular/platform-browser-dynamic": "^14.2.0",
-    "@angular/router": "^14.2.0",
+    "@angular/animations": "^14.2.7",
+    "@angular/common": "^14.2.7",
+    "@angular/compiler": "^14.2.7",
+    "@angular/core": "^14.2.7",
+    "@angular/forms": "^14.2.7",
+    "@angular/platform-browser": "^14.2.7",
+    "@angular/platform-browser-dynamic": "^14.2.7",
+    "@angular/router": "^14.2.7",
     "rxjs": "~7.4.0",
     "tslib": "^2.3.0",
     "zone.js": "~0.11.4"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^14.2.1",
-    "@angular/cli": "^14.2.1",
-    "@angular/compiler-cli": "^14.2.0",
+    "@angular-devkit/build-angular": "^14.2.6",
+    "@angular/cli": "^14.2.6",
+    "@angular/compiler-cli": "^14.2.7",
     "@types/node": "^12.11.1",
     "typescript": "~4.7.3"
   }
diff --git a/src/AzureDevopsTask/ReportGenerator/package-lock.json b/src/AzureDevopsTask/ReportGenerator/package-lock.json
diff --git a/src/AzureDevopsTask/ReportGenerator/package.json b/src/AzureDevopsTask/ReportGenerator/package.json
@@ -14,12 +14,12 @@
   },
   "homepage": "https://github.com/danielpalme/ReportGenerator",
   "dependencies": {
-    "azure-pipelines-task-lib": "^3.1.10"
+    "azure-pipelines-task-lib": "^3.3.1"
   },
   "devDependencies": {
-    "@types/node": "^16.11.8",
+    "@types/node": "^18.11.3",
     "@types/q": "^1.5.5",
-    "typescript": "^4.5.2"
+    "typescript": "^4.8.4"
   },
   "scripts": {
     "tsc": "tsc"
diff --git a/src/AzureDevopsTask/package-lock.json b/src/AzureDevopsTask/package-lock.json
diff --git a/src/Deployment/nuget/ReportGenerator.Core.nuspec b/src/Deployment/nuget/ReportGenerator.Core.nuspec
@@ -28,7 +28,7 @@ https://github.com/danielpalme/ReportGenerator/wiki/Custom-history-storage</desc
         <dependency id="Microsoft.Extensions.Configuration.Binder" version="5.0.0" />
         <dependency id="Microsoft.Extensions.Configuration.CommandLine" version="5.0.0" />
         <dependency id="Microsoft.Extensions.Configuration.Json" version="5.0.0" />
-        <dependency id="SixLabors.ImageSharp.Drawing" version="1.0.0-beta14" />
+        <dependency id="SixLabors.ImageSharp.Drawing" version="1.0.0-beta15" />
         <dependency id="DotNetConfig" version="1.0.6" />
       </group>
 
@@ -37,7 +37,7 @@ https://github.com/danielpalme/ReportGenerator/wiki/Custom-history-storage</desc
         <dependency id="Microsoft.Extensions.Configuration.Binder" version="5.0.0" />
         <dependency id="Microsoft.Extensions.Configuration.CommandLine" version="5.0.0" />
         <dependency id="Microsoft.Extensions.Configuration.Json" version="5.0.0" />
-        <dependency id="SixLabors.ImageSharp.Drawing" version="1.0.0-beta14" />
+        <dependency id="SixLabors.ImageSharp.Drawing" version="1.0.0-beta15" />
         <dependency id="DotNetConfig" version="1.0.6" />
         <dependency id="McMaster.NETCore.Plugins" version="1.4.0" />
       </group>
diff --git a/src/ReportGenerator.Core.Test/ReportGenerator.Core.Test.csproj b/src/ReportGenerator.Core.Test/ReportGenerator.Core.Test.csproj
@@ -15,9 +15,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="Moq" Version="4.17.2" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Moq" Version="4.18.2" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/src/ReportGenerator.Core/Parser/Analysis/Metric.cs b/src/ReportGenerator.Core/Parser/Analysis/Metric.cs
@@ -29,6 +29,7 @@ public Metric(string name, Uri explanationUrl, MetricType metricType, decimal? v
         /// <param name="explanationUrl">The explanation url.</param>
         /// <param name="metricType">The type of the metric.</param>
         /// <param name="value">The value.</param>
+        /// <param name="mergeOrder">The merge order.</param>
         public Metric(string name, Uri explanationUrl, MetricType metricType, decimal? value, MetricMergeOrder mergeOrder)
             : this(name, explanationUrl, metricType, value)
         {
diff --git a/src/ReportGenerator.Core/Program.cs b/src/ReportGenerator.Core/Program.cs
@@ -55,6 +55,11 @@ public static int Main(string[] args)
             return new Generator().GenerateReport(configuration) ? 0 : 1;
         }
 
+        /// <summary>
+        /// Normalizes the command line arguments.
+        /// </summary>
+        /// <param name="args">The command line arguments.</param>
+        /// <returns>The normalized command line arguments.</returns>
         public static string[] NormalizeArgs(string[] args)
         {
             return args.Select(a => a.Replace(@"""", string.Empty).Trim()).ToArray();
diff --git a/src/ReportGenerator.Core/ReportGenerator.Core.csproj b/src/ReportGenerator.Core/ReportGenerator.Core.csproj
@@ -85,7 +85,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
-    <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta14" />
+    <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta15" />
     <!-- System.Text.Encodings.Web 5.0.1+ for  CVE-2021-26701  - see https://github.com/dotnet/runtime/issues/49377 -->
     <PackageReference Include="System.Text.Encodings.Web" Version="5.0.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
diff --git a/src/ReportGenerator.Core/Reporting/Builders/HtmlReportBuilderBase.cs b/src/ReportGenerator.Core/Reporting/Builders/HtmlReportBuilderBase.cs
@@ -13,7 +13,7 @@
 namespace Palmmedia.ReportGenerator.Core.Reporting.Builders
 {
     /// <summary>
-    /// Implementation of <see cref="IReportBuilder"/> that uses <see cref="IReportRenderer"/> to create reports.
+    /// Implementation of <see cref="IReportBuilder"/> that uses <see cref="IHtmlRenderer"/> to create reports.
     /// </summary>
     public abstract class HtmlReportBuilderBase : IReportBuilder
     {
diff --git a/src/ReportGenerator.Core/Reporting/Builders/LatexReportBuilderBase.cs b/src/ReportGenerator.Core/Reporting/Builders/LatexReportBuilderBase.cs
@@ -12,7 +12,7 @@
 namespace Palmmedia.ReportGenerator.Core.Reporting.Builders
 {
     /// <summary>
-    /// Implementation of <see cref="IReportBuilder"/> that uses <see cref="IReportRenderer"/> to create reports.
+    /// Implementation of <see cref="IReportBuilder"/> that uses <see cref="ILatexRenderer"/> to create reports.
     /// </summary>
     public abstract class LatexReportBuilderBase : IReportBuilder
     {
diff --git a/src/ReportGenerator.Core/Reporting/Builders/Rendering/resources/main.js b/src/ReportGenerator.Core/Reporting/Builders/Rendering/resources/main.js
diff --git a/src/ReportGenerator.Core/Reporting/IReportBuilderFactory.cs b/src/ReportGenerator.Core/Reporting/IReportBuilderFactory.cs
@@ -14,7 +14,7 @@ public interface IReportBuilderFactory
         IEnumerable<string> GetAvailableReportTypes();
 
         /// <summary>
-        /// Gets the report builders that correspond to the given <paramref name="reportConfiguration"/>.
+        /// Gets the report builders that correspond to the given <paramref name="reportContext"/>.
         /// </summary>
         /// <param name="reportContext">The report context.</param>
         /// <returns>
diff --git a/src/ReportGenerator.Core/Reporting/ReportBuilderFactory.cs b/src/ReportGenerator.Core/Reporting/ReportBuilderFactory.cs
@@ -49,7 +49,7 @@ public IEnumerable<string> GetAvailableReportTypes()
         }
 
         /// <summary>
-        /// Gets the report builders that correspond to the given <paramref name="reportConfiguration" />.
+        /// Gets the report builders that correspond to the given <paramref name="reportContext" />.
         /// </summary>
         /// <param name="reportContext">The report context.</param>
         /// <returns>
diff --git a/src/ReportGenerator.Core/Settings.cs b/src/ReportGenerator.Core/Settings.cs
@@ -69,7 +69,7 @@ public int CachingDuringOfRemoteFilesInMinutes
         /// <summary>
         ///  Gets or sets custom headers (e.g. authentication headers) for remote requests.
         ///  Format: key1=value1;key2=value2
-        ///  Example: Authorization=Bearer <JWT>
+        ///  Example: Authorization=Bearer ~JWT~
         /// </summary>
         public string CustomHeadersForRemoteFiles { get; set; }
 
diff --git a/src/ReportGenerator.DotnetCorePluginLoader/DotnetCoreAssemblyLoader.cs b/src/ReportGenerator.DotnetCorePluginLoader/DotnetCoreAssemblyLoader.cs
@@ -6,6 +6,9 @@
 
 namespace ReportGenerator.DotnetCorePluginLoader
 {
+    /// <summary>
+    /// Aassembly loader for .NET Core.
+    /// </summary>
     public class DotNetCoreAssemblyLoader : IAssemblyLoader
     {
         /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ public Metric(string name, Uri explanationUrl, MetricType metricType, decimal? v`
`29`	`29`	`/// <param name="explanationUrl">The explanation url.</param>`
`30`	`30`	`/// <param name="metricType">The type of the metric.</param>`
`31`	`31`	`/// <param name="value">The value.</param>`
	`32`	`+ /// <param name="mergeOrder">The merge order.</param>`
`32`	`33`	`public Metric(string name, Uri explanationUrl, MetricType metricType, decimal? value, MetricMergeOrder mergeOrder)`
`33`	`34`	`: this(name, explanationUrl, metricType, value)`
`34`	`35`	`{`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,11 @@ public static int Main(string[] args)`
`55`	`55`	`return new Generator().GenerateReport(configuration) ? 0 : 1;`
`56`	`56`	`}`
`57`	`57`
	`58`	`+ /// <summary>`
	`59`	`+ /// Normalizes the command line arguments.`
	`60`	`+ /// </summary>`
	`61`	`+ /// <param name="args">The command line arguments.</param>`
	`62`	`+ /// <returns>The normalized command line arguments.</returns>`
`58`	`63`	`public static string[] NormalizeArgs(string[] args)`
`59`	`64`	`{`
`60`	`65`	`return args.Select(a => a.Replace(@"""", string.Empty).Trim()).ToArray();`