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

Merge remote-tracking branch 'origin/v9/dev' into v9/feature/AB13286-rename-ui-project-back-to-its-original-name

Browse Source
This commit is contained in:
Zeegaan
2021-08-19 09:37:23 +02:00
parent d9d7de8467 7b68083aff
commit 466434feda
10 changed files with 94 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Umbraco.Core.csproj
View File

@@ -17,7 +17,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="5.0.8" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="5.0.9" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />

12
src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
View File

@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
@@ -18,9 +18,9 @@
<ItemGroup>
<PackageReference Include="HtmlAgilityPack" Version="1.11.34" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.36" />
<PackageReference Include="MailKit" Version="2.14.0" />
<PackageReference Include="IPNetwork2" Version="2.5.329" />
<PackageReference Include="IPNetwork2" Version="2.5.341" />
<PackageReference Include="Markdown" Version="2.2.1" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
@@ -28,20 +28,20 @@
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
<PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="5.0.8" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="5.0.9" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
<PackageReference Include="MiniProfiler.Shared" Version="4.2.22" />
<PackageReference Include="ncrontab" Version="3.3.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="NPoco" Version="4.0.2" />
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Serilog.Enrichers.Process" Version="2.0.1" />
<PackageReference Include="Serilog.Enrichers.Process" Version="2.0.2" />
<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="4.1.2" />
<PackageReference Include="Serilog.Filters.Expressions" Version="2.1.0" />
<PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
<PackageReference Include="Serilog.Formatting.Compact.Reader" Version="1.0.5" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.2.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.Map" Version="1.0.2" />

2
src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
View File

@@ -17,7 +17,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="BenchmarkDotNet">
<Version>0.13.0</Version>
<Version>0.13.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Logging.Debug">
<Version>5.0.0</Version>

6
src/Umbraco.Tests.Integration.SqlCe/Umbraco.Tests.Integration.SqlCe.csproj
View File

@@ -8,11 +8,11 @@
<ItemGroup>
<PackageReference Include="Examine.Lucene" Version="2.0.0-beta.154" />
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.8" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.9" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="Moq" Version="4.16.1" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

68
src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs
View File

