Skip to content
Snippets Groups Projects
Commit e57788a9 authored by Klaus Fischer's avatar Klaus Fischer
Browse files

Merge branch 'main' into feature/1308-attachment-from-string

# Conflicts:
#	FitConnect/FitConnect.csproj
#	Tests/BasicUnitTest/BasicUnitTest.csproj
#	Tests/E2ETest/E2ETest.csproj
#	Tests/EncryptionTests/EncryptionTests.csproj
#	Tests/IntegrationTests/IntegrationTests.csproj
#	Tests/IntegrationTests/Routing/RoutingTests.cs
parents ef259628 0ea49e8d
No related branches found
No related tags found
1 merge request!91Feature/1308 attachment from string
File added
......@@ -33,7 +33,7 @@
<ItemGroup>
<PackageReference Include="Autofac" Version="7.1.0" />
<PackageReference Include="IdentityModel" Version="6.1.0" />
<PackageReference Include="IdentityModel" Version="6.2.0" />
<PackageReference Include="jose-jwt" Version="4.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
......
......@@ -16,7 +16,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.11.0" />
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
<PackageReference Include="Moq" Version="4.20.69" />
......
......@@ -161,6 +161,7 @@ public class AutoRejectReplyChannel : EndToEndTestBase {
}
[Ignore("missing feature from other branch, reactivate after merge 717")]
[Test]
[Order(70)]
public void SendingSubmissionWithReplyChannel_ToDestinationWithoutReplyChannel_ThrowsError() {
......
......@@ -17,11 +17,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.11.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="NUnit.Analyzers" Version="3.6.1">
<PackageReference Include="NUnit.Analyzers" Version="3.8.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
......
......@@ -18,10 +18,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.11.0" />
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="coverlet.collector" Version="6.0.0">
......
......@@ -17,12 +17,12 @@
<ItemGroup>
<PackageReference Include="DotNet.Testcontainers" Version="1.6.0" />
<PackageReference Include="FluentAssertions" Version="6.11.0" />
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.32.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.15" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
......
......@@ -69,7 +69,7 @@ public class RoutingTests {
route.DestinationSignature.Should().NotBeNull();
}
[Ignore("Server does not send valid data")]
[Ignore("Invalid server response")]
[TestCase("99123456760610", "931")]
public void FindDestination_WithAreaId(string leika, string areaId) {
// Arrange
......
......@@ -3,5 +3,14 @@
"extends": [
"config:base",
"local>fit-connect/renovate/renovate-config"
]
],
"major": {
"enabled": false
},
"minor": {
"enabled": true
},
"patch": {
"enabled": true
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment