update MPL-2.0 license header format

waf · waf · commit c0e274476138 · 2021-05-30T16:08:58.000+07:00
also minor nuget upgrade
diff --git a/CSharpRepl.Services/CSharpRepl.Services.csproj b/CSharpRepl.Services/CSharpRepl.Services.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="3.9.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
     <PackageReference Include="NuGet.PackageManagement" Version="5.9.1" />
-    <PackageReference Include="PrettyPrompt" Version="0.9.2" />
+    <PackageReference Include="PrettyPrompt" Version="0.9.3" />
   </ItemGroup>
 
 </Project>
diff --git a/CSharpRepl.Services/Completion/AutoCompleteService.cs b/CSharpRepl.Services/Completion/AutoCompleteService.cs
@@ -1,8 +1,7 @@
-﻿#region License Header
-// This Source Code Form is subject to the terms of the Mozilla Public
+﻿// This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#endregion
+
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Completion;
 using Microsoft.CodeAnalysis.QuickInfo;
diff --git a/CSharpRepl.Services/Configuration.cs b/CSharpRepl.Services/Configuration.cs
@@ -1,12 +1,14 @@
-﻿#region License Header
-// This Source Code Form is subject to the terms of the Mozilla Public
+﻿// This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#endregion
+
 using System.Collections.Generic;
 
 namespace Sharply.Services
 {
+    /// <summary>
+    /// Configuration from command line parameters
+    /// </summary>
     public class Configuration
     {
         public HashSet<string> References { get; } = new();
diff --git a/CSharpRepl.Services/EqualityComparerFunc.cs b/CSharpRepl.Services/EqualityComparerFunc.cs
@@ -1,8 +1,7 @@
-﻿#region License Header
-// This Source Code Form is subject to the terms of the Mozilla Public
+﻿// This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#endregion
+
 using System;
 using System.Collections.Generic;
 
@@ -19,14 +18,7 @@ public EqualityComparerFunc(Func<T, T, bool> comparer, Func<T, int> hash)
             _hash = hash;
         }
 
-        public bool Equals(T x, T y)
-        {
-            return _comparer(x, y);
-        }
-
-        public int GetHashCode(T obj)
-        {
-            return _hash(obj);
-        }
+        public bool Equals(T x, T y) => _comparer(x, y);
+        public int GetHashCode(T obj) => _hash(obj);
     }
 }
diff --git a/CSharpRepl.Services/Nuget/ConsoleNugetLogger.cs b/CSharpRepl.Services/Nuget/ConsoleNugetLogger.cs
@@ -1,8 +1,7 @@
-﻿#region License Header
-// This Source Code Form is subject to the terms of the Mozilla Public
+﻿// This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#endregion
+
 using System;
 using System.Threading.Tasks;
 using NuGet.Common;
diff --git a/CSharpRepl.Services/Nuget/NugetMetadataResolver.cs b/CSharpRepl.Services/Nuget/NugetMetadataResolver.cs
@@ -1,8 +1,7 @@
-﻿#region License Header
-// This Source Code Form is subject to the terms of the Mozilla Public
+﻿// This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#endregion
+
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Scripting;
 using PrettyPrompt.Consoles;
diff --git a/CSharpRepl.Services/Nuget/NugetPackageInstaller.cs b/CSharpRepl.Services/Nuget/NugetPackageInstaller.cs
@@ -1,8 +1,7 @@
-﻿#region License Header
-// This Source Code Form is subject to the terms of the Mozilla Public
+﻿// This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#endregion
+
 using Microsoft.CodeAnalysis;
 using NuGet.Configuration;
 using NuGet.Frameworks;
diff --git a/CSharpRepl.Services/Roslyn/PrettyPrinter.cs b/CSharpRepl.Services/Roslyn/PrettyPrinter.cs
@@ -1,8 +1,7 @@
-﻿#region License Header
-// This Source Code Form is subject to the terms of the Mozilla Public
+﻿// This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#endregion
+
 using Microsoft.CodeAnalysis.CSharp.Scripting.Hosting;
 using Microsoft.CodeAnalysis.Scripting.Hosting;
 using System;
diff --git a/CSharpRepl.Services/Roslyn/ReferenceAssemblyService.cs b/CSharpRepl.Services/Roslyn/ReferenceAssemblyService.cs
@@ -1,8 +1,7 @@
-﻿#region License Header
-// This Source Code Form is subject to the terms of the Mozilla Public
+﻿// This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#endregion
+
 using Microsoft.CodeAnalysis;
 using System;
 using System.Collections.Generic;
