Skip to content

Commit

Permalink
BaseCompositeFileProcessingProvider.BundleDomains can be null and cau…
Browse files Browse the repository at this point in the history
…se an exception #88
  • Loading branch information
Shazwazza committed Apr 30, 2016
1 parent e82c345 commit 4a4f28b
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ protected BaseCompositeFileProcessingProvider()
UrlType = UrlTypeDefault;
PathBasedUrlFormat = "{dependencyId}/{version}/{type}";
CompositeFilePathAsString = DefaultDependencyPath;
BundleDomains = new List<string>();
}

#region Public Properties
Expand Down
31 changes: 30 additions & 1 deletion ClientDependency.Web.Test/Models/TestModel.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,35 @@
namespace ClientDependency.Web.Test.Models
using System;

namespace ClientDependency.Web.Test.Models
{

public class TestLogger : ClientDependency.Core.Logging.ILogger
{
public void Debug(string msg)
{

}

public void Info(string msg)
{

}

public void Warn(string msg)
{
throw new Exception(msg);
}

public void Error(string msg, Exception ex)
{
throw new Exception(msg, ex);
}

public void Fatal(string msg, Exception ex)
{
throw new Exception(msg, ex);
}
}

public class TestModel
{
Expand Down
2 changes: 1 addition & 1 deletion ClientDependency.Web.Test/Web.config
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Composite files are used for both types of projects.
** IMPORTANT: If you're web.config setting: compilation debug="true" is set to 'true', then composite files will NOT be enabled no matter what
-->
<clientDependency version="16402" fileDependencyExtensions=".js,.css">
<clientDependency version="16405" fileDependencyExtensions=".js,.css" loggerType="ClientDependency.Web.Test.Models.TestLogger, ClientDependency.Web.Test">
<!--The enableCompositeFiles="true" is optional and by default is set to true.-->
<!--
This section is used for Web Forms only.
Expand Down
2 changes: 1 addition & 1 deletion SolutionInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@

[assembly: AssemblyVersion("1.9.0")]
[assembly: AssemblyFileVersion("1.9.0")]
[assembly: AssemblyInformationalVersion("1.9.0-beta3")]
[assembly: AssemblyInformationalVersion("1.9.0-beta1")]

0 comments on commit 4a4f28b

Please sign in to comment.