Skip to content

Conditionally target net 8 #2318

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.

Sign up for GitHub

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
westin-m merged 7 commits into from
Jul 19, 2023
Merged

Conditionally target net 8 #2318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
143b6f0
Add net 8 target
westin-m Jun 21, 2023
0ac8283
Merge branch 'main' into westinm/net8preview
westin-m Jun 21, 2023
221e05d
conditionally target net 8
westin-m Jun 30, 2023
bac532a
Merge branch 'master' into westinm/net8preview
westin-m Jul 11, 2023
94e3a73
update package versions
westin-m Jul 11, 2023
ed5c5c7
catch up with main
westin-m Jul 19, 2023
acf4f06
change preview number
westin-m Jul 19, 2023
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
8 changes: 8 additions & 0 deletions .github/workflows/dotnetcore.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ jobs:
uses: actions/[email protected]
with:
dotnet-version: 7.0.x

- name: Setup .NET 8.0.x
uses: actions/[email protected]
with:
dotnet-version: 8.0.100-preview.6.23330.14

# Install workload
- name: Setup wasm-tools
Expand All @@ -45,3 +50,6 @@ jobs:

- name: Build with .NET 7.0.x
run: dotnet test Microsoft.Identity.Web.sln -f net7.0 -p:FROM_GITHUB_ACTION=true --configuration Release --filter "(FullyQualifiedName!~Microsoft.Identity.Web.Test.Integration)&(FullyQualifiedName!~WebAppUiTests)&(FullyQualifiedName=IntegrationTests)"

- name: Build with .NET 8.0.x
run: dotnet test Microsoft.Identity.Web.sln -f net8.0 -p:FROM_GITHUB_ACTION=true --configuration Release --filter "(FullyQualifiedName!~Microsoft.Identity.Web.Test.Integration)&(FullyQualifiedName!~WebAppUiTests)&(FullyQualifiedName=IntegrationTests)"
30 changes: 26 additions & 4 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks>net6.0; net7.0; net462; net472; netstandard2.0; netcoreapp3.1</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetNet8)' == 'True'">net6.0; net7.0; net8.0; net462; net472; netstandard2.0; netcoreapp3.1</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetNet8)' != 'True'">net6.0; net7.0; net462; net472; netstandard2.0; netcoreapp3.1</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../../build/MSAL.snk</AssemblyOriginatorKeyFile>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand All @@ -29,9 +30,15 @@
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0'">
<PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == 'NET6_0_OR_GREATER'">
<IsTrimmable>true</IsTrimmable>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == 'NET8_0_OR_GREATER'">
<EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>
true
</EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>
</PropertyGroup>

<PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
Expand All @@ -44,7 +51,7 @@
</None>
</ItemGroup>

<ItemGroup Label="Build Tools" Condition="$([MSBuild]::IsOsPlatform('Windows'))">
<ItemGroup Label="Build Tools" Condition="$([MSBuild]::IsOsPlatform('Windows')) and '$(TargetFramework)' != 'net8.0'">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
</ItemGroup>

Expand All @@ -58,7 +65,7 @@
<DelaySign>false</DelaySign>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netstandard2.1' Or '$(TargetFramework)' == 'netcoreapp3.1'">
<PropertyGroup Condition="'$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netcoreapp3.1'">
<LangVersion>10.0</LangVersion>
</PropertyGroup>

Expand All @@ -78,6 +85,21 @@
<SystemDrawingCommon>4.7.2</SystemDrawingCommon>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
<IdentityModelVersion>7.0.0-preview</IdentityModelVersion>
<MicrosoftAspNetCoreAuthenticationJwtBearerVersion>8.0.0-preview.6.23329.11</MicrosoftAspNetCoreAuthenticationJwtBearerVersion>
<MicrosoftAspNetCoreAuthenticationOpenIdConnectVersion>8.0.0-preview.6.23329.11</MicrosoftAspNetCoreAuthenticationOpenIdConnectVersion>
<MicrosoftExtensionsCachingMemoryVersion>8.0.0-preview.6.23329.7</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsHostingVersion>8.0.0-preview.6.23329.7</MicrosoftExtensionsHostingVersion>
<MicrosoftAspNetCoreDataProtectionVersion>8.0.0-preview.6.23329.11</MicrosoftAspNetCoreDataProtectionVersion>
<SystemSecurityCryptographyPkcsVersion>8.0.0-preview.6.23329.7</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyXmlVersion>8.0.0-preview.6.23329.7</SystemSecurityCryptographyXmlVersion>
<MicrosoftExtensionsLoggingVersion>8.0.0-preview.6.23329.7</MicrosoftExtensionsLoggingVersion>
<SystemTextEncodingsWebVersion>8.0.0-preview.6.23329.7</SystemTextEncodingsWebVersion>
<MicrosoftExtensionsConfigurationBinderVersion>8.0.0-preview.6.23329.7</MicrosoftExtensionsConfigurationBinderVersion>
<MicrosoftExtensionsDependencyInjectionVersion>8.0.0-preview.6.23329.7</MicrosoftExtensionsDependencyInjectionVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net7.0'">
<MicrosoftAspNetCoreAuthenticationJwtBearerVersion>7.0.1</MicrosoftAspNetCoreAuthenticationJwtBearerVersion>
<MicrosoftAspNetCoreAuthenticationOpenIdConnectVersion>7.0.1</MicrosoftAspNetCoreAuthenticationOpenIdConnectVersion>
Expand Down
7 changes: 7 additions & 0 deletions build/template-install-dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@ steps:
inputs:
version: 7.0.x

