Merge pull request #86 from NLog/renames-for-nlogweb4.3

renames for consistency
NLog · Jan 15, 2017 · 330e553 · 330e553
2 parents a6f0498 + 05cbc18
commit 330e553
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/NLog.Web.AspNetCore.Tests/LayoutRenderers/AspNetSessionIDLayoutRendererTests.cs b/NLog.Web.AspNetCore.Tests/LayoutRenderers/AspNetSessionIDLayoutRendererTests.cs
@@ -20,7 +20,7 @@ public class AspNetSessionIDLayoutRendererTests : TestBase
         [Fact]
         public void NullHttpContextRendersEmptyString()
         {
-            var renderer = new AspNetSessionIDLayoutRenderer();
+            var renderer = new AspNetSessionIdLayoutRenderer();
 
             string result = renderer.Render(new LogEventInfo());
 
@@ -33,7 +33,7 @@ public void NullSessionRendersEmptyString()
             var httpContext = Substitute.For<HttpContextBase>();
             httpContext.Session.Returns(null as HttpSessionStateWrapper);
 
-            var renderer = new AspNetSessionIDLayoutRenderer();
+            var renderer = new AspNetSessionIdLayoutRenderer();
             renderer.HttpContextAccessor = new FakeHttpContextAccessor(httpContext);
 
             string result = renderer.Render(new LogEventInfo());
@@ -48,7 +48,7 @@ public void AvailableSessionRendersSessionId()
             var httpContext = Substitute.For<HttpContextBase>();
             httpContext.Session.SessionID.Returns(expectedResult);
 
-            var renderer = new AspNetSessionIDLayoutRenderer();
+            var renderer = new AspNetSessionIdLayoutRenderer();
             renderer.HttpContextAccessor = new FakeHttpContextAccessor(httpContext);
 
             string result = renderer.Render(new LogEventInfo());

diff --git a/...derers/AspNetQueryStringLayoutRenderer.cs → ...AspNetRequestQueryStringLayoutRenderer.cs b/...derers/AspNetQueryStringLayoutRenderer.cs → ...AspNetRequestQueryStringLayoutRenderer.cs
diff --git a/NLog.Web.AspNetCore/LayoutRenderers/AspNetRequestuseragent.cs b/NLog.Web.AspNetCore/LayoutRenderers/AspNetRequestuseragent.cs
@@ -14,13 +14,13 @@ namespace NLog.Web.LayoutRenderers
     /// <summary>
     /// ASP.NET User Agent
     /// </summary>
-    /// <para>Example usage of ${aspnet-useragent}:</para>
+    /// <para>Example usage of ${aspnet-request-useragent}:</para>
     /// <example>
     /// <code lang="NLog Layout Renderer">
-    /// ${aspnet-useragent} - Produces - User Agent String from the Request.
+    /// ${aspnet-request-useragent} - Produces - User Agent String from the Request.
     /// </code>
     /// </example>
-    [LayoutRenderer("aspnet-useragent")]
+    [LayoutRenderer("aspnet-request-useragent")]
     public class AspNetRequestUserAgent : AspNetLayoutRendererBase
     {
         /// <summary>

diff --git a/...enderers/AspNetSessionIDLayoutRenderer.cs → ...enderers/AspNetSessionIdLayoutRenderer.cs b/...enderers/AspNetSessionIDLayoutRenderer.cs → ...enderers/AspNetSessionIdLayoutRenderer.cs
@@ -12,7 +12,7 @@ namespace NLog.Web.LayoutRenderers
     /// ASP.NET Session ID.
     /// </summary>
     [LayoutRenderer("aspnet-sessionid")]
-    public class AspNetSessionIDLayoutRenderer : AspNetLayoutRendererBase
+    public class AspNetSessionIdLayoutRenderer : AspNetLayoutRendererBase
     {
         /// <summary>
         /// Renders the ASP.NET Session ID appends it to the specified <see cref="StringBuilder" />.

diff --git a/NLog.Web.AspNetCore/global.json b/NLog.Web.AspNetCore/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "1.0.0-preview2-003121"
+    "version": "1.0.0-preview2-1-003177"
 
   }
 }
diff --git a/NLog.Web/NLog.Web.csproj b/NLog.Web/NLog.Web.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -64,7 +64,7 @@
     <Compile Include="..\NLog.Web.AspNetCore\LayoutRenderers\AspNetMvcActionRenderer.cs" />
     <Compile Include="..\NLog.Web.AspNetCore\LayoutRenderers\AspNetMvcLayoutRendererBase.cs" />
     <Compile Include="..\NLog.Web.AspNetCore\LayoutRenderers\AspNetRequestValueLayoutRenderer.cs" />
-    <Compile Include="..\NLog.Web.AspNetCore\LayoutRenderers\AspNetSessionIDLayoutRenderer.cs" />
+    <Compile Include="..\NLog.Web.AspNetCore\LayoutRenderers\AspNetSessionIdLayoutRenderer.cs" />
     <Compile Include="..\NLog.Web.AspNetCore\LayoutRenderers\AspNetSessionValueLayoutRenderer.cs" />
     <Compile Include="..\NLog.Web.AspNetCore\LayoutRenderers\AspNetUserAuthTypeLayoutRenderer.cs" />
     <Compile Include="..\NLog.Web.AspNetCore\LayoutRenderers\AspNetUserIdentityLayoutRenderer.cs" />
@@ -73,7 +73,7 @@
     <Compile Include="..\NLog.Web.AspNetCore\LayoutRenderers\AspNetRequestUrlRenderer.cs" />
     <Compile Include="..\NLog.Web.AspNetCore\LayoutRenderers\AspNetRequestUserAgent.cs" />
     <Compile Include="..\NLog.Web.AspNetCore\LayoutRenderers\AspNetCookieLayoutRenderer.cs" />
-    <Compile Include="..\NLog.Web.AspNetCore\LayoutRenderers\AspNetQueryStringLayoutRenderer.cs" />
+    <Compile Include="..\NLog.Web.AspNetCore\LayoutRenderers\AspNetRequestQueryStringLayoutRenderer.cs" />
     <Compile Include="..\NLog.Web.AspNetCore\LayoutRenderers\AspNetRequestHttpMethodRenderer.cs" />
     <Compile Include="..\NLog.Web.AspNetCore\Enums\AspNetCookieLayoutOutputFormat.cs" />
     <Compile Include="..\NLog.Web.AspNetCore\Internal\PropertyReader.cs" />