Skip to content

Commit

Permalink
Version 2.15.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Taritsyn committed Jan 12, 2024
1 parent 13d7b6b commit 8bbf776
Show file tree
Hide file tree
Showing 44 changed files with 116 additions and 86 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Change log
==========

## v2.15.3 - January 12, 2024
* In WebMarkupMin.NUglify added support for the NUglify version 1.21.2
* In WebMarkupMin.AspNetCore6 added support for the ASP.NET Core 6.0.26
* In WebMarkupMin.AspNetCore7 added support for the ASP.NET Core 7.0.15
* In WebMarkupMin.AspNetCore8 added support for the ASP.NET Core 8.0.1

## v2.15.2 - November 15, 2023
* In WebMarkupMin.AspNetCore6 added support for the ASP.NET Core 6.0.25
* In WebMarkupMin.AspNetCore7 added support for the ASP.NET Core 7.0.14
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2013-2023 Andrey Taritsyn - http://www.taritsyn.ru
Copyright (c) 2013-2024 Andrey Taritsyn - http://www.taritsyn.ru

Apache License
Version 2.0, January 2004
Expand Down
2 changes: 1 addition & 1 deletion build/common.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Copyright>Copyright © 2013-2023 Andrey Taritsyn</Copyright>
<Copyright>Copyright © 2013-2024 Andrey Taritsyn</Copyright>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
</PropertyGroup>
Expand Down
8 changes: 8 additions & 0 deletions samples/SharedData/text-content/change-log.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
<p>An overview of new features and fixes:</p>

<h3>2.15.3 - January 12, 2024</h3>
<ul>
<li>In WebMarkupMin.NUglify added support for the NUglify version 1.21.2</li>
<li>In WebMarkupMin.AspNetCore6 added support for the ASP.NET Core 6.0.26</li>
<li>In WebMarkupMin.AspNetCore7 added support for the ASP.NET Core 7.0.15</li>
<li>In WebMarkupMin.AspNetCore8 added support for the ASP.NET Core 8.0.1</li>
</ul>

