Skip to content

Commit

Permalink
upgraded dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
seeste committed Mar 11, 2021
1 parent 25eda99 commit b1ea291
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 43 deletions.
7 changes: 2 additions & 5 deletions PdfAValidator/PdfAValidator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<LangVersion>8.0</LangVersion>
<RootNamespace>Codeuctivity</RootNamespace>
<NeutralLanguage>en</NeutralLanguage>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
</PropertyGroup>

<ItemGroup>
Expand All @@ -46,11 +47,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.9.0.19135">
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.19.0.28253">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
12 changes: 4 additions & 8 deletions PdfAValidatorTest/PdfAValidatorTest.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net5</TargetFrameworks>
<IsPackable>false</IsPackable>
<Nullable>enable</Nullable>
<LangVersion>8.0</LangVersion>
Expand Down Expand Up @@ -43,17 +43,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.9.0.19135">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.19.0.28253">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
14 changes: 5 additions & 9 deletions PdfAValidatorWebApi/PdfAValidatorWebApi.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Nullable>enable</Nullable>
<LangVersion>8.0</LangVersion>
Expand All @@ -12,17 +12,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.3" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.9.0.19135">
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.19.0.28253">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="5.1.2" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="6.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
18 changes: 11 additions & 7 deletions PdfAValidatorWebApiTest/IntegrativeTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public async Task ShouldAccessEndpointSuccessfull(string route, string contentTy

// Assert
response.EnsureSuccessStatusCode();
Assert.Equal(contentType, response.Content.Headers.ContentType.ToString());
Assert.Equal(contentType, response.Content.Headers.ContentType?.ToString());
}

[Fact]
Expand All @@ -41,8 +41,10 @@ public async Task ShouldValidatePdf()
using var request = new HttpRequestMessage(new HttpMethod("POST"), "http://localhost/api/PdfAValidator");
using var file = new ByteArrayContent(File.ReadAllBytes("../../../FromLibreOffice.pdf"));
file.Headers.Add("Content-Type", "application/pdf");
var multipartContent = new MultipartFormDataContent();
multipartContent.Add(file, "pdfFile", Path.GetFileName("FromLibreOffice.pdf"));
var multipartContent = new MultipartFormDataContent
{
{ file, "pdfFile", Path.GetFileName("FromLibreOffice.pdf") }
};
request.Content = multipartContent;

// Act
Expand All @@ -61,17 +63,19 @@ public async Task ShouldValidatePdfDetailedReport()
using var request = new HttpRequestMessage(new HttpMethod("POST"), "http://localhost/api/PdfAValidator/DetailedReport");
using var file = new ByteArrayContent(File.ReadAllBytes("../../../FromLibreOffice.pdf"));
file.Headers.Add("Content-Type", "application/pdf");
var multipartContent = new MultipartFormDataContent();
multipartContent.Add(file, "pdfFile", Path.GetFileName("FromLibreOffice.pdf"));
var multipartContent = new MultipartFormDataContent
{
{ file, "pdfFile", Path.GetFileName("FromLibreOffice.pdf") }
};
request.Content = multipartContent;

// Act
var response = await client.SendAsync(request).ConfigureAwait(false);
// Assert
response.EnsureSuccessStatusCode();

string actual = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
var actual = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
Assert.Contains("isCompliant\":true", actual);
}
}
}
}
20 changes: 6 additions & 14 deletions PdfAValidatorWebApiTest/PdfAValidatorWebApiTest.csproj
Original file line number Diff line number Diff line change
@@ -1,31 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5</TargetFramework>
<IsPackable>false</IsPackable>
<Nullable>enable</Nullable>
<LangVersion>8.0</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
<PackageReference Include="AngleSharp" Version="0.14.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="3.1.5" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.5" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.9.0.19135">
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="5.0.4" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.4" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.19.0.28253">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="1.3.0">
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down

0 comments on commit b1ea291

Please sign in to comment.