Merge pull request #243 from b3b00/tech/update-nugets

update nugets
b3b00 · Jul 20, 2021 · f929889 · f929889
2 parents 61e9f0b + aab1551
commit f929889
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 16 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -41,7 +41,7 @@
                 "/p:CollectCoverage=true",
                 "/p:CoverletOutputFormat=lcov",
                 "/p:CoverletOutput=./lcov",
-                "/p:exclude=\"[while]*,[jsonparser]*,[expressionParser]*,[SimpleExpressionParser]*,[GenericLexerWithCallbacks]*\"",
+                "/p:exclude=\"[while]*,[jsonparser]*,[expressionParser]*,[SimpleExpressionParser]*,[GenericLexerWithCallbacks]*,[indentedWhile]*,[indented]*\"",
                 "${workspaceFolder}/ParserTests/ParserTests.csproj"
             ],
             "problemMatcher": "$msCompile",            

diff --git a/ParserTests/ParserTests.csproj b/ParserTests/ParserTests.csproj
@@ -7,12 +7,15 @@
     <None Remove=".gitignore" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="GitHubActionsTestLogger" Version="1.1.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="GitHubActionsTestLogger" Version="1.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" 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>
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
-    <PackageReference Include="coverlet.msbuild" Version="2.8.1">
+    <PackageReference Include="coverlet.msbuild" Version="3.1.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/bench/GenericLexerBench.cs b/bench/GenericLexerBench.cs
@@ -52,7 +52,7 @@ public void Setup()
         [Benchmark]
 
         public void TestJson() {
-            var ignored = BenchedLexer.Tokenize(content).ToList();
+            var ignored = BenchedLexer.Tokenize(content).Tokens;
         }
 
 

diff --git a/bench/bench.csproj b/bench/bench.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
-    <PackageReference Include="sly" Version="2.2.5.1" />
-    <PackageReference Include="System.Memory" Version="4.5.3" />    
+    <PackageReference Include="BenchmarkDotNet" Version="0.11.4" />
+    <PackageReference Include="sly" Version="2.7.0.3" />
+    <PackageReference Include="System.Memory" Version="4.5.4" />    
   </ItemGroup>
 
   <ItemGroup>

diff --git a/bench2.4/bench2.4.csproj b/bench2.4/bench2.4.csproj
@@ -7,8 +7,8 @@
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
-    <PackageReference Include="sly" Version="2.2.5.1" />
-    <PackageReference Include="System.Memory" Version="4.5.3" />    
+    <PackageReference Include="sly" Version="2.7.0.3" />
+    <PackageReference Include="System.Memory" Version="4.5.4" />    
   </ItemGroup>
 
   <ItemGroup>

diff --git a/benchCurrent/benchCurrent.csproj b/benchCurrent/benchCurrent.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
-    <PackageReference Include="System.Memory" Version="4.5.3" />    
+    <PackageReference Include="System.Memory" Version="4.5.4" />    
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/ParserExample/ParserExample.csproj b/samples/ParserExample/ParserExample.csproj
@@ -19,7 +19,7 @@
 
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/sly/sly.csproj b/sly/sly.csproj
@@ -20,12 +20,12 @@
      <NoWarn>1701;1702;1705;1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19554-01">
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-20204-02">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
-    <PackageReference Include="System.Memory" Version="4.5.2" />
+    <PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
+    <PackageReference Include="System.Memory" Version="4.5.4" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
   <ItemGroup>