Merge pull request #37 from d-velop/dotnet8

Upgrade .NET 8
d-velop · Sep 17, 2024 · f446632 · f446632
2 parents eb76b0b + a41567c
commit f446632
Show file tree

Hide file tree

Showing 29 changed files with 357 additions and 238 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,6 +4,11 @@
     <Company>d.velop AG</Company>
     <Copyright>Copyright (c) 2024</Copyright>
     <PackageProjectUrl>https://github.com/d-velop/dvelop-sdk-cs</PackageProjectUrl>
-    <VersionPrefix>0.0.10</VersionPrefix>
+    <VersionPrefix>0.1.0</VersionPrefix>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="$(SolutionDir)/README.md" Pack="true" PackagePath="/" />
+  </ItemGroup>
 </Project>
diff --git a/dvelop-sdk-all/DvelopSdk.csproj b/dvelop-sdk-all/DvelopSdk.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <PackageId>Dvelop.Sdk</PackageId>
 
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>Dvelop.Sdk</AssemblyName>
     <RootNamespace>Dvelop.Sdk</RootNamespace>
     <Copyright>Copyright (c) 2019</Copyright>
@@ -12,7 +12,7 @@
     <IsPackable>true</IsPackable>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <PackageProjectUrl></PackageProjectUrl>
+    <PackageProjectUrl>https://github.com/d-velop/dvelop-sdk-cs</PackageProjectUrl>
 
     <RepositoryUrl>https://github.com/d-velop/dvelop-sdk-cs</RepositoryUrl>
 
@@ -21,10 +21,11 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <LangVersion>latestmajor</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 
 

diff --git a/dvelop-sdk-base/BaseDtos/BaseDtos.csproj b/dvelop-sdk-base/BaseDtos/BaseDtos.csproj
@@ -1,16 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>Dvelop.Sdk.Base.Dto</AssemblyName>
     <RootNamespace>Dvelop.Sdk.Base.Dto</RootNamespace>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <LangVersion>latestmajor</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 
 

diff --git a/dvelop-sdk-base/BaseInterfaces/BaseInterfaces.csproj b/dvelop-sdk-base/BaseInterfaces/BaseInterfaces.csproj
@@ -1,9 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>Dvelop.Sdk.BaseInterfaces</RootNamespace>
         <AssemblyName>Dvelop.Sdk.BaseInterfaces</AssemblyName>
+        <LangVersion>latestmajor</LangVersion>
     </PropertyGroup>
 
 </Project>
diff --git a/dvelop-sdk-cloudcenter/CloudCenterDtos/CloudCenterDtos.csproj b/dvelop-sdk-cloudcenter/CloudCenterDtos/CloudCenterDtos.csproj
@@ -8,10 +8,11 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <LangVersion>latestmajor</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 
 

diff --git a/dvelop-sdk-config/ConfigDtos/ConfigDtos.csproj b/dvelop-sdk-config/ConfigDtos/ConfigDtos.csproj
@@ -1,17 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>Dvelop.Sdk.Config.Dto</AssemblyName>
     <RootNamespace>Dvelop.Sdk.Config.Dto</RootNamespace>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <LangVersion>latestmajor</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 
 

diff --git a/dvelop-sdk-dash/DashboardDtos/DashboardDtos.csproj b/dvelop-sdk-dash/DashboardDtos/DashboardDtos.csproj
@@ -1,17 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>Dvelop.Sdk.Dashboard.Dto</AssemblyName>
     <RootNamespace>Dvelop.Sdk.Dashboard.Dto</RootNamespace>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
 

diff --git a/dvelop-sdk-home/HomeDtos/HomeDtos.csproj b/dvelop-sdk-home/HomeDtos/HomeDtos.csproj
@@ -1,17 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <AssemblyName>Dvelop.Sdk.Home.Dto</AssemblyName>
-    <RootNamespace>Dvelop.Sdk.Home.Dto</RootNamespace>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <AssemblyName>Dvelop.Sdk.Home.Dto</AssemblyName>
+        <RootNamespace>Dvelop.Sdk.Home.Dto</RootNamespace>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <IncludeSymbols>true</IncludeSymbols>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+        <LangVersion>latestmajor</LangVersion>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
+    </ItemGroup>
 
 
 </Project>
diff --git a/...k-httpclientextensions/HttpClientExtensions.UnitTest/HttpClientExtensions.UnitTest.csproj b/...k-httpclientextensions/HttpClientExtensions.UnitTest/HttpClientExtensions.UnitTest.csproj
@@ -9,10 +9,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-        <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
-        <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
-        <PackageReference Include="coverlet.collector" Version="3.1.0">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+        <PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
+        <PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
+        <PackageReference Include="coverlet.collector" Version="6.0.2">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/dvelop-sdk-httpclientextensions/HttpClientExtensions/HttpClientExtensions.csproj b/dvelop-sdk-httpclientextensions/HttpClientExtensions/HttpClientExtensions.csproj
@@ -1,25 +1,26 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <IsPackable>true</IsPackable>
         <RootNamespace>Dvelop.Sdk.HttpClientExtensions</RootNamespace>
         <AssemblyName>Dvelop.Sdk.HttpClientExtensions</AssemblyName>
         <OutputType>Library</OutputType>
