diff --git a/Jabberwocky.Library.nuspec b/Jabberwocky.Library.nuspec index a196310..b53ced8 100644 --- a/Jabberwocky.Library.nuspec +++ b/Jabberwocky.Library.nuspec @@ -14,22 +14,22 @@ Jabberwocky.Library, metapackage, Velir, Jabberwocky, Library - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/src/Extras/Jabberwock.Extras.NewRelic.Sc/Properties/AssemblyInfo.cs b/src/Extras/Jabberwock.Extras.NewRelic.Sc/Properties/AssemblyInfo.cs index 01097a7..02ce6f3 100644 --- a/src/Extras/Jabberwock.Extras.NewRelic.Sc/Properties/AssemblyInfo.cs +++ b/src/Extras/Jabberwock.Extras.NewRelic.Sc/Properties/AssemblyInfo.cs @@ -34,4 +34,4 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] diff --git a/src/Extras/Jabberwocky.Autofac.Extras.Log4Net.Sc/Properties/AssemblyInfo.cs b/src/Extras/Jabberwocky.Autofac.Extras.Log4Net.Sc/Properties/AssemblyInfo.cs index 2f463cd..53841c3 100644 --- a/src/Extras/Jabberwocky.Autofac.Extras.Log4Net.Sc/Properties/AssemblyInfo.cs +++ b/src/Extras/Jabberwocky.Autofac.Extras.Log4Net.Sc/Properties/AssemblyInfo.cs @@ -34,4 +34,4 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] diff --git a/src/Extras/Jabberwocky.Autofac.Extras.MiniProfiler.Sc/Properties/AssemblyInfo.cs b/src/Extras/Jabberwocky.Autofac.Extras.MiniProfiler.Sc/Properties/AssemblyInfo.cs index 16b0fa1..9cfd0d2 100644 --- a/src/Extras/Jabberwocky.Autofac.Extras.MiniProfiler.Sc/Properties/AssemblyInfo.cs +++ b/src/Extras/Jabberwocky.Autofac.Extras.MiniProfiler.Sc/Properties/AssemblyInfo.cs @@ -34,4 +34,4 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] diff --git a/src/Extras/Jabberwocky.Autofac.Extras.MiniProfiler/Properties/AssemblyInfo.cs b/src/Extras/Jabberwocky.Autofac.Extras.MiniProfiler/Properties/AssemblyInfo.cs index 184ef3c..d97978d 100644 --- a/src/Extras/Jabberwocky.Autofac.Extras.MiniProfiler/Properties/AssemblyInfo.cs +++ b/src/Extras/Jabberwocky.Autofac.Extras.MiniProfiler/Properties/AssemblyInfo.cs @@ -34,6 +34,6 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] [assembly: InternalsVisibleTo("Jabberwocky.Autofac.Extras.MiniProfiler.Sc")] \ No newline at end of file diff --git a/src/Extras/Jabberwocky.Extras.Polly.Sc/Jabberwocky.Extras.Polly.Sc.csproj b/src/Extras/Jabberwocky.Extras.Polly.Sc/Jabberwocky.Extras.Polly.Sc.csproj index 4e85204..4c7fc7d 100644 --- a/src/Extras/Jabberwocky.Extras.Polly.Sc/Jabberwocky.Extras.Polly.Sc.csproj +++ b/src/Extras/Jabberwocky.Extras.Polly.Sc/Jabberwocky.Extras.Polly.Sc.csproj @@ -74,6 +74,7 @@ + diff --git a/src/Extras/Jabberwocky.Extras.Polly.Sc/Packages/Jabberwocky Extras Polly Sc.zip b/src/Extras/Jabberwocky.Extras.Polly.Sc/Packages/Jabberwocky Extras Polly Sc.zip index 1617665..aa514d6 100644 Binary files a/src/Extras/Jabberwocky.Extras.Polly.Sc/Packages/Jabberwocky Extras Polly Sc.zip and b/src/Extras/Jabberwocky.Extras.Polly.Sc/Packages/Jabberwocky Extras Polly Sc.zip differ diff --git a/src/Extras/Jabberwocky.Extras.Polly.Sc/Pipelines/Mvc/GetRenderer/AddPageEditorWrapper.cs b/src/Extras/Jabberwocky.Extras.Polly.Sc/Pipelines/Mvc/GetRenderer/AddPageEditorWrapper.cs index 9e32b84..11a6299 100644 --- a/src/Extras/Jabberwocky.Extras.Polly.Sc/Pipelines/Mvc/GetRenderer/AddPageEditorWrapper.cs +++ b/src/Extras/Jabberwocky.Extras.Polly.Sc/Pipelines/Mvc/GetRenderer/AddPageEditorWrapper.cs @@ -1,19 +1,23 @@ using Jabberwocky.Extras.Polly.Sc.Renderer; +using Sitecore; using Sitecore.Mvc.Pipelines.Response.GetRenderer; namespace Jabberwocky.Extras.Polly.Sc.Pipelines.Mvc.GetRenderer { - public class AddPageEditorWrapper : GetRendererProcessor - { - public override void Process(GetRendererArgs args) - { - if (args.Result == null) return; + public class AddPageEditorWrapper : GetRendererProcessor + { + public override void Process(GetRendererArgs args) + { + if (args.Result == null) return; - var renderer = args.Result; - var rendering = args.Rendering; - if (rendering == null) return; + var renderer = args.Result; + var rendering = args.Rendering; + if (rendering == null) return; - args.Result = new PageEditorRendererDecorator(renderer, rendering.RenderingItem); - } - } + // Only apply this decorator when in Experience Editor + if (!Context.PageMode.IsExperienceEditor) return; + + args.Result = new PageEditorRendererDecorator(renderer, rendering.RenderingItem); + } + } } diff --git a/src/Extras/Jabberwocky.Extras.Polly.Sc/Properties/AssemblyInfo.cs b/src/Extras/Jabberwocky.Extras.Polly.Sc/Properties/AssemblyInfo.cs index 601a481..0c9b115 100644 --- a/src/Extras/Jabberwocky.Extras.Polly.Sc/Properties/AssemblyInfo.cs +++ b/src/Extras/Jabberwocky.Extras.Polly.Sc/Properties/AssemblyInfo.cs @@ -34,4 +34,4 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] diff --git a/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/BaseRendererDecorator.cs b/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/BaseRendererDecorator.cs new file mode 100644 index 0000000..9ec7deb --- /dev/null +++ b/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/BaseRendererDecorator.cs @@ -0,0 +1,16 @@ +using System; + +namespace Jabberwocky.Extras.Polly.Sc.Renderer +{ + public abstract class BaseRendererDecorator : Sitecore.Mvc.Presentation.Renderer + { + private readonly Sitecore.Mvc.Presentation.Renderer _innerRenderer; + + protected BaseRendererDecorator(Sitecore.Mvc.Presentation.Renderer innerRenderer) + { + _innerRenderer = innerRenderer ?? throw new ArgumentNullException(nameof(innerRenderer)); + } + + public override string CacheKey => _innerRenderer.CacheKey; + } +} diff --git a/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/CircuitBreakerRendererDecorator.cs b/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/CircuitBreakerRendererDecorator.cs index 20c59d1..e4df1c7 100644 --- a/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/CircuitBreakerRendererDecorator.cs +++ b/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/CircuitBreakerRendererDecorator.cs @@ -9,49 +9,45 @@ namespace Jabberwocky.Extras.Polly.Sc.Renderer { - public class CircuitBreakerRendererDecorator : Sitecore.Mvc.Presentation.Renderer - { - private readonly Sitecore.Mvc.Presentation.Renderer _innerRenderer; - private readonly RenderingItem _renderingItem; - private readonly IPolicyCacheProvider _cacheProvider; - private readonly IPolicyKeyProvider _keyProvider; + public class CircuitBreakerRendererDecorator : BaseRendererDecorator + { + private readonly Sitecore.Mvc.Presentation.Renderer _innerRenderer; + private readonly RenderingItem _renderingItem; + private readonly IPolicyCacheProvider _cacheProvider; + private readonly IPolicyKeyProvider _keyProvider; - public CircuitBreakerRendererDecorator(Sitecore.Mvc.Presentation.Renderer innerRenderer, - RenderingItem renderingItem, - IPolicyCacheProvider cacheProvider, - IPolicyKeyProvider keyProvider) - { - if (innerRenderer == null) throw new ArgumentNullException(nameof(innerRenderer)); - if (renderingItem == null) throw new ArgumentNullException(nameof(renderingItem)); - if (cacheProvider == null) throw new ArgumentNullException(nameof(cacheProvider)); - if (keyProvider == null) throw new ArgumentNullException(nameof(keyProvider)); - _innerRenderer = innerRenderer; - _renderingItem = renderingItem; - _cacheProvider = cacheProvider; - _keyProvider = keyProvider; - } + public CircuitBreakerRendererDecorator(Sitecore.Mvc.Presentation.Renderer innerRenderer, + RenderingItem renderingItem, + IPolicyCacheProvider cacheProvider, + IPolicyKeyProvider keyProvider) : base(innerRenderer) + { + _innerRenderer = innerRenderer ?? throw new ArgumentNullException(nameof(innerRenderer)); + _renderingItem = renderingItem ?? throw new ArgumentNullException(nameof(renderingItem)); + _cacheProvider = cacheProvider ?? throw new ArgumentNullException(nameof(cacheProvider)); + _keyProvider = keyProvider ?? throw new ArgumentNullException(nameof(keyProvider)); + } - public override void Render(TextWriter writer) - { - int numExceptions; - int seconds; - if (!int.TryParse(_renderingItem.InnerItem[FieldConstants.BreakAfterExceptionCount], out numExceptions) - || !int.TryParse(_renderingItem.InnerItem[FieldConstants.OpenCircuitDurationInSeconds], out seconds)) - { - // Could not parse the values to integers, so just pass through - Log.Warn($"Configuration values on rendering '{_renderingItem.ID}' for " + - $"'{FieldConstants.BreakAfterExceptionCount}' or '{FieldConstants.OpenCircuitDurationInSeconds}' were invalid.", this); + public override void Render(TextWriter writer) + { + int numExceptions; + int seconds; + if (!int.TryParse(_renderingItem.InnerItem[FieldConstants.BreakAfterExceptionCount], out numExceptions) + || !int.TryParse(_renderingItem.InnerItem[FieldConstants.OpenCircuitDurationInSeconds], out seconds)) + { + // Could not parse the values to integers, so just pass through + Log.Warn($"Configuration values on rendering '{_renderingItem.ID}' for " + + $"'{FieldConstants.BreakAfterExceptionCount}' or '{FieldConstants.OpenCircuitDurationInSeconds}' were invalid.", this); - _innerRenderer.Render(writer); - return; - } + _innerRenderer.Render(writer); + return; + } - var policyKey = _keyProvider.GetKey(_renderingItem); + var policyKey = _keyProvider.GetKey(_renderingItem); - var policy = _cacheProvider.GetOrAddPolicy(policyKey, - key => Policy.Handle().CircuitBreaker(numExceptions, TimeSpan.FromSeconds(seconds))); + var policy = _cacheProvider.GetOrAddPolicy(policyKey, + key => Policy.Handle().CircuitBreaker(numExceptions, TimeSpan.FromSeconds(seconds))); - policy.Execute(() => _innerRenderer.Render(writer)); - } - } + policy.Execute(() => _innerRenderer.Render(writer)); + } + } } diff --git a/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/ErrorHandlingRendererDecorator.cs b/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/ErrorHandlingRendererDecorator.cs index a3d807f..8a7eda2 100644 --- a/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/ErrorHandlingRendererDecorator.cs +++ b/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/ErrorHandlingRendererDecorator.cs @@ -5,29 +5,28 @@ namespace Jabberwocky.Extras.Polly.Sc.Renderer { - public class ErrorHandlingRendererDecorator : Sitecore.Mvc.Presentation.Renderer - { - private readonly Sitecore.Mvc.Presentation.Renderer _innerRenderer; - private readonly RenderingItem _renderingItem; + public class ErrorHandlingRendererDecorator : BaseRendererDecorator + { + private readonly Sitecore.Mvc.Presentation.Renderer _innerRenderer; + private readonly RenderingItem _renderingItem; - public ErrorHandlingRendererDecorator(Sitecore.Mvc.Presentation.Renderer innerRenderer, RenderingItem renderingItem) - { - if (innerRenderer == null) throw new ArgumentNullException(nameof(innerRenderer)); - if (renderingItem == null) throw new ArgumentNullException(nameof(renderingItem)); - _innerRenderer = innerRenderer; - _renderingItem = renderingItem; - } + public ErrorHandlingRendererDecorator(Sitecore.Mvc.Presentation.Renderer innerRenderer, RenderingItem renderingItem) + : base(innerRenderer) + { + _innerRenderer = innerRenderer ?? throw new ArgumentNullException(nameof(innerRenderer)); + _renderingItem = renderingItem ?? throw new ArgumentNullException(nameof(renderingItem)); + } - public override void Render(TextWriter writer) - { - try - { - _innerRenderer.Render(writer); - } - catch (Exception ex) - { - Log.Warn($"Hiding rendering '{_renderingItem.ID}' due to error.", ex, typeof(ErrorHandlingRendererDecorator)); - } - } - } + public override void Render(TextWriter writer) + { + try + { + _innerRenderer.Render(writer); + } + catch (Exception ex) + { + Log.Error($"Hiding rendering '{_renderingItem.ID}' due to error.", ex, typeof(ErrorHandlingRendererDecorator)); + } + } + } } diff --git a/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/PageEditorRendererDecorator.cs b/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/PageEditorRendererDecorator.cs index 7d5e63b..dea8713 100644 --- a/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/PageEditorRendererDecorator.cs +++ b/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/PageEditorRendererDecorator.cs @@ -1,47 +1,36 @@ using System; using System.IO; using System.Web; -using Sitecore; using Sitecore.Data.Items; using Sitecore.Diagnostics; namespace Jabberwocky.Extras.Polly.Sc.Renderer { - public class PageEditorRendererDecorator : Sitecore.Mvc.Presentation.Renderer - { - private readonly Sitecore.Mvc.Presentation.Renderer _innerRenderer; - private readonly RenderingItem _renderingItem; + public class PageEditorRendererDecorator : BaseRendererDecorator + { + private readonly Sitecore.Mvc.Presentation.Renderer _innerRenderer; + private readonly RenderingItem _renderingItem; - public PageEditorRendererDecorator(Sitecore.Mvc.Presentation.Renderer innerRenderer, RenderingItem renderingItem) - { - if (innerRenderer == null) throw new ArgumentNullException(nameof(innerRenderer)); - if (renderingItem == null) throw new ArgumentNullException(nameof(renderingItem)); - _innerRenderer = innerRenderer; - _renderingItem = renderingItem; - } + public PageEditorRendererDecorator(Sitecore.Mvc.Presentation.Renderer innerRenderer, RenderingItem renderingItem) + : base(innerRenderer) + { + _innerRenderer = innerRenderer ?? throw new ArgumentNullException(nameof(innerRenderer)); + _renderingItem = renderingItem ?? throw new ArgumentNullException(nameof(renderingItem)); + } - public override void Render(TextWriter writer) - { - // Only bother with capturing exceptions if we're in Experience Editor mode - // No point in catching and immediately rethrowing when not in 'happy path' - if (Context.PageMode.IsExperienceEditor) - { - try - { - _innerRenderer.Render(writer); - } - catch (Exception ex) - { - writer.Write("

Error rendering the following component: {0}

{1}

", - HttpUtility.HtmlEncode(_renderingItem.Name), - HttpUtility.HtmlEncode(ex)); - Log.Error(ex.Message, ex, typeof(PageEditorRendererDecorator)); - } - } - else - { - _innerRenderer.Render(writer); - } - } - } + public override void Render(TextWriter writer) + { + try + { + _innerRenderer.Render(writer); + } + catch (Exception ex) + { + writer.Write("

Error rendering the following component: {0}

{1}

", + HttpUtility.HtmlEncode(_renderingItem.Name), + HttpUtility.HtmlEncode(ex)); + Log.Error(ex.Message, ex, typeof(PageEditorRendererDecorator)); + } + } + } } diff --git a/src/Jabberwocky.Autofac/Properties/AssemblyInfo.cs b/src/Jabberwocky.Autofac/Properties/AssemblyInfo.cs index 082fa5d..20b7ed8 100644 --- a/src/Jabberwocky.Autofac/Properties/AssemblyInfo.cs +++ b/src/Jabberwocky.Autofac/Properties/AssemblyInfo.cs @@ -34,4 +34,4 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] diff --git a/src/Jabberwocky.Core/Properties/AssemblyInfo.cs b/src/Jabberwocky.Core/Properties/AssemblyInfo.cs index 722d0e4..94156c7 100644 --- a/src/Jabberwocky.Core/Properties/AssemblyInfo.cs +++ b/src/Jabberwocky.Core/Properties/AssemblyInfo.cs @@ -34,5 +34,5 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] [assembly: InternalsVisibleTo("Jabberwocky.Core.Tests")] \ No newline at end of file diff --git a/src/Jabberwocky.DependencyInjection.Sc/Properties/AssemblyInfo.cs b/src/Jabberwocky.DependencyInjection.Sc/Properties/AssemblyInfo.cs index b4c380f..a73ebf3 100644 --- a/src/Jabberwocky.DependencyInjection.Sc/Properties/AssemblyInfo.cs +++ b/src/Jabberwocky.DependencyInjection.Sc/Properties/AssemblyInfo.cs @@ -34,4 +34,4 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] diff --git a/src/Jabberwocky.DependencyInjection/Properties/AssemblyInfo.cs b/src/Jabberwocky.DependencyInjection/Properties/AssemblyInfo.cs index 751804c..8cac8cc 100644 --- a/src/Jabberwocky.DependencyInjection/Properties/AssemblyInfo.cs +++ b/src/Jabberwocky.DependencyInjection/Properties/AssemblyInfo.cs @@ -34,4 +34,4 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] diff --git a/src/Jabberwocky.Glass.Autofac.Mvc/Properties/AssemblyInfo.cs b/src/Jabberwocky.Glass.Autofac.Mvc/Properties/AssemblyInfo.cs index b0f245f..e2b84b6 100644 --- a/src/Jabberwocky.Glass.Autofac.Mvc/Properties/AssemblyInfo.cs +++ b/src/Jabberwocky.Glass.Autofac.Mvc/Properties/AssemblyInfo.cs @@ -34,6 +34,6 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] [assembly: InternalsVisibleTo("Jabberwocky.Glass.Autofac.Mvc.Tests")] \ No newline at end of file diff --git a/src/Jabberwocky.Glass.Autofac.WebApi/Properties/AssemblyInfo.cs b/src/Jabberwocky.Glass.Autofac.WebApi/Properties/AssemblyInfo.cs index c8df40c..c1477da 100644 --- a/src/Jabberwocky.Glass.Autofac.WebApi/Properties/AssemblyInfo.cs +++ b/src/Jabberwocky.Glass.Autofac.WebApi/Properties/AssemblyInfo.cs @@ -34,4 +34,4 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] diff --git a/src/Jabberwocky.Glass.Autofac/Properties/AssemblyInfo.cs b/src/Jabberwocky.Glass.Autofac/Properties/AssemblyInfo.cs index 3ea985b..ed80a40 100644 --- a/src/Jabberwocky.Glass.Autofac/Properties/AssemblyInfo.cs +++ b/src/Jabberwocky.Glass.Autofac/Properties/AssemblyInfo.cs @@ -34,7 +34,7 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] [assembly: InternalsVisibleTo("Jabberwocky.Glass.Autofac.Mvc")] [assembly: InternalsVisibleTo("Jabberwocky.Glass.Autofac.WebApi")] diff --git a/src/Jabberwocky.Glass.Mvc/Properties/AssemblyInfo.cs b/src/Jabberwocky.Glass.Mvc/Properties/AssemblyInfo.cs index d09986e..9b2470d 100644 --- a/src/Jabberwocky.Glass.Mvc/Properties/AssemblyInfo.cs +++ b/src/Jabberwocky.Glass.Mvc/Properties/AssemblyInfo.cs @@ -34,4 +34,4 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] diff --git a/src/Jabberwocky.Glass/Properties/AssemblyInfo.cs b/src/Jabberwocky.Glass/Properties/AssemblyInfo.cs index 4582a4b..d42314d 100644 --- a/src/Jabberwocky.Glass/Properties/AssemblyInfo.cs +++ b/src/Jabberwocky.Glass/Properties/AssemblyInfo.cs @@ -34,6 +34,6 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] [assembly: InternalsVisibleTo("Jabberwocky.Glass.Tests")] [assembly: InternalsVisibleTo("Jabberwocky.Glass.Autofac")] diff --git a/src/Jabberwocky.WebApi.Sc/Properties/AssemblyInfo.cs b/src/Jabberwocky.WebApi.Sc/Properties/AssemblyInfo.cs index e3672df..be68ef0 100644 --- a/src/Jabberwocky.WebApi.Sc/Properties/AssemblyInfo.cs +++ b/src/Jabberwocky.WebApi.Sc/Properties/AssemblyInfo.cs @@ -34,4 +34,4 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] diff --git a/src/Jabberwocky.WebApi/Properties/AssemblyInfo.cs b/src/Jabberwocky.WebApi/Properties/AssemblyInfo.cs index 63c2b53..6a393b1 100644 --- a/src/Jabberwocky.WebApi/Properties/AssemblyInfo.cs +++ b/src/Jabberwocky.WebApi/Properties/AssemblyInfo.cs @@ -34,4 +34,4 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] diff --git a/tools/Nuget/nuget.bat b/tools/Nuget/nuget.bat index 62dc05c..2256bf9 100644 --- a/tools/Nuget/nuget.bat +++ b/tools/Nuget/nuget.bat @@ -5,10 +5,10 @@ set projfile=!projfile:nuspec=csproj! ..\..\.nuget\NuGet.exe pack !projfile! -IncludeReferencedProjects -symbols -Build -OutputDirectory . -Prop Configuration=Release ) -..\..\.nuget\NuGet.exe pack ..\..\Jabberwocky.Library.nuspec -NoPackageAnalysis -Version 2.0.0-beta -OutputDirectory . +..\..\.nuget\NuGet.exe pack ..\..\Jabberwocky.Library.nuspec -NoPackageAnalysis -Version 2.0.0 -OutputDirectory . -..\..\.nuget\NuGet.exe pack ..\..\diagnostics\Jabberwocky.Core.CodeAnalysis/Jabberwocky.Core.CodeAnalysis/Jabberwocky.Core.CodeAnalysis.nuspec -NoPackageAnalysis -Version 2.0.0-beta -OutputDirectory . -Prop Configuration=Release -..\..\.nuget\NuGet.exe pack ..\..\diagnostics\Jabberwocky.Glass.CodeAnalysis/Jabberwocky.Glass.CodeAnalysis/Jabberwocky.Glass.CodeAnalysis.nuspec -NoPackageAnalysis -Version 2.0.0-beta -OutputDirectory . -Prop Configuration=Release +..\..\.nuget\NuGet.exe pack ..\..\diagnostics\Jabberwocky.Core.CodeAnalysis/Jabberwocky.Core.CodeAnalysis/Jabberwocky.Core.CodeAnalysis.nuspec -NoPackageAnalysis -Version 2.0.0 -OutputDirectory . -Prop Configuration=Release +..\..\.nuget\NuGet.exe pack ..\..\diagnostics\Jabberwocky.Glass.CodeAnalysis/Jabberwocky.Glass.CodeAnalysis/Jabberwocky.Glass.CodeAnalysis.nuspec -NoPackageAnalysis -Version 2.0.0 -OutputDirectory . -Prop Configuration=Release REM - Copy symbol sources to 'symbols' directory mkdir symbols