From d5398683536a61d93eddea50b199ded5a1b4ac69 Mon Sep 17 00:00:00 2001 From: Jean-Marc Prieur Date: Thu, 27 Aug 2020 17:17:30 +0200 Subject: [PATCH 1/2] Update to Microsoft.Identity.Web 0.3.1-preview --- .../1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj | 4 ++-- .../1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj | 4 ++-- .../WebApp-OpenIDConnect-DotNet.csproj | 2 +- .../1-4-Sovereign/WebApp-OpenIDConnect-DotNet.csproj | 2 +- .../1-5-B2C/WebApp-OpenIDConnect-DotNet.csproj | 4 ++-- .../1-5-B2C/WebApp-OpenIDConnect-DotNet.sln | 12 ++++++++++++ .../WebApp-OpenIDConnect-DotNet.csproj | 2 +- .../WebApp-OpenIDConnect-DotNet.csproj | 2 +- .../WebApp-OpenIDConnect-DotNet.csproj | 2 +- .../WebApp-OpenIDConnect-DotNet.csproj | 2 +- .../WebApp-OpenIDConnect-DotNet.csproj | 2 +- .../4-1-MyOrg/Client/TodoListClient.csproj | 2 +- .../4-1-MyOrg/TodoListService/TodoListService.csproj | 2 +- .../4-2-B2C/Client/TodoListClient.csproj | 2 +- .../4-2-B2C/TodoListService/TodoListService.csproj | 2 +- .../4-3-AnyOrg/ToDoListClient/ToDoListClient.csproj | 2 +- .../TodoListService/ToDoListService.csproj | 2 +- .../5-1-Roles/WebApp-OpenIDConnect-DotNet.csproj | 2 +- .../5-2-Groups/WebApp-OpenIDConnect-DotNet.csproj | 2 +- 19 files changed, 33 insertions(+), 21 deletions(-) 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 64671695..9fac4a78 100644 --- a/1-WebApp-OIDC/1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj +++ b/1-WebApp-OIDC/1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj @@ -25,8 +25,8 @@ 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 7c96b7f7..4c775671 100644 --- a/1-WebApp-OIDC/1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj +++ b/1-WebApp-OIDC/1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj @@ -18,8 +18,8 @@ - - + + 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 7c96b7f7..93d110eb 100644 --- a/1-WebApp-OIDC/1-3-AnyOrgOrPersonal/WebApp-OpenIDConnect-DotNet.csproj +++ b/1-WebApp-OIDC/1-3-AnyOrgOrPersonal/WebApp-OpenIDConnect-DotNet.csproj @@ -18,7 +18,7 @@ - + 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 7c96b7f7..93d110eb 100644 --- a/1-WebApp-OIDC/1-4-Sovereign/WebApp-OpenIDConnect-DotNet.csproj +++ b/1-WebApp-OIDC/1-4-Sovereign/WebApp-OpenIDConnect-DotNet.csproj @@ -18,7 +18,7 @@ - + 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 7c96b7f7..4c775671 100644 --- a/1-WebApp-OIDC/1-5-B2C/WebApp-OpenIDConnect-DotNet.csproj +++ b/1-WebApp-OIDC/1-5-B2C/WebApp-OpenIDConnect-DotNet.csproj @@ -18,8 +18,8 @@ - - + + diff --git a/1-WebApp-OIDC/1-5-B2C/WebApp-OpenIDConnect-DotNet.sln b/1-WebApp-OIDC/1-5-B2C/WebApp-OpenIDConnect-DotNet.sln index ba25ac77..e04756ab 100644 --- a/1-WebApp-OIDC/1-5-B2C/WebApp-OpenIDConnect-DotNet.sln +++ b/1-WebApp-OIDC/1-5-B2C/WebApp-OpenIDConnect-DotNet.sln @@ -5,6 +5,10 @@ VisualStudioVersion = 16.0.29123.89 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApp-OpenIDConnect-DotNet", "WebApp-OpenIDConnect-DotNet.csproj", "{8DCFEEC2-0A85-4C7E-B96A-21C9184470B1}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Identity.Web", "..\..\..\..\..\gh\microsoft-identity-web\src\Microsoft.Identity.Web\Microsoft.Identity.Web.csproj", "{D8BB5AEE-7B17-4A03-AB1D-37B73238788B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Identity.Web.UI", "..\..\..\..\..\gh\microsoft-identity-web\src\Microsoft.Identity.Web.UI\Microsoft.Identity.Web.UI.csproj", "{6A400A74-F4D9-4D9B-AB38-A52D5249D5F7}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,6 +19,14 @@ Global {8DCFEEC2-0A85-4C7E-B96A-21C9184470B1}.Debug|Any CPU.Build.0 = Debug|Any CPU {8DCFEEC2-0A85-4C7E-B96A-21C9184470B1}.Release|Any CPU.ActiveCfg = Release|Any CPU {8DCFEEC2-0A85-4C7E-B96A-21C9184470B1}.Release|Any CPU.Build.0 = Release|Any CPU + {D8BB5AEE-7B17-4A03-AB1D-37B73238788B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D8BB5AEE-7B17-4A03-AB1D-37B73238788B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D8BB5AEE-7B17-4A03-AB1D-37B73238788B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D8BB5AEE-7B17-4A03-AB1D-37B73238788B}.Release|Any CPU.Build.0 = Release|Any CPU + {6A400A74-F4D9-4D9B-AB38-A52D5249D5F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6A400A74-F4D9-4D9B-AB38-A52D5249D5F7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6A400A74-F4D9-4D9B-AB38-A52D5249D5F7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6A400A74-F4D9-4D9B-AB38-A52D5249D5F7}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/2-WebApp-graph-user/2-1-Call-MSGraph/WebApp-OpenIDConnect-DotNet.csproj b/2-WebApp-graph-user/2-1-Call-MSGraph/WebApp-OpenIDConnect-DotNet.csproj index 7c96b7f7..93d110eb 100644 --- a/2-WebApp-graph-user/2-1-Call-MSGraph/WebApp-OpenIDConnect-DotNet.csproj +++ b/2-WebApp-graph-user/2-1-Call-MSGraph/WebApp-OpenIDConnect-DotNet.csproj @@ -18,7 +18,7 @@ - + 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 d386b62c..bef240c9 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 @@ -20,7 +20,7 @@ - + diff --git a/2-WebApp-graph-user/2-3-Multi-Tenant/WebApp-OpenIDConnect-DotNet.csproj b/2-WebApp-graph-user/2-3-Multi-Tenant/WebApp-OpenIDConnect-DotNet.csproj index f61b616b..d5656bb7 100644 --- a/2-WebApp-graph-user/2-3-Multi-Tenant/WebApp-OpenIDConnect-DotNet.csproj +++ b/2-WebApp-graph-user/2-3-Multi-Tenant/WebApp-OpenIDConnect-DotNet.csproj @@ -21,7 +21,7 @@ - + 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 7c96b7f7..93d110eb 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 @@ -18,7 +18,7 @@ - + diff --git a/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj b/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj index 40fecbb4..85e68669 100644 --- a/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj +++ b/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj @@ -18,7 +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 5a21169f..f9ade9d1 100644 --- a/4-WebApp-your-API/4-1-MyOrg/Client/TodoListClient.csproj +++ b/4-WebApp-your-API/4-1-MyOrg/Client/TodoListClient.csproj @@ -23,7 +23,7 @@ - + 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 483f7c6f..0e1612d6 100644 --- a/4-WebApp-your-API/4-1-MyOrg/TodoListService/TodoListService.csproj +++ b/4-WebApp-your-API/4-1-MyOrg/TodoListService/TodoListService.csproj @@ -7,7 +7,7 @@ - + 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 d8736bb2..6b6a8600 100644 --- a/4-WebApp-your-API/4-2-B2C/Client/TodoListClient.csproj +++ b/4-WebApp-your-API/4-2-B2C/Client/TodoListClient.csproj @@ -23,7 +23,7 @@ - + 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 483f7c6f..0e1612d6 100644 --- a/4-WebApp-your-API/4-2-B2C/TodoListService/TodoListService.csproj +++ b/4-WebApp-your-API/4-2-B2C/TodoListService/TodoListService.csproj @@ -7,7 +7,7 @@ - + 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 09bc88aa..5eb39df1 100644 --- a/4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/ToDoListClient.csproj +++ b/4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/ToDoListClient.csproj @@ -5,7 +5,7 @@ - + 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 72dc5a28..23be7749 100644 --- a/4-WebApp-your-API/4-3-AnyOrg/TodoListService/ToDoListService.csproj +++ b/4-WebApp-your-API/4-3-AnyOrg/TodoListService/ToDoListService.csproj @@ -15,7 +15,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + 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 7c96b7f7..93d110eb 100644 --- a/5-WebApp-AuthZ/5-1-Roles/WebApp-OpenIDConnect-DotNet.csproj +++ b/5-WebApp-AuthZ/5-1-Roles/WebApp-OpenIDConnect-DotNet.csproj @@ -18,7 +18,7 @@ - + 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 7c96b7f7..93d110eb 100644 --- a/5-WebApp-AuthZ/5-2-Groups/WebApp-OpenIDConnect-DotNet.csproj +++ b/5-WebApp-AuthZ/5-2-Groups/WebApp-OpenIDConnect-DotNet.csproj @@ -18,7 +18,7 @@ - + From c4ff5f8e311a8444b07a3b14d4b05546a38f4c81 Mon Sep 17 00:00:00 2001 From: Jean-Marc Prieur Date: Thu, 27 Aug 2020 17:21:44 +0200 Subject: [PATCH 2/2] Removing the references to the Ms.Id.Web project in the 1.5 solution --- .../1-5-B2C/WebApp-OpenIDConnect-DotNet.sln | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/1-WebApp-OIDC/1-5-B2C/WebApp-OpenIDConnect-DotNet.sln b/1-WebApp-OIDC/1-5-B2C/WebApp-OpenIDConnect-DotNet.sln index e04756ab..ba25ac77 100644 --- a/1-WebApp-OIDC/1-5-B2C/WebApp-OpenIDConnect-DotNet.sln +++ b/1-WebApp-OIDC/1-5-B2C/WebApp-OpenIDConnect-DotNet.sln @@ -5,10 +5,6 @@ VisualStudioVersion = 16.0.29123.89 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApp-OpenIDConnect-DotNet", "WebApp-OpenIDConnect-DotNet.csproj", "{8DCFEEC2-0A85-4C7E-B96A-21C9184470B1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Identity.Web", "..\..\..\..\..\gh\microsoft-identity-web\src\Microsoft.Identity.Web\Microsoft.Identity.Web.csproj", "{D8BB5AEE-7B17-4A03-AB1D-37B73238788B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Identity.Web.UI", "..\..\..\..\..\gh\microsoft-identity-web\src\Microsoft.Identity.Web.UI\Microsoft.Identity.Web.UI.csproj", "{6A400A74-F4D9-4D9B-AB38-A52D5249D5F7}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -19,14 +15,6 @@ Global {8DCFEEC2-0A85-4C7E-B96A-21C9184470B1}.Debug|Any CPU.Build.0 = Debug|Any CPU {8DCFEEC2-0A85-4C7E-B96A-21C9184470B1}.Release|Any CPU.ActiveCfg = Release|Any CPU {8DCFEEC2-0A85-4C7E-B96A-21C9184470B1}.Release|Any CPU.Build.0 = Release|Any CPU - {D8BB5AEE-7B17-4A03-AB1D-37B73238788B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8BB5AEE-7B17-4A03-AB1D-37B73238788B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8BB5AEE-7B17-4A03-AB1D-37B73238788B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8BB5AEE-7B17-4A03-AB1D-37B73238788B}.Release|Any CPU.Build.0 = Release|Any CPU - {6A400A74-F4D9-4D9B-AB38-A52D5249D5F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A400A74-F4D9-4D9B-AB38-A52D5249D5F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A400A74-F4D9-4D9B-AB38-A52D5249D5F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A400A74-F4D9-4D9B-AB38-A52D5249D5F7}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE