diff --git a/.gitignore b/.gitignore index 7f9be227..fb8a29a7 100644 --- a/.gitignore +++ b/.gitignore @@ -138,3 +138,5 @@ packages /.vscode /2-WebApp-graph-user/2-1-Call-MSGraph/Properties/PublishProfiles /2-WebApp-graph-user/2-3-Multi-Tenant/AppCreationScripts/createdApps.html +/.SharedData +/out/.s/.output/.responses/.s/.output/.reports diff --git a/1-WebApp-OIDC/1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj b/1-WebApp-OIDC/1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj index 0a064a28..005de6ba 100644 --- a/1-WebApp-OIDC/1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj +++ b/1-WebApp-OIDC/1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj @@ -1,7 +1,7 @@  - net7.0; net8.0 + net8.0 aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8 0 @@ -19,19 +19,7 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - diff --git a/1-WebApp-OIDC/1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj b/1-WebApp-OIDC/1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj index ef566c25..58dd45f0 100644 --- a/1-WebApp-OIDC/1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj +++ b/1-WebApp-OIDC/1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj @@ -1,7 +1,7 @@ - net7.0; net8.0 + net8.0 aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8 0 @@ -18,12 +18,6 @@ - - - - - - diff --git a/1-WebApp-OIDC/1-3-AnyOrgOrPersonal/WebApp-OpenIDConnect-DotNet.csproj b/1-WebApp-OIDC/1-3-AnyOrgOrPersonal/WebApp-OpenIDConnect-DotNet.csproj index f829f663..58dd45f0 100644 --- a/1-WebApp-OIDC/1-3-AnyOrgOrPersonal/WebApp-OpenIDConnect-DotNet.csproj +++ b/1-WebApp-OIDC/1-3-AnyOrgOrPersonal/WebApp-OpenIDConnect-DotNet.csproj @@ -1,7 +1,7 @@ - net7.0; net8.0 + net8.0 aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8 0 @@ -18,7 +18,6 @@ - diff --git a/1-WebApp-OIDC/1-4-Sovereign/WebApp-OpenIDConnect-DotNet.csproj b/1-WebApp-OIDC/1-4-Sovereign/WebApp-OpenIDConnect-DotNet.csproj index f829f663..58dd45f0 100644 --- a/1-WebApp-OIDC/1-4-Sovereign/WebApp-OpenIDConnect-DotNet.csproj +++ b/1-WebApp-OIDC/1-4-Sovereign/WebApp-OpenIDConnect-DotNet.csproj @@ -1,7 +1,7 @@ - net7.0; net8.0 + net8.0 aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8 0 @@ -18,7 +18,6 @@ - diff --git a/1-WebApp-OIDC/1-5-B2C/WebApp-OpenIDConnect-DotNet.csproj b/1-WebApp-OIDC/1-5-B2C/WebApp-OpenIDConnect-DotNet.csproj index f829f663..58dd45f0 100644 --- a/1-WebApp-OIDC/1-5-B2C/WebApp-OpenIDConnect-DotNet.csproj +++ b/1-WebApp-OIDC/1-5-B2C/WebApp-OpenIDConnect-DotNet.csproj @@ -1,7 +1,7 @@ - net7.0; net8.0 + net8.0 aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8 0 @@ -18,7 +18,6 @@ - diff --git a/2-WebApp-graph-user/2-1-Call-MSGraph/Views/Home/Profile.cshtml b/2-WebApp-graph-user/2-1-Call-MSGraph/Views/Home/Profile.cshtml index 5865c838..aaed5b71 100644 --- a/2-WebApp-graph-user/2-1-Call-MSGraph/Views/Home/Profile.cshtml +++ b/2-WebApp-graph-user/2-1-Call-MSGraph/Views/Home/Profile.cshtml @@ -1,5 +1,4 @@ -@using Newtonsoft.Json.Linq -@{ +@{ ViewData["Title"] = "User Profile fetched from MS Graph"; Layout = "~/Views/Shared/_Layout.cshtml"; } diff --git a/2-WebApp-graph-user/2-1-Call-MSGraph/WebApp-OpenIDConnect-DotNet-graph.csproj b/2-WebApp-graph-user/2-1-Call-MSGraph/WebApp-OpenIDConnect-DotNet-graph.csproj index bcc988aa..af76a6b6 100644 --- a/2-WebApp-graph-user/2-1-Call-MSGraph/WebApp-OpenIDConnect-DotNet-graph.csproj +++ b/2-WebApp-graph-user/2-1-Call-MSGraph/WebApp-OpenIDConnect-DotNet-graph.csproj @@ -1,7 +1,7 @@ - net7.0; net8.0 + net8.0 aspnet-WebApp_OpenIDConnect_DotNet_graph-0701D544-D6FC-4E5A-84E4-B8DD052BA93F 0 CallMSGraph @@ -11,7 +11,6 @@ - diff --git a/2-WebApp-graph-user/2-2-TokenCache/WebApp-OpenIDConnect-DotNet.csproj b/2-WebApp-graph-user/2-2-TokenCache/WebApp-OpenIDConnect-DotNet.csproj index 9de0ee25..b09b39cb 100644 --- a/2-WebApp-graph-user/2-2-TokenCache/WebApp-OpenIDConnect-DotNet.csproj +++ b/2-WebApp-graph-user/2-2-TokenCache/WebApp-OpenIDConnect-DotNet.csproj @@ -1,7 +1,7 @@ - net7.0; net8.0 + net8.0 aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8 0 diff --git a/2-WebApp-graph-user/2-3-Multi-Tenant/WebApp-MultiTenant-v2.csproj b/2-WebApp-graph-user/2-3-Multi-Tenant/WebApp-MultiTenant-v2.csproj index 5e4c019f..04e9e8ab 100644 --- a/2-WebApp-graph-user/2-3-Multi-Tenant/WebApp-MultiTenant-v2.csproj +++ b/2-WebApp-graph-user/2-3-Multi-Tenant/WebApp-MultiTenant-v2.csproj @@ -1,7 +1,7 @@ - net7.0; net8.0 + net8.0 WebApp-MultiTenant-v2-99C23405-82C0-4B27-8A15-F3B0744E06BE 0 WebApp_OpenIDConnect_DotNet diff --git a/2-WebApp-graph-user/2-4-Sovereign-Call-MSGraph/WebApp-OpenIDConnect-DotNet.csproj b/2-WebApp-graph-user/2-4-Sovereign-Call-MSGraph/WebApp-OpenIDConnect-DotNet.csproj index ae0d51b9..da1f2491 100644 --- a/2-WebApp-graph-user/2-4-Sovereign-Call-MSGraph/WebApp-OpenIDConnect-DotNet.csproj +++ b/2-WebApp-graph-user/2-4-Sovereign-Call-MSGraph/WebApp-OpenIDConnect-DotNet.csproj @@ -1,7 +1,7 @@ - net7.0; net8.0 + net8.0 aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8 0 @@ -17,10 +17,9 @@ - - - - - + + + + diff --git a/2-WebApp-graph-user/2-5-HybridFlow/2-5-HybridFlow.csproj b/2-WebApp-graph-user/2-5-HybridFlow/2-5-HybridFlow.csproj index 98ba9a20..5586da58 100644 --- a/2-WebApp-graph-user/2-5-HybridFlow/2-5-HybridFlow.csproj +++ b/2-WebApp-graph-user/2-5-HybridFlow/2-5-HybridFlow.csproj @@ -1,17 +1,15 @@ - net6.0; net8.0 + net8.0 enable enable WebApp_OpenIDConnect_DotNet - - diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/CallGraphBFF.csproj b/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/CallGraphBFF.csproj index 67905a50..f02aeb0b 100644 --- a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/CallGraphBFF.csproj +++ b/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/CallGraphBFF.csproj @@ -1,7 +1,7 @@ - net7.0; net8.0 + net8.0 enable true Latest @@ -15,7 +15,6 @@ - diff --git a/3-WebApp-multi-APIs/Controllers/HomeController.cs b/3-WebApp-multi-APIs/Controllers/HomeController.cs index e4a8886f..518a5081 100644 --- a/3-WebApp-multi-APIs/Controllers/HomeController.cs +++ b/3-WebApp-multi-APIs/Controllers/HomeController.cs @@ -103,13 +103,13 @@ public async Task Blob() await blobClient.UploadAsync(stream); message = "Blob successfully created"; } - catch (MicrosoftIdentityWebChallengeUserException ex) + catch (MicrosoftIdentityWebChallengeUserException) { - throw ex; + throw; } - catch (MsalUiRequiredException ex) + catch (MsalUiRequiredException) { - throw ex; + throw; } catch (Exception ex) { diff --git a/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj b/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj index f2eacfa5..ca3e7fa6 100644 --- a/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj +++ b/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj @@ -1,7 +1,7 @@ - net7.0; net8.0 + net8.0 aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8 0 @@ -18,8 +18,7 @@ - - + diff --git a/4-WebApp-your-API/4-1-MyOrg/Client/TodoListClient.csproj b/4-WebApp-your-API/4-1-MyOrg/Client/TodoListClient.csproj index 7e007b3c..bb859991 100644 --- a/4-WebApp-your-API/4-1-MyOrg/Client/TodoListClient.csproj +++ b/4-WebApp-your-API/4-1-MyOrg/Client/TodoListClient.csproj @@ -1,7 +1,7 @@ - net7.0; net8.0 + net8.0 aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8 0 @@ -18,14 +18,13 @@ - - - - + - + + + diff --git a/4-WebApp-your-API/4-1-MyOrg/TodoListService/TodoListService.csproj b/4-WebApp-your-API/4-1-MyOrg/TodoListService/TodoListService.csproj index b5e2799c..0dbc2afb 100644 --- a/4-WebApp-your-API/4-1-MyOrg/TodoListService/TodoListService.csproj +++ b/4-WebApp-your-API/4-1-MyOrg/TodoListService/TodoListService.csproj @@ -1,7 +1,7 @@ - net7.0; net8.0 + net8.0 aspnet-TodoListService-03230DB1-5145-408C-A48B-BE3DAFC56C30 0 diff --git a/4-WebApp-your-API/4-2-B2C/Client/TodoListClient.csproj b/4-WebApp-your-API/4-2-B2C/Client/TodoListClient.csproj index aa606f49..23103f97 100644 --- a/4-WebApp-your-API/4-2-B2C/Client/TodoListClient.csproj +++ b/4-WebApp-your-API/4-2-B2C/Client/TodoListClient.csproj @@ -1,7 +1,7 @@ - net7.0; net8.0 + net8.0 aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D9 0 @@ -22,7 +22,6 @@ - diff --git a/4-WebApp-your-API/4-2-B2C/TodoListService/TodoListService.csproj b/4-WebApp-your-API/4-2-B2C/TodoListService/TodoListService.csproj index b5e2799c..0dbc2afb 100644 --- a/4-WebApp-your-API/4-2-B2C/TodoListService/TodoListService.csproj +++ b/4-WebApp-your-API/4-2-B2C/TodoListService/TodoListService.csproj @@ -1,7 +1,7 @@ - net7.0; net8.0 + net8.0 aspnet-TodoListService-03230DB1-5145-408C-A48B-BE3DAFC56C30 0 diff --git a/4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/ToDoListClient.csproj b/4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/ToDoListClient.csproj index 742a0652..5a7a5e2d 100644 --- a/4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/ToDoListClient.csproj +++ b/4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/ToDoListClient.csproj @@ -1,13 +1,13 @@ - net7.0; net8.0 + net8.0 - + diff --git a/4-WebApp-your-API/4-3-AnyOrg/TodoListService/ToDoListService.csproj b/4-WebApp-your-API/4-3-AnyOrg/TodoListService/ToDoListService.csproj index 69dff381..3dd5bd9a 100644 --- a/4-WebApp-your-API/4-3-AnyOrg/TodoListService/ToDoListService.csproj +++ b/4-WebApp-your-API/4-3-AnyOrg/TodoListService/ToDoListService.csproj @@ -1,7 +1,7 @@ - net7.0; net8.0 + net8.0 aspnet-ToDoListService-BA938C29-8BAB-4664-A688-8FD54049C1C3 1 diff --git a/5-WebApp-AuthZ/5-1-Roles/WebApp-OpenIDConnect-DotNet.csproj b/5-WebApp-AuthZ/5-1-Roles/WebApp-OpenIDConnect-DotNet.csproj index becff8c1..6a196946 100644 --- a/5-WebApp-AuthZ/5-1-Roles/WebApp-OpenIDConnect-DotNet.csproj +++ b/5-WebApp-AuthZ/5-1-Roles/WebApp-OpenIDConnect-DotNet.csproj @@ -1,7 +1,7 @@ - net6.0; net8.0 + net8.0 aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8 0 diff --git a/5-WebApp-AuthZ/5-2-Groups/WebApp-OpenIDConnect-DotNet.csproj b/5-WebApp-AuthZ/5-2-Groups/WebApp-OpenIDConnect-DotNet.csproj index 659a3770..84fc8efd 100644 --- a/5-WebApp-AuthZ/5-2-Groups/WebApp-OpenIDConnect-DotNet.csproj +++ b/5-WebApp-AuthZ/5-2-Groups/WebApp-OpenIDConnect-DotNet.csproj @@ -1,7 +1,7 @@ - net7.0; net8.0 + net8.0 aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8 0 diff --git a/build.bat b/build.bat index f6fb50a9..6c4dc1d6 100644 --- a/build.bat +++ b/build.bat @@ -1,2 +1 @@ -msbuild /t:restore buildAllSlns.proj -msbuild buildAllSlns.proj \ No newline at end of file +msbuild /restore buildAllSlns.proj /v:m \ No newline at end of file diff --git a/buildAllSlns.proj b/buildAllSlns.proj index f41dc2e7..3c135b0d 100644 --- a/buildAllSlns.proj +++ b/buildAllSlns.proj @@ -3,12 +3,12 @@ - + - + - + \ No newline at end of file