cleanup

leastprivilege · leastprivilege · commit d342129d11a9 · 2023-10-10T10:23:27.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,26 +21,11 @@ jobs:
     steps:
     - uses: actions/checkout@af513c7a016048ae468971c52ed77d9562c7c819
 
-    - name: Setup net6
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '7.0.x'
-        
     - name: Setup net6
       uses: actions/setup-dotnet@v1
       with:
           dotnet-version: '6.0.x'
 
-    - name: Setup net5
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '5.0.x'
-      
-    - name: Setup net3
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '3.1.x'
-
     - run: dotnet --info
     
     - if: contains(matrix.runs-on, 'macOS') || contains(matrix.runs-on, 'ubuntu')
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.100",
+    "version": "6.0.100",
     "rollForward": "latestMajor",
     "allowPrerelease": false
   }
diff --git a/test/DPoPTests/DPoPTests.cs b/test/DPoPTests/DPoPTests.cs
@@ -2,18 +2,14 @@
 using Duende.IdentityServer.Configuration;
 using Duende.IdentityServer.Models;
 using FluentAssertions;
-using IdentityModel;
 using IdentityModel.Client;
 using IdentityModel.OidcClient.DPoP;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Tokens;
 using System.Net;
+using System.Net.Http;
 using System.Net.Http.Headers;
-using System.Runtime.InteropServices;
-using System.Text;
 using System.Text.Json;
+using System.Threading.Tasks;
 using Xunit;
 
 namespace DPoPTests;
diff --git a/test/DPoPTests/DPoPTests.csproj b/test/DPoPTests/DPoPTests.csproj
@@ -1,16 +1,13 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-    <!--Conditional compilation-->
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-	</PropertyGroup>
+    </PropertyGroup>
 
     <PropertyGroup>
         <AssemblyOriginatorKeyFile>../../key.snk</AssemblyOriginatorKeyFile>
         <SignAssembly>true</SignAssembly>
         <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
-        <RootNamespace>IdentityModel.OidcClient.Tests</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/test/DPoPTests/Framework/ApiHost.cs b/test/DPoPTests/Framework/ApiHost.cs
@@ -1,6 +1,8 @@
 ﻿// Copyright (c) Duende Software. All rights reserved.
 // See LICENSE in the project root for license information.
 
+using System;
+using System.Threading.Tasks;
 using ApiHost;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/test/DPoPTests/Framework/DPoP/ConfigureJwtBearerOptions.cs b/test/DPoPTests/Framework/DPoP/ConfigureJwtBearerOptions.cs
@@ -1,3 +1,4 @@
+using System;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.Extensions.Options;
 
diff --git a/test/DPoPTests/Framework/DPoP/DPoPExtensions.cs b/test/DPoPTests/Framework/DPoP/DPoPExtensions.cs
@@ -1,3 +1,5 @@
+using System.Collections.Generic;
+using System.Linq;
 using IdentityModel;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http;
diff --git a/test/DPoPTests/Framework/DPoP/DPoPJwtBearerEvents.cs b/test/DPoPTests/Framework/DPoP/DPoPJwtBearerEvents.cs
@@ -3,6 +3,7 @@
 using Microsoft.Extensions.Options;
 using Microsoft.Net.Http.Headers;
 using System.Text;
+using System.Threading.Tasks;
 using static IdentityModel.OidcConstants;
 
 namespace ApiHost;
