Skip to content

Commit 9bd5141

Browse files
author
Alexander van Delft
committed
Rebase on 28.3.0 and create 29.0.0-rc1
1 parent 15dd8bb commit 9bd5141

File tree

15 files changed

+20
-18
lines changed

15 files changed

+20
-18
lines changed

‎CDP4Common/CDP4Common.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFrameworks>net48;netstandard2.0</TargetFrameworks>
55
<Company>Starion Group S.A.</Company>
66
<Title>CDP4Common Community Edition</Title>
7-
<VersionPrefix>28.3.0</VersionPrefix>
7+
<VersionPrefix>29.0.0</VersionPrefix>
88
<Description>CDP4 Common Class Library that contains DTOs, POCOs</Description>
99
<Copyright>Copyright © Starion Group S.A.</Copyright>
1010
<Authors>Sam, Merlin, Alex, Naron, Alexander, Yevhen, Nathanael, Ahmed</Authors>

‎CDP4Dal/CDP4Dal.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFrameworks>net48;netstandard2.0</TargetFrameworks>
55
<Company>Starion Group S.A.</Company>
66
<Title>CDP4Dal Community Edition</Title>
7-
<VersionPrefix>28.3.0</VersionPrefix>
7+
<VersionPrefix>29.0.0</VersionPrefix>
88
<Description>CDP4 Data Access Layer library, a consumer of an ECSS-E-TM-10-25 Annex C API</Description>
99
<Copyright>Copyright © Starion Group S.A.</Copyright>
1010
<Authors>Sam, Merlin, Alex, Naron, Alexander, Yevhen, Nathanael, Ahmed</Authors>

‎CDP4Dal/ISession.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ namespace CDP4Dal
4040
using CDP4Dal.Permission;
4141

4242
using CDP4DalCommon.Authentication;
43-
using CDP4DalCommon.Tasks;
4443
using CDP4DalCommon.Protocol.Operations;
4544
using CDP4DalCommon.Protocol.Tasks;
4645

‎CDP4DalCommon/CDP4DalCommon.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Company>Starion Group S.A.</Company>
66
<Language>latest</Language>
77
<Title>CDP4DalCommon Community Edition</Title>
8-
<VersionPrefix>28.3.0</VersionPrefix>
8+
<VersionPrefix>29.0.0</VersionPrefix>
99
<Description>CDP4 Common Class Library that contains common types for any CDP4 server and the CDP4Dal</Description>
1010
<Copyright>Copyright © Starion Group S.A.</Copyright>
1111
<Authors>Sam, Alex, Alexander, Nathanael, Antoine, Omar, Jaime</Authors>

‎CDP4JsonFileDal/CDP4JsonFileDal.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFrameworks>net48;netstandard2.0</TargetFrameworks>
55
<Company>Starion Group S.A.</Company>
66
<Title>CDP4JsonFileDal Community Edition</Title>
7-
<VersionPrefix>28.3.0</VersionPrefix>
7+
<VersionPrefix>29.0.0</VersionPrefix>
88
<Description>CDP4 Json File Dal Plugin</Description>
99
<Copyright>Copyright © Starion Group S.A.</Copyright>
1010
<Authors>Sam, Merlin, Alex, Naron, Alexander, Yevhen, Nathanael</Authors>

‎CDP4JsonSerializer/CDP4JsonSerializer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFrameworks>net48;netstandard2.0</TargetFrameworks>
55
<Company>Starion Group S.A.</Company>
66
<Title>CDP4JsonSerializer Community Edition</Title>
7-
<VersionPrefix>28.3.0</VersionPrefix>
7+
<VersionPrefix>29.0.0</VersionPrefix>
88
<Description>CDP4 JSON Serialization Library</Description>
99
<Copyright>Copyright © RHEA System S.A.</Copyright>
1010
<Authors>Sam, Merlin, Alex, Naron, Alexander, Yevhen, Nathanael, Jaime, Antoine</Authors>

‎CDP4MessagePackSerializer/CDP4MessagePackSerializer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFrameworks>net48;netstandard2.0</TargetFrameworks>
55
<Company>Starion Group S.A.</Company>
66
<Title>CDP4MessagePackSerializer Community Edition</Title>
7-
<VersionPrefix>28.3.0</VersionPrefix>
7+
<VersionPrefix>29.0.0</VersionPrefix>
88
<Description>CDP4 MessagePack Serialization Library</Description>
99
<Copyright>Copyright © Starion Group S.A.</Copyright>
1010
<Authors>Sam, Alex, Alexander, Nathanael, Antoine, Omar</Authors>

‎CDP4Reporting/CDP4Reporting.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFrameworks>netstandard2.0</TargetFrameworks>
55
<Company>Starion Group S.A.</Company>
66
<Title>CDP4Reporting Community Edition</Title>
7-
<VersionPrefix>28.3.0</VersionPrefix>
7+
<VersionPrefix>29.0.0</VersionPrefix>
88
<Description>CDP4 Reporting</Description>
99
<Copyright>Copyright © Starion Group S.A.</Copyright>
1010
<Authors>Sam, Alex, Alexander</Authors>

‎CDP4RequirementsVerification/CDP4RequirementsVerification.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFrameworks>net48;netstandard2.0</TargetFrameworks>
55
<Company>Starion Group S.A.</Company>
66
<Title>CDP4RequirementsVerification Community Edition</Title>
7-
<VersionPrefix>28.3.0</VersionPrefix>
7+
<VersionPrefix>29.0.0</VersionPrefix>
88
<Description>CDP4 Class Library that provides requirement verification</Description>
99
<Copyright>Copyright © Starion Group S.A.</Copyright>
1010
<Authors>Sam, Alex, Alexander, Yevhen, Nathanael</Authors>