diff --git a/CSharpRepl.Services/Roslyn/RoslynExtensions.cs b/CSharpRepl.Services/Roslyn/RoslynExtensions.cs
@@ -1,8 +1,7 @@
-﻿#region License Header
-// This Source Code Form is subject to the terms of the Mozilla Public
+﻿// This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#endregion
+
 using Microsoft.CodeAnalysis;
 using System;
 
diff --git a/CSharpRepl.Services/Roslyn/RoslynServices.cs b/CSharpRepl.Services/Roslyn/RoslynServices.cs
@@ -1,8 +1,7 @@
-﻿#region License Header
-// This Source Code Form is subject to the terms of the Mozilla Public
+﻿// This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#endregion
+
 using Sharply.Services.SyntaxHighlighting;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
diff --git a/CSharpRepl.Services/Roslyn/ScriptRunner.cs b/CSharpRepl.Services/Roslyn/ScriptRunner.cs
@@ -1,8 +1,7 @@
-﻿#region License Header
-// This Source Code Form is subject to the terms of the Mozilla Public
+﻿// This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#endregion
+
 using Sharply.Services.Nuget;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
diff --git a/CSharpRepl.Services/Roslyn/WorkspaceManager.cs b/CSharpRepl.Services/Roslyn/WorkspaceManager.cs
@@ -1,8 +1,7 @@
-﻿#region License Header
-// This Source Code Form is subject to the terms of the Mozilla Public
+﻿// This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#endregion
+
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Host.Mef;
diff --git a/CSharpRepl.Services/SymbolExploration/SymbolExplorer.cs b/CSharpRepl.Services/SymbolExploration/SymbolExplorer.cs
@@ -1,8 +1,7 @@
-﻿#region License Header
-// This Source Code Form is subject to the terms of the Mozilla Public
+﻿// This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#endregion
+
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using System.Linq;
diff --git a/CSharpRepl.Services/SyntaxHighlighting/DefaultTheme.cs b/CSharpRepl.Services/SyntaxHighlighting/DefaultTheme.cs
@@ -1,8 +1,7 @@
-﻿#region License Header
-// This Source Code Form is subject to the terms of the Mozilla Public
+﻿// This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#endregion
+
 using Microsoft.CodeAnalysis.Classification;
 
 namespace Sharply.Services.SyntaxHighlighting
diff --git a/CSharpRepl.Services/SyntaxHighlighting/HighlightedSpan.cs b/CSharpRepl.Services/SyntaxHighlighting/HighlightedSpan.cs
@@ -1,8 +1,7 @@
-﻿#region License Header
-// This Source Code Form is subject to the terms of the Mozilla Public
+﻿// This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#endregion
+
 using Microsoft.CodeAnalysis.Text;
 using PrettyPrompt.Highlighting;
 
diff --git a/CSharpRepl.Services/SyntaxHighlighting/SyntaxHighlighter.cs b/CSharpRepl.Services/SyntaxHighlighting/SyntaxHighlighter.cs
@@ -1,8 +1,7 @@
-﻿#region License Header
-// This Source Code Form is subject to the terms of the Mozilla Public
+﻿// This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#endregion
+
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Classification;
 using Microsoft.CodeAnalysis.Text;