<h3>2.15.2 - November 15, 2023</h3>
<ul>
<li>In WebMarkupMin.AspNetCore6 added support for the ASP.NET Core 6.0.25</li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Web Markup Minifier: Sample ASP.NET MVC 4 Site")]
[assembly: AssemblyCopyright("Copyright © 2013-2023 Andrey Taritsyn")]
[assembly: AssemblyCopyright("Copyright © 2013-2024 Andrey Taritsyn")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

[assembly: ComVisible(false)]
[assembly: Guid("d94caf32-2855-453e-a282-60f6b5cc7955")]

[assembly: AssemblyVersion("2.15.2.0")]
[assembly: AssemblyFileVersion("2.15.2.0")]
[assembly: AssemblyVersion("2.15.3.0")]
[assembly: AssemblyFileVersion("2.15.3.0")]
2 changes: 1 addition & 1 deletion samples/WebMarkupMin.Sample.AspNet4.Mvc4/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "webmarkupmin.sample.aspnet4.mvc4",
"private": true,
"version": "2.15.2",
"version": "2.15.3",
"devDependencies": {
"gulp": "4.0.2",
"del": "5.1.0",
Expand Down
18 changes: 9 additions & 9 deletions samples/WebMarkupMin.Sample.AspNet4.WebPages2/Web.config
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
type="BundleTransformer.Core.Configuration.CoreSettings, BundleTransformer.Core" />
<section name="less"
type="BundleTransformer.Less.Configuration.LessSettings, BundleTransformer.Less" />
<section name="microsoftAjax"
type="BundleTransformer.MicrosoftAjax.Configuration.MicrosoftAjaxSettings, BundleTransformer.MicrosoftAjax" />
<section name="nuglify"
type="BundleTransformer.NUglify.Configuration.NUglifySettings, BundleTransformer.NUglify" />
</sectionGroup>
</configSections>
<appSettings>
Expand Down Expand Up @@ -50,7 +50,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="JavaScriptEngineSwitcher.Core" publicKeyToken="c608b2a8cc9e4472" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.19.0.0" newVersion="3.19.0.0" />
<bindingRedirect oldVersion="0.0.0.0-3.21.0.0" newVersion="3.21.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="BundleTransformer.Core" publicKeyToken="973c344c93aac60d" culture="neutral" />
Expand All @@ -60,7 +60,7 @@
</runtime>
<bundleTransformer xmlns="http://tempuri.org/BundleTransformer.Configuration.xsd">
<core>
<css defaultMinifier="MicrosoftAjaxCssMinifier" defaultPostProcessors="UrlRewritingCssPostProcessor">
<css defaultMinifier="NUglifyCssMinifier" defaultPostProcessors="UrlRewritingCssPostProcessor">
<translators>
<add name="NullTranslator"
type="BundleTransformer.Core.Translators.NullTranslator, BundleTransformer.Core"
Expand All @@ -76,15 +76,15 @@
<minifiers>
<add name="NullMinifier"
type="BundleTransformer.Core.Minifiers.NullMinifier, BundleTransformer.Core" />
<add name="MicrosoftAjaxCssMinifier"
type="BundleTransformer.MicrosoftAjax.Minifiers.MicrosoftAjaxCssMinifier, BundleTransformer.MicrosoftAjax" />
<add name="NUglifyCssMinifier"
type="BundleTransformer.NUglify.Minifiers.NUglifyCssMinifier, BundleTransformer.NUglify" />
</minifiers>
<fileExtensions>
<add fileExtension=".css" assetTypeCode="Css" />
<add fileExtension=".less" assetTypeCode="Less" />
</fileExtensions>
</css>
<js defaultMinifier="MicrosoftAjaxJsMinifier">
<js defaultMinifier="NUglifyJsMinifier">
<translators>
<add name="NullTranslator"
type="BundleTransformer.Core.Translators.NullTranslator, BundleTransformer.Core"
Expand All @@ -93,8 +93,8 @@
<minifiers>
<add name="NullMinifier"
type="BundleTransformer.Core.Minifiers.NullMinifier, BundleTransformer.Core" />
<add name="MicrosoftAjaxJsMinifier"
type="BundleTransformer.MicrosoftAjax.Minifiers.MicrosoftAjaxJsMinifier, BundleTransformer.MicrosoftAjax" />
<add name="NUglifyJsMinifier"
type="BundleTransformer.NUglify.Minifiers.NUglifyJsMinifier, BundleTransformer.NUglify" />
</minifiers>
<fileExtensions>
<add fileExtension=".js" assetTypeCode="JavaScript" />
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
11 changes: 6 additions & 5 deletions samples/WebMarkupMin.Sample.AspNet4.WebPages2/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,18 @@
<package id="BrotliSharpLib" version="0.3.3" targetFramework="net40" />
<package id="BundleTransformer.Core" version="1.10.0" targetFramework="net40" />
<package id="BundleTransformer.Less" version="1.12.44" targetFramework="net40" />
<package id="BundleTransformer.MicrosoftAjax" version="1.10.0" targetFramework="net40" />
<package id="JavaScriptEngineSwitcher.Core" version="3.19.0" targetFramework="net40" />
<package id="JavaScriptEngineSwitcher.Msie" version="3.19.0" targetFramework="net40" />
<package id="BundleTransformer.NUglify" version="1.13.16" targetFramework="net40" />
<package id="JavaScriptEngineSwitcher.Core" version="3.21.0" targetFramework="net40" />
<package id="JavaScriptEngineSwitcher.Msie" version="3.23.7" targetFramework="net40" />
<package id="jQuery" version="1.10.2" targetFramework="net40" />
<package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net40" />
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net40" />
<package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net40" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
<package id="Modernizr" version="2.8.3" targetFramework="net40" />
<package id="MsieJavaScriptEngine" version="3.0.9" targetFramework="net40" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net40" />
<package id="MsieJavaScriptEngine" version="3.2.4" targetFramework="net40" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net40" />
<package id="NUglify" version="1.21.2" targetFramework="net40" />
<package id="PolyfillsForOldDotNet.System.Threading" version="0.1.1" targetFramework="net40" />
<package id="Twitter.Bootstrap.Less" version="3.3.0" targetFramework="net40" />
<package id="WebGrease" version="1.6.0" targetFramework="net40" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,7 @@
</xs:annotation>
<xs:all>
<xs:element name="includePaths" type="IncludedPathRegistrationCollection_SchemaType" minOccurs="0" maxOccurs="1" />
<xs:element name="jsEngine" type="JsEngineSettings_SchemaType" minOccurs="0" maxOccurs="1" />
</xs:all>
<xs:attribute name="useNativeMinification" type="Boolean_SchemaType" use="optional" default="false">
<xs:annotation>
Expand Down Expand Up @@ -538,22 +539,22 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:attribute name="precision" use="optional" default="5">
<xs:attribute name="severity" use="optional" default="0">
<xs:annotation>
<xs:documentation>Precision for fractional numbers</xs:documentation>
<xs:documentation>
Severity level of errors:
0 - only error messages;
1 - only error messages and warnings except deprecations;
2 - only error messages and all warnings.
</xs:documentation>
</xs:annotation>
<xs:simpleType>
<xs:restriction base="xs:int">
<xs:minInclusive value="-1" />
<xs:maxInclusive value="2147483647" />
<xs:minInclusive value="0" />
<xs:maxInclusive value="2" />
</xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:attribute name="sourceComments" type="Boolean_SchemaType" use="optional" default="false">
<xs:annotation>
<xs:documentation>Flag for whether to emit comments in the generated CSS indicating the corresponding source line</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
<!-- /Sass and SCSS settings -->

Expand Down Expand Up @@ -607,11 +608,16 @@
<xs:documentation>Flag for whether to interpret optional property types as written, rather than adding `undefined`</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="forceConsistentCasingInFileNames" type="Boolean_SchemaType" use="optional" default="false">
<xs:attribute name="forceConsistentCasingInFileNames" type="Boolean_SchemaType" use="optional" default="true">
<xs:annotation>
<xs:documentation>Flag for whether to ensure that casing is correct in imports</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="ignoreDeprecations" type="xs:string" use="optional" default="">
<xs:annotation>
<xs:documentation>Version number of TypeScript for which deprecation warnings should be ignored</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="keyofStringsOnly" type="Boolean_SchemaType" use="optional" default="false">
<xs:annotation>
<xs:documentation>Flag for whether to make keyof only return strings instead of string, numbers or symbols. Legacy option.</xs:documentation>
Expand Down Expand Up @@ -768,7 +774,7 @@
<xs:documentation>Flag for whether to suppress type checking errors. Non-standard option.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="target" use="optional" default="EcmaScript3">
<xs:attribute name="target" use="optional" default="EcmaScript5">
<xs:annotation>
<xs:documentation>JavaScript language version for emitted JavaScript and include compatible library declarations</xs:documentation>
</xs:annotation>
Expand Down Expand Up @@ -1582,6 +1588,11 @@ Specify 0 to get a line break after each semi-colon in JS, and after each rule i
</xs:annotation>
<xs:complexContent>
<xs:extension base="NUglifyMinifierSettingsBase_SchemaType">
<xs:attribute name="abbreviateHexColor" type="Boolean_SchemaType" use="optional" default="true">
<xs:annotation>
<xs:documentation>Value indicating whether to abbreviate hex colors to #rgb(a) format</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="colorNames" use="optional" default="Hex">
<xs:annotation>
<xs:documentation>ColorNames setting</xs:documentation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Web Markup Minifier: Sample ASP.NET 4.5 WebForms Site")]
[assembly: AssemblyCopyright("Copyright © 2013-2023 Andrey Taritsyn")]
[assembly: AssemblyCopyright("Copyright © 2013-2024 Andrey Taritsyn")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

[assembly: ComVisible(false)]
[assembly: Guid("ead85e04-c167-496e-ad08-476c85e44289")]

[assembly: AssemblyVersion("2.15.2.0")]
[assembly: AssemblyFileVersion("2.15.2.0")]
[assembly: AssemblyVersion("2.15.3.0")]
[assembly: AssemblyFileVersion("2.15.3.0")]
18 changes: 9 additions & 9 deletions samples/WebMarkupMin.Sample.AspNet45.WebForms/Web.config
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
type="BundleTransformer.Core.Configuration.CoreSettings, BundleTransformer.Core" />
<section name="less"
type="BundleTransformer.Less.Configuration.LessSettings, BundleTransformer.Less" />
<section name="microsoftAjax"
type="BundleTransformer.MicrosoftAjax.Configuration.MicrosoftAjaxSettings, BundleTransformer.MicrosoftAjax" />
<section name="nuglify"
type="BundleTransformer.NUglify.Configuration.NUglifySettings, BundleTransformer.NUglify" />
</sectionGroup>
</configSections>
<appSettings>
Expand Down Expand Up @@ -62,7 +62,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="JavaScriptEngineSwitcher.Core" publicKeyToken="c608b2a8cc9e4472" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.19.0.0" newVersion="3.19.0.0" />
<bindingRedirect oldVersion="0.0.0.0-3.21.0.0" newVersion="3.21.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="BundleTransformer.Core" publicKeyToken="973c344c93aac60d" culture="neutral" />
Expand All @@ -72,7 +72,7 @@
</runtime>
<bundleTransformer xmlns="http://tempuri.org/BundleTransformer.Configuration.xsd">
<core>
<css defaultMinifier="MicrosoftAjaxCssMinifier" defaultPostProcessors="UrlRewritingCssPostProcessor">
<css defaultMinifier="NUglifyCssMinifier" defaultPostProcessors="UrlRewritingCssPostProcessor">
<translators>
<add name="NullTranslator"
type="BundleTransformer.Core.Translators.NullTranslator, BundleTransformer.Core"
Expand All @@ -88,15 +88,15 @@
<minifiers>
<add name="NullMinifier"
type="BundleTransformer.Core.Minifiers.NullMinifier, BundleTransformer.Core" />
<add name="MicrosoftAjaxCssMinifier"
type="BundleTransformer.MicrosoftAjax.Minifiers.MicrosoftAjaxCssMinifier, BundleTransformer.MicrosoftAjax" />
<add name="NUglifyCssMinifier"
type="BundleTransformer.NUglify.Minifiers.NUglifyCssMinifier, BundleTransformer.NUglify" />
</minifiers>
<fileExtensions>
<add fileExtension=".css" assetTypeCode="Css" />
<add fileExtension=".less" assetTypeCode="Less" />
</fileExtensions>
</css>
<js defaultMinifier="MicrosoftAjaxJsMinifier">
<js defaultMinifier="NUglifyJsMinifier">
<translators>
<add name="NullTranslator"
type="BundleTransformer.Core.Translators.NullTranslator, BundleTransformer.Core"
Expand All @@ -105,8 +105,8 @@
<minifiers>
<add name="NullMinifier"
type="BundleTransformer.Core.Minifiers.NullMinifier, BundleTransformer.Core" />
<add name="MicrosoftAjaxJsMinifier"
type="BundleTransformer.MicrosoftAjax.Minifiers.MicrosoftAjaxJsMinifier, BundleTransformer.MicrosoftAjax" />
<add name="NUglifyJsMinifier"
type="BundleTransformer.NUglify.Minifiers.NUglifyJsMinifier, BundleTransformer.NUglify" />
</minifiers>
<fileExtensions>
<add fileExtension=".js" assetTypeCode="JavaScript" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@
<Reference Include="BundleTransformer.Less, Version=1.12.44.0, Culture=neutral, PublicKeyToken=973c344c93aac60d, processorArchitecture=MSIL">
<HintPath>..\..\packages\BundleTransformer.Less.1.12.44\lib\net40\BundleTransformer.Less.dll</HintPath>
</Reference>
<Reference Include="BundleTransformer.MicrosoftAjax, Version=1.10.0.0, Culture=neutral, PublicKeyToken=973c344c93aac60d, processorArchitecture=MSIL">
<HintPath>..\..\packages\BundleTransformer.MicrosoftAjax.1.10.0\lib\net40\BundleTransformer.MicrosoftAjax.dll</HintPath>
<Reference Include="BundleTransformer.NUglify, Version=1.13.16.0, Culture=neutral, PublicKeyToken=973c344c93aac60d, processorArchitecture=MSIL">
<HintPath>..\..\packages\BundleTransformer.NUglify.1.13.16\lib\net40\BundleTransformer.NUglify.dll</HintPath>
</Reference>
<Reference Include="JavaScriptEngineSwitcher.Core, Version=3.19.0.0, Culture=neutral, PublicKeyToken=c608b2a8cc9e4472, processorArchitecture=MSIL">
<HintPath>..\..\packages\JavaScriptEngineSwitcher.Core.3.19.0\lib\net45\JavaScriptEngineSwitcher.Core.dll</HintPath>
<Reference Include="JavaScriptEngineSwitcher.Core, Version=3.21.0.0, Culture=neutral, PublicKeyToken=c608b2a8cc9e4472, processorArchitecture=MSIL">
<HintPath>..\..\packages\JavaScriptEngineSwitcher.Core.3.21.0\lib\net45\JavaScriptEngineSwitcher.Core.dll</HintPath>
</Reference>
<Reference Include="JavaScriptEngineSwitcher.Msie, Version=3.19.0.0, Culture=neutral, PublicKeyToken=c608b2a8cc9e4472, processorArchitecture=MSIL">
<HintPath>..\..\packages\JavaScriptEngineSwitcher.Msie.3.19.0\lib\net45\JavaScriptEngineSwitcher.Msie.dll</HintPath>
<Reference Include="JavaScriptEngineSwitcher.Msie, Version=3.23.7.0, Culture=neutral, PublicKeyToken=c608b2a8cc9e4472, processorArchitecture=MSIL">
<HintPath>..\..\packages\JavaScriptEngineSwitcher.Msie.3.23.7\lib\net45\JavaScriptEngineSwitcher.Msie.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.FriendlyUrls, Version=1.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.AspNet.FriendlyUrls.Core.1.0.2\lib\net45\Microsoft.AspNet.FriendlyUrls.dll</HintPath>
Expand All @@ -77,11 +77,14 @@
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="MsieJavaScriptEngine, Version=3.0.9.0, Culture=neutral, PublicKeyToken=a3a2846a37ac0d3e, processorArchitecture=MSIL">
<HintPath>..\..\packages\MsieJavaScriptEngine.3.0.9\lib\net45\MsieJavaScriptEngine.dll</HintPath>
<Reference Include="MsieJavaScriptEngine, Version=3.2.4.0, Culture=neutral, PublicKeyToken=a3a2846a37ac0d3e, processorArchitecture=MSIL">
<HintPath>..\..\packages\MsieJavaScriptEngine.3.2.4\lib\net45\MsieJavaScriptEngine.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NUglify, Version=1.21.2.0, Culture=neutral, PublicKeyToken=15bc7810aec21b5e, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUglify.1.21.2\lib\net40\NUglify.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
Loading

0 comments on commit 8bbf776

Please sign in to comment.