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

Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging

Browse Source 
# Conflicts:
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestParserTests.cs
#	src/Umbraco.Tests/IO/ShadowFileSystemTests.cs
This commit is contained in:
Mole
2020-10-06 08:13:29 +02:00
parent 81e2ebda96 a7c4fa5f2e
commit 7a8a7104c7
75 changed files with 1780 additions and 1942 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
View File

@@ -24,7 +24,6 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="Moq" Version="4.14.5" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="Moq" Version="4.13.1" />
<PackageReference Include="nunit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
<PrivateAssets>all</PrivateAssets>