-
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-  </PropertyGroup>
+        <LangVersion>latestmajor</LangVersion>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-  </ItemGroup>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <IncludeSymbols>true</IncludeSymbols>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\dvelop-sdk-base\BaseInterfaces\BaseInterfaces.csproj" />
-      <ProjectReference Include="..\..\dvelop-sdk-logging\Logging.Abstractions\Logging.Abstractions.csproj" />
-      <ProjectReference Include="..\..\dvelop-sdk-signing\SigningAlgorithms\SigningAlgorithms.csproj" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\dvelop-sdk-base\BaseInterfaces\BaseInterfaces.csproj"/>
+        <ProjectReference Include="..\..\dvelop-sdk-logging\Logging.Abstractions\Logging.Abstractions.csproj"/>
+        <ProjectReference Include="..\..\dvelop-sdk-signing\SigningAlgorithms\SigningAlgorithms.csproj"/>
     </ItemGroup>
 
 </Project>
diff --git a/dvelop-sdk-identityprovider/IdentityProviderClient/IdentityProviderClient.csproj b/dvelop-sdk-identityprovider/IdentityProviderClient/IdentityProviderClient.csproj
@@ -1,23 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>Dvelop.Sdk.IdentityProvider.Client</AssemblyName>
     <RootNamespace>Dvelop.Sdk.IdentityProvider.Client</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <LangVersion>latestmajor</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/dvelop-sdk-identityprovider/IdentityProviderClient/IdentityProviderSessionStore.cs b/dvelop-sdk-identityprovider/IdentityProviderClient/IdentityProviderSessionStore.cs
@@ -8,7 +8,7 @@ namespace Dvelop.Sdk.IdentityProvider.Client
 {
     public class IdentityProviderSessionStore
     {
-        private readonly ISystemClock _clock;
+        private readonly TimeProvider _clock;
         private readonly int _cleanupThreshold;
 
         private readonly ConcurrentDictionary<string, IdentityProviderSessionItem> _sessionCache =
@@ -17,13 +17,13 @@ public class IdentityProviderSessionStore
         private int _cleanupCounter;
         private readonly object _cleanupLock=new object();
 
-        public IdentityProviderSessionStore(ISystemClock clock, int cleanupThreshold)
+        public IdentityProviderSessionStore(TimeProvider clock, int cleanupThreshold)
         {
             _clock = clock;
             _cleanupThreshold = cleanupThreshold;
         }
 
-        public IdentityProviderSessionStore():this(new SystemClock(), 20)
+        public IdentityProviderSessionStore():this(TimeProvider.System, 20)
         {
 
         }
@@ -34,7 +34,7 @@ public ClaimsPrincipal GetPrincipal(string cookie)
             //CleanUp();
             var id = IdFromCookie(cookie);
             if (!_sessionCache.TryGetValue(id, out var sessionItem)) return null;
-            if (sessionItem.Expire.CompareTo(_clock.UtcNow) < 0)
+            if (sessionItem.Expire.CompareTo(_clock.GetUtcNow()) < 0)
             {
                 _sessionCache.TryRemove(id,out _);
                 return null;
@@ -68,7 +68,7 @@ private void CleanUp()
                     foreach (var key in _sessionCache.Keys)
                     {
                         if (!_sessionCache.TryGetValue(key, out var sessionItem)) continue;
-                        if (sessionItem.Expire.CompareTo(_clock.UtcNow) < 0)
+                        if (sessionItem.Expire.CompareTo(_clock.GetUtcNow()) < 0)
                         {
                             _sessionCache.TryRemove(key, out _);
                         }

diff --git a/dvelop-sdk-identityprovider/IdentityProviderDtos/IdentityProviderDtos.csproj b/dvelop-sdk-identityprovider/IdentityProviderDtos/IdentityProviderDtos.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 
 

diff --git a/...typrovider/IdentityProviderMiddleware.UnitTest/IdentityProviderMiddleware.UnitTest.csproj b/...typrovider/IdentityProviderMiddleware.UnitTest/IdentityProviderMiddleware.UnitTest.csproj
@@ -6,14 +6,15 @@
     <AssemblyName>Dvelop.Sdk.IdentityProviderMiddleware.UnitTest</AssemblyName>
     <RootNamespace>Dvelop.Sdk.IdentityProviderMiddleware.UnitTest</RootNamespace>
     <OutputType>Library</OutputType>
+    <LangVersion>latestmajor</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="4.19.4" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="Moq" Version="4.16.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
+    <PackageReference Include="FluentAssertions" Version="6.12.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Moq" Version="4.20.72" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
   </ItemGroup>
 
   <ItemGroup>