- task: UseDotNet@2
displayName: 'Use .Net Core SDK 8'
inputs:
version: 8.x
includePreviewVersions: true
condition: eq(variables['TargetNet8'], 'True')

# Run Nuget Tool Installer

- task: NuGetToolInstaller@1
Expand Down
2 changes: 2 additions & 0 deletions build/template-postbuild-code-analysis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
steps:
- task: securedevelopmentteam.vss-secure-development-tools.build-task-roslynanalyzers.RoslynAnalyzers@3
displayName: 'Run Roslyn Analyzers'
condition: eq(variables['TargetNet8'], 'False')
inputs:
userProvideBuildInfo: auto
env:
Expand All @@ -12,5 +13,6 @@ steps:

- task: securedevelopmentteam.vss-secure-development-tools.build-task-postanalysis.PostAnalysis@2
displayName: 'Check Roslyn Results '
condition: eq(variables['TargetNet8'], 'False')
inputs:
RoslynAnalyzers: true
11 changes: 5 additions & 6 deletions build/template-restore-build-MSIdentityWeb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,17 @@ steps:

# This task is needed so that the 1CS Rolsyn analyzers task works.
# The previous task does the restore
- task: VSBuild@1
- task: DotNetCoreCLI@2
displayName: 'Build solution Microsoft.Identity.Web.sln for governance'
inputs:
solution: Microsoft.Identity.Web.sln
msbuildArgs: '/p:RunCodeAnalysis=false /p:MsIdentityWebSemVer=${{ parameters.MsIdentityWebSemVer }} /p:SourceLinkCreate=true'
platform: ${{ parameters.BuildPlatform }}
configuration: ${{ parameters.BuildConfiguration }}
command: build
project: Microsoft.Identity.Web.sln
arguments: '--configuration ${{ parameters.BuildConfiguration }} -p:RunCodeAnalysis=false -p:MsIdentityWebSemVer=${{ parameters.MsIdentityWebSemVer }} -p:SourceLinkCreate=true'

- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
displayName: 'Component Detection'
inputs:
failOnAlert: true
scanType: 'Register'
verbosity: 'Verbose'
alertWarningLevel: 'High'
alertWarningLevel: 'High'
4 changes: 3 additions & 1 deletion src/Microsoft.Identity.Web.TokenAcquisition/MergedOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,9 @@ internal static void UpdateMergedOptionsFromMicrosoftIdentityOptions(MicrosoftId
mergedOptions.SkipUnrecognizedRequests |= microsoftIdentityOptions.SkipUnrecognizedRequests;
mergedOptions.StateDataFormat ??= microsoftIdentityOptions.StateDataFormat;
mergedOptions.StringDataFormat ??= microsoftIdentityOptions.StringDataFormat;

#if NET8_0_OR_GREATER
mergedOptions.TimeProvider = microsoftIdentityOptions.TimeProvider;
#endif
mergedOptions.TokenValidationParameters = microsoftIdentityOptions.TokenValidationParameters.Clone();
mergedOptions.UsePkce |= microsoftIdentityOptions.UsePkce;

Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.Identity.Web.TokenAcquisition/Microsoft.Identity.Web.TokenAcquisition.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'netcoreapp3.1'">
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'netcoreapp3.1'">
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftAspNetCoreAuthenticationJwtBearerVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(MicrosoftAspNetCoreAuthenticationOpenIdConnectVersion)" />
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(IdentityModelVersion)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netcoreapp3.1'">
<ItemGroup Condition="'$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'netcoreapp3.1'">
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(MicrosoftExtensionsConfigurationBinderVersion)" />
</ItemGroup>

Expand All @@ -34,7 +34,7 @@
<ProjectReference Include="..\Microsoft.Identity.Web.TokenCache\Microsoft.Identity.Web.TokenCache.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'netstandard2.0'">
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' Or '$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
<Compile Remove="AspNetCore\*.cs" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Identity.Web.TokenCache/Microsoft.Identity.Web.TokenCache.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<PackageReference Include="System.Drawing.Common" Version="$(SystemDrawingCommon)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0'">
<ItemGroup Condition="'$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="$(MicrosoftAspNetCoreDataProtectionVersion)" />
Expand Down
15 changes: 7 additions & 8 deletions src/Microsoft.Identity.Web/AppServicesAuth/AppServicesAuthenticationHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,19 @@ namespace Microsoft.Identity.Web
/// </summary>
public class AppServicesAuthenticationHandler : AuthenticationHandler<AppServicesAuthenticationOptions>
{
/// <summary>
/// Constructor for the AppServiceAuthenticationHandler.
/// Note the parameters are required by the base class.
/// </summary>
/// <param name="options">App service authentication options.</param>
/// <param name="logger">Logger factory.</param>
/// <param name="encoder">URL encoder.</param>
/// <param name="clock">System clock.</param>
/// <inheritdoc/>
///<remarks>Note the parameters are required by the base class.</remarks>
public AppServicesAuthenticationHandler(
IOptionsMonitor<AppServicesAuthenticationOptions> options,
ILoggerFactory logger,
#if NET8_0_OR_GREATER
UrlEncoder encoder)
: base(options, logger, encoder)
#else
UrlEncoder encoder,
ISystemClock clock)
: base(options, logger, encoder, clock)
#endif
{
}

Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.Identity.Web/Microsoft.Identity.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'netcoreapp3.1'">
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NET' Or '$(TargetFramework)' == 'netcoreapp3.1'">
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftAspNetCoreAuthenticationJwtBearerVersion)" />
</ItemGroup>

Expand All @@ -26,7 +26,7 @@
<PackageReference Include="System.Drawing.Common" Version="$(SystemDrawingCommon)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'netstandard2.0'">
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' Or '$(TargetFramework)' == 'netstandard2.0'">
<Compile Remove="*.cs" />
<Compile Remove="AppServicesAuth\**" />
<Compile Remove="AzureSdkSupport\**" />
Expand Down
3 changes: 3 additions & 0 deletions ...t.Identity.Web/WebAppExtensions/MicrosoftIdentityWebAppAuthenticationBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,6 +521,9 @@ internal static void PopulateOpenIdOptionsFromMergedOptions(
options.ForwardSignIn = mergedOptions.ForwardSignIn;
options.ForwardSignOut = mergedOptions.ForwardSignOut;
options.ForwardDefaultSelector = mergedOptions.ForwardDefaultSelector;
#if NET8_0_OR_GREATER
options.TimeProvider = mergedOptions.TimeProvider;
#endif
}
}
}
3 changes: 2 additions & 1 deletion tests/DevApps/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project>

<PropertyGroup>
<TargetFrameworks>net6.0; net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetNet8)' == 'True'">net6.0; net7.0; net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetNet8)' != 'True'">net6.0; net7.0</TargetFrameworks>
<UseWip>true</UseWip>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions tests/DevApps/WebAppCallsWebApiCallsGraph/Client/TodoListClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.21.6" />
<PackageReference Include="Grpc.Net.Client" Version="2.52.0" />
<PackageReference Include="Grpc.Tools" Version="2.44.0">
<PackageReference Include="Google.Protobuf" Version="3.23.4" />
<PackageReference Include="Grpc.Net.Client" Version="2.55.0" />
<PackageReference Include="Grpc.Tools" Version="2.56.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
6 changes: 3 additions & 3 deletions tests/DevApps/WebAppCallsWebApiCallsGraph/TodoListService/TodoListService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
<ProjectReference Include="..\..\..\..\src\Microsoft.Identity.Web.MicrosoftGraph\Microsoft.Identity.Web.MicrosoftGraph.csproj" />
<ProjectReference Include="..\..\..\..\src\Microsoft.Identity.Web\Microsoft.Identity.Web.csproj" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="5.0.1" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.*" />
<PackageReference Include="Microsoft.IdentityModel.Protocols" Version="6.*" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.0.0-preview" />
<PackageReference Include="Microsoft.IdentityModel.Protocols" Version="7.0.0-preview" />
<PackageReference Include="StackExchange.Redis" Version="2.2.4" />
<!--CVE-2021-24112-->
<PackageReference Include="System.Drawing.Common" Version="5.0.3" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' ">
<PackageReference Include="Microsoft.IdentityModel.Logging" Version="6.*" />
<PackageReference Include="Microsoft.IdentityModel.Logging" Version="7.0.0-preview" />
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.*" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.*" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/DevApps/WebAppCallsWebApiCallsGraph/gRPC/grpc.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Grpc.AspNetCore" Version="2.52.0" />
<PackageReference Include="Grpc.AspNetCore" Version="2.55.0" />
</ItemGroup>

