diff --git a/eng/Versions.props b/eng/Versions.props index c05c4e60986a..ff27e5017aae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -296,10 +296,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/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 diff --git a/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj b/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj index 38196cc81d5f..1918b64591ea 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/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 { 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