Update NuGet packages (#57)

* Update some NuGet packages * 6 * 2022 * <Version>1.1.3</Version> * -n -s * > * .
StefH · Apr 25, 2022 · a1b121e · a1b121e
1 parent f176c80
commit a1b121e
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 34 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,5 +1,5 @@
 pool:
-  vmImage: 'windows-2019'
+  vmImage: 'windows-2022'
 
 variables:
   Prerelease: 'ci'
@@ -33,7 +33,7 @@ steps:
 # - https://github.com/Microsoft/vsts-tasks/issues/8291
 #
 - script: |
-    %USERPROFILE%\.dotnet\tools\dotnet-sonarscanner begin /k:"StefH_XPath2.Net" /o:"stefh-github" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.login="$(SONAR_TOKEN)" /v:"$(buildId)" /d:sonar.cs.opencover.reportsPaths="**\coverage.net5.0.opencover.xml"
+    %USERPROFILE%\.dotnet\tools\dotnet-sonarscanner begin /k:"StefH_XPath2.Net" /o:"stefh-github" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.login="$(SONAR_TOKEN)" /v:"$(buildId)" /d:sonar.cs.opencover.reportsPaths="**\coverage.net6.0.opencover.xml"
   displayName: Begin SonarScanner
 
 - task: DotNetCoreCLI@2
@@ -57,11 +57,11 @@ steps:
     arguments: /p:Configuration=Debug --framework netstandard2.1
     projects: $(buildProjects)
 
-# Build tests and run tests for net452 and net5.0 (with coverage)
+# Build tests and run tests for net452 and net6.0 (with coverage)
 - script: |
     dotnet test ./tests/XPath2.Tests/XPath2.Tests.csproj --configuration Debug --framework net452
-    dotnet test ./tests/XPath2.Tests/XPath2.Tests.csproj --configuration Debug --framework net5.0 --logger trx /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
-  displayName: 'Build tests and run tests for net452 and net5.0 (with coverage)'
+    dotnet test ./tests/XPath2.Tests/XPath2.Tests.csproj --configuration Debug --framework net6.0 --logger trx /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
+  displayName: 'Build tests and run tests for net452 and net6.0 (with coverage)'
 
 # End SonarScanner
 - script: |
@@ -104,4 +104,4 @@ steps:
   inputs:
     command: custom
     custom: nuget
-    arguments: push $(Build.ArtifactStagingDirectory)\packages\*.nupkg  -n true --source https://www.myget.org/F/xpath2/api/v3/index.json --no-service-endpoint --api-key $(MyGetKey)
+    arguments: push $(Build.ArtifactStagingDirectory)\packages\*.nupkg -n -s https://www.myget.org/F/xpath2/api/v3/index.json --no-service-endpoint --api-key $(MyGetKey)
diff --git a/src/XPath2.Extensions/XPath2.Extensions.csproj b/src/XPath2.Extensions/XPath2.Extensions.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>1.1.2</Version>
+    <Version>1.1.3</Version>
     <Description>Non-official extensions for XPath2.dll (generate-id, base64encode, base64decode, json-to-xml and json-to-xmlstring)</Description>
     <Copyright>Stef Heyenrath</Copyright>
     <AssemblyTitle>Non-official extensions for XPath2.dll</AssemblyTitle>
@@ -37,7 +37,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 
   <!-- https://github.com/Microsoft/msbuild/issues/1333 -->
@@ -55,29 +55,30 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2021.2.0" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" PrivateAssets="All" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
     <Reference Include="System" />
     <Reference Include="System.Xml" />
-    <PackageReference Include="Newtonsoft.Json" Version="6.0.8" />
+    <!--<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />-->
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
     <Reference Include="System" />
     <Reference Include="System.Xml" />
-    <PackageReference Include="Newtonsoft.Json" Version="6.0.8" />
+    <!--<PackageReference Include="Newtonsoft.Json" Version="6.0.8" />-->
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
     <Reference Include="System" />
     <Reference Include="System.Xml" />
-    <PackageReference Include="Newtonsoft.Json" Version="6.0.8" />
+    <!--<PackageReference Include="Newtonsoft.Json" Version="6.0.8" />-->
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'">
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <!--<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />-->
   </ItemGroup>
 
 </Project>
diff --git a/src/XPath2/XPath2.csproj b/src/XPath2/XPath2.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
 
   <PropertyGroup>
-    <Version>1.1.2</Version>
+    <Version>1.1.3</Version>
     <Description>This is an implementation of W3C XML Path Language (XPath) 2.0 for .NET based on standard XPathNavigator API.</Description>
     <Copyright>Semyon A. Chertkov and Stef Heyenrath</Copyright>
     <AssemblyTitle>Lightweight XPath2 implementation for .NET</AssemblyTitle>
@@ -40,7 +40,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 
   <!-- https://github.com/Microsoft/msbuild/issues/1333 -->

diff --git a/src/XQTSRunConsole/Program.cs b/src/XQTSRunConsole/Program.cs
@@ -20,11 +20,17 @@ static void Main(string[] args)
             // 15133 executed, 12954 (85.60%) succeeded.
             Console.WriteLine("{0} / {1} = {2}%", result2.Passed, result2.Total, result2.Percentage);
 
-            passedWriter.Flush();
-            passedWriter.Close();
+            if (passedWriter != null)
+            {
+                passedWriter.Flush();
+                passedWriter.Close();
+            }
 
-            errorWriter.Flush();
-            errorWriter.Close();
+            if (errorWriter != null)
+            {
+                errorWriter.Flush();
+                errorWriter.Close();
+            }
         }
     }
 }
