Skip to content
Open
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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net452;net461;net472;netstandard2.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net452;net461;net472;netstandard2.0;netcoreapp3.1;</TargetFrameworks>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net452' OR '$(TargetFramework)' == 'net461' OR '$(TargetFramework)' == 'net472'">
Expand All @@ -14,7 +14,7 @@
<PackageReference Include="Kentor.OwinCookieSaver" Version="1.1.1" />
<PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.7" />
<PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="5.2.7" />

</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net452'">
Expand All @@ -31,16 +31,16 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net461' OR '$(TargetFramework)' == 'net472'">
<PackageReference Include="StackExchange.Redis">
<Version>2.2.4</Version>
</PackageReference>
<PackageReference Include="StackExchange.Redis.Extensions.Core">
<Version>6.3.4</Version>
</PackageReference>
<PackageReference Include="StackExchange.Redis.Extensions.Newtonsoft">
<Version>6.3.4</Version>
</PackageReference>
<PackageReference Include="Polly" Version="7.2.1" />
<PackageReference Include="StackExchange.Redis">
<Version>2.2.4</Version>
</PackageReference>
<PackageReference Include="StackExchange.Redis.Extensions.Core">
<Version>6.3.4</Version>
</PackageReference>
<PackageReference Include="StackExchange.Redis.Extensions.Newtonsoft">
<Version>6.3.4</Version>
</PackageReference>
<PackageReference Include="Polly" Version="7.1.1" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
Expand All @@ -52,46 +52,46 @@
<PackageReference Include="Microsoft.Extensions.Caching.Redis">
<Version>2.2.0</Version>
</PackageReference>
<PackageReference Include="StackExchange.Redis">
<Version>2.2.4</Version>
</PackageReference>
<PackageReference Include="StackExchange.Redis.Extensions.Core">
<Version>6.3.4</Version>
</PackageReference>
<PackageReference Include="StackExchange.Redis.Extensions.Newtonsoft">
<Version>6.3.4</Version>
</PackageReference>
<PackageReference Include="Polly" Version="7.2.1" />
<PackageReference Include="StackExchange.Redis">
<Version>2.2.4</Version>
</PackageReference>
<PackageReference Include="StackExchange.Redis.Extensions.Core">
<Version>6.3.4</Version>
</PackageReference>
<PackageReference Include="StackExchange.Redis.Extensions.Newtonsoft">
<Version>6.3.4</Version>
</PackageReference>
<PackageReference Include="Polly" Version="7.1.1" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="2.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="2.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="2.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Authorization.Policy" Version="2.1.2" />
<PackageReference Include="Microsoft.Extensions.Http" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.Caching.Redis">
<Version>2.1.2</Version>
</PackageReference>
<PackageReference Include="StackExchange.Redis">
<Version>2.2.4</Version>
</PackageReference>
<PackageReference Include="StackExchange.Redis.Extensions.Core">
<Version>5.5.0</Version>
</PackageReference>
<PackageReference Include="StackExchange.Redis.Extensions.Newtonsoft">
<Version>5.5.0</Version>
</PackageReference>
<PackageReference Include="Polly" Version="7.2.1" />
<PackageReference Include="StackExchange.Redis">
<Version>2.2.4</Version>
</PackageReference>
<PackageReference Include="StackExchange.Redis.Extensions.Core">
<Version>5.5.0</Version>
</PackageReference>
<PackageReference Include="StackExchange.Redis.Extensions.Newtonsoft">
<Version>5.5.0</Version>
</PackageReference>
<PackageReference Include="Polly" Version="7.1.1" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Auth0.AuthenticationApi" Version="7.5.0" />
<PackageReference Include="Auth0.Core" Version="7.5.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />

</ItemGroup>

<Target Name="ChangeAliasesOfStrongNameAssemblies" BeforeTargets="FindReferenceAssembliesForReferences;ResolveReferences">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<UserSecretsId>b69bc28e-14c9-4c24-bd25-232e24a55745</UserSecretsId>
</PropertyGroup>

Expand Down Expand Up @@ -32,15 +32,14 @@
<PackageReference Include="Auth0.AuthenticationApi" Version="7.5.0" />
<PackageReference Include="Auth0.ManagementApi" Version="7.5.0" />
<PackageReference Include="MailKit" Version="2.13.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="3.1.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.8">
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="10.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.3" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.3" />
<!--<PackageReference Include="Microsoft.AspNet.WebPages" Version="3.2.7" />
<PackageReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />-->
Expand Down
30 changes: 15 additions & 15 deletions NICE.Identity.Test/NICE.Identity.Test.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net10.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand All @@ -11,15 +11,15 @@
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.HttpsPolicy" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.3" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.0" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="10.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.3" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.3" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Include="Moq" Version="4.13.1" />
<PackageReference Include="netDumbster" Version="3.0.1" />
Expand All @@ -44,16 +44,16 @@
</Reference>
</ItemGroup>

<ItemGroup>
<Folder Include="DiffTools\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NICE.Identity.Authentication.Sdk\NICE.Identity.Authentication.Sdk.csproj" />
<ProjectReference Include="..\NICE.Identity.Authorisation.WebAPI\NICE.Identity.Authorisation.WebAPI.csproj" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\NICE.Identity.Authentication.Sdk\NICE.Identity.Authentication.Sdk.csproj" />
<ProjectReference Include="..\NICE.Identity.Authorisation.WebAPI\NICE.Identity.Authorisation.WebAPI.csproj" />
<Folder Include="DiffTools\" />
</ItemGroup>

<ItemGroup>
<ItemGroup>
<None Update="Emails\BasicTemplate.html">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ public async Task Delete_single_user_with_userId()

context.UserRoles.Add(new DataModels.UserRole() { RoleId = roleId, UserId = userToBeDeleted.UserId });
context.Jobs.Add(new DataModels.Job() { IsLead = false, OrganisationId = organisationId, UserId = userToBeDeleted.UserId });
context.UserEmailHistory.Add(new DataModels.UserEmailHistory() {UserId = userToBeDeleted.UserId, EmailAddress = "oldAddress@example.com"});
context.UserEmailHistory.Add(new DataModels.UserEmailHistory() {UserId = userToBeDeleted.UserId, EmailAddress = "oldAddress@example.com", ArchivedDateUTC = DateTime.Now });
context.UserAcceptedTermsVersions.Add(new DataModels.UserAcceptedTermsVersion() { TermsVersionId = 1, UserAcceptedDate = DateTime.Now, UserId = userToBeDeleted.UserId });

context.SaveChanges();
Expand Down