Merge pull request #35 from NLog/rename

304NotModified · web-flow · commit b0b94f4a2dcb · 2017-01-26T22:34:28.000+01:00
Rename project and folders
diff --git a/NLog.StructuredEvents.sln b/NLog.StructuredEvents.sln
@@ -9,9 +9,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		global.json = global.json
 	EndProjectSection
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Parser", "src\Parser\Parser.xproj", "{58438CA4-C827-4E4B-A243-0BFBCD48A2DD}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NLog.StructuredEvents", "src\NLog.StructuredEvents\NLog.StructuredEvents.xproj", "{58438CA4-C827-4E4B-A243-0BFBCD48A2DD}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Parser.Tests", "test\Parser.Tests\Parser.Tests.xproj", "{8867FF56-F14D-408C-B126-FE9CF13AE207}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NLog.StructuredEvents.Tests", "test\NLog.StructuredEvents.Tests\NLog.StructuredEvents.Tests.xproj", "{8867FF56-F14D-408C-B126-FE9CF13AE207}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Benchmarks", "test\Benchmarks\Benchmarks.xproj", "{EC23ABDF-B869-459F-97C5-DD25279567F1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -27,6 +29,10 @@ Global
 		{8867FF56-F14D-408C-B126-FE9CF13AE207}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8867FF56-F14D-408C-B126-FE9CF13AE207}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8867FF56-F14D-408C-B126-FE9CF13AE207}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EC23ABDF-B869-459F-97C5-DD25279567F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EC23ABDF-B869-459F-97C5-DD25279567F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EC23ABDF-B869-459F-97C5-DD25279567F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EC23ABDF-B869-459F-97C5-DD25279567F1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/appveyor.yml b/appveyor.yml
@@ -3,7 +3,7 @@ build_script:
 - ps: .\build.ps1
 test_script:
   - nuget.exe install OpenCover -ExcludeVersion
-  - OpenCover\tools\OpenCover.Console.exe -register:user -filter:"+[Parser]*" -target:"dotnet.exe" "-targetargs:test test\Parser.Tests" -returntargetcode -hideskipped:All -output:coverage.xml
+  - OpenCover\tools\OpenCover.Console.exe -register:user -filter:"+[NLog.StructuredEvents]*" -target:"dotnet.exe" "-targetargs:test test\NLog.StructuredEvents.Tests" -returntargetcode -hideskipped:All -output:coverage.xml
   - "SET PATH=C:\\Python34;C:\\Python34\\Scripts;%PATH%"
   - pip install codecov
   - codecov -f "coverage.xml"
diff --git a/build.ps1 b/build.ps1
@@ -1,2 +1,2 @@
 dotnet restore 
-dotnet pack src\Parser -c release -o artifacts\
+dotnet pack src\NLog.StructuredEvents -c release -o artifacts\
diff --git a/run-tests.ps1 b/run-tests.ps1
@@ -1,2 +1,2 @@
 dotnet restore 
-dotnet test test\Parser.Tests -c release                                                                                                                                                                                                     
+dotnet test test\NLog.StructuredEvents.Tests -c release                                                                                                                                                                                                     
diff --git a/src/NLog.StructuredEvents/NLog.StructuredEvents.xproj b/src/NLog.StructuredEvents/NLog.StructuredEvents.xproj
@@ -4,18 +4,16 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>58438ca4-c827-4e4b-a243-0bfbcd48a2dd</ProjectGuid>
-    <RootNamespace>Parser</RootNamespace>
+    <RootNamespace>NLog.StructuredEvents</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
   </PropertyGroup>
