From a1b121e5e1d095539395c7d4db7a7640e842983e Mon Sep 17 00:00:00 2001 From: Stef Heyenrath Date: Mon, 25 Apr 2022 20:12:51 +0200 Subject: [PATCH] Update NuGet packages (#57) * Update some NuGet packages * 6 * 2022 * 1.1.3 * -n -s * > * . --- azure-pipelines.yml | 12 ++++++------ src/XPath2.Extensions/XPath2.Extensions.csproj | 17 +++++++++-------- src/XPath2/XPath2.csproj | 4 ++-- src/XQTSRunConsole/Program.cs | 14 ++++++++++---- src/XQTSRunConsole/XQTSRunConsole.csproj | 2 +- .../XPath2.Extensions.Tests.csproj | 11 ++++++----- .../XPath2.TestRunner/XPath2.TestRunner.csproj | 4 ++-- tests/XPath2.Tests/XPath2.Tests.csproj | 13 +++++++------ 8 files changed, 43 insertions(+), 34 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c4bebd1..8ea653f 100644 --- 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 index f6b3b0a..7551732 100644 --- a/src/XPath2.Extensions/XPath2.Extensions.csproj +++ b/src/XPath2.Extensions/XPath2.Extensions.csproj @@ -1,7 +1,7 @@ - + - 1.1.2 + 1.1.3 Non-official extensions for XPath2.dll (generate-id, base64encode, base64decode, json-to-xml and json-to-xmlstring) Stef Heyenrath Non-official extensions for XPath2.dll @@ -37,7 +37,7 @@ - + @@ -55,29 +55,30 @@ - + + - + - + - + - + \ No newline at end of file diff --git a/src/XPath2/XPath2.csproj b/src/XPath2/XPath2.csproj index 5429f19..9def81e 100644 --- a/src/XPath2/XPath2.csproj +++ b/src/XPath2/XPath2.csproj @@ -1,7 +1,7 @@ - 1.1.2 + 1.1.3 This is an implementation of W3C XML Path Language (XPath) 2.0 for .NET based on standard XPathNavigator API. Semyon A. Chertkov and Stef Heyenrath Lightweight XPath2 implementation for .NET @@ -40,7 +40,7 @@ - + diff --git a/src/XQTSRunConsole/Program.cs b/src/XQTSRunConsole/Program.cs index 9870596..a226a84 100644 --- 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(); + } } } } \ No newline at end of file diff --git a/src/XQTSRunConsole/XQTSRunConsole.csproj b/src/XQTSRunConsole/XQTSRunConsole.csproj index 77907e9..3b6b6a9 100644 --- a/src/XQTSRunConsole/XQTSRunConsole.csproj +++ b/src/XQTSRunConsole/XQTSRunConsole.csproj @@ -2,7 +2,7 @@ Exe - net5.0 + net6.0 XQTSRunConsole.Program diff --git a/tests/XPath2.Extensions.Tests/XPath2.Extensions.Tests.csproj b/tests/XPath2.Extensions.Tests/XPath2.Extensions.Tests.csproj index 4052147..eeb92b0 100644 --- a/tests/XPath2.Extensions.Tests/XPath2.Extensions.Tests.csproj +++ b/tests/XPath2.Extensions.Tests/XPath2.Extensions.Tests.csproj @@ -2,7 +2,7 @@ Stef Heyenrath - net452;net5.0 + net452;net6.0 XPath2.Extensions.Tests XPath2.Extensions.Tests true @@ -21,25 +21,26 @@ runtime; build; native; contentfiles; analyzers - - + + all runtime; build; native; contentfiles; analyzers + - + - + \ No newline at end of file diff --git a/tests/XPath2.TestRunner/XPath2.TestRunner.csproj b/tests/XPath2.TestRunner/XPath2.TestRunner.csproj index 2e0d207..d168161 100644 --- a/tests/XPath2.TestRunner/XPath2.TestRunner.csproj +++ b/tests/XPath2.TestRunner/XPath2.TestRunner.csproj @@ -1,7 +1,7 @@ - net452;netstandard2.0;netstandard2.1;net5.0 + net452;netstandard2.0;netstandard2.1;net5.0;net6.0 true @@ -11,7 +11,7 @@ - + diff --git a/tests/XPath2.Tests/XPath2.Tests.csproj b/tests/XPath2.Tests/XPath2.Tests.csproj index b5c936e..3c4afba 100644 --- a/tests/XPath2.Tests/XPath2.Tests.csproj +++ b/tests/XPath2.Tests/XPath2.Tests.csproj @@ -2,7 +2,7 @@ Stef Heyenrath - net452;net5.0 + net452;net6.0 XPath2.Tests XPath2.Tests true @@ -26,16 +26,16 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers - + @@ -43,17 +43,18 @@ runtime; build; native; contentfiles; analyzers + - + - + \ No newline at end of file