Skip to content

Commit

Permalink
Update nuget non-major dependencies (#190)
Browse files Browse the repository at this point in the history
* Update nuget non-major dependencies

* Fix test after app-lib does not allow zero bytes files

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: tjololo <[email protected]>
  • Loading branch information
renovate[bot] and tjololo authored Jan 9, 2024
1 parent 53409ab commit ba699ac
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 23 deletions.
14 changes: 7 additions & 7 deletions src/App.IntegrationTests/ApiTests/DataApiTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ public async Task Data_Post_WithContributerOrgRestriction_Ok()
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);

string url = $"/tdd/{app}/instances/1337/{guid}/data?dataType=customElement";
HttpContent content = new StringContent(string.Empty);
HttpContent content = new StringContent("not a pdf");
content.Headers.ContentDisposition = ContentDispositionHeaderValue.Parse("attachment; filename=test.pdf");

HttpResponseMessage response = await client.PostAsync(url, content);
Expand All @@ -372,7 +372,7 @@ public async Task Data_Post_WithContributerOrgNoRestriction_Ok()
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);

string url = $"/tdd/{app}/instances/1337/{guid}/data?dataType=customElement";
HttpContent content = new StringContent(string.Empty);
HttpContent content = new StringContent("not-an-actual-pdf");
content.Headers.ContentDisposition = ContentDispositionHeaderValue.Parse("attachment; filename=test.pdf");

HttpResponseMessage response = await client.PostAsync(url, content);
Expand Down Expand Up @@ -480,13 +480,13 @@ public async Task Data_Post_InvalidFiletypeCorrectContentType_BadRequest()
TestDataUtil.DeleteInstance("tdd", app, 1337, guid);
TestDataUtil.PrepareInstance("tdd", app, 1337, guid);
string token = PrincipalUtil.GetOrgToken("nav", "160694123");
string expectedMsg = "Invalid data provided. Error: Invalid content type: text/xml. Please try another file. Permitted content types include: application/pdf, image/png, application/json";
string expectedMsg = "Invalid data provided. Error: Invalid content type: application/xml. Please try another file. Permitted content types include: application/pdf, image/png, application/json";

HttpClient client = SetupUtil.GetTestClient(_factory, "tdd", app);
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);

string url = $"/tdd/{app}/instances/1337/{guid}/data?dataType=specificFileType";
HttpContent content = new StringContent(string.Empty);
HttpContent content = new StringContent("<root>content</root>");
content.Headers.ContentType = MediaTypeHeaderValue.Parse("text/xml");
content.Headers.ContentDisposition = ContentDispositionHeaderValue.Parse("attachment; filename=testfile.xml");

Expand Down Expand Up @@ -515,7 +515,7 @@ public async Task Data_Post_ValidFiletype_Ok()
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);

string url = $"/tdd/{app}/instances/1337/{guid}/data?dataType=specificFileType";
HttpContent content = new StringContent(string.Empty);
HttpContent content = new StringContent("not-an-actual-pdf");
content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/pdf");
content.Headers.ContentDisposition = ContentDispositionHeaderValue.Parse("attachment; filename=testfile.pdf");

Expand Down Expand Up @@ -543,7 +543,7 @@ public async Task Data_Post_ValidComplexFileName_Ok()
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);

string url = $"/tdd/{app}/instances/1337/{guid}/data?dataType=specificFileType";
HttpContent content = new StringContent(string.Empty);
HttpContent content = new StringContent("{\"test\":\"test\"}");
content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json");
content.Headers.ContentDisposition = ContentDispositionHeaderValue.Parse("attachment; filename=\"appsettings.development.json\"");

Expand Down Expand Up @@ -571,7 +571,7 @@ public async Task Data_Post_ValidFileNameStar_Ok()
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);

string url = $"/tdd/{app}/instances/1337/{guid}/data?dataType=specificFileType";
HttpContent content = new StringContent(string.Empty);
HttpContent content = new StringContent("{\"test\":\"test\"}");
content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json");
content.Headers.ContentDisposition = ContentDispositionHeaderValue.Parse("attachment; filename=\"appsettings.development.json\"; filename*=UTF-8''appsettings.staging.json");

Expand Down
12 changes: 6 additions & 6 deletions src/App.IntegrationTests/App.IntegrationTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.11.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.21" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="xunit" Version="2.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.25" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="xunit" Version="2.6.4" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
12 changes: 6 additions & 6 deletions src/App.IntegrationTests/AppRef.IntegrationTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.11.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.21" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="xunit" Version="2.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.25" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="xunit" Version="2.6.4" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions src/App/App.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Altinn.App.Api" Version="7.13.1">
<PackageReference Include="Altinn.App.Api" Version="7.15.2">
<CopyToOutputDirectory>lib\$(TargetFramework)\*.xml</CopyToOutputDirectory>
</PackageReference>
<PackageReference Include="Altinn.App.Core" Version="7.13.1"/>
<PackageReference Include="Altinn.App.Core" Version="7.15.2"/>
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0"/>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0"/>
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/App/AppRef.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Altinn.App.Api" Version="7.13.1">
<PackageReference Include="Altinn.App.Api" Version="7.15.2">
<CopyToOutputDirectory>lib\$(TargetFramework)\*.xml</CopyToOutputDirectory>
</PackageReference>
<PackageReference Include="Altinn.App.Core" Version="7.13.1" />
<PackageReference Include="Altinn.App.Core" Version="7.15.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
</ItemGroup>
Expand Down

0 comments on commit ba699ac

Please sign in to comment.