Run dotnet format

IdentityServer/v6/Basics/Apis/SimpleApi/IdentityController.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
+
 using System.Linq;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;

IdentityServer/v6/Basics/Apis/SimpleApi/Program.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
+
 using System;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;

IdentityServer/v6/Basics/Apis/SimpleApi/Startup.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
+
 using System.IdentityModel.Tokens.Jwt;
 using Client;
 using Microsoft.AspNetCore.Builder;

IdentityServer/v6/Basics/IdentityServer/src/Program.cs

@@ -1,6 +1,6 @@
-// Copyright (c) Duende Software. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
+// Copyright (c) Duende Software. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
 
 using System;
 using Microsoft.AspNetCore.Hosting;

IdentityServer/v6/Basics/IdentityServer/src/Startup.cs

@@ -1,6 +1,6 @@
-// Copyright (c) Duende Software. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
+// Copyright (c) Duende Software. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
 
 using Duende.IdentityServer;
 using Microsoft.AspNetCore.Builder;
@@ -36,14 +36,14 @@ public void ConfigureServices(IServiceCollection services)
             // see https://docs.duendesoftware.com/identityserver/v6/fundamentals/resources/api_scopes
             options.EmitStaticAudienceClaim = true;
         })
-            .AddTestUsers(TestUsers.Users);
-
+            .AddTestUsers(TestUsers.Users);
+
         builder.AddInMemoryIdentityResources(Resources.Identity);
         builder.AddInMemoryApiScopes(Resources.ApiScopes);
         builder.AddInMemoryApiResources(Resources.ApiResources);
-        builder.AddInMemoryClients(Clients.List);
-
-        // this is only needed for the JAR and JWT samples and adds supports for JWT-based client authentication
+        builder.AddInMemoryClients(Clients.List);
+
+        // this is only needed for the JAR and JWT samples and adds supports for JWT-based client authentication
         builder.AddJwtBearerClientAuthentication();
 
         services.AddAuthentication()

IdentityServer/v6/Basics/Shared/Constants.cs

@@ -1,47 +1,16 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-<<<<<<< TODO: Unmerged change from project 'Client', Before:
-namespace Client
-{
-    public class Urls
-    {
-        public const string IdentityServer = "https://localhost:5001";
-        public const string SampleApi = "https://localhost:5002/";
 
-        // The API built with the OWIN pipeline defaults to not using TLS
-        // so that the sample will run "out of the box", without needing
-        // to create certificates and manage bindings with netsh.
-        public const string SampleOwinApi = "http://localhost:5003/";
-    }
-=======
-// Copyright (c) Duende Software. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
+namespace Client;
 
-namespace Client;
-
-public class Urls
-{
-    public const string IdentityServer = "https://localhost:5001";
+public class Urls
+{
+    public const string IdentityServer = "https://localhost:5001";
     public const string SampleApi = "https://localhost:5002/";
 
     // The API built with the OWIN pipeline defaults to not using TLS
     // so that the sample will run "out of the box", without needing
     // to create certificates and manage bindings with netsh.
-    public const string SampleOwinApi = "http://localhost:5003/";
->>>>>>> After
-    // Copyright (c) Duende Software. All rights reserved.
-    // Licensed under the MIT License. See LICENSE in the project root for license information.
-
-    namespace Client;
-
-    public class Urls
-    {
-        public const string IdentityServer = "https://localhost:5001";
-        public const string SampleApi = "https://localhost:5002/";
-
-        // The API built with the OWIN pipeline defaults to not using TLS
-        // so that the sample will run "out of the box", without needing
-        // to create certificates and manage bindings with netsh.
-        public const string SampleOwinApi = "http://localhost:5003/";
-    }
+    public const string SampleOwinApi = "http://localhost:5003/";
+}