diff --git a/src/XQTSRunConsole/XQTSRunConsole.csproj b/src/XQTSRunConsole/XQTSRunConsole.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <StartupObject>XQTSRunConsole.Program</StartupObject>
     </PropertyGroup>
 

diff --git a/tests/XPath2.Extensions.Tests/XPath2.Extensions.Tests.csproj b/tests/XPath2.Extensions.Tests/XPath2.Extensions.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Authors>Stef Heyenrath</Authors>
-    <TargetFrameworks>net452;net5.0</TargetFrameworks>
+    <TargetFrameworks>net452;net6.0</TargetFrameworks>
     <AssemblyName>XPath2.Extensions.Tests</AssemblyName>
     <PackageId>XPath2.Extensions.Tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -21,25 +21,26 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="OpenCover" Version="4.7.922" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="OpenCover" Version="4.7.1221" />
     <PackageReference Include="ReportGenerator" Version="4.5.8" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
 
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <!--<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />-->
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <!--<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />-->
   </ItemGroup>
 
 </Project>
diff --git a/tests/XPath2.TestRunner/XPath2.TestRunner.csproj b/tests/XPath2.TestRunner/XPath2.TestRunner.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net452;netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
+        <TargetFrameworks>net452;netstandard2.0;netstandard2.1;net5.0;net6.0</TargetFrameworks>
         <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
         <!--<Nullable>enable</Nullable>-->
     </PropertyGroup>
@@ -11,7 +11,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="DotNetZip" Version="1.15.0" />
+        <PackageReference Include="DotNetZip" Version="1.16.0" />
         <PackageReference Include="ReflectionMagic" Version="4.1.0" />
     </ItemGroup>
 

diff --git a/tests/XPath2.Tests/XPath2.Tests.csproj b/tests/XPath2.Tests/XPath2.Tests.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <Authors>Stef Heyenrath</Authors>
-        <TargetFrameworks>net452;net5.0</TargetFrameworks>
+        <TargetFrameworks>net452;net6.0</TargetFrameworks>
         <AssemblyName>XPath2.Tests</AssemblyName>
         <PackageId>XPath2.Tests</PackageId>
         <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -26,34 +26,35 @@
 
     <ItemGroup>
         <PackageReference Include="Codecov" Version="1.13.0" />
-        <PackageReference Include="coverlet.collector" Version="3.1.0">
+        <PackageReference Include="coverlet.collector" Version="3.1.2">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.msbuild" Version="3.1.0">
+        <PackageReference Include="coverlet.msbuild" Version="3.1.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>
         <PackageReference Include="FluentAssertions" Version="5.10.3" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
         <PackageReference Include="OpenCover" Version="4.7.1221" />
         <PackageReference Include="ReportGenerator" Version="4.8.12" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>
         <PackageReference Include="xunit" Version="2.4.1" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
         <Reference Include="System" />
         <Reference Include="Microsoft.CSharp" />
 
-        <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+        <!--<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />-->
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
-        <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+        <!--<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />-->
     </ItemGroup>
 
 </Project>