Merge pull request #176 from nblumhardt/more-project-updates

More project updates

samples/LinqyCalculator/LinqyCalculator.csproj

@@ -1,22 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp3.1</TargetFrameworks>
-    <AssemblyName>LinqyCalculator</AssemblyName>
+    <TargetFramework>net5.0</TargetFramework>
     <OutputType>Exe</OutputType>
-    <PackageId>LinqyCalculator</PackageId>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Sprache\Sprache.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
 </Project>

samples/LinqyCalculator/Program.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Sprache;
 
 namespace LinqyCalculator

samples/TinyTemplates.Tests/TinyTemplates.Tests.csproj

@@ -1,13 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
-    <AssemblyName>TinyTemplates.Tests</AssemblyName>
-    <PackageId>TinyTemplates.Tests</PackageId>
-    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -16,9 +10,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="xunit" Version="2.4.1" />
   </ItemGroup>
 
 </Project>

samples/TinyTemplates/TinyTemplates.csproj

@@ -1,25 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Copyright>Copyright Sprache Contributors 2013</Copyright>
-    <AssemblyTitle>TinyTemplates</AssemblyTitle>
-    <VersionPrefix>2.0.0</VersionPrefix>
-    <Authors>Nicholas Blumhardt and Contributors</Authors>
-    <TargetFrameworks>net45;netstandard2.1</TargetFrameworks>
-    <AssemblyName>TinyTemplates</AssemblyName>
-    <PackageId>TinyTemplates</PackageId>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Sprache\Sprache.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
 </Project>

samples/XmlExample/Program.cs

@@ -4,7 +4,6 @@
 using System.Text;
 using Sprache;
 using System.IO;
-using System.Xml;
 
 namespace XmlExample
 {

samples/XmlExample/XmlExample.csproj

@@ -1,19 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <AssemblyName>XmlExample</AssemblyName>
+    <TargetFramework>net5.0</TargetFramework>
     <OutputType>Exe</OutputType>
-    <PackageId>XmlExample</PackageId>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\Sprache\Sprache.csproj" />
   </ItemGroup>

src/Sprache/CommentParser.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Sprache
+namespace Sprache
 {
     /// <summary>
     /// Constructs customizable comment parsers.

src/Sprache/IComment.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Sprache
+namespace Sprache
 {
     /// <summary>
     /// Represents a customizable comment parser.

src/Sprache/IInput.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Sprache
 {

src/Sprache/Input.cs

@@ -16,7 +16,7 @@ public class Input : IInput
         /// <summary>
         /// Gets the list of memos assigned to the <see cref="Input" /> instance.
         /// </summary>
-        public IDictionary<object, object> Memos { get; private set; }
+        public IDictionary<object, object> Memos { get; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Input" /> class.

src/Sprache/Parse.cs

@@ -2,6 +2,9 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+// ReSharper disable MemberCanBePrivate.Global
+// ReSharper disable InconsistentNaming
+// ReSharper disable UnusedMember.Global
 
 namespace Sprache
 {
@@ -284,7 +287,7 @@ public static Parser<IEnumerable<T>> Many<T>(this Parser<T> parser)
         /// unqualified counterparts.
         /// </para>
         /// </remarks>
-        /// <seealso cref="XOr"/>
+        /// <seealso cref="XOr{T}"/>
         public static Parser<IEnumerable<T>> XMany<T>(this Parser<T> parser)
         {
             if (parser == null) throw new ArgumentNullException(nameof(parser));
@@ -389,7 +392,7 @@ public static Parser<T> Ref<T>(Func<Parser<T>> reference)
 
                            if (i.Memos.ContainsKey(p))
                            {
-                               var pResult = i.Memos[p] as IResult<T>;
+                               var pResult = (IResult<T>)i.Memos[p];
                                if (pResult.WasSuccessful)
                                    return pResult;
                                throw new ParseException(pResult.ToString());
@@ -593,7 +596,7 @@ public static Parser<T> Return<T>(T value)
         /// <returns></returns>
         public static Parser<IEnumerable<T>> Until<T, U>(this Parser<T> parser, Parser<U> until)
         {
-            return parser.Except(until).Many().Then(r => until.Return(r));
+            return parser.Except(until).Many().Then(until.Return);
         }
 
         /// <summary>
@@ -610,7 +613,7 @@ public static Parser<T> Where<T>(this Parser<T> parser, Func<T, bool> predicate)
 
             return i => parser(i).IfSuccess(s =>
                 predicate(s.Value) ? s : Result.Failure<T>(i,
-                    string.Format("Unexpected {0}.", s.Value),
+                    $"Unexpected {s.Value}.",
                     new string[0]));
         }
 
@@ -686,9 +689,9 @@ public static Parser<T> Where<T>(this Parser<T> parser, Func<T, bool> predicate)
             if (op == null) throw new ArgumentNullException(nameof(op));
             if (operand == null) throw new ArgumentNullException(nameof(operand));
             if (apply == null) throw new ArgumentNullException(nameof(apply));
-            return or(op.Then(opvalue =>
+            return or(op.Then(opValue =>
                           operand.Then(operandValue =>
-                              ChainOperatorRest(apply(opvalue, firstOperand, operandValue), op, operand, apply, or))),
+                              ChainOperatorRest(apply(opValue, firstOperand, operandValue), op, operand, apply, or))),
                       Return(firstOperand));
         }
 
@@ -742,10 +745,10 @@ public static Parser<T> Where<T>(this Parser<T> parser, Func<T, bool> predicate)
             if (op == null) throw new ArgumentNullException(nameof(op));
             if (operand == null) throw new ArgumentNullException(nameof(operand));
             if (apply == null) throw new ArgumentNullException(nameof(apply));
-            return or(op.Then(opvalue =>
+            return or(op.Then(opValue =>
                         operand.Then(operandValue =>
                             ChainRightOperatorRest(operandValue, op, operand, apply, or)).Then(r =>
-                                Return(apply(opvalue, lastOperand, r)))),
+                                Return(apply(opValue, lastOperand, r)))),
                       Return(lastOperand));
         }
 

src/Sprache/Position.cs

@@ -1,4 +1,5 @@
 using System;
+// ReSharper disable MemberCanBePrivate.Global
 
 namespace Sprache
 {
@@ -36,7 +37,6 @@ public static Position FromInput(IInput input)
         public int Pos
         {
             get;
-            private set;
         }
 
         /// <summary>
@@ -45,7 +45,6 @@ public int Pos
         public int Line
         {
             get;
-            private set;
         }
 
         /// <summary>
@@ -54,7 +53,6 @@ public int Line
         public int Column
         {
             get;
-            private set;
         }
 
         /// <summary>

src/Sprache/Properties/AssemblyInfo.cs

@@ -1,4 +1,3 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("Sprache.Tests")]