yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'netcore/netcore' into netcore/members-userstore

Browse Source 
# Conflicts:
#	src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberServiceTests.cs
This commit is contained in:
Emma Garland
2021-01-19 15:29:40 +00:00
parent 1431a0a076 817b63266d
commit 9ba78497a0
283 changed files with 13730 additions and 11173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/Security/MembershipHelper.cs
View File

@@ -122,7 +122,7 @@ namespace Umbraco.Web.Security
{
pathsWithAccess.TryGetValue(path, out var hasAccess);
// if it's not found it's false anyways
result[path] = hasAccess;
result[path] = !pathsWithProtection.Contains(path) || hasAccess;
}
return result;
}

6
src/Umbraco.Web/Umbraco.Web.csproj
View File

@@ -94,6 +94,9 @@
<PackageReference Include="MiniProfiler" Version="4.2.1" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NPoco" Version="4.0.2" />
<PackageReference Include="MiniProfiler" Version="4.0.138" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="NPoco" Version="4.0.3" />
<PackageReference Include="SecurityCodeScan">
<Version>3.5.3</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
@@ -264,5 +267,8 @@
<Link>Mvc\web.config</Link>
</None>
</ItemGroup>
<ItemGroup>
<Folder Include="Install\InstallSteps" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>