<ItemGroup>
Expand Down
23 changes: 18 additions & 5 deletions tests/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
<PropertyGroup>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
<TargetFrameworks>net6.0; net7.0; net462; net472</TargetFrameworks>
<SignAssembly>True</SignAssembly>
<IsPackable>false</IsPackable>
<AssemblyOriginatorKeyFile>../../build/MSAL.snk</AssemblyOriginatorKeyFile>
<TargetFrameworks Condition="'$(TargetNet8)' == 'True'">net6.0; net7.0; net8.0; net462; net472</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetNet8)' != 'True'">net6.0; net7.0; net462; net472</TargetFrameworks>
<SignAssembly>True</SignAssembly>
<IsPackable>false</IsPackable>
<AssemblyOriginatorKeyFile>../../build/MSAL.snk</AssemblyOriginatorKeyFile>
<LangVersion>10.0</LangVersion>
</PropertyGroup>

Expand Down Expand Up @@ -37,7 +38,19 @@
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
<MicrosoftAspNetCoreMvcTestingVersion>6.0.12</MicrosoftAspNetCoreMvcTestingVersion>
<MicrosoftAspNetCoreMvcTestingVersion>6.0.12</MicrosoftAspNetCoreMvcTestingVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
<MicrosoftAspNetCoreMvcTestingVersion>8.0.0-preview.5.23302.2</MicrosoftAspNetCoreMvcTestingVersion>
<MicrosoftNetTestSdkVersion>17.6.3</MicrosoftNetTestSdkVersion>
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == 'NET8_0_OR_GREATER'">
<EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>
true
</EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>
</PropertyGroup>

</Project>
3 changes: 2 additions & 1 deletion tests/IntegrationTests/IntegrationTestService/IntegrationTestService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net6.0; net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetNet8)' == 'True'">net6.0; net7.0; net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetNet8)' != 'True'">net6.0; net7.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<SignAssembly>true</SignAssembly>
<UserSecretsId>ce2cc20c-397d-48f2-9023-daf7c8550c53</UserSecretsId>
Expand Down
3 changes: 2 additions & 1 deletion tests/IntegrationTests/TokenAcquirerTests/TokenAcquirerTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetNet8)' == 'True'">net7.0; net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetNet8)' != 'True'">net7.0</TargetFrameworks>
<AssemblyOriginatorKeyFile>../../../build/MSAL.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

Expand Down
9 changes: 5 additions & 4 deletions tests/IntegrationTests/WebAppUiTests/WebAppUiTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0; net7.0</TargetFrameworks>
<AssemblyOriginatorKeyFile>../../../build/MSAL.snk</AssemblyOriginatorKeyFile>
<IsPackable>false</IsPackable>
<PropertyGroup>
<TargetFrameworks Condition="'$(TargetNet8)' == 'True'">net6.0; net7.0; net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetNet8)' != 'True'">net6.0; net7.0</TargetFrameworks>
<AssemblyOriginatorKeyFile>../../../build/MSAL.snk</AssemblyOriginatorKeyFile>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
Expand Down
5 changes: 3 additions & 2 deletions tests/Microsoft.Identity.Web.Test.Common/Microsoft.Identity.Web.Test.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net462; net472; net6.0; net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetNet8)' == 'True'">net462; net472; net6.0; net7.0; net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetNet8)' != 'True'">net462; net472; net6.0; net7.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../../build/MSAL.snk</AssemblyOriginatorKeyFile>
Expand All @@ -16,7 +17,7 @@
<PackageReference Include="xunit.assert" Version="$(XunitAssertVersion)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net462'">
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
<Compile Remove="Mocks\LoggerMock.cs" />
<Compile Remove="Mocks\MockHttpContextAccessor.cs" />
<Compile Remove="TestHelpers\HttpContextUtilities.cs" />
Expand Down
4 changes: 2 additions & 2 deletions tests/Microsoft.Identity.Web.Test.Integration/Microsoft.Identity.Web.Test.Integration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0; net7.0</TargetFrameworks>

<TargetFrameworks Condition="'$(TargetNet8)' == 'True'">net6.0; net7.0; net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetNet8)' != 'True'">net6.0; net7.0</TargetFrameworks>
<IsPackable>false</IsPackable>

<SignAssembly>true</SignAssembly>
Expand Down
Loading