From 7b1de3146425d85f6a601ece07c4acbe8103514b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=BCtbach?= Date: Thu, 7 Nov 2024 10:48:01 +0100 Subject: [PATCH] Upgrade .NET 8 some cleanup in project files https://github.com/d-velop/dvelop-sdk-cs/issues/36 --- Directory.Build.props | 3 +++ dvelop-sdk-all/DvelopSdk.csproj | 4 +--- dvelop-sdk-base/BaseDtos/BaseDtos.csproj | 2 +- dvelop-sdk-base/BaseInterfaces/BaseInterfaces.csproj | 10 ++++++++-- dvelop-sdk-config/ConfigDtos/ConfigDtos.csproj | 2 +- dvelop-sdk-dash/DashboardDtos/DashboardDtos.csproj | 4 ++-- dvelop-sdk-home/HomeDtos/HomeDtos.csproj | 2 +- .../IdentityProviderClient.csproj | 2 +- .../IdentityProviderDtos/IdentityProviderDtos.csproj | 6 +++--- .../IdentityProviderClientTest.cs | 7 ++++++- 10 files changed, 27 insertions(+), 15 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index bcb8e35..9f75438 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -6,6 +6,9 @@ https://github.com/d-velop/dvelop-sdk-cs 0.1.0 README.md + true + true + snupkg diff --git a/dvelop-sdk-all/DvelopSdk.csproj b/dvelop-sdk-all/DvelopSdk.csproj index 80870a4..588a943 100644 --- a/dvelop-sdk-all/DvelopSdk.csproj +++ b/dvelop-sdk-all/DvelopSdk.csproj @@ -6,16 +6,14 @@ net8.0 Dvelop.Sdk Dvelop.Sdk - Copyright (c) 2019 + Copyright (c) 2024 d.velop cloud SDK d.velop AG true false false https://github.com/d-velop/dvelop-sdk-cs - https://github.com/d-velop/dvelop-sdk-cs - Christian Kütbach true diff --git a/dvelop-sdk-base/BaseDtos/BaseDtos.csproj b/dvelop-sdk-base/BaseDtos/BaseDtos.csproj index 69e4751..1695f50 100644 --- a/dvelop-sdk-base/BaseDtos/BaseDtos.csproj +++ b/dvelop-sdk-base/BaseDtos/BaseDtos.csproj @@ -1,13 +1,13 @@  - net8.0 Dvelop.Sdk.Base.Dto Dvelop.Sdk.Base.Dto true true snupkg latestmajor + net8.0 diff --git a/dvelop-sdk-base/BaseInterfaces/BaseInterfaces.csproj b/dvelop-sdk-base/BaseInterfaces/BaseInterfaces.csproj index 8ddeb74..09c3353 100644 --- a/dvelop-sdk-base/BaseInterfaces/BaseInterfaces.csproj +++ b/dvelop-sdk-base/BaseInterfaces/BaseInterfaces.csproj @@ -1,10 +1,16 @@ - net8.0 Dvelop.Sdk.BaseInterfaces Dvelop.Sdk.BaseInterfaces + true + true + snupkg latestmajor + net8.0 - + + + + diff --git a/dvelop-sdk-config/ConfigDtos/ConfigDtos.csproj b/dvelop-sdk-config/ConfigDtos/ConfigDtos.csproj index 4f60c39..d71f655 100644 --- a/dvelop-sdk-config/ConfigDtos/ConfigDtos.csproj +++ b/dvelop-sdk-config/ConfigDtos/ConfigDtos.csproj @@ -1,13 +1,13 @@  - net8.0 Dvelop.Sdk.Config.Dto Dvelop.Sdk.Config.Dto true true snupkg latestmajor + net8.0 diff --git a/dvelop-sdk-dash/DashboardDtos/DashboardDtos.csproj b/dvelop-sdk-dash/DashboardDtos/DashboardDtos.csproj index cd407ec..a57991d 100644 --- a/dvelop-sdk-dash/DashboardDtos/DashboardDtos.csproj +++ b/dvelop-sdk-dash/DashboardDtos/DashboardDtos.csproj @@ -1,13 +1,13 @@  - net8.0 Dvelop.Sdk.Dashboard.Dto Dvelop.Sdk.Dashboard.Dto true true snupkg - + latestmajor + net8.0 diff --git a/dvelop-sdk-home/HomeDtos/HomeDtos.csproj b/dvelop-sdk-home/HomeDtos/HomeDtos.csproj index 3fa2276..f69ddd4 100644 --- a/dvelop-sdk-home/HomeDtos/HomeDtos.csproj +++ b/dvelop-sdk-home/HomeDtos/HomeDtos.csproj @@ -1,7 +1,7 @@  - net8.0 + net8.0;netstandard2.0 Dvelop.Sdk.Home.Dto Dvelop.Sdk.Home.Dto true diff --git a/dvelop-sdk-identityprovider/IdentityProviderClient/IdentityProviderClient.csproj b/dvelop-sdk-identityprovider/IdentityProviderClient/IdentityProviderClient.csproj index 07a4571..83d0d7c 100644 --- a/dvelop-sdk-identityprovider/IdentityProviderClient/IdentityProviderClient.csproj +++ b/dvelop-sdk-identityprovider/IdentityProviderClient/IdentityProviderClient.csproj @@ -1,7 +1,6 @@  - net8.0 Dvelop.Sdk.IdentityProvider.Client Dvelop.Sdk.IdentityProvider.Client true @@ -9,6 +8,7 @@ true snupkg latestmajor + net8.0 diff --git a/dvelop-sdk-identityprovider/IdentityProviderDtos/IdentityProviderDtos.csproj b/dvelop-sdk-identityprovider/IdentityProviderDtos/IdentityProviderDtos.csproj index ea20ebe..5d5a535 100644 --- a/dvelop-sdk-identityprovider/IdentityProviderDtos/IdentityProviderDtos.csproj +++ b/dvelop-sdk-identityprovider/IdentityProviderDtos/IdentityProviderDtos.csproj @@ -1,17 +1,17 @@  - net8.0 Dvelop.Sdk.IdentityProvider.Dto Dvelop.Sdk.IdentityProvider.Dto true true snupkg latestmajor + net8.0 - + - + diff --git a/dvelop-sdk-identityprovider/IdentityProviderMiddleware.UnitTest/IdentityProviderClientTest.cs b/dvelop-sdk-identityprovider/IdentityProviderMiddleware.UnitTest/IdentityProviderClientTest.cs index 47c99cc..33f417c 100644 --- a/dvelop-sdk-identityprovider/IdentityProviderMiddleware.UnitTest/IdentityProviderClientTest.cs +++ b/dvelop-sdk-identityprovider/IdentityProviderMiddleware.UnitTest/IdentityProviderClientTest.cs @@ -42,7 +42,12 @@ public void Setup() } } }); - _unit = new IdentityProviderClient(new HttpClient(_fakeHttpMessageHandler.Object), () => new TenantInformation {SystemBaseUri = "http://localhost/", TenantId = "0"}); + _unit = new IdentityProviderClient(new IdentityProviderClientOptions + { + HttpClient = new HttpClient(_fakeHttpMessageHandler.Object), + TenantInformationCallback = () => new TenantInformation {SystemBaseUri = "http://localhost/", TenantId = "0"} + + }); } [TestMethod]