diff --git a/HtmlMinifier.Tests/Data/GithubIssue54.txt b/HtmlMinifier.Tests/Data/GithubIssue54.txt new file mode 100644 index 0000000..62c9e63 --- /dev/null +++ b/HtmlMinifier.Tests/Data/GithubIssue54.txt @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/HtmlMinifier.Tests/Data/GithubIssue54Result.txt b/HtmlMinifier.Tests/Data/GithubIssue54Result.txt new file mode 100644 index 0000000..aa98776 --- /dev/null +++ b/HtmlMinifier.Tests/Data/GithubIssue54Result.txt @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/HtmlMinifier.Tests/DataHelpers.cs b/HtmlMinifier.Tests/DataHelpers.cs index f008d4d..caea242 100644 --- a/HtmlMinifier.Tests/DataHelpers.cs +++ b/HtmlMinifier.Tests/DataHelpers.cs @@ -108,5 +108,8 @@ public static class DataHelpers public static string GithubIssue44 = "

Xem gì hôm nay?

"; public static string GithubIssue44Result = "

Xem gì hôm nay?

"; + + public static string GithubIssue54 = ""; + public static string GithubIssue54Result = ""; } } diff --git a/HtmlMinifier.Tests/HtmlMinifier.Tests.csproj b/HtmlMinifier.Tests/HtmlMinifier.Tests.csproj index de1a8b7..d52201f 100644 --- a/HtmlMinifier.Tests/HtmlMinifier.Tests.csproj +++ b/HtmlMinifier.Tests/HtmlMinifier.Tests.csproj @@ -95,6 +95,8 @@ + + diff --git a/HtmlMinifier.Tests/MinificationTests.cs b/HtmlMinifier.Tests/MinificationTests.cs index 10fed6a..dd407b8 100644 --- a/HtmlMinifier.Tests/MinificationTests.cs +++ b/HtmlMinifier.Tests/MinificationTests.cs @@ -271,5 +271,18 @@ public void GithubIssue44_ShouldReturnCorrectly() // Assert Assert.AreEqual(minifiedHtml, expectedResult); } + + [TestMethod] + public void GithubIssue54_ShouldReturnCorrectly() + { + // Arrange + string expectedResult = DataHelpers.GithubIssue54Result; + + // Act + string minifiedHtml = StreamReaderExtension.MinifyHtmlCode(DataHelpers.GithubIssue54, noFeatures); + + // Assert + Assert.AreEqual(minifiedHtml, expectedResult); + } } } diff --git a/HtmlMinifier.Tests/Properties/AssemblyInfo.cs b/HtmlMinifier.Tests/Properties/AssemblyInfo.cs index d9ec8f2..cf1af55 100644 --- a/HtmlMinifier.Tests/Properties/AssemblyInfo.cs +++ b/HtmlMinifier.Tests/Properties/AssemblyInfo.cs @@ -3,11 +3,11 @@ using System.Runtime.InteropServices; [assembly: AssemblyTitle("HtmlMinifier.Tests")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyDescription("Test suite for HtmlMinifier")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("HtmlMinifier.Tests")] -[assembly: AssemblyCopyright("Copyright © 2022")] +[assembly: AssemblyCopyright("Copyright © 2022 - 2024")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -16,5 +16,5 @@ [assembly: Guid("206365fc-84f9-49ae-8970-ed31b2b5b42b")] // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.0.0")] -[assembly: AssemblyFileVersion("2.0.0.0")] +[assembly: AssemblyVersion("2.1.0.0")] +[assembly: AssemblyFileVersion("2.1.0.0")] diff --git a/HtmlMinifier.sln b/HtmlMinifier.sln index dafe006..ae67321 100644 --- a/HtmlMinifier.sln +++ b/HtmlMinifier.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29215.179 +# Visual Studio Version 17 +VisualStudioVersion = 17.10.35027.167 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlMinifier", "ViewMinifier\HtmlMinifier.csproj", "{339A7163-32AC-413A-BF8F-EB30E8B5C136}" EndProject @@ -10,17 +10,27 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {339A7163-32AC-413A-BF8F-EB30E8B5C136}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {339A7163-32AC-413A-BF8F-EB30E8B5C136}.Debug|Any CPU.Build.0 = Debug|Any CPU + {339A7163-32AC-413A-BF8F-EB30E8B5C136}.Debug|x64.ActiveCfg = Debug|Any CPU + {339A7163-32AC-413A-BF8F-EB30E8B5C136}.Debug|x64.Build.0 = Debug|Any CPU {339A7163-32AC-413A-BF8F-EB30E8B5C136}.Release|Any CPU.ActiveCfg = Release|Any CPU {339A7163-32AC-413A-BF8F-EB30E8B5C136}.Release|Any CPU.Build.0 = Release|Any CPU + {339A7163-32AC-413A-BF8F-EB30E8B5C136}.Release|x64.ActiveCfg = Release|x64 + {339A7163-32AC-413A-BF8F-EB30E8B5C136}.Release|x64.Build.0 = Release|x64 {206365FC-84F9-49AE-8970-ED31B2B5B42B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {206365FC-84F9-49AE-8970-ED31B2B5B42B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {206365FC-84F9-49AE-8970-ED31B2B5B42B}.Debug|x64.ActiveCfg = Debug|Any CPU + {206365FC-84F9-49AE-8970-ED31B2B5B42B}.Debug|x64.Build.0 = Debug|Any CPU {206365FC-84F9-49AE-8970-ED31B2B5B42B}.Release|Any CPU.ActiveCfg = Release|Any CPU {206365FC-84F9-49AE-8970-ED31B2B5B42B}.Release|Any CPU.Build.0 = Release|Any CPU + {206365FC-84F9-49AE-8970-ED31B2B5B42B}.Release|x64.ActiveCfg = Release|Any CPU + {206365FC-84F9-49AE-8970-ED31B2B5B42B}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ViewMinifier/HtmlMinifier.csproj b/ViewMinifier/HtmlMinifier.csproj index d75d1c3..d14a48c 100644 --- a/ViewMinifier/HtmlMinifier.csproj +++ b/ViewMinifier/HtmlMinifier.csproj @@ -12,6 +12,9 @@ v4.8 512 false + + + publish\ true Disk @@ -26,9 +29,6 @@ 1.0.0.%2a false true - - - AnyCPU @@ -49,6 +49,28 @@ prompt 4 + + true + bin\x64\Debug\ + DEBUG;TRACE + true + full + x64 + 7.3 + prompt + true + + + bin\x64\Release\ + TRACE + true + true + pdbonly + x64 + 7.3 + prompt + true + diff --git a/ViewMinifier/Program.cs b/ViewMinifier/Program.cs index 18e7ab6..7181dbb 100644 --- a/ViewMinifier/Program.cs +++ b/ViewMinifier/Program.cs @@ -11,7 +11,6 @@ namespace HtmlMinifier /// public class Program { - static void Main(string[] args) { if (args.Length == 0) diff --git a/ViewMinifier/Properties/AssemblyInfo.cs b/ViewMinifier/Properties/AssemblyInfo.cs index c13ef7d..53584c0 100644 --- a/ViewMinifier/Properties/AssemblyInfo.cs +++ b/ViewMinifier/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("HtmlMinifier")] -[assembly: AssemblyCopyright("Copyright Dean Hume © 2014 - 2019")] +[assembly: AssemblyCopyright("Copyright Dean Hume © 2014 - 2024")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.9.1.0")] -[assembly: AssemblyFileVersion("1.9.1.0")] +[assembly: AssemblyVersion("1.9.2.0")] +[assembly: AssemblyFileVersion("1.9.2.0")]