@@ -148,16 +148,34 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Packaging
Name = "test",
};
bool result = PackageBuilder.SavePackage(def);
//Update values and save
def.Name = "updated";
def.ContentNodeId = "test";
def.Languages.Add("Danish");
def.Languages.Add("English");
def.Scripts.Add("TestScript1");
def.Scripts.Add("TestScript2");
result = PackageBuilder.SavePackage(def);
Assert.IsTrue(result);
// re-get
def = PackageBuilder.GetById(def.Id);
Assert.AreEqual("updated", def.Name);
// TODO: There's a whole lot more assertions to be done
Assert.Multiple(() =>
{
Assert.AreEqual("updated", def.Name);
Assert.AreEqual("test", def.ContentNodeId);
Assert.AreEqual(2, def.Languages.Count());
Assert.AreEqual(2, def.Scripts.Count());
Assert.AreEqual(0, def.DataTypes.Count());
Assert.AreEqual(0, def.DictionaryItems.Count());
Assert.AreEqual(0, def.DocumentTypes.Count());
Assert.AreEqual(0, def.Macros.Count());
Assert.AreEqual(0, def.MediaTypes.Count());
Assert.AreEqual(0, def.MediaUdis.Count());
Assert.AreEqual(0, def.PartialViews.Count());
Assert.AreEqual(0, def.Stylesheets.Count());
Assert.AreEqual(0, def.Templates.Count());
});
}
[Test]
@@ -259,15 +277,24 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Packaging
using (FileStream packageZipStream = File.OpenRead(packageXmlPath))
using (ZipArchive zipArchive = PackageMigrationResource.GetPackageDataManifest(packageZipStream, out XDocument packageXml))
{
Assert.AreEqual("umbPackage", packageXml.Root.Name.ToString());
Assert.IsNotNull(zipArchive.GetEntry("media/media/test-file.txt"));
Assert.AreEqual(
$"<MediaItems><MediaSet><testImage id=\"{m1.Id}\" key=\"{m1.Key}\" parentID=\"-1\" level=\"1\" creatorID=\"-1\" sortOrder=\"0\" createDate=\"{m1.CreateDate.ToString("s")}\" updateDate=\"{m1.UpdateDate.ToString("s")}\" nodeName=\"Test File\" urlName=\"test-file\" path=\"{m1.Path}\" isDoc=\"\" nodeType=\"{mt.Id}\" nodeTypeAlias=\"testImage\" writerName=\"\" writerID=\"0\" udi=\"{m1.GetUdi()}\" mediaFilePath=\"/media/test-file.txt\"><umbracoFile><![CDATA[/media/test-file.txt]]></umbracoFile><umbracoBytes><![CDATA[100]]></umbracoBytes><umbracoExtension><![CDATA[png]]></umbracoExtension></testImage></MediaSet></MediaItems>",
packageXml.Element("umbPackage").Element("MediaItems").ToString(SaveOptions.DisableFormatting));
// TODO: There's a whole lot more assertions to be done
string test = "test-file.txt";
Assert.Multiple(() =>
{
var mediaEntry = zipArchive.GetEntry("media/media/test-file.txt");
Assert.AreEqual("umbPackage", packageXml.Root.Name.ToString());
Assert.IsNotNull(mediaEntry);
Assert.AreEqual(test, mediaEntry.Name);
Assert.IsNotNull(zipArchive.GetEntry("package.xml"));
Assert.AreEqual(
$"<MediaItems><MediaSet><testImage id=\"{m1.Id}\" key=\"{m1.Key}\" parentID=\"-1\" level=\"1\" creatorID=\"-1\" sortOrder=\"0\" createDate=\"{m1.CreateDate.ToString("s")}\" updateDate=\"{m1.UpdateDate.ToString("s")}\" nodeName=\"Test File\" urlName=\"test-file\" path=\"{m1.Path}\" isDoc=\"\" nodeType=\"{mt.Id}\" nodeTypeAlias=\"testImage\" writerName=\"\" writerID=\"0\" udi=\"{m1.GetUdi()}\" mediaFilePath=\"/media/test-file.txt\"><umbracoFile><![CDATA[/media/test-file.txt]]></umbracoFile><umbracoBytes><![CDATA[100]]></umbracoBytes><umbracoExtension><![CDATA[png]]></umbracoExtension></testImage></MediaSet></MediaItems>",
packageXml.Element("umbPackage").Element("MediaItems").ToString(SaveOptions.DisableFormatting));
Assert.AreEqual(2, zipArchive.Entries.Count());
Assert.AreEqual(ZipArchiveMode.Read, zipArchive.Mode);
Assert.IsNull(packageXml.DocumentType);
Assert.IsNull(packageXml.NextNode);
Assert.IsNull(packageXml.Parent);
Assert.IsNull(packageXml.PreviousNode);
});
}
}
@@ -297,12 +324,15 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Packaging
using (var packageXmlStream = File.OpenRead(packageXmlPath))
{
var xml = XDocument.Load(packageXmlStream);
Assert.AreEqual("umbPackage", xml.Root.Name.ToString());
Assert.AreEqual($"<Templates><Template><Name>Text page</Name><Alias>textPage</Alias><Design><![CDATA[@using Umbraco.Cms.Web.Common.PublishedModels;{Environment.NewLine}@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage{Environment.NewLine}@{{{Environment.NewLine}\tLayout = null;{Environment.NewLine}}}]]></Design></Template></Templates>", xml.Element("umbPackage").Element("Templates").ToString(SaveOptions.DisableFormatting));
// TODO: There's a whole lot more assertions to be done
Assert.Multiple(() =>
{
Assert.AreEqual("umbPackage", xml.Root.Name.ToString());
Assert.AreEqual($"<Templates><Template><Name>Text page</Name><Alias>textPage</Alias><Design><![CDATA[@using Umbraco.Cms.Web.Common.PublishedModels;{Environment.NewLine}@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage{Environment.NewLine}@{{{Environment.NewLine}\tLayout = null;{Environment.NewLine}}}]]></Design></Template></Templates>", xml.Element("umbPackage").Element("Templates").ToString(SaveOptions.DisableFormatting));
Assert.IsNull(xml.DocumentType);
Assert.IsNull(xml.Parent);
Assert.IsNull(xml.NextNode);
Assert.IsNull(xml.PreviousNode);
});
}
}
}

