Skip to content

Commit 0a027be

Browse files
ckuetbachckuetbach
authored
Merge pull request #43 from d-velop/dotnet8
Dotnet8 - Some code cleanup
2 parents f9a5be0 + 7ded3ae commit 0a027be

11 files changed

Lines changed: 123 additions & 111 deletions

File tree

‎Directory.Build.props‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
<PackageProjectUrl>https://github.com/d-velop/dvelop-sdk-cs</PackageProjectUrl>
77
<VersionPrefix>0.1.0</VersionPrefix>
88
<PackageReadmeFile>README.md</PackageReadmeFile>
9+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
10+
<IncludeSymbols>true</IncludeSymbols>
11+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
912
</PropertyGroup>
1013

1114
<ItemGroup>

‎dvelop-sdk-all/DvelopSdk.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@
66
<TargetFramework>net8.0</TargetFramework>
77
<AssemblyName>Dvelop.Sdk</AssemblyName>
88
<RootNamespace>Dvelop.Sdk</RootNamespace>
9-
<Copyright>Copyright (c) 2019</Copyright>
9+
<Copyright>Copyright (c) 2024</Copyright>
1010
<Product>d.velop cloud SDK</Product>
1111
<Company>d.velop AG</Company>
1212
<IsPackable>true</IsPackable>
1313
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
1414
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
1515
<PackageProjectUrl>https://github.com/d-velop/dvelop-sdk-cs</PackageProjectUrl>
16-
1716
<RepositoryUrl>https://github.com/d-velop/dvelop-sdk-cs</RepositoryUrl>
18-
1917
<Authors>Christian Kütbach</Authors>
2018

2119
<PublishRepositoryUrl>true</PublishRepositoryUrl>

‎dvelop-sdk-base/BaseDtos/BaseDtos.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
54
<AssemblyName>Dvelop.Sdk.Base.Dto</AssemblyName>
65
<RootNamespace>Dvelop.Sdk.Base.Dto</RootNamespace>
76
<PublishRepositoryUrl>true</PublishRepositoryUrl>
87
<IncludeSymbols>true</IncludeSymbols>
98
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
109
<LangVersion>latestmajor</LangVersion>
10+
<TargetFramework>net8.0</TargetFramework>
1111
</PropertyGroup>
1212

1313
<ItemGroup>

‎dvelop-sdk-base/BaseInterfaces/BaseInterfaces.csproj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
54
<RootNamespace>Dvelop.Sdk.BaseInterfaces</RootNamespace>
65
<AssemblyName>Dvelop.Sdk.BaseInterfaces</AssemblyName>
6+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
7+
<IncludeSymbols>true</IncludeSymbols>
8+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
79
<LangVersion>latestmajor</LangVersion>
10+
<TargetFramework>net8.0</TargetFramework>
811
</PropertyGroup>
9-
12+
13+
<ItemGroup>
14+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
15+
</ItemGroup>
1016
</Project>

‎dvelop-sdk-config/ConfigDtos/ConfigDtos.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
54
<AssemblyName>Dvelop.Sdk.Config.Dto</AssemblyName>
65
<RootNamespace>Dvelop.Sdk.Config.Dto</RootNamespace>
76
<PublishRepositoryUrl>true</PublishRepositoryUrl>
87
<IncludeSymbols>true</IncludeSymbols>
98
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
109
<LangVersion>latestmajor</LangVersion>
10+
<TargetFramework>net8.0</TargetFramework>
1111
</PropertyGroup>
1212

1313
<ItemGroup>

‎dvelop-sdk-dash/DashboardDtos/DashboardDtos.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
54
<AssemblyName>Dvelop.Sdk.Dashboard.Dto</AssemblyName>
65
<RootNamespace>Dvelop.Sdk.Dashboard.Dto</RootNamespace>
76
<PublishRepositoryUrl>true</PublishRepositoryUrl>
87
<IncludeSymbols>true</IncludeSymbols>
98
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
10-
9+
<LangVersion>latestmajor</LangVersion>
10+
<TargetFramework>net8.0</TargetFramework>
1111
</PropertyGroup>
1212

1313
<ItemGroup>

‎dvelop-sdk-home/HomeDtos/HomeDtos.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
55
<AssemblyName>Dvelop.Sdk.Home.Dto</AssemblyName>
66
<RootNamespace>Dvelop.Sdk.Home.Dto</RootNamespace>
77
<PublishRepositoryUrl>true</PublishRepositoryUrl>

