diff --git a/Superpower.sln b/Superpower.sln
index c94a98a..2b5bf04 100644
--- a/Superpower.sln
+++ b/Superpower.sln
@@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "global", "global", "{66B005
Build.ps1 = Build.ps1
LICENSE = LICENSE
README.md = README.md
+ global.json = global.json
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{2ED926D3-7AC8-4BFD-A16B-74D942602968}"
@@ -19,6 +20,10 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "asset", "asset", "{69238E6E-26AB-494B-8CBD-65F8C1F0696A}"
ProjectSection(SolutionItems) = preProject
asset\Superpower.snk = asset\Superpower.snk
+ asset\Superpower.svg = asset\Superpower.svg
+ asset\Superpower-Transparent-400px.png = asset\Superpower-Transparent-400px.png
+ asset\Superpower-White-200px.png = asset\Superpower-White-200px.png
+ asset\Superpower-White-400px.png = asset\Superpower-White-400px.png
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{7533E145-1C93-4348-A70D-E68746C5438C}"
diff --git a/global.json b/global.json
new file mode 100644
index 0000000..a46dc9b
--- /dev/null
+++ b/global.json
@@ -0,0 +1,6 @@
+{
+ "sdk": {
+ "version": "5.0.100",
+ "rollForward": "latestFeature"
+ }
+}
diff --git a/sample/DateTimeTextParser/DateTimeParser.csproj b/sample/DateTimeTextParser/DateTimeParser.csproj
index fddab5b..7cfea5e 100644
--- a/sample/DateTimeTextParser/DateTimeParser.csproj
+++ b/sample/DateTimeTextParser/DateTimeParser.csproj
@@ -1,9 +1,12 @@
+
Exe
- netcoreapp2.0
+ net5.0
+
+
diff --git a/sample/IntCalc/IntCalc.csproj b/sample/IntCalc/IntCalc.csproj
index 03b2bdb..cc46fec 100644
--- a/sample/IntCalc/IntCalc.csproj
+++ b/sample/IntCalc/IntCalc.csproj
@@ -1,22 +1,12 @@
-
- netcoreapp1.0
-
-
- netcoreapp2.0
-
-
+
- IntCalc
Exe
- IntCalc
- false
- false
- false
+ net5.0
-
+
-
+
diff --git a/sample/IntCalc/Properties/AssemblyInfo.cs b/sample/IntCalc/Properties/AssemblyInfo.cs
deleted file mode 100644
index a5739cb..0000000
--- a/sample/IntCalc/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Sample")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("34bbd428-8297-484e-b771-0b72c172c264")]
diff --git a/sample/JsonParser/JsonParser.csproj b/sample/JsonParser/JsonParser.csproj
index 9d07df9..fa3c8a4 100644
--- a/sample/JsonParser/JsonParser.csproj
+++ b/sample/JsonParser/JsonParser.csproj
@@ -2,7 +2,7 @@
Exe
- netcoreapp2.0
+ net5.0
diff --git a/src/Superpower/ParserExtensions.cs b/src/Superpower/ParserExtensions.cs
index 34cfeca..2f25f3e 100644
--- a/src/Superpower/ParserExtensions.cs
+++ b/src/Superpower/ParserExtensions.cs
@@ -50,7 +50,6 @@ public static Result TryParse(this TextParser parser, string input)
public static TokenListParserResult TryParse(this TokenListParser parser, TokenList input)
{
if (parser == null) throw new ArgumentNullException(nameof(parser));
- if (input == null) throw new ArgumentNullException(nameof(input));
return parser(input);
}
@@ -90,7 +89,6 @@ public static T Parse(this TextParser parser, string input)
public static T Parse(this TokenListParser parser, TokenList input)
{
if (parser == null) throw new ArgumentNullException(nameof(parser));
- if (input == null) throw new ArgumentNullException(nameof(input));
var result = parser.TryParse(input);
diff --git a/src/Superpower/Superpower.csproj b/src/Superpower/Superpower.csproj
index 5a1ae7e..3213c0a 100644
--- a/src/Superpower/Superpower.csproj
+++ b/src/Superpower/Superpower.csproj
@@ -1,23 +1,26 @@
- netstandard2.0
+ netstandard2.0;net5.0
A parser combinator library for C#
3.0.0
Datalust;Superpower Contributors;Sprache Contributors
true
true
- Superpower
../../asset/Superpower.snk
true
true
- Superpower
superpower;parser
- https://raw.githubusercontent.com/datalust/superpower/dev/asset/Superpower-White-400px.png
https://github.com/datalust/superpower
- http://www.apache.org/licenses/LICENSE-2.0
false
+ Superpower-White-400px.png
+ Apache-2.0
+ https://github.com/datalust/superpower
+ git
$(DefineConstants);CHECKED
+
+
+
diff --git a/test/Superpower.Benchmarks/Superpower.Benchmarks.csproj b/test/Superpower.Benchmarks/Superpower.Benchmarks.csproj
index 19bac4c..7e31a36 100644
--- a/test/Superpower.Benchmarks/Superpower.Benchmarks.csproj
+++ b/test/Superpower.Benchmarks/Superpower.Benchmarks.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.0
+ net5.0
true
@@ -20,13 +20,4 @@
-
-
-
-
-
-
-
-
-
diff --git a/test/Superpower.Tests/Superpower.Tests.csproj b/test/Superpower.Tests/Superpower.Tests.csproj
index 5464da3..d4644aa 100644
--- a/test/Superpower.Tests/Superpower.Tests.csproj
+++ b/test/Superpower.Tests/Superpower.Tests.csproj
@@ -1,6 +1,6 @@
- netcoreapp2.0
+ net5.0
Superpower.Tests
../../asset/Superpower.snk
true
@@ -10,7 +10,6 @@
false
false
false
- 7.3
@@ -23,7 +22,4 @@
-
-
-
\ No newline at end of file