-
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
diff --git a/src/NLog.StructuredEvents/NLog.snk b/src/NLog.StructuredEvents/NLog.snk
diff --git a/src/NLog.StructuredEvents/Parts/CaptureType.cs b/src/NLog.StructuredEvents/Parts/CaptureType.cs
@@ -1,4 +1,4 @@
-namespace Parser.Parts
+namespace NLog.StructuredEvents.Parts
 {
     public enum CaptureType : byte
     {
diff --git a/src/NLog.StructuredEvents/Parts/Hole.cs b/src/NLog.StructuredEvents/Parts/Hole.cs
@@ -1,4 +1,4 @@
-namespace Parser.Parts
+namespace NLog.StructuredEvents.Parts
 {
     public struct Hole
     {
diff --git a/src/NLog.StructuredEvents/Parts/Literal.cs b/src/NLog.StructuredEvents/Parts/Literal.cs
@@ -1,4 +1,4 @@
-namespace Parser.Parts
+namespace NLog.StructuredEvents.Parts
 {
     public struct Literal
     {
diff --git a/src/NLog.StructuredEvents/Properties/AssemblyInfo.cs b/src/NLog.StructuredEvents/Properties/AssemblyInfo.cs
@@ -16,4 +16,4 @@
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
-[assembly: InternalsVisibleTo("Parser.Tests")]
+[assembly: InternalsVisibleTo("NLog.StructuredEvents.Tests")]
diff --git a/src/NLog.StructuredEvents/RenderException.cs b/src/NLog.StructuredEvents/RenderException.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Parser
+namespace NLog.StructuredEvents
 {
     /// <summary>
     /// Rendering failed
diff --git a/src/NLog.StructuredEvents/Serialization/FuncSerializer.cs b/src/NLog.StructuredEvents/Serialization/FuncSerializer.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Text;
 
-namespace Parser
+namespace NLog.StructuredEvents.Serialization
 {
     /// <summary>
     /// Serialize a type with a (lamdba) function
diff --git a/src/NLog.StructuredEvents/Serialization/ISerializer.cs b/src/NLog.StructuredEvents/Serialization/ISerializer.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using System.Text;
 
-namespace Parser
+namespace NLog.StructuredEvents.Serialization
 {
    ///<summary>Serializer</summary>
     public interface ISerializer
diff --git a/src/NLog.StructuredEvents/Serialization/SerializationManager.cs b/src/NLog.StructuredEvents/Serialization/SerializationManager.cs
@@ -3,7 +3,7 @@
 using System.Globalization;
 using System.Text;
 
-namespace Parser
+namespace NLog.StructuredEvents.Serialization
 {
     ///<summary>Manager serializers for customizing serialization of specific types</summary>
     public class SerializationManager
diff --git a/src/NLog.StructuredEvents/Template.cs b/src/NLog.StructuredEvents/Template.cs
@@ -1,12 +1,10 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
 using System.Text;
-using Parser.Parts;
+using NLog.StructuredEvents.Parts;
 
-namespace Parser
+namespace NLog.StructuredEvents
 {
   [SuppressMessage("ReSharper", "RedundantToStringCall", Justification = "Performance")]
   public class Template
diff --git a/src/NLog.StructuredEvents/TemplateParser.cs b/src/NLog.StructuredEvents/TemplateParser.cs
@@ -1,11 +1,11 @@
 ﻿using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using Parser.Parts;
-using static System.Diagnostics.Debug;
+using NLog.StructuredEvents.Parts;
 
-namespace Parser
+namespace NLog.StructuredEvents
 {
     [SuppressMessage("ReSharper", "FieldCanBeMadeReadOnly.Local", Justification = "Performance")]
     public class TemplateParser
@@ -61,7 +61,7 @@ private Template Parse()
                 if (_literalLength != 0)
                     AddLiteral();
 
-                Assert(_holes.Count == _literals.Count(x => x.Skip > 0));
+                Debug.Assert(_holes.Count == _literals.Count(x => x.Skip > 0));
                 return new Template(_template, _isPositional, _literals, _holes);
             }
             catch (IndexOutOfRangeException)
@@ -227,7 +227,7 @@ private int ParseAlignment()
         private void Skip(char c)
         {
             // Can be out of bounds, but never in correct use (expects a required char).
-            Assert(_template[_position] == c);
+            Debug.Assert(_template[_position] == c);
             _position++;
         }
 
diff --git a/src/NLog.StructuredEvents/TemplateParserException.cs b/src/NLog.StructuredEvents/TemplateParserException.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Parser
+namespace NLog.StructuredEvents
 {
     public class TemplateParserException : Exception
     {
diff --git a/src/NLog.StructuredEvents/TemplateRenderer.cs b/src/NLog.StructuredEvents/TemplateRenderer.cs
@@ -1,8 +1,9 @@
 ﻿using System;
 using System.Text;
-using Parser.Parts;
+using NLog.StructuredEvents.Parts;
+using NLog.StructuredEvents.Serialization;
 
-namespace Parser
+namespace NLog.StructuredEvents
 {
     public static class TemplateRenderer
     {
diff --git a/src/NLog.StructuredEvents/ValueRenderer.cs b/src/NLog.StructuredEvents/ValueRenderer.cs
@@ -1,11 +1,8 @@
 ﻿using System;
 using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
 using System.Text;
 
-namespace Parser
+namespace NLog.StructuredEvents
 {
     public static class ValueRenderer
     {
diff --git a/src/NLog.StructuredEvents/project.json b/src/NLog.StructuredEvents/project.json
@@ -1,17 +1,17 @@
 ﻿{
-  "version": "0.2.0-alpha01",
+  "version": "0.3.0",
   "description": "Parsing and rendering message templates",
   "authors": [ "Julian Verdurmen" ],
   "packOptions": {
     "summary": "NLog - Message template parser and renderer",
-    "tags": [ "template", "parse", "remder" ],
+    "tags": [ "template", "parse", "render" ],
     "projectUrl": "http://nlog-project.org/",
-    "licenseUrl": "http://raw.github.com/NLog/NLog/master/LICENSE.txt",
+    "licenseUrl": "http://raw.github.com/NLog/NLog.StructuredEvents/master/LICENSE",
     "requireLicenseAcceptance": false,
     "iconUrl": "http://nlog-project.org/N.png",
     "repository": {
       "type": "git",
-      "url": "git://github.com/NLog/yamtp"
+      "url": "git://github.com/NLog/NLog.StructuredEvents"
     }
 
   },
diff --git a/test/Benchmarks/Benchmarks.xproj b/test/Benchmarks/Benchmarks.xproj
@@ -0,0 +1,19 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0.25420" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.25420</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>ec23abdf-b869-459f-97c5-dd25279567f1</ProjectGuid>
+    <RootNamespace>Benchmarks</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>
diff --git a/test/Benchmarks/Program.cs b/test/Benchmarks/Program.cs
@@ -1,6 +1,6 @@
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Running;
-using Parser;
+using NLog.StructuredEvents;
 
 public class Program 
 {
diff --git a/test/Benchmarks/project.json b/test/Benchmarks/project.json
@@ -1,17 +1,17 @@
 {
-    "buildOptions": {
-        "emitEntryPoint": true,
-        "optimize": true
+  "buildOptions": {
+    "emitEntryPoint": true,
+    "optimize": true
+  },
+  "dependencies": {
+    "Microsoft.NETCore.App": {
+      "type": "platform",
+      "version": "1.0.0"
     },
-    "dependencies": {
-        "Microsoft.NETCore.App": {
-            "type": "platform",
-            "version": "1.0.0"
-        },
-        "BenchmarkDotNet": "0.9.8",
-        "Parser": "*",
-    },
-    "frameworks": {
-      "netcoreapp1.0": { }
-    }
+    "BenchmarkDotNet": "0.9.8",
+    "NLog.StructuredEvents": "*"
+  },
+  "frameworks": {
+    "netcoreapp1.0": {}
+  }
 }
diff --git a/test/NLog.StructuredEvents.Tests/JsonNetSerializer.cs b/test/NLog.StructuredEvents.Tests/JsonNetSerializer.cs
@@ -1,12 +1,10 @@
 ﻿using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json;
+using NLog.StructuredEvents.Serialization;
 
-namespace Parser.Tests
+namespace NLog.StructuredEvents.Tests
 {
     /// <summary>
     /// Serializer using the great JSON.NET
diff --git a/test/NLog.StructuredEvents.Tests/NLog.StructuredEvents.Tests.xproj b/test/NLog.StructuredEvents.Tests/NLog.StructuredEvents.Tests.xproj
@@ -7,7 +7,7 @@
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>8867ff56-f14d-408c-b126-fe9cf13ae207</ProjectGuid>
-    <RootNamespace>Parser.Tests</RootNamespace>
+    <RootNamespace>NLog.StructuredEvents.Tests</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
diff --git a/test/NLog.StructuredEvents.Tests/NLog.snk b/test/NLog.StructuredEvents.Tests/NLog.snk
diff --git a/test/NLog.StructuredEvents.Tests/ParserTests.cs b/test/NLog.StructuredEvents.Tests/ParserTests.cs
@@ -1,11 +1,8 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Parser.Parts;
+using NLog.StructuredEvents.Parts;
 using Xunit;
 
-namespace Parser.Tests
+namespace NLog.StructuredEvents.Tests
 {
     public class ParserTests
     {
diff --git a/test/NLog.StructuredEvents.Tests/Properties/AssemblyInfo.cs b/test/NLog.StructuredEvents.Tests/Properties/AssemblyInfo.cs
diff --git a/test/NLog.StructuredEvents.Tests/RendererTests.cs b/test/NLog.StructuredEvents.Tests/RendererTests.cs
@@ -1,11 +1,8 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Threading.Tasks;
 using Xunit;
 
-namespace Parser.Tests
+namespace NLog.StructuredEvents.Tests
 {
     public class RendererTests
     {
diff --git a/test/NLog.StructuredEvents.Tests/SerializationTests.cs b/test/NLog.StructuredEvents.Tests/SerializationTests.cs
@@ -1,13 +1,9 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.Globalization;
-using System.Linq;
-using System.Threading.Tasks;
+using NLog.StructuredEvents.Serialization;
 using Xunit;
-using Xunit.Extensions;
 
-namespace Parser.Tests
+namespace NLog.StructuredEvents.Tests
 {
     public class SerializationTests
     {
diff --git a/test/NLog.StructuredEvents.Tests/project.json b/test/NLog.StructuredEvents.Tests/project.json
@@ -1,9 +1,9 @@
 ﻿{
-  "version": "0.2.0-*",
+  "version": "0.3.0-*",
   "testRunner": "xunit",
   "dependencies": {
     "xunit": "2.2.0-beta2-build3300",
-    "Parser": "0.2-*",
+    "NLog.StructuredEvents": "0.3-*",
     "dotnet-test-xunit": "2.2.0-preview2-build1029",
     "Newtonsoft.Json": "9.0.1"
   },

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`dotnet restore`
`2`		`-dotnet pack src\Parser -c release -o artifacts\`
	`2`	`+dotnet pack src\NLog.StructuredEvents -c release -o artifacts\`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`dotnet restore`
`2`		`-dotnet test test\Parser.Tests -c release`
	`2`	`+dotnet test test\NLog.StructuredEvents.Tests -c release`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace Parser.Parts`
	`1`	`+namespace NLog.StructuredEvents.Parts`
`2`	`2`	`{`
`3`	`3`	`public enum CaptureType : byte`
`4`	`4`	`{`