From 42aaa9f02d4c83436117b465618072d0a46f079c Mon Sep 17 00:00:00 2001 From: Eduardo Caceres Date: Wed, 20 May 2020 01:20:32 +0200 Subject: [PATCH] Remove extra TargetFrameworks from NuGet test project --- NugetTest/NugetTest/NugetTest.csproj | 4 ++-- azure-pipelines.yml | 14 +++++++------- src/FileParser/FileParser.csproj | 2 +- src/FileParser/Implementations/ParsedFile.cs | 8 +++++--- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/NugetTest/NugetTest/NugetTest.csproj b/NugetTest/NugetTest/NugetTest.csproj index 94f054b..6288da0 100644 --- a/NugetTest/NugetTest/NugetTest.csproj +++ b/NugetTest/NugetTest/NugetTest.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1;netcoreapp2.2;net471;net461;net46 + netcoreapp3.1 false @@ -10,7 +10,7 @@ - + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 36ffd9e..f4ca18a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -143,13 +143,6 @@ stages: git config --replace-all user.email "azure@devops.com" git config --replace-all user.name "Azure DevOps" - - task: DotNetCoreCLI@2 - displayName: 'Build' - inputs: - command: build - arguments: '--configuration Release /p:ContinuousIntegrationBuild=true' - projects: './src/FileParserSolution.sln' - - task: DotNetCoreCLI@2 displayName: 'Modify project version' condition: ne(variables['PackageVersion'], '') @@ -158,6 +151,13 @@ stages: arguments: '--configuration Release /t:ReplaceVersion /p:VersionTag=$(PackageVersion)' projects: '**/FileParser.csproj' + - task: DotNetCoreCLI@2 + displayName: 'Build' + inputs: + command: build + arguments: '--configuration Release /p:ContinuousIntegrationBuild=true' + projects: './src/FileParserSolution.sln' + - task: DotNetCoreCLI@2 displayName: 'Generate NuGet package' inputs: diff --git a/src/FileParser/FileParser.csproj b/src/FileParser/FileParser.csproj index dc89438..3081060 100644 --- a/src/FileParser/FileParser.csproj +++ b/src/FileParser/FileParser.csproj @@ -5,7 +5,7 @@ snupkg FileParser FileParser - 1.4.3 + 1.4.4 FileParser, TextParser, TextReader, File, Parser, Text, txt, Read, Reader $(PackageTags) Eduardo Cáceres diff --git a/src/FileParser/Implementations/ParsedFile.cs b/src/FileParser/Implementations/ParsedFile.cs index e3bb229..328484f 100644 --- a/src/FileParser/Implementations/ParsedFile.cs +++ b/src/FileParser/Implementations/ParsedFile.cs @@ -122,6 +122,11 @@ public string ToSingleString(string wordSeparator = " ", string lineSeparator = /// /// /// Word separator + /// + /// + /// + /// + /// /// public static Queue ParseFile(string path, string existingSeparator = null) { @@ -153,9 +158,6 @@ public static Queue ParseFile(string path, string existingSeparator } catch (Exception e) { - // Possible exceptions: - // FileNotFoundException, DirectoryNotFoundException, IOException, ArgumentException - Print.WriteLine(e.Message); Print.WriteLine("(path: {0}", path); throw;