‎dvelop-sdk-identityprovider/IdentityProviderClient/IdentityProviderClient.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
54
<AssemblyName>Dvelop.Sdk.IdentityProvider.Client</AssemblyName>
65
<RootNamespace>Dvelop.Sdk.IdentityProvider.Client</RootNamespace>
76
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
87
<PublishRepositoryUrl>true</PublishRepositoryUrl>
98
<IncludeSymbols>true</IncludeSymbols>
109
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
1110
<LangVersion>latestmajor</LangVersion>
11+
<TargetFramework>net8.0</TargetFramework>
1212
</PropertyGroup>
1313

1414
<ItemGroup>

‎dvelop-sdk-identityprovider/IdentityProviderDtos/IdentityProviderDtos.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
54
<AssemblyName>Dvelop.Sdk.IdentityProvider.Dto</AssemblyName>
65
<RootNamespace>Dvelop.Sdk.IdentityProvider.Dto</RootNamespace>
76
<PublishRepositoryUrl>true</PublishRepositoryUrl>
87
<IncludeSymbols>true</IncludeSymbols>
98
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
109
<LangVersion>latestmajor</LangVersion>
10+
<TargetFramework>net8.0</TargetFramework>
1111
</PropertyGroup>
12-
12+
1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
1515
</ItemGroup>
16-
16+
1717
</Project>

‎dvelop-sdk-identityprovider/IdentityProviderMiddleware.UnitTest/IdentityProviderClientTest.cs‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public void Setup()
2525
CallBase = true
2626
};
2727
_fakeHttpMessageHandler
28-
.Setup( h => h.Send(It.IsAny<HttpRequestMessage>()))
28+
.Setup(h => h.Send(It.IsAny<HttpRequestMessage>()))
2929
.Returns(new HttpResponseMessage
3030
{
3131
Content = new StringContent(JsonConvert.SerializeObject(new UserDto
@@ -42,37 +42,43 @@ public void Setup()
4242
}
4343
}
4444
});
45-
_unit = new IdentityProviderClient(new HttpClient(_fakeHttpMessageHandler.Object), () => new TenantInformation {SystemBaseUri = "http://localhost/", TenantId = "0"});
45+
_unit = new IdentityProviderClient(new IdentityProviderClientOptions
46+
{
47+
HttpClient = new HttpClient(_fakeHttpMessageHandler.Object),
48+
SystemBaseUri = new Uri("http://localhost/"),
49+
TenantInformationCallback = () => new TenantInformation
50+
{ SystemBaseUri = "http://localhost/", TenantId = "0" }
51+
});
4652
}
47-
53+
4854
[TestMethod]
4955
public async Task OneSessionShouldOnlyValidateOnce()
5056
{
5157
var claimsUser = await _unit.GetClaimsPrincipalAsync("a&1").ConfigureAwait(false);
5258
Assert.IsNotNull(claimsUser);
53-
59+
5460
claimsUser = await _unit.GetClaimsPrincipalAsync("a&1").ConfigureAwait(false);
5561
Assert.IsNotNull(claimsUser);
56-
57-
_fakeHttpMessageHandler.Verify( h => h.Send(It.IsAny<HttpRequestMessage>()) ,Times.Once);
62+
63+
_fakeHttpMessageHandler.Verify(h => h.Send(It.IsAny<HttpRequestMessage>()), Times.Once);
5864
}
59-
65+
6066
[TestMethod]
6167
public async Task TwoSessionsShouldOnlyValidateOncePerSession()
6268
{
6369
var claimsUser = await _unit.GetClaimsPrincipalAsync("a&1").ConfigureAwait(false);
6470
Assert.IsNotNull(claimsUser);
65-
71+
6672
claimsUser = await _unit.GetClaimsPrincipalAsync("a&2").ConfigureAwait(false);
6773
Assert.IsNotNull(claimsUser);
68-
74+
6975
claimsUser = await _unit.GetClaimsPrincipalAsync("a&1").ConfigureAwait(false);
7076
Assert.IsNotNull(claimsUser);
71-
77+
7278
claimsUser = await _unit.GetClaimsPrincipalAsync("a&2").ConfigureAwait(false);
7379
Assert.IsNotNull(claimsUser);
74-
75-
_fakeHttpMessageHandler.Verify( h => h.Send(It.IsAny<HttpRequestMessage>()) ,Times.Exactly(2));
80+
81+
_fakeHttpMessageHandler.Verify(h => h.Send(It.IsAny<HttpRequestMessage>()), Times.Exactly(2));
7682
}
7783

7884
[TestMethod]

0 commit comments

Comments
 (0)