diff --git a/test/DPoPTests/Framework/DPoP/DPoPOptions.cs b/test/DPoPTests/Framework/DPoP/DPoPOptions.cs
@@ -1,4 +1,6 @@
-﻿namespace ApiHost;
+﻿using System;
+
+namespace ApiHost;
 
 public class DPoPOptions
 {
diff --git a/test/DPoPTests/Framework/DPoP/DPoPProofValidatonResult.cs b/test/DPoPTests/Framework/DPoP/DPoPProofValidatonResult.cs
@@ -1,3 +1,5 @@
+using System.Collections.Generic;
+
 namespace ApiHost;
 
 public class DPoPProofValidatonResult
diff --git a/test/DPoPTests/Framework/DPoP/DPoPServiceCollectionExtensions.cs b/test/DPoPTests/Framework/DPoP/DPoPServiceCollectionExtensions.cs
@@ -1,3 +1,4 @@
+using System;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
diff --git a/test/DPoPTests/Framework/DPoP/DefaultReplayCache.cs b/test/DPoPTests/Framework/DPoP/DefaultReplayCache.cs
@@ -1,4 +1,6 @@
-﻿using Microsoft.Extensions.Caching.Distributed;
+﻿using System;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Caching.Distributed;
 
 namespace ApiHost;
 
diff --git a/test/DPoPTests/Framework/DPoP/IReplayCache.cs b/test/DPoPTests/Framework/DPoP/IReplayCache.cs
@@ -1,3 +1,6 @@
+using System;
+using System.Threading.Tasks;
+
 namespace ApiHost;
 
 public interface IReplayCache
diff --git a/test/DPoPTests/Framework/GenericHost.cs b/test/DPoPTests/Framework/GenericHost.cs
@@ -2,13 +2,16 @@
 // See LICENSE in the project root for license information.
 
 
+using System;
+using System.Net.Http;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using System.Reflection;
+using System.Threading.Tasks;
 
 namespace DPoPTests;
 
diff --git a/test/DPoPTests/Framework/IdentityServerHost.cs b/test/DPoPTests/Framework/IdentityServerHost.cs
@@ -1,6 +1,7 @@
 ﻿// Copyright (c) Duende Software. All rights reserved.
 // See LICENSE in the project root for license information.
 
+using System.Collections.Generic;
 using Duende.IdentityServer.Models;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/test/DPoPTests/Framework/TestLoggerProvider.cs b/test/DPoPTests/Framework/TestLoggerProvider.cs
@@ -1,6 +1,8 @@
 ﻿// Copyright (c) Duende Software. All rights reserved.
 // See LICENSE in the project root for license information.
 
+using System;
+using System.Collections.Generic;
 using Microsoft.Extensions.Logging;
 
 namespace DPoPTests;
diff --git a/test/JwtValidationTests/JwtValidationTests.csproj b/test/JwtValidationTests/JwtValidationTests.csproj
@@ -1,11 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <!--Conditional compilation-->
-    <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
-        <TargetFrameworks>net472;net6.0</TargetFrameworks>
-    </PropertyGroup>
-
-    <PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
+    <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
     </PropertyGroup>
 
diff --git a/test/OidcClient.Tests/OidcClient.Tests.csproj b/test/OidcClient.Tests/OidcClient.Tests.csproj
@@ -1,31 +1,26 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-  <!--Conditional compilation-->
-  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
-    <TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+    </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-  </PropertyGroup>
+    <PropertyGroup>
+        <AssemblyOriginatorKeyFile>../../key.snk</AssemblyOriginatorKeyFile>
+        <SignAssembly>true</SignAssembly>
+        <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
+        <RootNamespace>IdentityModel.OidcClient.Tests</RootNamespace>
+    </PropertyGroup>
 
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>../../key.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>true</SignAssembly>
-    <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
-    <RootNamespace>IdentityModel.OidcClient.Tests</RootNamespace>
-  </PropertyGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\src\OidcClient\OidcClient.csproj"/>
+    </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\OidcClient\OidcClient.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.12.0"/>
 
-  <ItemGroup>
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.12.0" />
-    
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="FluentAssertions" Version="5.10.3" />
-  </ItemGroup>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4"/>
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3"/>
+        <PackageReference Include="xunit" Version="2.4.1"/>
+        <PackageReference Include="FluentAssertions" Version="5.10.3"/>
+    </ItemGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "7.0.100",`
	`3`	`+ "version": "6.0.100",`
`4`	`4`	`"rollForward": "latestMajor",`
`5`	`5`	`"allowPrerelease": false`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using System;`
`1`	`2`	`using Microsoft.AspNetCore.Authentication.JwtBearer;`
`2`	`3`	`using Microsoft.Extensions.Options;`
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+using System.Collections.Generic;`
	`2`	`+using System.Linq;`
`1`	`3`	`using IdentityModel;`
`2`	`4`	`using Microsoft.AspNetCore.Authentication;`
`3`	`5`	`using Microsoft.AspNetCore.Http;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-namespace ApiHost;`
	`1`	`+using System;`
	`2`	`+`
	`3`	`+namespace ApiHost;`
`2`	`4`
`3`	`5`	`public class DPoPOptions`
`4`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+using System.Collections.Generic;`
	`2`	`+`
`1`	`3`	`namespace ApiHost;`
`2`	`4`
`3`	`5`	`public class DPoPProofValidatonResult`