38
src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/PackageInstallationTest.cs
View File

@@ -32,9 +32,12 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Packaging
var testPackageFile = new FileInfo(Path.Combine(HostingEnvironment.MapPathContentRoot("~/TestData/Packages"), DocumentTypePickerPackage));
using var fileStream = testPackageFile.OpenRead();
CompiledPackage package = PackageInstallation.ReadPackage(XDocument.Load(fileStream));
Assert.IsNotNull(package);
Assert.AreEqual("Document Type Picker", package.Name);
Assert.AreEqual(1, package.DataTypes.Count());
Assert.Multiple(() =>
{
Assert.IsNotNull(package);
Assert.AreEqual("Document Type Picker", package.Name);
Assert.AreEqual(1, package.DataTypes.Count());
});
}
[Test]
@@ -43,12 +46,15 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Packaging
var testPackageFile = new FileInfo(Path.Combine(HostingEnvironment.MapPathContentRoot("~/TestData/Packages"), HelloPackage));
using var fileStream = testPackageFile.OpenRead();
CompiledPackage package = PackageInstallation.ReadPackage(XDocument.Load(fileStream));
Assert.IsNotNull(package);
Assert.AreEqual("Hello", package.Name);
Assert.AreEqual(1, package.Documents.Count());
Assert.AreEqual(1, package.DocumentTypes.Count());
Assert.AreEqual(1, package.Templates.Count());
Assert.AreEqual(1, package.DataTypes.Count());
Assert.Multiple(() =>
{
Assert.IsNotNull(package);
Assert.AreEqual("Hello", package.Name);
Assert.AreEqual(1, package.Documents.Count());
Assert.AreEqual(1, package.DocumentTypes.Count());
Assert.AreEqual(1, package.Templates.Count());
Assert.AreEqual(1, package.DataTypes.Count());
});
}
[Test]
@@ -66,9 +72,17 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Packaging
using var fileStream = File.OpenRead(packageFile);
CompiledPackage package = PackageInstallation.ReadPackage(XDocument.Load(fileStream));
InstallWarnings preInstallWarnings = package.Warnings;
Assert.IsNotNull(preInstallWarnings);
// TODO: More Asserts
var dataType = package.DataTypes.First();
Assert.Multiple(() =>
{
Assert.AreEqual("Document Type Picker", package.Name);
Assert.AreEqual("3593d8e7-8b35-47b9-beda-5e830ca8c93c", dataType.LastAttribute?.Value);
Assert.AreEqual("Document Type Picker", dataType.FirstAttribute?.Value);
Assert.IsNotNull(preInstallWarnings);
Assert.AreEqual(0, preInstallWarnings.ConflictingMacros.Count());
Assert.AreEqual(0, preInstallWarnings.ConflictingStylesheets.Count());
Assert.AreEqual(0, preInstallWarnings.ConflictingTemplates.Count());
});
}
[Test]

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

@@ -76,11 +76,11 @@
<ItemGroup>
<PackageReference Include="Examine.Lucene" Version="2.0.0-beta.154" />
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.8" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.9" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="Moq" Version="4.16.1" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

4
src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj
View File

@@ -16,9 +16,9 @@
<ItemGroup>
<PackageReference Include="AngleSharp" Version="0.16.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
<PackageReference Include="System.Data.Odbc" Version="5.0.0" />
<PackageReference Include="System.Data.OleDb" Version="5.0.0" />
</ItemGroup>

4
src/Umbraco.Web.Common/Umbraco.Web.Common.csproj
View File

@@ -25,8 +25,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.8" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="5.0.8" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.9" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="5.0.9" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

2
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -66,7 +66,7 @@
<!-- We don't want to include the generated files, they will throw a lot of errors -->
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.8" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.9" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>