diff --git a/eng/Versions.props b/eng/Versions.props index 93ddb85ac8..598a010544 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -189,16 +189,16 @@ 3.4.0 3.4.0 3.19.8 - 5.5.0 - 5.5.0 - 5.5.0 + 6.6.0 + 6.6.0 + 6.6.0 2.2.1 1.0.1 3.0.1 3.0.1 11.1.0 1.4.0 - 5.5.0 + 6.6.0 2.1.1 2.2.0 diff --git a/src/MusicStore/samples/MusicStore/MusicStore.csproj b/src/MusicStore/samples/MusicStore/MusicStore.csproj index 80170076e3..ca8b13e76a 100644 --- a/src/MusicStore/samples/MusicStore/MusicStore.csproj +++ b/src/MusicStore/samples/MusicStore/MusicStore.csproj @@ -35,6 +35,7 @@ + diff --git a/src/Security/Authentication/JwtBearer/samples/JwtBearerSample/JwtBearerSample.csproj b/src/Security/Authentication/JwtBearer/samples/JwtBearerSample/JwtBearerSample.csproj index 9f1096e8c5..798b2f54d0 100644 --- a/src/Security/Authentication/JwtBearer/samples/JwtBearerSample/JwtBearerSample.csproj +++ b/src/Security/Authentication/JwtBearer/samples/JwtBearerSample/JwtBearerSample.csproj @@ -1,7 +1,7 @@  - $(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) aspnet5-JwtBearerSample-20151210102827 OutOfProcess diff --git a/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/OpenIdConnectSample.csproj b/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/OpenIdConnectSample.csproj index 46aea57e81..9381309a7e 100644 --- a/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/OpenIdConnectSample.csproj +++ b/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/OpenIdConnectSample.csproj @@ -1,7 +1,7 @@ - $(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) aspnet5-OpenIdConnectSample-20151210110318 OutOfProcess diff --git a/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/Readme.md b/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/Readme.md index 846e3f8e6a..522c6c312a 100644 --- a/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/Readme.md +++ b/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/Readme.md @@ -1,6 +1,6 @@ # How to set up the sample locally -The OpenIdConnect sample supports multilpe authentication providers. In these instruction, we will explore how to set up this sample with both Azure Active Directory and Google Identity Platform. +The OpenIdConnect sample supports multiple authentication providers. In these instruction, we will explore how to set up this sample with both Azure Active Directory and Google Identity Platform. ## Determine your development environment and a few key variables @@ -14,19 +14,21 @@ If the application is run from command line or terminal, environment variable AS 1. Set up a new Azure Active Directory (AAD) in your Azure Subscription. 2. Open the newly created AAD in Azure web portal. -3. Navigate to the Applications tab. +3. Navigate to the App registrations tab. 4. Add a new Application to the AAD. Set the "Sign-on URL" to sample application's URL. -5. Naigate to the Application, and click the Configure tab. +5. Navigate to the Application, and click the Configure tab. 6. Find and save the "Client Id". 7. Add a new key in the "Keys" section. Save value of the key, which is the "Client Secret". 8. Click the "View Endpoints" on the drawer, a dialog will shows six endpoint URLs. Copy the "OAuth 2.0 Authorization Endpoint" to a text editor and remove the "/oauth2/authorize" from the string. The remaining part is the __authority URL__. It looks like `https://login.microsoftonline.com/`. +9. Click the Authentication tab and check (i.e. enable) the ID tokens option under "Implicit grant". +10. On the Authentication tab, ensure the "Redirect URIs" is set to `https://localhost:44318/signin-oidc` (i.e. the sample application's URI appended with "/signin-oidc") -### Configure with Google Identity Platform +### Configure with Google Identity Platform 1. Create a new project through [Google APIs](https://console.developers.google.com). 2. In the sidebar choose "Credentials". 3. Navigate to "OAuth consent screen" tab, fill in the project name and save. -4. Navigate to "Credentials" tab. Click "Create credentials". Choose "OAuth client ID". +4. Navigate to "Credentials" tab. Click "Create credentials". Choose "OAuth client ID". 5. Select "Web application" as the application type. Fill in the "Authorized redirect URIs" with `https://localhost:44318/signin-oidc`. 6. Save the "Client ID" and "Client Secret" shown in the dialog. 7. The "Authority URL" for Google Authentication is `https://accounts.google.com/`. @@ -41,4 +43,4 @@ dotnet user-secrets set oidc:clientid dotnet user-secrets set oidc:clientsecret dotnet user-secrets set oidc:authority ``` - +3. Update the call to `AddOpenIdConnect()` in `ConfigureServices` to use the configuration values from user secrets. diff --git a/src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTestApp.csproj b/src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTestApp.csproj index 6a5cb67738..0d4c1c0b64 100644 --- a/src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTestApp.csproj +++ b/src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTestApp.csproj @@ -34,6 +34,7 @@ +