Merge branch 'main' into brock/TreatWarningsAsErrors

.github/workflows/ci.yml

@@ -33,7 +33,7 @@ jobs:
       with:
         dotnet-version: |
           6.0.x
-          7.0.100-rc.2.22477.23
+          7.0.x
     
     - run: dotnet --info
     

.github/workflows/codeql-analysis.yml

@@ -42,7 +42,7 @@ jobs:
       with:
         dotnet-version: |
           6.0.x
-          7.0.100-rc.2.22477.23
+          7.0.x
       
     - run: dotnet --info
 

Directory.Build.targets

@@ -8,9 +8,9 @@
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(TargetFramework)' == 'net7.0'">
-        <FrameworkVersion>7.0.0-rc.2.*</FrameworkVersion>
-        <ExtensionsVersion>7.0.0-rc.2.*</ExtensionsVersion>
-        <EntityFrameworkVersion>7.0.0-rc.2.*</EntityFrameworkVersion>
+        <FrameworkVersion>7.0.0</FrameworkVersion>
+        <ExtensionsVersion>7.0.0</ExtensionsVersion>
+        <EntityFrameworkVersion>7.0.0</EntityFrameworkVersion>
         <WilsonVersion>6.15.1</WilsonVersion>
     </PropertyGroup>
 

clients/src/MvcAutomaticTokenManagement/Controllers/HomeController.cs

@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Mvc;
 using System.Text.Json;
 using System.Net.Http;
 using System.Threading.Tasks;
+using Clients;
 
 namespace MvcCode.Controllers
 {
@@ -27,9 +28,11 @@ namespace MvcCode.Controllers
             var client = _httpClientFactory.CreateClient("client");
 
             var response = await client.GetStringAsync("identity");
-            ViewBag.Json = JsonDocument.Parse(response).ToString();
-
+            ViewBag.Json = response.PrettyPrintJson();
+            
             return View();
         }
+
+
     }
 }

clients/src/MvcJarJwt/Controllers/HomeController.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using System.Text.Json;
+using Clients;
 using System.Net.Http;
 using System.Threading.Tasks;
 
@@ -27,7 +27,7 @@ namespace MvcCode.Controllers
             var client = _httpClientFactory.CreateClient("client");
 
             var response = await client.GetStringAsync("identity");
-            ViewBag.Json = response;
+            ViewBag.Json = response.PrettyPrintJson();
 
             return View();
         }

clients/src/MvcJarUriJwt/Controllers/HomeController.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using System.Text.Json;
+using Clients;
 using System.Net.Http;
 using System.Threading.Tasks;
 
@@ -27,7 +27,7 @@ namespace MvcCode.Controllers
             var client = _httpClientFactory.CreateClient("client");
 
             var response = await client.GetStringAsync("identity");
-            ViewBag.Json = response;
+            ViewBag.Json = response.PrettyPrintJson();
 
             return View();
         }

global.json

@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "7.0.100-rc.1.22431.12",
+    "version": "7.0.100",
     "rollForward": "latestMajor",
-    "allowPrerelease": true
+    "allowPrerelease": false
   }
 }

test/IdentityServer.UnitTests/Services/Default/DefaultRefreshTokenServiceTests.cs

@@ -287,6 +287,9 @@ public class DefaultRefreshTokenServiceTests
 
         oldToken.ConsumedTime.Should().Be(now);
         newToken.ConsumedTime.Should().BeNull();
+
+        newToken.CreationTime.Should().Be(oldToken.CreationTime);
+        newToken.Lifetime.Should().Be(oldToken.Lifetime);
     }
         
     [Fact]
@@ -471,4 +474,4 @@ public class DefaultRefreshTokenServiceTests
 
         result.IsError.Should().BeFalse();
     }
-}
+}