Skip to content

Commit

Permalink
Remove extra TargetFrameworks from NuGet test project
Browse files Browse the repository at this point in the history
  • Loading branch information
eduherminio committed May 19, 2020
1 parent 2757f1a commit 42aaa9f
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 13 deletions.
4 changes: 2 additions & 2 deletions NugetTest/NugetTest/NugetTest.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;netcoreapp2.2;net471;net461;net46</TargetFrameworks>
<TargetFramework>netcoreapp3.1</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand All @@ -10,7 +10,7 @@
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
<PackageReference Include="FileParser" Version="1.4.3" />
<PackageReference Include="FileParser" Version="1.4.4" />
</ItemGroup>

<ItemGroup>
Expand Down
14 changes: 7 additions & 7 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,6 @@ stages:
git config --replace-all user.email "[email protected]"
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'], '')
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/FileParser/FileParser.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<Title>FileParser</Title>
<PackageId>FileParser</PackageId>
<Version>1.4.3</Version>
<Version>1.4.4</Version>
<PackageTags>FileParser, TextParser, TextReader, File, Parser, Text, txt, Read, Reader</PackageTags>
<Tags>$(PackageTags)</Tags>
<Authors>Eduardo Cáceres</Authors>
Expand Down
8 changes: 5 additions & 3 deletions src/FileParser/Implementations/ParsedFile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,11 @@ public string ToSingleString(string wordSeparator = " ", string lineSeparator =
/// </summary>
/// <param name="path"></param>
/// <param name="existingSeparator">Word separator</param>
/// <exception cref="FileNotFoundException"></exception>
/// <exception cref="DirectoryNotFoundException"></exception>
/// <exception cref="IOException"></exception>
/// <exception cref="ArgumentException"></exception>
/// <exception cref="ArgumentNullException"></exception>
/// <returns></returns>
public static Queue<IParsedLine> ParseFile(string path, string existingSeparator = null)
{
Expand Down Expand Up @@ -153,9 +158,6 @@ public static Queue<IParsedLine> ParseFile(string path, string existingSeparator
}
catch (Exception e)
{
// Possible exceptions:
// FileNotFoundException, DirectoryNotFoundException, IOException, ArgumentException

Print.WriteLine(e.Message);
Print.WriteLine("(path: {0}", path);
throw;
Expand Down

0 comments on commit 42aaa9f

Please sign in to comment.