@@ -18,6 +17,10 @@
 
 namespace Sharply.Services.SyntaxHighlighting
 {
+    /// <summary>
+    /// Invokes roslyn's classification API on a code document, and combines the
+    /// classifications with a theme file to determine the resulting spans of color.
+    /// </summary>
     class SyntaxHighlighter
     {
         private readonly IReadOnlyDictionary<string, AnsiColor> theme;
diff --git a/CSharpRepl.Tests/CSharpRepl.Tests.csproj b/CSharpRepl.Tests/CSharpRepl.Tests.csproj
@@ -25,15 +25,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
     <PackageReference Include="NSubstitute" Version="4.2.2" />
-    <PackageReference Include="PrettyPrompt" Version="0.9.2" />
+    <PackageReference Include="PrettyPrompt" Version="0.9.3" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="1.3.0">
+    <PackageReference Include="coverlet.collector" Version="3.0.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/CSharpRepl.Tests/CommandLineTests.cs b/CSharpRepl.Tests/CommandLineTests.cs
@@ -1,8 +1,7 @@
-﻿#region License Header
-// This Source Code Form is subject to the terms of the Mozilla Public
+﻿// This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#endregion
+
 using Sharply.Services;
 using Sharply.Services.Roslyn;
 using System;
diff --git a/CSharpRepl.Tests/CompletionTests.cs b/CSharpRepl.Tests/CompletionTests.cs
@@ -1,8 +1,7 @@
-﻿#region License Header
-// This Source Code Form is subject to the terms of the Mozilla Public
+﻿// This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#endregion
+
 using Sharply.Services;
 using Sharply.Services.Roslyn;
 using System.Linq;
diff --git a/CSharpRepl.Tests/EvaluationTests.cs b/CSharpRepl.Tests/EvaluationTests.cs
@@ -1,8 +1,7 @@
-#region License Header
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#endregion
+
 using Sharply.Services;
 using Sharply.Services.Roslyn;
 using System;
diff --git a/CSharpRepl.Tests/FakeConsole.cs b/CSharpRepl.Tests/FakeConsole.cs
@@ -1,8 +1,7 @@
-﻿#region License Header
-// This Source Code Form is subject to the terms of the Mozilla Public
+﻿// This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#endregion
+
 using NSubstitute;
 using PrettyPrompt.Consoles;
 using System.Text;
diff --git a/CSharpRepl.Tests/SymbolExplorerTests.cs b/CSharpRepl.Tests/SymbolExplorerTests.cs
@@ -1,8 +1,7 @@
-﻿#region License Header
-// This Source Code Form is subject to the terms of the Mozilla Public
+﻿// This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#endregion
+
 using Sharply.Services;
 using Sharply.Services.Roslyn;
 using System.Threading.Tasks;
diff --git a/CSharpRepl.Tests/SyntaxHighlightingTests.cs b/CSharpRepl.Tests/SyntaxHighlightingTests.cs
@@ -1,8 +1,7 @@
-﻿#region License Header
-// This Source Code Form is subject to the terms of the Mozilla Public
+﻿// This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#endregion
+
 using Microsoft.CodeAnalysis.Text;
 using Sharply.Services;
 using Sharply.Services.Roslyn;
diff --git a/CSharpRepl.sln.licenseheader b/CSharpRepl.sln.licenseheader
@@ -1,6 +1,4 @@
 ﻿extensions: .cs
-#region License Header
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#endregion
diff --git a/CSharpRepl/CSharpRepl.csproj b/CSharpRepl/CSharpRepl.csproj
@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="PrettyPrompt" Version="0.9.2" />
+    <PackageReference Include="PrettyPrompt" Version="0.9.3" />
   </ItemGroup>
 
 </Project>
diff --git a/CSharpRepl/CommandLine.cs b/CSharpRepl/CommandLine.cs
@@ -1,8 +1,7 @@
-﻿#region License Header
-// This Source Code Form is subject to the terms of the Mozilla Public
+﻿// This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#endregion
+
 using Sharply.Services;
 using Sharply.Services.Roslyn;
 using System;
@@ -145,7 +144,7 @@ public static string GetHelp() =>
             "  -f <framework> or --framework <framework>: Reference a shared framework. May be specified multiple times." + NewLine +
             "                                             Available shared frameworks: " + NewLine + GetInstalledFrameworks(
             "                                             ") + NewLine +
-            "  -t <theme.json> or --theme <theme.json>:   Read a theme file for syntax highlighting." + NewLine +
+            "  -t <theme.json> or --theme <theme.json>:   Read a theme file for syntax highlighting. The NO_COLOR standard is supported." + NewLine +
             "  -v or --version:                           Show version number and exit." + NewLine +
             "  -h or --help:                              Show this help and exit." + NewLine + NewLine +
             "response-file.rsp:" + NewLine +
diff --git a/CSharpRepl/Program.cs b/CSharpRepl/Program.cs
@@ -1,8 +1,7 @@
-﻿#region License Header
-// This Source Code Form is subject to the terms of the Mozilla Public
+﻿// This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#endregion
+
 using System;
 using System.Threading.Tasks;
 using Sharply.Services.Roslyn;
diff --git a/CSharpRepl/Prompt/PromptAdapter.cs b/CSharpRepl/Prompt/PromptAdapter.cs
@@ -1,8 +1,7 @@
-﻿#region License Header
-// This Source Code Form is subject to the terms of the Mozilla Public
+﻿// This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#endregion
+
 using System.Collections.Generic;
 using System.Linq;
 using Sharply.Services.SyntaxHighlighting;
diff --git a/CSharpRepl/Prompt/PromptConfiguration.cs b/CSharpRepl/Prompt/PromptConfiguration.cs
@@ -1,8 +1,7 @@
-﻿#region License Header
-// This Source Code Form is subject to the terms of the Mozilla Public
+﻿// This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#endregion
+
 using PrettyPrompt;
 using PrettyPrompt.Highlighting;
 using Sharply.Services.Roslyn;
