From 7629f8e04ec716c699233d096c093793bdc74de5 Mon Sep 17 00:00:00 2001 From: kellysong Date: Mon, 27 Nov 2023 14:08:08 -0800 Subject: [PATCH 1/5] update to idweb 2.16.0 --- .../1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj | 14 +++++++------- .../1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj | 14 +++++++------- .../WebApp-OpenIDConnect-DotNet.csproj | 4 ++-- .../WebApp-OpenIDConnect-DotNet.csproj | 4 ++-- .../1-5-B2C/WebApp-OpenIDConnect-DotNet.csproj | 4 ++-- .../WebApp-OpenIDConnect-DotNet-graph.csproj | 4 ++-- .../WebApp-OpenIDConnect-DotNet.csproj | 4 ++-- .../2-3-Multi-Tenant/WebApp-MultiTenant-v2.csproj | 4 ++-- .../WebApp-OpenIDConnect-DotNet.csproj | 6 +++--- .../2-5-HybridFlow/2-5-HybridFlow.csproj | 6 +++--- .../2-6-BFF-Proxy/CallGraphBFF/CallGraphBFF.csproj | 6 +++--- .../WebApp-OpenIDConnect-DotNet.csproj | 4 ++-- .../4-1-MyOrg/Client/TodoListClient.csproj | 6 +++--- .../TodoListService/TodoListService.csproj | 2 +- .../4-2-B2C/Client/TodoListClient.csproj | 4 ++-- .../4-2-B2C/TodoListService/TodoListService.csproj | 2 +- .../ToDoListClient/ToDoListClient.csproj | 4 ++-- .../TodoListService/ToDoListService.csproj | 4 ++-- .../5-1-Roles/WebApp-OpenIDConnect-DotNet.csproj | 4 ++-- .../5-2-Groups/WebApp-OpenIDConnect-DotNet.csproj | 4 ++-- 20 files changed, 52 insertions(+), 52 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 b7487486..79b1a09f 100644 --- a/1-WebApp-OIDC/1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj +++ b/1-WebApp-OIDC/1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj @@ -24,13 +24,13 @@ 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 bbb79922..1399ffcf 100644 --- a/1-WebApp-OIDC/1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj +++ b/1-WebApp-OIDC/1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj @@ -18,13 +18,13 @@ - - - - - - - + + + + + + + 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 787d10e6..3f20b4b8 100644 --- a/1-WebApp-OIDC/1-3-AnyOrgOrPersonal/WebApp-OpenIDConnect-DotNet.csproj +++ b/1-WebApp-OIDC/1-3-AnyOrgOrPersonal/WebApp-OpenIDConnect-DotNet.csproj @@ -18,8 +18,8 @@ - - + + 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 787d10e6..3f20b4b8 100644 --- a/1-WebApp-OIDC/1-4-Sovereign/WebApp-OpenIDConnect-DotNet.csproj +++ b/1-WebApp-OIDC/1-4-Sovereign/WebApp-OpenIDConnect-DotNet.csproj @@ -18,8 +18,8 @@ - - + + 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 787d10e6..3f20b4b8 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/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 baa8f432..d7affe8a 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 @@ -9,8 +9,8 @@ - - + + 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 4098e7de..5811278d 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 @@ -21,8 +21,8 @@ - - + + 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 242266be..0618e38d 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 @@ -18,8 +18,8 @@ - - + + 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 0693cb9b..f55fad59 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,9 +18,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 72463b68..6daf00a2 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 @@ -8,9 +8,9 @@ - - - + + + 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 d6a72c9f..007c95ae 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 @@ -15,9 +15,9 @@ - - - + + + diff --git a/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj b/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj index c760320b..04ee21ee 100644 --- a/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj +++ b/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj @@ -19,8 +19,8 @@ - - + + 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 36dd3fa9..7d5d9440 100644 --- a/4-WebApp-your-API/4-1-MyOrg/Client/TodoListClient.csproj +++ b/4-WebApp-your-API/4-1-MyOrg/Client/TodoListClient.csproj @@ -18,9 +18,9 @@ - - - + + + 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 23974845..68aac1ed 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 e8f5843e..0f299463 100644 --- a/4-WebApp-your-API/4-2-B2C/Client/TodoListClient.csproj +++ b/4-WebApp-your-API/4-2-B2C/Client/TodoListClient.csproj @@ -22,8 +22,8 @@ - - + + 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 23974845..68aac1ed 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 9edbbb58..00b893ea 100644 --- a/4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/ToDoListClient.csproj +++ b/4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/ToDoListClient.csproj @@ -5,8 +5,8 @@ - - + + 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 6fd4ba57..72e1ab40 100644 --- a/4-WebApp-your-API/4-3-AnyOrg/TodoListService/ToDoListService.csproj +++ b/4-WebApp-your-API/4-3-AnyOrg/TodoListService/ToDoListService.csproj @@ -14,8 +14,8 @@ 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 6f1ba897..7cca83ef 100644 --- a/5-WebApp-AuthZ/5-1-Roles/WebApp-OpenIDConnect-DotNet.csproj +++ b/5-WebApp-AuthZ/5-1-Roles/WebApp-OpenIDConnect-DotNet.csproj @@ -17,8 +17,8 @@ - - + + 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 9681c3d4..e1bfc874 100644 --- a/5-WebApp-AuthZ/5-2-Groups/WebApp-OpenIDConnect-DotNet.csproj +++ b/5-WebApp-AuthZ/5-2-Groups/WebApp-OpenIDConnect-DotNet.csproj @@ -19,8 +19,8 @@ - - + + From a356323d74558fd3985d5ed445b85896df13bba0 Mon Sep 17 00:00:00 2001 From: kellysong Date: Tue, 28 Nov 2023 11:34:12 -0800 Subject: [PATCH 2/5] add directory build props to keep idweb version in one place --- Directory.Build.props | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Directory.Build.props diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 00000000..abe04979 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,5 @@ + + + 2.16.0 + + \ No newline at end of file From b8da631066b05f16b139ef933e161798badf09fc Mon Sep 17 00:00:00 2001 From: kellysong Date: Tue, 28 Nov 2023 11:34:53 -0800 Subject: [PATCH 3/5] reference idweb version from build props --- .../1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj | 14 +++++++------- .../1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj | 14 +++++++------- .../WebApp-OpenIDConnect-DotNet.csproj | 4 ++-- .../WebApp-OpenIDConnect-DotNet.csproj | 4 ++-- .../1-5-B2C/WebApp-OpenIDConnect-DotNet.csproj | 4 ++-- .../WebApp-OpenIDConnect-DotNet-graph.csproj | 4 ++-- .../WebApp-OpenIDConnect-DotNet.csproj | 4 ++-- .../2-3-Multi-Tenant/WebApp-MultiTenant-v2.csproj | 4 ++-- .../WebApp-OpenIDConnect-DotNet.csproj | 6 +++--- .../2-5-HybridFlow/2-5-HybridFlow.csproj | 6 +++--- .../2-6-BFF-Proxy/CallGraphBFF/CallGraphBFF.csproj | 6 +++--- .../CallGraphBFF/ClientApp/package-lock.json | 10 +++++----- .../CallGraphBFF/ClientApp/package.json | 2 +- .../WebApp-OpenIDConnect-DotNet.csproj | 4 ++-- .../4-1-MyOrg/Client/TodoListClient.csproj | 6 +++--- .../TodoListService/TodoListService.csproj | 2 +- .../4-2-B2C/Client/TodoListClient.csproj | 4 ++-- .../4-2-B2C/TodoListService/TodoListService.csproj | 2 +- .../ToDoListClient/ToDoListClient.csproj | 4 ++-- .../TodoListService/ToDoListService.csproj | 4 ++-- .../5-1-Roles/WebApp-OpenIDConnect-DotNet.csproj | 4 ++-- .../5-2-Groups/WebApp-OpenIDConnect-DotNet.csproj | 4 ++-- 22 files changed, 58 insertions(+), 58 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 79b1a09f..9576a112 100644 --- a/1-WebApp-OIDC/1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj +++ b/1-WebApp-OIDC/1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj @@ -24,13 +24,13 @@ 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 1399ffcf..5636bdab 100644 --- a/1-WebApp-OIDC/1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj +++ b/1-WebApp-OIDC/1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj @@ -18,13 +18,13 @@ - - - - - - - + + + + + + + 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 3f20b4b8..a4315772 100644 --- a/1-WebApp-OIDC/1-3-AnyOrgOrPersonal/WebApp-OpenIDConnect-DotNet.csproj +++ b/1-WebApp-OIDC/1-3-AnyOrgOrPersonal/WebApp-OpenIDConnect-DotNet.csproj @@ -18,8 +18,8 @@ - - + + 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 3f20b4b8..a4315772 100644 --- a/1-WebApp-OIDC/1-4-Sovereign/WebApp-OpenIDConnect-DotNet.csproj +++ b/1-WebApp-OIDC/1-4-Sovereign/WebApp-OpenIDConnect-DotNet.csproj @@ -18,8 +18,8 @@ - - + + 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 3f20b4b8..a4315772 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/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 d7affe8a..c9c92a85 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 @@ -9,8 +9,8 @@ - - + + 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 5811278d..4bda9bc3 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 @@ -21,8 +21,8 @@ - - + + 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 0618e38d..f31de044 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 @@ -18,8 +18,8 @@ - - + + 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 f55fad59..0e6e1058 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,9 +18,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 6daf00a2..86c7491a 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 @@ -8,9 +8,9 @@ - - - + + + 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 007c95ae..e10a5ab2 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 @@ -15,9 +15,9 @@ - - - + + + diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/package-lock.json b/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/package-lock.json index f1a18501..5865647b 100644 --- a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/package-lock.json +++ b/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/package-lock.json @@ -43,7 +43,7 @@ "eslint-plugin-import": "^2.26.0", "eslint-plugin-jsx-a11y": "^6.6.0", "eslint-plugin-react": "^7.30.1", - "nan": "^2.16.0", + "nan": "^$(MicrosoftIdentityWebVersion)", "typescript": "^4.7.4" } }, @@ -11352,8 +11352,8 @@ } }, "node_modules/nan": { - "version": "2.16.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.16.0.tgz", + "version": "$(MicrosoftIdentityWebVersion)", + "resolved": "https://registry.npmjs.org/nan/-/nan-$(MicrosoftIdentityWebVersion).tgz", "integrity": "sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==", "dev": true }, @@ -24505,8 +24505,8 @@ } }, "nan": { - "version": "2.16.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.16.0.tgz", + "version": "$(MicrosoftIdentityWebVersion)", + "resolved": "https://registry.npmjs.org/nan/-/nan-$(MicrosoftIdentityWebVersion).tgz", "integrity": "sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==", "dev": true }, diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/package.json b/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/package.json index bb64fe18..ebe8db28 100644 --- a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/package.json +++ b/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/package.json @@ -38,7 +38,7 @@ "eslint-plugin-import": "^2.26.0", "eslint-plugin-jsx-a11y": "^6.6.0", "eslint-plugin-react": "^7.30.1", - "nan": "^2.16.0", + "nan": "^$(MicrosoftIdentityWebVersion)", "typescript": "^4.7.4" }, "overrides": { diff --git a/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj b/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj index 04ee21ee..9584e112 100644 --- a/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj +++ b/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj @@ -19,8 +19,8 @@ - - + + 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 7d5d9440..824dc467 100644 --- a/4-WebApp-your-API/4-1-MyOrg/Client/TodoListClient.csproj +++ b/4-WebApp-your-API/4-1-MyOrg/Client/TodoListClient.csproj @@ -18,9 +18,9 @@ - - - + + + 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 68aac1ed..7504f2f4 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 0f299463..7189d243 100644 --- a/4-WebApp-your-API/4-2-B2C/Client/TodoListClient.csproj +++ b/4-WebApp-your-API/4-2-B2C/Client/TodoListClient.csproj @@ -22,8 +22,8 @@ - - + + 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 68aac1ed..7504f2f4 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 00b893ea..dd0fb1f3 100644 --- a/4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/ToDoListClient.csproj +++ b/4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/ToDoListClient.csproj @@ -5,8 +5,8 @@ - - + + 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 72e1ab40..3c2d28aa 100644 --- a/4-WebApp-your-API/4-3-AnyOrg/TodoListService/ToDoListService.csproj +++ b/4-WebApp-your-API/4-3-AnyOrg/TodoListService/ToDoListService.csproj @@ -14,8 +14,8 @@ 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 7cca83ef..5d8df3b9 100644 --- a/5-WebApp-AuthZ/5-1-Roles/WebApp-OpenIDConnect-DotNet.csproj +++ b/5-WebApp-AuthZ/5-1-Roles/WebApp-OpenIDConnect-DotNet.csproj @@ -17,8 +17,8 @@ - - + + 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 e1bfc874..ee7a1424 100644 --- a/5-WebApp-AuthZ/5-2-Groups/WebApp-OpenIDConnect-DotNet.csproj +++ b/5-WebApp-AuthZ/5-2-Groups/WebApp-OpenIDConnect-DotNet.csproj @@ -19,8 +19,8 @@ - - + + From e9dc36d35a384ec9ec572775f2dd683c4c6a4c0f Mon Sep 17 00:00:00 2001 From: kellysong Date: Tue, 28 Nov 2023 11:46:56 -0800 Subject: [PATCH 4/5] Revert "reference idweb version from build props" This reverts commit b8da631066b05f16b139ef933e161798badf09fc. --- .../1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj | 14 +++++++------- .../1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj | 14 +++++++------- .../WebApp-OpenIDConnect-DotNet.csproj | 4 ++-- .../WebApp-OpenIDConnect-DotNet.csproj | 4 ++-- .../1-5-B2C/WebApp-OpenIDConnect-DotNet.csproj | 4 ++-- .../WebApp-OpenIDConnect-DotNet-graph.csproj | 4 ++-- .../WebApp-OpenIDConnect-DotNet.csproj | 4 ++-- .../2-3-Multi-Tenant/WebApp-MultiTenant-v2.csproj | 4 ++-- .../WebApp-OpenIDConnect-DotNet.csproj | 6 +++--- .../2-5-HybridFlow/2-5-HybridFlow.csproj | 6 +++--- .../2-6-BFF-Proxy/CallGraphBFF/CallGraphBFF.csproj | 6 +++--- .../CallGraphBFF/ClientApp/package-lock.json | 10 +++++----- .../CallGraphBFF/ClientApp/package.json | 2 +- .../WebApp-OpenIDConnect-DotNet.csproj | 4 ++-- .../4-1-MyOrg/Client/TodoListClient.csproj | 6 +++--- .../TodoListService/TodoListService.csproj | 2 +- .../4-2-B2C/Client/TodoListClient.csproj | 4 ++-- .../4-2-B2C/TodoListService/TodoListService.csproj | 2 +- .../ToDoListClient/ToDoListClient.csproj | 4 ++-- .../TodoListService/ToDoListService.csproj | 4 ++-- .../5-1-Roles/WebApp-OpenIDConnect-DotNet.csproj | 4 ++-- .../5-2-Groups/WebApp-OpenIDConnect-DotNet.csproj | 4 ++-- 22 files changed, 58 insertions(+), 58 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 9576a112..79b1a09f 100644 --- a/1-WebApp-OIDC/1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj +++ b/1-WebApp-OIDC/1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj @@ -24,13 +24,13 @@ 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 5636bdab..1399ffcf 100644 --- a/1-WebApp-OIDC/1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj +++ b/1-WebApp-OIDC/1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj @@ -18,13 +18,13 @@ - - - - - - - + + + + + + + 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 a4315772..3f20b4b8 100644 --- a/1-WebApp-OIDC/1-3-AnyOrgOrPersonal/WebApp-OpenIDConnect-DotNet.csproj +++ b/1-WebApp-OIDC/1-3-AnyOrgOrPersonal/WebApp-OpenIDConnect-DotNet.csproj @@ -18,8 +18,8 @@ - - + + 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 a4315772..3f20b4b8 100644 --- a/1-WebApp-OIDC/1-4-Sovereign/WebApp-OpenIDConnect-DotNet.csproj +++ b/1-WebApp-OIDC/1-4-Sovereign/WebApp-OpenIDConnect-DotNet.csproj @@ -18,8 +18,8 @@ - - + + 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 a4315772..3f20b4b8 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/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 c9c92a85..d7affe8a 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 @@ -9,8 +9,8 @@ - - + + 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 4bda9bc3..5811278d 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 @@ -21,8 +21,8 @@ - - + + 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 f31de044..0618e38d 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 @@ -18,8 +18,8 @@ - - + + 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 0e6e1058..f55fad59 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,9 +18,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 86c7491a..6daf00a2 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 @@ -8,9 +8,9 @@ - - - + + + 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 e10a5ab2..007c95ae 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 @@ -15,9 +15,9 @@ - - - + + + diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/package-lock.json b/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/package-lock.json index 5865647b..f1a18501 100644 --- a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/package-lock.json +++ b/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/package-lock.json @@ -43,7 +43,7 @@ "eslint-plugin-import": "^2.26.0", "eslint-plugin-jsx-a11y": "^6.6.0", "eslint-plugin-react": "^7.30.1", - "nan": "^$(MicrosoftIdentityWebVersion)", + "nan": "^2.16.0", "typescript": "^4.7.4" } }, @@ -11352,8 +11352,8 @@ } }, "node_modules/nan": { - "version": "$(MicrosoftIdentityWebVersion)", - "resolved": "https://registry.npmjs.org/nan/-/nan-$(MicrosoftIdentityWebVersion).tgz", + "version": "2.16.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.16.0.tgz", "integrity": "sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==", "dev": true }, @@ -24505,8 +24505,8 @@ } }, "nan": { - "version": "$(MicrosoftIdentityWebVersion)", - "resolved": "https://registry.npmjs.org/nan/-/nan-$(MicrosoftIdentityWebVersion).tgz", + "version": "2.16.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.16.0.tgz", "integrity": "sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==", "dev": true }, diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/package.json b/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/package.json index ebe8db28..bb64fe18 100644 --- a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/package.json +++ b/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/package.json @@ -38,7 +38,7 @@ "eslint-plugin-import": "^2.26.0", "eslint-plugin-jsx-a11y": "^6.6.0", "eslint-plugin-react": "^7.30.1", - "nan": "^$(MicrosoftIdentityWebVersion)", + "nan": "^2.16.0", "typescript": "^4.7.4" }, "overrides": { diff --git a/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj b/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj index 9584e112..04ee21ee 100644 --- a/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj +++ b/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj @@ -19,8 +19,8 @@ - - + + 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 824dc467..7d5d9440 100644 --- a/4-WebApp-your-API/4-1-MyOrg/Client/TodoListClient.csproj +++ b/4-WebApp-your-API/4-1-MyOrg/Client/TodoListClient.csproj @@ -18,9 +18,9 @@ - - - + + + 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 7504f2f4..68aac1ed 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 7189d243..0f299463 100644 --- a/4-WebApp-your-API/4-2-B2C/Client/TodoListClient.csproj +++ b/4-WebApp-your-API/4-2-B2C/Client/TodoListClient.csproj @@ -22,8 +22,8 @@ - - + + 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 7504f2f4..68aac1ed 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 dd0fb1f3..00b893ea 100644 --- a/4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/ToDoListClient.csproj +++ b/4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/ToDoListClient.csproj @@ -5,8 +5,8 @@ - - + + 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 3c2d28aa..72e1ab40 100644 --- a/4-WebApp-your-API/4-3-AnyOrg/TodoListService/ToDoListService.csproj +++ b/4-WebApp-your-API/4-3-AnyOrg/TodoListService/ToDoListService.csproj @@ -14,8 +14,8 @@ 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 5d8df3b9..7cca83ef 100644 --- a/5-WebApp-AuthZ/5-1-Roles/WebApp-OpenIDConnect-DotNet.csproj +++ b/5-WebApp-AuthZ/5-1-Roles/WebApp-OpenIDConnect-DotNet.csproj @@ -17,8 +17,8 @@ - - + + 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 ee7a1424..e1bfc874 100644 --- a/5-WebApp-AuthZ/5-2-Groups/WebApp-OpenIDConnect-DotNet.csproj +++ b/5-WebApp-AuthZ/5-2-Groups/WebApp-OpenIDConnect-DotNet.csproj @@ -19,8 +19,8 @@ - - + + From 604132db97d69366282012356c02d21c7ba70549 Mon Sep 17 00:00:00 2001 From: kellysong Date: Tue, 28 Nov 2023 11:48:09 -0800 Subject: [PATCH 5/5] Revert "add directory build props to keep idweb version in one place" This reverts commit a356323d74558fd3985d5ed445b85896df13bba0. --- Directory.Build.props | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 Directory.Build.props diff --git a/Directory.Build.props b/Directory.Build.props deleted file mode 100644 index abe04979..00000000 --- a/Directory.Build.props +++ /dev/null @@ -1,5 +0,0 @@ - - - 2.16.0 - - \ No newline at end of file