Skip to content

Cleanup + move to .NET 8 only #779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 1 addition & 13 deletions 1-WebApp-OIDC/1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net7.0; net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<!--<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>-->
<UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8</UserSecretsId>
<WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
Expand All @@ -19,19 +19,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Identity.Web" Version="3.0.0" />
<PackageReference Include="Microsoft.Identity.Web.Certificate" Version="3.0.0" />
<PackageReference Include="Microsoft.Identity.Web.Certificateless" Version="3.0.0" />
<PackageReference Include="Microsoft.Identity.Web.Diagnostics" Version="3.0.0" />
<PackageReference Include="Microsoft.Identity.Web.TokenAcquisition" Version="3.0.0" />
<PackageReference Include="Microsoft.Identity.Web.TokenCache" Version="3.0.0" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.0.0" />
</ItemGroup>

</Project>
8 changes: 1 addition & 7 deletions 1-WebApp-OIDC/1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net7.0; net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8</UserSecretsId>
<WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
</PropertyGroup>
Expand All @@ -18,12 +18,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Identity.Web" Version="3.0.0" />
<PackageReference Include="Microsoft.Identity.Web.Certificate" Version="3.0.0" />
<PackageReference Include="Microsoft.Identity.Web.Certificateless" Version="3.0.0" />
<PackageReference Include="Microsoft.Identity.Web.Diagnostics" Version="3.0.0" />
<PackageReference Include="Microsoft.Identity.Web.TokenAcquisition" Version="3.0.0" />
<PackageReference Include="Microsoft.Identity.Web.TokenCache" Version="3.0.0" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net7.0; net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8</UserSecretsId>
<WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
</PropertyGroup>
Expand All @@ -18,7 +18,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Identity.Web" Version="3.0.0" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net7.0; net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8</UserSecretsId>
<WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
</PropertyGroup>
Expand All @@ -18,7 +18,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Identity.Web" Version="3.0.0" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" />
</ItemGroup>

Expand Down
3 changes: 1 addition & 2 deletions 1-WebApp-OIDC/1-5-B2C/WebApp-OpenIDConnect-DotNet.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net7.0; net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8</UserSecretsId>
<WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
</PropertyGroup>
Expand All @@ -18,7 +18,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Identity.Web" Version="3.0.0" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@using Newtonsoft.Json.Linq
@{
@{
ViewData["Title"] = "User Profile fetched from MS Graph";
Layout = "~/Views/Shared/_Layout.cshtml";
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net7.0; net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet_graph-0701D544-D6FC-4E5A-84E4-B8DD052BA93F</UserSecretsId>
<WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
<RootNamespace>CallMSGraph</RootNamespace>
Expand All @@ -11,7 +11,6 @@
<ItemGroup>
<PackageReference Include="Microsoft.Identity.Web.GraphServiceClientBeta" Version="3.0.0" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.5" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net7.0; net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8</UserSecretsId>
<WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net7.0; net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<UserSecretsId>WebApp-MultiTenant-v2-99C23405-82C0-4B27-8A15-F3B0744E06BE</UserSecretsId>
<WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
<RootNamespace>WebApp_OpenIDConnect_DotNet</RootNamespace>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net7.0; net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8</UserSecretsId>
<WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
</PropertyGroup>
Expand All @@ -17,10 +17,9 @@
<None Remove="ReadmeFiles\**" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Identity.Web" Version="3.0.0" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" />
<PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="3.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" />
<PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="3.0.0" />
</ItemGroup>

</Project>
4 changes: 1 addition & 3 deletions 2-WebApp-graph-user/2-5-HybridFlow/2-5-HybridFlow.csproj
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net6.0; net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>WebApp_OpenIDConnect_DotNet</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Identity.Web" Version="3.0.0" />
<PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="3.0.0" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.3" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net7.0; net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<Nullable>enable</Nullable>
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
Expand All @@ -15,7 +15,6 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="7.0.5" />
<PackageReference Include="Microsoft.Identity.Web" Version="3.0.0" />
<PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="3.0.0" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" />
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions 3-WebApp-multi-APIs/Controllers/HomeController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,13 @@ public async Task<IActionResult> 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)
{
Expand Down
5 changes: 2 additions & 3 deletions 3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net7.0; net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8</UserSecretsId>
<WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
</PropertyGroup>
Expand All @@ -18,8 +18,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Azure.Storage.Blobs" Version="12.13.4" />
<PackageReference Include="Microsoft.Identity.Web" Version="3.0.0" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.21.0" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
Expand Down
11 changes: 5 additions & 6 deletions 4-WebApp-your-API/4-1-MyOrg/Client/TodoListClient.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net7.0; net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8</UserSecretsId>
<WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
</PropertyGroup>
Expand All @@ -18,14 +18,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Identity.Web" Version="3.0.0" />
<PackageReference Include="Microsoft.Identity.Web.DownstreamApi" Version="3.0.0" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<Compile Include="..\TodoListService\Models\TodoItem.cs" Link="TodoItem.cs" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\TodoListService\TodoListService.csproj" />
<PackageReference Include="Microsoft.Identity.Web.DownstreamApi" Version="3.0.0" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>

<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net7.0; net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<UserSecretsId>aspnet-TodoListService-03230DB1-5145-408C-A48B-BE3DAFC56C30</UserSecretsId>
<WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
</PropertyGroup>
Expand Down
3 changes: 1 addition & 2 deletions 4-WebApp-your-API/4-2-B2C/Client/TodoListClient.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net7.0; net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D9</UserSecretsId>
<WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
</PropertyGroup>
Expand All @@ -22,7 +22,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Identity.Web" Version="3.0.0" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net7.0; net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<UserSecretsId>aspnet-TodoListService-03230DB1-5145-408C-A48B-BE3DAFC56C30</UserSecretsId>
<WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net7.0; net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
</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.VisualStudio.Web.CodeGeneration.Design" Version="7.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

<ProjectExtensions><VisualStudio><UserProperties properties_4launchsettings_1json__JsonSchema="http://json.schemastore.org/modernizrrc" /></VisualStudio></ProjectExtensions>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net7.0; net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<UserSecretsId>aspnet-ToDoListService-BA938C29-8BAB-4664-A688-8FD54049C1C3</UserSecretsId>
<WebProject_DirectoryAccessLevelKey>1</WebProject_DirectoryAccessLevelKey>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net6.0; net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8</UserSecretsId>
<WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net7.0; net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8</UserSecretsId>
<WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
</PropertyGroup>
Expand Down
3 changes: 1 addition & 2 deletions build.bat
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
msbuild /t:restore buildAllSlns.proj
msbuild buildAllSlns.proj
msbuild /restore buildAllSlns.proj /v:m
6 changes: 3 additions & 3 deletions buildAllSlns.proj
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<Solution Include="**\*.sln" />
</ItemGroup>
<Target Name="Build">
<MSBuild Projects="@(Solution)" Targets="Build" Properties="Configuration=Release" />
<MSBuild Projects="@(Solution)" Targets="Build" Properties="Configuration=Release;Platform=Any CPU;v=m" />
</Target>
<Target Name="restore">
<MSBuild Projects="@(Solution)" Targets="restore" />
<MSBuild Projects="@(Solution)" Targets="restore" Properties="Configuration=Release;Platform=Any CPU;v=m"/>
</Target>
<Target Name="clean">
<MSBuild Projects="@(Solution)" Targets="clean" />
<MSBuild Projects="@(Solution)" Targets="clean" Properties="Configuration=Release;Platform=Any CPU;v=m" />
</Target>
</Project>
Loading