‎CDP4Rules/CDP4Rules.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFrameworks>net48;netstandard2.0</TargetFrameworks>
55
<Company>Starion Group S.A.</Company>
66
<Title>CDP4Rules Community Edition</Title>
7-
<VersionPrefix>28.3.0</VersionPrefix>
7+
<VersionPrefix>29.0.0</VersionPrefix>
88
<Description>CDP4 Class Library that provides Model Analysis and Rule Checking</Description>
99
<Copyright>Copyright © Starion Group S.A.</Copyright>
1010
<Authors>Sam, Alex, Alexander, Yevhen, Nathanael</Authors>

‎CDP4ServicesDal.Tests/CdpServicesDalTestFixture.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ namespace CDP4ServicesDal.Tests
5454

5555
using CDP4JsonSerializer;
5656

57+
using Moq;
58+
5759
using NUnit.Framework;
5860

5961
using RichardSzalay.MockHttp;

‎CDP4ServicesDal/CDP4ServicesDal.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFrameworks>net48;netstandard2.0</TargetFrameworks>
55
<Company>Starion Group S.A.</Company>
66
<Title>CDP4ServicesDal Community Edition</Title>
7-
<VersionPrefix>28.3.0</VersionPrefix>
7+
<VersionPrefix>29.0.0</VersionPrefix>
88
<Description>CDP4ServicesDal Dal Plugin</Description>
99
<Copyright>Copyright © Starion Group S.A.</Copyright>
1010
<Authors>Sam, Merlin, Alex, Naron, Alexander, Yevhen, Nathanael</Authors>
@@ -27,6 +27,7 @@
2727
</PropertyGroup>
2828

2929
<ItemGroup>
30+
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
3031
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
3132
<PackageReference Include="Polly" Version="8.5.2" />
3233
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.6.0" />

‎CDP4ServicesDal/CdpServicesDal.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ namespace CDP4ServicesDal
3636
using System.Net;
3737
using System.Net.Http;
3838
using System.Net.Http.Headers;
39+
using System.Text;
3940
using System.Text.Json;
4041
using System.Threading;
4142
using System.Threading.Tasks;
@@ -115,9 +116,9 @@ public CdpServicesDal([Import]IAuthenticationRefreshService authenticationRefres
115116
}
116117
#else
117118
public CdpServicesDal(IAuthenticationRefreshService authenticationRefreshService)
118-
{
119+
{
119120
this.AuthenticationRefreshService = authenticationRefreshService;
120-
this.Cdp4JsonSerializer = new Cdp4JsonSerializer(this.MetaDataProvider, this.DalVersion);
121+
this.Cdp4DalJsonSerializer = new Cdp4DalJsonSerializer(this.MetaDataProvider, this.DalVersion, false);
121122
this.MessagePackSerializer = new MessagePackSerializer();
122123
}
123124
#endif
@@ -1296,8 +1297,7 @@ private HttpClient CreateHttpClient(Credentials credentials, HttpClient injected
12961297
result.DefaultRequestHeaders.Accept.Clear();
12971298
result.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
12981299
result.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/msgpack"));
1299-
TODO: Check if this is necessary, because was added in json branch
1300-
result.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", Convert.ToBase64String(ASCIIEncoding.ASCII.GetBytes($"{credentials.UserName}:{credentials.Password}")));
1300+
13011301
result.DefaultRequestHeaders.Add(Headers.AcceptCdpVersion, Headers.AcceptCdpVersionValue);
13021302
result.DefaultRequestHeaders.Add("User-Agent", "CDP4 (ECSS-E-TM-10-25 Annex C.2) CDPServicesDal");
13031303

@@ -1623,7 +1623,7 @@ public override async Task<AuthenticationSchemeResponse> RequestAvailableAuthent
16231623
}
16241624

16251625
cancellationToken.ThrowIfCancellationRequested();
1626-
var response = this.Cdp4JsonSerializer.Deserialize<AuthenticationSchemeResponse>(await httpResponseMessage.Content.ReadAsStreamAsync());
1626+
var response = this.Cdp4DalJsonSerializer.Deserialize<AuthenticationSchemeResponse>(await httpResponseMessage.Content.ReadAsStreamAsync());
16271627

16281628
watch.Stop();
16291629
Logger.Info("JSON Deserializer completed in {0} [ms]", watch.ElapsedMilliseconds);

‎CDP4ServicesMessaging/CDP4ServicesMessaging.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFrameworks>netstandard2.0</TargetFrameworks>
55
<Company>Starion Group S.A.</Company>
66
<Title>CDP4Common Community Edition</Title>
7-
<VersionPrefix>28.3.0</VersionPrefix>
7+
<VersionPrefix>29.0.0</VersionPrefix>
88
<Description>CDP4 Services Messaging is a Class Library that contains clients and messages class that can be used for inter services communication</Description>
99
<Copyright>Copyright © Starion Group S.A.</Copyright>
1010
<Authors>Sam, Alex, Alexander, Nathanael, Antoine</Authors>

‎CDP4Web/CDP4Web.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<LangVersion>latest</LangVersion>
66
<Company>Starion Group S.A.</Company>
77
<Title>CDP4Web Community Edition</Title>
8-
<VersionPrefix>28.3.0</VersionPrefix>
8+
<VersionPrefix>29.0.0</VersionPrefix>
99
<Description>CDP4Web Dedicated Sdk for CDPServicesDal</Description>
1010
<Copyright>Copyright © Starion Group S.A.</Copyright>
1111
<Authors>Sam, Alex, Alexander, Nathanael, Antoine, Omar, Jaime</Authors>

0 commit comments

Comments
 (0)