From 884a18ea7be149ba2887e563f2e398ad99f0c52f Mon Sep 17 00:00:00 2001 From: Josh Lozensky <joshlozensky@microsoft.com> Date: Mon, 27 Jan 2025 14:41:10 -0800 Subject: [PATCH 1/2] version increase --- 1-WebApp-OIDC/1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj | 2 +- 1-WebApp-OIDC/1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj | 2 +- .../1-3-AnyOrgOrPersonal/WebApp-OpenIDConnect-DotNet.csproj | 2 +- .../1-4-Sovereign/WebApp-OpenIDConnect-DotNet.csproj | 2 +- 1-WebApp-OIDC/1-5-B2C/WebApp-OpenIDConnect-DotNet.csproj | 2 +- .../2-1-Call-MSGraph/WebApp-OpenIDConnect-DotNet-graph.csproj | 4 ++-- .../2-2-TokenCache/WebApp-OpenIDConnect-DotNet.csproj | 4 ++-- .../2-3-Multi-Tenant/WebApp-MultiTenant-v2.csproj | 4 ++-- .../WebApp-OpenIDConnect-DotNet.csproj | 4 ++-- 2-WebApp-graph-user/2-5-HybridFlow/2-5-HybridFlow.csproj | 4 ++-- 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF.csproj | 4 ++-- 3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj | 2 +- 4-WebApp-your-API/4-1-MyOrg/Client/TodoListClient.csproj | 4 ++-- .../4-1-MyOrg/TodoListService/TodoListService.csproj | 2 +- 4-WebApp-your-API/4-2-B2C/Client/TodoListClient.csproj | 2 +- .../4-2-B2C/TodoListService/TodoListService.csproj | 2 +- .../4-3-AnyOrg/ToDoListClient/ToDoListClient.csproj | 4 ++-- .../4-3-AnyOrg/TodoListService/ToDoListService.csproj | 4 ++-- 5-WebApp-AuthZ/5-1-Roles/WebApp-OpenIDConnect-DotNet.csproj | 4 ++-- 5-WebApp-AuthZ/5-2-Groups/WebApp-OpenIDConnect-DotNet.csproj | 4 ++-- 20 files changed, 31 insertions(+), 31 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 005de6ba..0669ff0c 100644 --- a/1-WebApp-OIDC/1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj +++ b/1-WebApp-OIDC/1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj @@ -19,7 +19,7 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" /> + <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.6.2" /> </ItemGroup> </Project> 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 58dd45f0..5b8913f1 100644 --- a/1-WebApp-OIDC/1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj +++ b/1-WebApp-OIDC/1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj @@ -18,7 +18,7 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" /> + <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.6.2" /> </ItemGroup> </Project> 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 58dd45f0..5b8913f1 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 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" /> + <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.6.2" /> </ItemGroup> </Project> 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 58dd45f0..5b8913f1 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 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" /> + <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.6.2" /> </ItemGroup> </Project> 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 58dd45f0..5b8913f1 100644 --- a/1-WebApp-OIDC/1-5-B2C/WebApp-OpenIDConnect-DotNet.csproj +++ b/1-WebApp-OIDC/1-5-B2C/WebApp-OpenIDConnect-DotNet.csproj @@ -18,7 +18,7 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" /> + <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.6.2" /> </ItemGroup> </Project> 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 af76a6b6..85ff95f4 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 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="Microsoft.Identity.Web.GraphServiceClientBeta" Version="3.0.0" /> - <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" /> + <PackageReference Include="Microsoft.Identity.Web.GraphServiceClientBeta" Version="3.6.2" /> + <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.6.2" /> </ItemGroup> </Project> 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 b09b39cb..81076be0 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 @@ <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.8" /> <PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="3.1.8" /> <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="7.0.0" /> - <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" /> - <PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="3.0.0" /> + <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.6.2" /> + <PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="3.6.2" /> </ItemGroup> 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 04e9e8ab..54fd3c12 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 @@ </PackageReference> <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.0" /> <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" /> - <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" /> - <PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="3.0.0" /> + <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.6.2" /> + <PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="3.6.2" /> </ItemGroup> </Project> 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 da1f2491..f0b18bf3 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,8 +18,8 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" /> - <PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="3.0.0" /> + <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.6.2" /> + <PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="3.6.2" /> </ItemGroup> </Project> 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 5586da58..239f8f14 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,8 +8,8 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="3.0.0" /> - <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" /> + <PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="3.6.2" /> + <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.6.2" /> </ItemGroup> </Project> diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF.csproj b/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF.csproj index f02aeb0b..6c1b33d2 100644 --- a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF.csproj +++ b/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF.csproj @@ -15,8 +15,8 @@ <ItemGroup> <PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="7.0.5" /> - <PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="3.0.0" /> - <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" /> + <PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="3.6.2" /> + <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.6.2" /> </ItemGroup> <ItemGroup> diff --git a/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj b/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj index ca3e7fa6..1a7d12e5 100644 --- a/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj +++ b/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj @@ -19,7 +19,7 @@ <ItemGroup> <PackageReference Include="Azure.Storage.Blobs" Version="12.21.0" /> - <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" /> + <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.6.2" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> </ItemGroup> 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 bb859991..d715f1e7 100644 --- a/4-WebApp-your-API/4-1-MyOrg/Client/TodoListClient.csproj +++ b/4-WebApp-your-API/4-1-MyOrg/Client/TodoListClient.csproj @@ -22,8 +22,8 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="Microsoft.Identity.Web.DownstreamApi" Version="3.0.0" /> - <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" /> + <PackageReference Include="Microsoft.Identity.Web.DownstreamApi" Version="3.6.2" /> + <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.6.2" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> </ItemGroup> 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 0dbc2afb..f5936a41 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 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="Microsoft.Identity.Web" Version="3.0.0" /> + <PackageReference Include="Microsoft.Identity.Web" Version="3.6.2" /> </ItemGroup> </Project> 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 23103f97..8a2de65a 100644 --- a/4-WebApp-your-API/4-2-B2C/Client/TodoListClient.csproj +++ b/4-WebApp-your-API/4-2-B2C/Client/TodoListClient.csproj @@ -22,7 +22,7 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" /> + <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.6.2" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.2" /> </ItemGroup> 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 0dbc2afb..f5936a41 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 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="Microsoft.Identity.Web" Version="3.0.0" /> + <PackageReference Include="Microsoft.Identity.Web" Version="3.6.2" /> </ItemGroup> </Project> 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 5a7a5e2d..dc9bc428 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 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" /> - <PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="3.0.0" /> + <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.6.2" /> + <PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="3.6.2" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> </ItemGroup> 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 3dd5bd9a..f223201c 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 @@ <PrivateAssets>all</PrivateAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> </PackageReference> - <PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="3.0.0" /> - <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" /> + <PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="3.6.2" /> + <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.6.2" /> <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.1" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.1" Condition="'$(Configuration)' == 'Debug'" /> </ItemGroup> 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 6a196946..f1a3b02f 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 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" /> - <PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="3.0.0" /> + <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.6.2" /> + <PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="3.6.2" /> </ItemGroup> </Project> 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 84fc8efd..34bf797c 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 @@ <ItemGroup> <PackageReference Include="Microsoft.AspNetCore.Session" Version="2.2.0" /> - <PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="3.0.0" /> - <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" /> + <PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="3.6.2" /> + <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.6.2" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> </ItemGroup> From 1a8318948ec923f573e10ecb33bd6e1ed85cd0cd Mon Sep 17 00:00:00 2001 From: Josh Lozensky <joshlozensky@microsoft.com> Date: Mon, 27 Jan 2025 14:54:17 -0800 Subject: [PATCH 2/2] update build pipeline to net 9 --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index a58ad3cc..a3eda1e4 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -19,6 +19,6 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v3 with: - dotnet-version: 7.x + dotnet-version: 9.x - name: Build run: dotnet build buildAllSlns.proj