diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index c30b6b22..42797097 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -11,7 +11,7 @@ body:
attributes:
label: Microsoft.Identity.Web version
description: "Please enter the latest version this issue can be reproduced in. "
- placeholder: "2.17.3"
+ placeholder: "2.18.0"
validations:
required: true
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 9daae5c6..6bd87be1 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 41f106a5..cca40aad 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 e75c80ac..ab582167 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 e75c80ac..ab582167 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 e75c80ac..ab582167 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 3bdf3678..22dddb87 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 c26be564..e2a64311 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 048b7905..4d50d839 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 5786574c..54f0f321 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 90a4fde8..7ed92bd5 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 1452ed77..56034edd 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 852ab4a2..4c511261 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 684f4a60..09b192db 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 903a788e..701ad036 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 413cec5e..fc2c1d42 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 903a788e..701ad036 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 d59c2314..03388a03 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 d1ca2c7d..aac66916 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 509efb12..fb8508e5 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 06d7f0c8..42fcfcd5 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 @@
-
-
+
+