From dd4e163173a5f0b92d4ee89587090d32856478e3 Mon Sep 17 00:00:00 2001 From: Ajay Bhargav Baaskaran Date: Mon, 19 Jun 2017 16:52:36 -0700 Subject: [PATCH] Change GenerateChecksum to SuppressChecksum --- .../CodeGeneration/DefaultDocumentWriter.cs | 2 +- .../DefaultRazorCodeGenerationOptions.cs | 8 ++--- ...efaultRazorCodeGenerationOptionsBuilder.cs | 4 +-- .../DesignTimeOptionsFeature.cs | 2 +- .../RazorCodeGenerationOptions.cs | 8 ++--- .../RazorCodeGenerationOptionsBuilder.cs | 2 +- .../RazorEngine.cs | 3 -- .../RuntimeOptionsFeature.cs | 33 ------------------- src/RazorPageGenerator/Program.cs | 6 ++-- .../DefaultDocumentWriterTest.cs | 4 +-- ...aultRazorIRLoweringPhaseIntegrationTest.cs | 4 +-- .../RazorEngineTest.cs | 3 +- 12 files changed, 20 insertions(+), 59 deletions(-) delete mode 100644 src/Microsoft.AspNetCore.Razor.Language/RuntimeOptionsFeature.cs diff --git a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultDocumentWriter.cs b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultDocumentWriter.cs index a9971b6d4f..8b4c859e2c 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultDocumentWriter.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultDocumentWriter.cs @@ -70,7 +70,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration public override void VisitDocument(DocumentIRNode node) { - if (Context.Options.GenerateChecksum) + if (!Context.Options.SuppressChecksum) { // See http://msdn.microsoft.com/en-us/library/system.codedom.codechecksumpragma.checksumalgorithmid.aspx const string Sha1AlgorithmId = "{ff1816ec-aa5e-4d10-87f7-6f4963833460}"; diff --git a/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCodeGenerationOptions.cs b/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCodeGenerationOptions.cs index 1c87d2d8fc..c7a9fcf673 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCodeGenerationOptions.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCodeGenerationOptions.cs @@ -1,18 +1,16 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; - namespace Microsoft.AspNetCore.Razor.Language { internal class DefaultRazorCodeGenerationOptions : RazorCodeGenerationOptions { - public DefaultRazorCodeGenerationOptions(bool indentWithTabs, int indentSize, bool designTime, bool generateChecksum) + public DefaultRazorCodeGenerationOptions(bool indentWithTabs, int indentSize, bool designTime, bool suppressChecksum) { IndentWithTabs = indentWithTabs; IndentSize = indentSize; DesignTime = designTime; - GenerateChecksum = generateChecksum; + SuppressChecksum = suppressChecksum; } public override bool DesignTime { get; } @@ -21,6 +19,6 @@ namespace Microsoft.AspNetCore.Razor.Language public override int IndentSize { get; } - public override bool GenerateChecksum { get; } + public override bool SuppressChecksum { get; } } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCodeGenerationOptionsBuilder.cs b/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCodeGenerationOptionsBuilder.cs index 7b5e25afa5..8d6ec2f97c 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCodeGenerationOptionsBuilder.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCodeGenerationOptionsBuilder.cs @@ -11,11 +11,11 @@ namespace Microsoft.AspNetCore.Razor.Language public override bool IndentWithTabs { get; set; } - public override bool GenerateChecksum { get; set; } + public override bool SuppressChecksum { get; set; } public override RazorCodeGenerationOptions Build() { - return new DefaultRazorCodeGenerationOptions(IndentWithTabs, IndentSize, DesignTime, GenerateChecksum); + return new DefaultRazorCodeGenerationOptions(IndentWithTabs, IndentSize, DesignTime, SuppressChecksum); } } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/DesignTimeOptionsFeature.cs b/src/Microsoft.AspNetCore.Razor.Language/DesignTimeOptionsFeature.cs index 10c5c9e85d..bdcbd3978b 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/DesignTimeOptionsFeature.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/DesignTimeOptionsFeature.cs @@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.Razor.Language } options.DesignTime = true; - options.GenerateChecksum = false; + options.SuppressChecksum = true; } } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/RazorCodeGenerationOptions.cs b/src/Microsoft.AspNetCore.Razor.Language/RazorCodeGenerationOptions.cs index 050f1fc17d..601e2cf36b 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/RazorCodeGenerationOptions.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/RazorCodeGenerationOptions.cs @@ -5,14 +5,14 @@ namespace Microsoft.AspNetCore.Razor.Language { public abstract class RazorCodeGenerationOptions { - public static RazorCodeGenerationOptions Create(bool indentWithTabs, int indentSize, bool designTime, bool generateChecksum) + public static RazorCodeGenerationOptions Create(bool indentWithTabs, int indentSize, bool designTime, bool suppressChecksum) { - return new DefaultRazorCodeGenerationOptions(indentWithTabs, indentSize, designTime, generateChecksum); + return new DefaultRazorCodeGenerationOptions(indentWithTabs, indentSize, designTime, suppressChecksum); } public static RazorCodeGenerationOptions CreateDefault() { - return new DefaultRazorCodeGenerationOptions(indentWithTabs: false, indentSize: 4, designTime: false, generateChecksum: true); + return new DefaultRazorCodeGenerationOptions(indentWithTabs: false, indentSize: 4, designTime: false, suppressChecksum: false); } public abstract bool DesignTime { get; } @@ -21,6 +21,6 @@ namespace Microsoft.AspNetCore.Razor.Language public abstract int IndentSize { get; } - public abstract bool GenerateChecksum { get; } + public abstract bool SuppressChecksum { get; } } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/RazorCodeGenerationOptionsBuilder.cs b/src/Microsoft.AspNetCore.Razor.Language/RazorCodeGenerationOptionsBuilder.cs index a62d703533..024cd7a169 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/RazorCodeGenerationOptionsBuilder.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/RazorCodeGenerationOptionsBuilder.cs @@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Razor.Language public abstract bool IndentWithTabs { get; set; } - public abstract bool GenerateChecksum { get; set; } + public abstract bool SuppressChecksum { get; set; } public abstract RazorCodeGenerationOptions Build(); } diff --git a/src/Microsoft.AspNetCore.Razor.Language/RazorEngine.cs b/src/Microsoft.AspNetCore.Razor.Language/RazorEngine.cs index 3e427c0deb..25781c98cf 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/RazorEngine.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/RazorEngine.cs @@ -102,9 +102,6 @@ namespace Microsoft.AspNetCore.Razor.Language internal static void AddRuntimeDefaults(IRazorEngineBuilder builder) { builder.Features.Add(new RazorPreallocatedTagHelperAttributeOptimizationPass()); - - // Configure options - builder.Features.Add(new RuntimeOptionsFeature()); } internal static void AddDesignTimeDefaults(IRazorEngineBuilder builder) diff --git a/src/Microsoft.AspNetCore.Razor.Language/RuntimeOptionsFeature.cs b/src/Microsoft.AspNetCore.Razor.Language/RuntimeOptionsFeature.cs deleted file mode 100644 index 5910c0bf86..0000000000 --- a/src/Microsoft.AspNetCore.Razor.Language/RuntimeOptionsFeature.cs +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; - -namespace Microsoft.AspNetCore.Razor.Language -{ - internal class RuntimeOptionsFeature : RazorEngineFeatureBase, IRazorParserOptionsFeature, IRazorCodeGenerationOptionsFeature - { - public int Order { get; set; } - - public void Configure(RazorParserOptionsBuilder options) - { - if (options == null) - { - throw new ArgumentNullException(nameof(options)); - } - - options.DesignTime = false; - } - - public void Configure(RazorCodeGenerationOptionsBuilder options) - { - if (options == null) - { - throw new ArgumentNullException(nameof(options)); - } - - options.DesignTime = false; - options.GenerateChecksum = true; - } - } -} diff --git a/src/RazorPageGenerator/Program.cs b/src/RazorPageGenerator/Program.cs index 2bc60f96ff..e55b31f927 100644 --- a/src/RazorPageGenerator/Program.cs +++ b/src/RazorPageGenerator/Program.cs @@ -50,7 +50,7 @@ namespace RazorPageGenerator @class.AccessModifier = "internal"; }); - builder.Features.Add(new DisableChecksumOptionsFeature()); + builder.Features.Add(new SuppressChecksumOptionsFeature()); }); var viewDirectories = Directory.EnumerateDirectories(targetProjectDirectory, "Views", SearchOption.AllDirectories); @@ -107,7 +107,7 @@ namespace RazorPageGenerator }; } - private class DisableChecksumOptionsFeature : RazorEngineFeatureBase, IRazorCodeGenerationOptionsFeature + private class SuppressChecksumOptionsFeature : RazorEngineFeatureBase, IRazorCodeGenerationOptionsFeature { public int Order { get; set; } @@ -118,7 +118,7 @@ namespace RazorPageGenerator throw new ArgumentNullException(nameof(options)); } - options.GenerateChecksum = false; + options.SuppressChecksum = true; } } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DefaultDocumentWriterTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DefaultDocumentWriterTest.cs index e6eba748e9..0f12e8d251 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DefaultDocumentWriterTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DefaultDocumentWriterTest.cs @@ -42,13 +42,13 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration } [Fact] - public void WriteDocument_Empty_GenerateChecksumFalse_WritesNothing() + public void WriteDocument_Empty_SuppressChecksumTrue_WritesNothing() { // Arrange var codeDocument = TestRazorCodeDocument.CreateEmpty(); var optionsBuilder = new DefaultRazorCodeGenerationOptionsBuilder() { - GenerateChecksum = false + SuppressChecksum = true }; var options = optionsBuilder.Build(); diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorIRLoweringPhaseIntegrationTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorIRLoweringPhaseIntegrationTest.cs index a317ba2209..4c23cfd37a 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorIRLoweringPhaseIntegrationTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorIRLoweringPhaseIntegrationTest.cs @@ -44,7 +44,7 @@ namespace Microsoft.AspNetCore.Razor.Language o.DesignTime = true; o.IndentSize = 17; o.IndentWithTabs = true; - o.GenerateChecksum = true; + o.SuppressChecksum = true; }); // Act @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Razor.Language Assert.True(irDocument.Options.DesignTime); Assert.Equal(17, irDocument.Options.IndentSize); Assert.True(irDocument.Options.IndentWithTabs); - Assert.True(irDocument.Options.GenerateChecksum); + Assert.True(irDocument.Options.SuppressChecksum); } [Fact] diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/RazorEngineTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/RazorEngineTest.cs index f1f7ac236a..0ea1f5689a 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/RazorEngineTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/RazorEngineTest.cs @@ -152,8 +152,7 @@ namespace Microsoft.AspNetCore.Razor.Language feature => Assert.IsType(feature), feature => Assert.IsType(feature), feature => Assert.IsType(feature), - feature => Assert.IsType(feature), - feature => Assert.IsType(feature)); + feature => Assert.IsType(feature)); } private static void AssertDefaultRuntimePhases(IReadOnlyList phases)