From cda89e5318cbbdad4fedf3cb1748ee40513841b8 Mon Sep 17 00:00:00 2001 From: Jenny Ferries Date: Fri, 16 Jun 2023 12:29:36 -0700 Subject: [PATCH 1/3] Update ProjectTemplates to Id Web 2.12.2, which supports new MS Graph SDK v5. Updates are in project references (from 2.10 to 2.12.2), and new package reference from Microsoft.Identity.Web.MicrosoftGraph to Microsoft.Identity.Web.GraphServiceClient and updates in the respective controllers in graphserviceclient section. --- eng/Versions.props | 8 ++++---- .../Web.ProjectTemplates/BlazorServerWeb-CSharp.csproj.in | 2 +- .../ComponentsWebAssembly-CSharp.Server.csproj.in | 2 +- .../Microsoft.DotNet.Web.ProjectTemplates.csproj | 2 +- .../Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in | 2 +- .../Web.ProjectTemplates/StarterWeb-CSharp.csproj.in | 2 +- .../Web.ProjectTemplates/WebApi-CSharp.csproj.in | 2 +- .../BlazorServerWeb-CSharp/Pages/ShowProfile.razor | 4 ++-- .../Server/Controllers/WeatherForecastController.cs | 2 +- .../content/RazorPagesWeb-CSharp/Pages/Index.cshtml.cs | 4 ++-- .../StarterWeb-CSharp/Controllers/HomeController.cs | 4 ++-- .../Controllers/WeatherForecastController.cs | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index d103a72997da..b34a2a81354e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -294,10 +294,10 @@ 6.0.4 6.0.4 2.5.108 - 2.10.0 - 2.10.0 - 2.10.0 - 2.10.0 + 2.12.2 + 2.12.2 + 2.12.2 + 2.12.2 $(MessagePackVersion) 4.10.0 0.11.2 diff --git a/src/ProjectTemplates/Web.ProjectTemplates/BlazorServerWeb-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/BlazorServerWeb-CSharp.csproj.in index d7786a9e09d1..7b300de7dbc9 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/BlazorServerWeb-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/BlazorServerWeb-CSharp.csproj.in @@ -29,7 +29,7 @@ - + diff --git a/src/ProjectTemplates/Web.ProjectTemplates/ComponentsWebAssembly-CSharp.Server.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/ComponentsWebAssembly-CSharp.Server.csproj.in index b40abaead722..6cfd2a94f51e 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/ComponentsWebAssembly-CSharp.Server.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/ComponentsWebAssembly-CSharp.Server.csproj.in @@ -43,7 +43,7 @@ - + diff --git a/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj b/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj index 8669de2fe0a5..f1c4563d36b9 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj +++ b/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj @@ -20,7 +20,7 @@ MicrosoftExtensionsHostingVersion=$(MicrosoftExtensionsHostingVersion); MicrosoftExtensionsHttpVersion=$(MicrosoftExtensionsHttpVersion); MicrosoftIdentityWebVersion=$(MicrosoftIdentityWebVersion); - MicrosoftIdentityWebMicrosoftGraphVersion=$(MicrosoftIdentityWebMicrosoftGraphVersion); + MicrosoftIdentityWebGraphServiceClientVersion=$(MicrosoftIdentityWebGraphServiceClientVersion); MicrosoftIdentityWebUIVersion=$(MicrosoftIdentityWebUIVersion); MicrosoftIdentityWebDownstreamApiVersion=$(MicrosoftIdentityWebDownstreamApiVersion); MicrosoftNETCoreAppRuntimeVersion=$(MicrosoftNETCoreAppRuntimeVersion); diff --git a/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in index bb4de59b14bc..ee04cb442ea1 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in @@ -27,7 +27,7 @@ - + diff --git a/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in index 444453017f10..c900105fff89 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in @@ -27,7 +27,7 @@ - + diff --git a/src/ProjectTemplates/Web.ProjectTemplates/WebApi-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/WebApi-CSharp.csproj.in index 0e825ca5f248..0ebd36f902c2 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/WebApi-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/WebApi-CSharp.csproj.in @@ -17,7 +17,7 @@ - + diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/ShowProfile.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/ShowProfile.razor index 17c945965bc4..dc8864824e8c 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/ShowProfile.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/ShowProfile.razor @@ -22,7 +22,7 @@ else Name - @user.DisplayName + @user?.DisplayName } @@ -34,7 +34,7 @@ else { try { - user = await GraphServiceClient.Me.Request().GetAsync(); + user = await GraphServiceClient.Me.GetAsync(); } catch (Exception ex) { diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Server/Controllers/WeatherForecastController.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Server/Controllers/WeatherForecastController.cs index 7f9c35470eb7..b22dccad5905 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Server/Controllers/WeatherForecastController.cs +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Server/Controllers/WeatherForecastController.cs @@ -83,7 +83,7 @@ public WeatherForecastController(ILogger logger, [HttpGet] public async Task> Get() { - var user = await _graphServiceClient.Me.Request().GetAsync(); + var user = await _graphServiceClient.Me.GetAsync(); return Enumerable.Range(1, 5).Select(index => new WeatherForecast { diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Index.cshtml.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Index.cshtml.cs index 1e6a3050e5e5..e937859ea730 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Index.cshtml.cs +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Index.cshtml.cs @@ -56,9 +56,9 @@ public IndexModel(ILogger logger, public async Task OnGet() { - var user = await _graphServiceClient.Me.Request().GetAsync(); + var user = await _graphServiceClient.Me.GetAsync(); - ViewData["ApiResult"] = user.DisplayName; + ViewData["ApiResult"] = user?.DisplayName; } #else public IndexModel(ILogger logger) diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Controllers/HomeController.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Controllers/HomeController.cs index d5674f6c5408..3414e9cb3f8e 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Controllers/HomeController.cs +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Controllers/HomeController.cs @@ -63,8 +63,8 @@ public HomeController(ILogger logger, [AuthorizeForScopes(ScopeKeySection = "DownstreamApi:Scopes")] public async Task Index() { - var user = await _graphServiceClient.Me.Request().GetAsync(); - ViewData["ApiResult"] = user.DisplayName; + var user = await _graphServiceClient.Me.GetAsync(); + ViewData["ApiResult"] = user?.DisplayName; return View(); } diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Controllers/WeatherForecastController.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Controllers/WeatherForecastController.cs index 1f0cd2dcae98..32bb96c761af 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Controllers/WeatherForecastController.cs +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Controllers/WeatherForecastController.cs @@ -90,7 +90,7 @@ public WeatherForecastController(ILogger logger, #endif public async Task> Get() { - var user = await _graphServiceClient.Me.Request().GetAsync(); + var user = await _graphServiceClient.Me.GetAsync(); return Enumerable.Range(1, 5).Select(index => new WeatherForecast { From f1c632bbd15e778feb6eddc2fc0b480d7eede977 Mon Sep 17 00:00:00 2001 From: Jenny Ferries Date: Fri, 23 Jun 2023 19:09:19 -0700 Subject: [PATCH 2/3] fix graph public API change in 2 places --- .../Web.ProjectTemplates/content/WebApi-CSharp/Program.Main.cs | 2 +- .../WebApi-CSharp/Program.MinimalAPIs.OrgOrIndividualB2CAuth.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Program.Main.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Program.Main.cs index 314d3412d3dc..5f394bbcbedc 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Program.Main.cs +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Program.Main.cs @@ -133,7 +133,7 @@ public static void Main(string[] args) { httpContext.VerifyUserHasAnyAcceptedScope(scopeRequiredByApi); - var user = await graphServiceClient.Me.Request().GetAsync(); + var user = await graphServiceClient.Me.GetAsync(); var forecast = Enumerable.Range(1, 5).Select(index => new WeatherForecast diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Program.MinimalAPIs.OrgOrIndividualB2CAuth.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Program.MinimalAPIs.OrgOrIndividualB2CAuth.cs index 587cb84bdd24..a61fb627a85c 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Program.MinimalAPIs.OrgOrIndividualB2CAuth.cs +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Program.MinimalAPIs.OrgOrIndividualB2CAuth.cs @@ -100,7 +100,7 @@ { httpContext.VerifyUserHasAnyAcceptedScope(scopeRequiredByApi); - var user = await graphServiceClient.Me.Request().GetAsync(); + var user = await graphServiceClient.Me.GetAsync(); var forecast = Enumerable.Range(1, 5).Select(index => new WeatherForecast From 331d122dfefe094334f1f17cb141d9e3862eee9b Mon Sep 17 00:00:00 2001 From: Jenny Ferries Date: Fri, 23 Jun 2023 19:25:22 -0700 Subject: [PATCH 3/3] add launchSettings --- .../Properties/launchSettings.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/Components/test/testassets/Components.WasmMinimal/Properties/launchSettings.json diff --git a/src/Components/test/testassets/Components.WasmMinimal/Properties/launchSettings.json b/src/Components/test/testassets/Components.WasmMinimal/Properties/launchSettings.json new file mode 100644 index 000000000000..8c8b635bb440 --- /dev/null +++ b/src/Components/test/testassets/Components.WasmMinimal/Properties/launchSettings.json @@ -0,0 +1,12 @@ +{ + "profiles": { + "Components.WasmMinimal": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "https://localhost:53674;http://localhost:53675" + } + } +} \ No newline at end of file