From 69cdcbfb23ef3310ec1ed23374f838cad33f9cb3 Mon Sep 17 00:00:00 2001 From: Craig Gleadall Date: Sun, 22 Nov 2020 10:28:25 -0500 Subject: [PATCH 1/8] initail updates for Yaml writer --- src/dotnet/Taml.NET.sln | 28 ++++++++++ .../GivenChildArrays/WhenWriterGivesYaml.cs | 26 +++++++++ .../GivenChildArrays/childarrays.taml | 12 +++++ .../WhenParsingSampleOne.cs | 51 ++++++++++++++++++ .../GivenComplexChildDocument/sample1.taml | 12 +++++ .../GivenComplexChildDocument/sample2.taml | 12 +++++ .../GivenSimpleArray/WhenWritingYaml.cs | 27 ++++++++++ .../GivenSimpleArray/simple.taml | 4 ++ .../GivenComments/WhenReadingComments.cs | 27 ++++++++++ .../Spec_1-1/GivenComments/simple.taml | 3 ++ .../Test.Yaml.Writer.Taml.NET.csproj | 44 +++++++++++++++ .../Yaml.Writer.Taml.NET.csproj | 20 +++++++ .../Yaml.Writer.Taml.NET/YamlWriter.cs | 53 +++++++++++++++++++ 13 files changed, 319 insertions(+) create mode 100644 src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenChildArrays/WhenWriterGivesYaml.cs create mode 100644 src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenChildArrays/childarrays.taml create mode 100644 src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenComplexChildDocument/WhenParsingSampleOne.cs create mode 100644 src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenComplexChildDocument/sample1.taml create mode 100644 src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenComplexChildDocument/sample2.taml create mode 100644 src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenSimpleArray/WhenWritingYaml.cs create mode 100644 src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenSimpleArray/simple.taml create mode 100644 src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/Spec_1-1/GivenComments/WhenReadingComments.cs create mode 100644 src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/Spec_1-1/GivenComments/simple.taml create mode 100644 src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET.csproj create mode 100644 src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET.csproj create mode 100644 src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET/YamlWriter.cs diff --git a/src/dotnet/Taml.NET.sln b/src/dotnet/Taml.NET.sln index dfeee22..d998863 100644 --- a/src/dotnet/Taml.NET.sln +++ b/src/dotnet/Taml.NET.sln @@ -15,6 +15,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Directory.Build.props = Directory.Build.props EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yaml.Writer.Taml.NET", "Yaml.Writer.Taml.NET\Yaml.Writer.Taml.NET\Yaml.Writer.Taml.NET.csproj", "{8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.Yaml.Writer.Taml.NET", "Yaml.Writer.Taml.NET\Test.Yaml.Writer.Taml.NET\Test.Yaml.Writer.Taml.NET.csproj", "{392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -49,6 +53,30 @@ Global {CD41ADB4-BC4F-4AB3-9CB3-3D1ABDB32AA1}.Release|x64.Build.0 = Release|Any CPU {CD41ADB4-BC4F-4AB3-9CB3-3D1ABDB32AA1}.Release|x86.ActiveCfg = Release|Any CPU {CD41ADB4-BC4F-4AB3-9CB3-3D1ABDB32AA1}.Release|x86.Build.0 = Release|Any CPU + {8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}.Debug|x64.ActiveCfg = Debug|Any CPU + {8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}.Debug|x64.Build.0 = Debug|Any CPU + {8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}.Debug|x86.ActiveCfg = Debug|Any CPU + {8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}.Debug|x86.Build.0 = Debug|Any CPU + {8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}.Release|Any CPU.Build.0 = Release|Any CPU + {8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}.Release|x64.ActiveCfg = Release|Any CPU + {8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}.Release|x64.Build.0 = Release|Any CPU + {8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}.Release|x86.ActiveCfg = Release|Any CPU + {8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}.Release|x86.Build.0 = Release|Any CPU + {392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}.Debug|x64.ActiveCfg = Debug|Any CPU + {392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}.Debug|x64.Build.0 = Debug|Any CPU + {392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}.Debug|x86.ActiveCfg = Debug|Any CPU + {392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}.Debug|x86.Build.0 = Debug|Any CPU + {392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}.Release|Any CPU.Build.0 = Release|Any CPU + {392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}.Release|x64.ActiveCfg = Release|Any CPU + {392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}.Release|x64.Build.0 = Release|Any CPU + {392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}.Release|x86.ActiveCfg = Release|Any CPU + {392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenChildArrays/WhenWriterGivesYaml.cs b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenChildArrays/WhenWriterGivesYaml.cs new file mode 100644 index 0000000..7c02710 --- /dev/null +++ b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenChildArrays/WhenWriterGivesYaml.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Text; +using TAML; +using TAML.Writer.Yaml; +using Test.Taml.NET; +using Xunit; + +namespace Test.Yaml.Writer.Taml.NET.GivenChildArrays +{ + public class WhenWriterGivesYaml : BaseFixture + { + protected override string SampleFilename => "GivenChildArrays/childarrays.taml"; + + [Fact] + public void ShouldFindThreeElements() + { + var tamlDocument = Parser.Parse(base.Sample); + var yamlString = YamlWriter.Write(tamlDocument); + + var newLines = yamlString.Split(Environment.NewLine); + + Assert.Equal(13, newLines.Length); + } + } +} diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenChildArrays/childarrays.taml b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenChildArrays/childarrays.taml new file mode 100644 index 0000000..6e1366e --- /dev/null +++ b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenChildArrays/childarrays.taml @@ -0,0 +1,12 @@ +value1 + value12 + value13 + value14 +value2 + value22 + value23 + value24 +value3 + value32 + value33 + value34 diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenComplexChildDocument/WhenParsingSampleOne.cs b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenComplexChildDocument/WhenParsingSampleOne.cs new file mode 100644 index 0000000..5766f47 --- /dev/null +++ b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenComplexChildDocument/WhenParsingSampleOne.cs @@ -0,0 +1,51 @@ +using System; +using System.Collections.Generic; +using System.Text; +using TAML; +using TAML.Writer.Yaml; +using Test.Taml.NET; +using Xunit; + +namespace Test.Yaml.Writer.Taml.NET.GivenComplexChildDocument +{ + public class WhenParsingSampleOne : BaseFixture + { + protected override string SampleFilename => "GivenComplexChildDocument/sample1.taml"; + + [Fact] + public void ShouldHaveOneRootKey() + { + var result = YamlWriter.Write(Parser.Parse(base.Sample)); + + var rootLineCount = 0; + + foreach (var line in result.Split(Environment.NewLine)) + { + if (!line.StartsWith(" ") && line.Length > 2) rootLineCount++; + } + + Assert.Equal(1, rootLineCount); + } + + [Fact] + public void ShouldHaveCorrectNesting() + { + var expected = @"root: + - key1: value1 + - key2: value2 + - key3: + - item1 + - item2 + - item3 + - item4: + - key41: value41 + - key42: value42 + - key43: value43 + - key44: value44 +"; + var result = YamlWriter.Write(Parser.Parse(base.Sample)); + + Assert.Equal(expected, result); + } + } +} diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenComplexChildDocument/sample1.taml b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenComplexChildDocument/sample1.taml new file mode 100644 index 0000000..c7a4b36 --- /dev/null +++ b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenComplexChildDocument/sample1.taml @@ -0,0 +1,12 @@ +root + key1 value1 + key2 value2 + key3 + item1 + item2 + item3 + item4 + key41 value41 + key42 value42 + key43 value43 + key44 value44 diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenComplexChildDocument/sample2.taml b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenComplexChildDocument/sample2.taml new file mode 100644 index 0000000..f67396b --- /dev/null +++ b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenComplexChildDocument/sample2.taml @@ -0,0 +1,12 @@ +root1 + key1 value1 + key2 value2 + key3 + item1 + item2 + key4 value4 +root2 + key41 value41 + key42 value42 + key43 value43 + key44 value44 diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenSimpleArray/WhenWritingYaml.cs b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenSimpleArray/WhenWritingYaml.cs new file mode 100644 index 0000000..481c84f --- /dev/null +++ b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenSimpleArray/WhenWritingYaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Text; +using Xunit; +using Test.Taml.NET; +using TAML; +using TAML.Writer.Yaml; + +namespace Test.Yaml.Writer.Taml.NET.GivenSimpleArray +{ + public class WhenWritingYaml : BaseFixture + { + protected override string SampleFilename => "GivenSimpleArray/simple.taml"; + + [Fact] + public void ThenShouldFindArray() + { + var tamlDocument = Parser.Parse(Sample); + + var yamlString = YamlWriter.Write(tamlDocument); + + var newLines = yamlString.Split(Environment.NewLine); + + Assert.Equal(5, newLines.Length); + } + } +} diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenSimpleArray/simple.taml b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenSimpleArray/simple.taml new file mode 100644 index 0000000..6075f39 --- /dev/null +++ b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenSimpleArray/simple.taml @@ -0,0 +1,4 @@ +key + value1 + value2 + value3 diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/Spec_1-1/GivenComments/WhenReadingComments.cs b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/Spec_1-1/GivenComments/WhenReadingComments.cs new file mode 100644 index 0000000..e3c633c --- /dev/null +++ b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/Spec_1-1/GivenComments/WhenReadingComments.cs @@ -0,0 +1,27 @@ +using TAML; +using TAML.Writer.Yaml; +using Test.Taml.NET; +using Xunit; + +namespace Test.Yaml.Writer.Taml.NET.Spec_1_1.GivenComments +{ + public class WhenReadingComments : BaseFixture + { + protected override string SampleFilename => "Spec_1-1/GivenComments/simple.taml"; + + [Fact] + public void ThenShouldIgnoreCommentLines() + { + // arrange + var expected = @"key1: value1 +key2: value2 +"; + + // act + var result = YamlWriter.Write(Parser.Parse(Sample)); + + // assert + Assert.Equal(expected, result); + } + } +} diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/Spec_1-1/GivenComments/simple.taml b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/Spec_1-1/GivenComments/simple.taml new file mode 100644 index 0000000..29b9822 --- /dev/null +++ b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/Spec_1-1/GivenComments/simple.taml @@ -0,0 +1,3 @@ +key1 value1 +# This is a comment +key2 value2 diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET.csproj b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET.csproj new file mode 100644 index 0000000..d88f1ab --- /dev/null +++ b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET.csproj @@ -0,0 +1,44 @@ + + + + netcoreapp3.1 + + false + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + + + + + + + + + + PreserveNewest + + + PreserveNewest + + + Always + + + + diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET.csproj b/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET.csproj new file mode 100644 index 0000000..496b24c --- /dev/null +++ b/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET.csproj @@ -0,0 +1,20 @@ + + + + netstandard2.0 + 0.0.1 + Jeffrey T. Fritz and Friends + Yaml writer for TAML + Copyright Jeffery T. Fritz + MIT + https://github.com/csharpfritz/TAML + https://github.com/cgleadall/TAML + GitHub + TAML.Writer.Yaml + + + + + + + diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET/YamlWriter.cs b/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET/YamlWriter.cs new file mode 100644 index 0000000..f89082f --- /dev/null +++ b/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET/YamlWriter.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace TAML.Writer.Yaml +{ + public class YamlWriter + { + public static string Write(TamlDocument tamlDocument) + { + var yaml = new StringBuilder(); + var indentCount = 0; + + foreach (var item in tamlDocument.KeyValuePairs) + { + if (item.HasValue && item.Value != null) + { + WriteValue(indentCount, item.Value, yaml); + } + } + + var yamlResult = yaml.ToString(); + return yamlResult; + } + + private static string Indent(int indentCount) + { + return "".PadLeft(indentCount); + } + + private static void WriteValue(int indentCount, TamlValue tamlValue, StringBuilder stringBuilder) + { + switch (tamlValue.GetType().Name) + { + case "TamlArray": + var valueArray = (TamlArray)tamlValue; + stringBuilder.AppendLine($"{Indent(indentCount)}{tamlValue}:"); + foreach (var value in valueArray) + { + WriteValue(indentCount + 2, value, stringBuilder); + stringBuilder.AppendLine($"{Indent(indentCount + 2)}- {value}"); + } + + break; + + case "TamlValue": + stringBuilder.AppendLine($"{Indent(indentCount)}{tamlValue}: {tamlValue}"); + + break; + } + } + } +} From 6ada9a2b441635e193ffd7f3ce0fa8a960e2d7b1 Mon Sep 17 00:00:00 2001 From: Craig Gleadall Date: Sun, 22 Nov 2020 18:58:18 -0500 Subject: [PATCH 2/8] redo writer. --- src/dotnet/Taml.NET.sln | 18 +++++++- .../WhenParsingSampleOne.cs | 5 ++- .../Yaml.Writer.Cli/Program.cs | 32 ++++++++++++++ .../Yaml.Writer.Cli/Yaml.Writer.Cli.csproj | 13 ++++++ .../Yaml.Writer.Taml.NET/YamlWriter.cs | 42 +++++++++++-------- 5 files changed, 88 insertions(+), 22 deletions(-) create mode 100644 src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/Program.cs create mode 100644 src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/Yaml.Writer.Cli.csproj diff --git a/src/dotnet/Taml.NET.sln b/src/dotnet/Taml.NET.sln index d998863..039a8bf 100644 --- a/src/dotnet/Taml.NET.sln +++ b/src/dotnet/Taml.NET.sln @@ -15,9 +15,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Directory.Build.props = Directory.Build.props EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yaml.Writer.Taml.NET", "Yaml.Writer.Taml.NET\Yaml.Writer.Taml.NET\Yaml.Writer.Taml.NET.csproj", "{8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yaml.Writer.Taml.NET", "Yaml.Writer.Taml.NET\Yaml.Writer.Taml.NET\Yaml.Writer.Taml.NET.csproj", "{8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.Yaml.Writer.Taml.NET", "Yaml.Writer.Taml.NET\Test.Yaml.Writer.Taml.NET\Test.Yaml.Writer.Taml.NET.csproj", "{392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.Yaml.Writer.Taml.NET", "Yaml.Writer.Taml.NET\Test.Yaml.Writer.Taml.NET\Test.Yaml.Writer.Taml.NET.csproj", "{392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yaml.Writer.Cli", "Yaml.Writer.Taml.NET\Yaml.Writer.Cli\Yaml.Writer.Cli.csproj", "{BB383A98-D380-422B-9347-8FCC5F58357F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -77,6 +79,18 @@ Global {392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}.Release|x64.Build.0 = Release|Any CPU {392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}.Release|x86.ActiveCfg = Release|Any CPU {392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}.Release|x86.Build.0 = Release|Any CPU + {BB383A98-D380-422B-9347-8FCC5F58357F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BB383A98-D380-422B-9347-8FCC5F58357F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BB383A98-D380-422B-9347-8FCC5F58357F}.Debug|x64.ActiveCfg = Debug|Any CPU + {BB383A98-D380-422B-9347-8FCC5F58357F}.Debug|x64.Build.0 = Debug|Any CPU + {BB383A98-D380-422B-9347-8FCC5F58357F}.Debug|x86.ActiveCfg = Debug|Any CPU + {BB383A98-D380-422B-9347-8FCC5F58357F}.Debug|x86.Build.0 = Debug|Any CPU + {BB383A98-D380-422B-9347-8FCC5F58357F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BB383A98-D380-422B-9347-8FCC5F58357F}.Release|Any CPU.Build.0 = Release|Any CPU + {BB383A98-D380-422B-9347-8FCC5F58357F}.Release|x64.ActiveCfg = Release|Any CPU + {BB383A98-D380-422B-9347-8FCC5F58357F}.Release|x64.Build.0 = Release|Any CPU + {BB383A98-D380-422B-9347-8FCC5F58357F}.Release|x86.ActiveCfg = Release|Any CPU + {BB383A98-D380-422B-9347-8FCC5F58357F}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenComplexChildDocument/WhenParsingSampleOne.cs b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenComplexChildDocument/WhenParsingSampleOne.cs index 5766f47..a25cc19 100644 --- a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenComplexChildDocument/WhenParsingSampleOne.cs +++ b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenComplexChildDocument/WhenParsingSampleOne.cs @@ -30,11 +30,12 @@ public void ShouldHaveOneRootKey() [Fact] public void ShouldHaveCorrectNesting() { - var expected = @"root: + var expected = +@"root: - key1: value1 - key2: value2 - key3: - - item1 + - item1 - item2 - item3 - item4: diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/Program.cs b/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/Program.cs new file mode 100644 index 0000000..b575d32 --- /dev/null +++ b/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/Program.cs @@ -0,0 +1,32 @@ +using System; +using System.IO; +using TAML; +using TAML.Writer.Yaml; + +namespace Yaml.Writer.Cli +{ + internal class Program + { + private static void Main(string[] args) + { + var filename = GetFileName(args); + var tamlDoc = Parser.Parse(new StreamReader(File.OpenRead(filename))); + + var yaml = YamlWriter.Write(tamlDoc); + + Console.WriteLine(yaml); + } + + private static string GetFileName(string[] args) + { + if (args.Length >= 1) + { + if (File.Exists(args[0])) + { + return args[0]; + } + } + return "sample1.taml"; + } + } +} diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/Yaml.Writer.Cli.csproj b/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/Yaml.Writer.Cli.csproj new file mode 100644 index 0000000..184cd15 --- /dev/null +++ b/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/Yaml.Writer.Cli.csproj @@ -0,0 +1,13 @@ + + + + Exe + netcoreapp3.1 + + + + + + + + diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET/YamlWriter.cs b/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET/YamlWriter.cs index f89082f..ecee65d 100644 --- a/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET/YamlWriter.cs +++ b/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET/YamlWriter.cs @@ -15,7 +15,7 @@ public static string Write(TamlDocument tamlDocument) { if (item.HasValue && item.Value != null) { - WriteValue(indentCount, item.Value, yaml); + WriteKeyWithTamlValue(indentCount, item, yaml); } } @@ -25,28 +25,34 @@ public static string Write(TamlDocument tamlDocument) private static string Indent(int indentCount) { - return "".PadLeft(indentCount); + return "".PadLeft(indentCount) + (indentCount > 0 ? "- " : ""); } - private static void WriteValue(int indentCount, TamlValue tamlValue, StringBuilder stringBuilder) + private static void WriteKeyWithTamlValue(int indentCount, TamlKeyValuePair tamlKvp, StringBuilder stringBuilder) { - switch (tamlValue.GetType().Name) - { - case "TamlArray": - var valueArray = (TamlArray)tamlValue; - stringBuilder.AppendLine($"{Indent(indentCount)}{tamlValue}:"); - foreach (var value in valueArray) - { - WriteValue(indentCount + 2, value, stringBuilder); - stringBuilder.AppendLine($"{Indent(indentCount + 2)}- {value}"); - } - - break; + var isTamlValue = tamlKvp.Value is TamlValue; + var isTamlArray = tamlKvp.Value is TamlArray; - case "TamlValue": - stringBuilder.AppendLine($"{Indent(indentCount)}{tamlValue}: {tamlValue}"); + if (isTamlArray && isTamlValue) + { + stringBuilder.AppendLine($"{Indent(indentCount)}{tamlKvp.Key}:"); + } - break; + if (isTamlArray && tamlKvp.HasValue && tamlKvp.Value != null) + { + var tva = (TamlArray)tamlKvp.Value; + foreach (var item in tva) + { + WriteKeyWithTamlValue(indentCount + 2, (TamlKeyValuePair)item, stringBuilder); + } + } + else if (isTamlValue) + { + stringBuilder.AppendLine($"{Indent(indentCount)}{tamlKvp.Key}: {tamlKvp.Value}"); + } + else + { + stringBuilder.AppendLine($"{Indent(indentCount)}{ tamlKvp.Key}"); } } } From 32162e510ac27239044c26805422c9076d965de1 Mon Sep 17 00:00:00 2001 From: Craig Gleadall Date: Sun, 22 Nov 2020 19:40:21 -0500 Subject: [PATCH 3/8] added samples for CLI --- .../Yaml.Writer.Taml.NET/Yaml.Writer.Cli/Program.cs | 13 +++++++++---- .../Yaml.Writer.Cli/sample1.taml | 12 ++++++++++++ .../Yaml.Writer.Cli/sample2.taml | 12 ++++++++++++ 3 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/sample1.taml create mode 100644 src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/sample2.taml diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/Program.cs b/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/Program.cs index b575d32..b3f182e 100644 --- a/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/Program.cs +++ b/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/Program.cs @@ -10,6 +10,7 @@ internal class Program private static void Main(string[] args) { var filename = GetFileName(args); + Console.WriteLine($"Read file: {filename}"); var tamlDoc = Parser.Parse(new StreamReader(File.OpenRead(filename))); var yaml = YamlWriter.Write(tamlDoc); @@ -17,13 +18,17 @@ private static void Main(string[] args) Console.WriteLine(yaml); } + /// + /// Find the first file with a `.taml` extension from the command line arguments. + /// If no such file exists then default to `sample1.taml` + /// private static string GetFileName(string[] args) { - if (args.Length >= 1) - { - if (File.Exists(args[0])) + foreach(var arg in args){ + + if (arg.EndsWith("taml") && File.Exists(arg)) { - return args[0]; + return arg; } } return "sample1.taml"; diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/sample1.taml b/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/sample1.taml new file mode 100644 index 0000000..971ac7f --- /dev/null +++ b/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/sample1.taml @@ -0,0 +1,12 @@ +root + key1 value1 + key2 value2 + key3 + item1 + item2 + item3 + item4 + key41 value41 + key42 value42 + key43 value43 + key44 value44 \ No newline at end of file diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/sample2.taml b/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/sample2.taml new file mode 100644 index 0000000..f67396b --- /dev/null +++ b/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/sample2.taml @@ -0,0 +1,12 @@ +root1 + key1 value1 + key2 value2 + key3 + item1 + item2 + key4 value4 +root2 + key41 value41 + key42 value42 + key43 value43 + key44 value44 From 4046c6c0c5464d089911ff0b54986faba2200846 Mon Sep 17 00:00:00 2001 From: Craig Gleadall Date: Sun, 22 Nov 2020 19:40:40 -0500 Subject: [PATCH 4/8] simple docs for YamlWriter --- .../Yaml.Writer.Taml.NET/YamlWriter.cs | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET/YamlWriter.cs b/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET/YamlWriter.cs index ecee65d..413c383 100644 --- a/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET/YamlWriter.cs +++ b/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET/YamlWriter.cs @@ -6,6 +6,9 @@ namespace TAML.Writer.Yaml { public class YamlWriter { + /// + /// Convert the provided `tamlDocument` to a Yaml string. + /// public static string Write(TamlDocument tamlDocument) { var yaml = new StringBuilder(); @@ -19,15 +22,22 @@ public static string Write(TamlDocument tamlDocument) } } - var yamlResult = yaml.ToString(); - return yamlResult; + return yaml.ToString(); } + /// Create an 'indentation string that contains `indentCount` spaces. + /// If the indentCount is grater than 0 then append the YAML 'Block Sequence' character private static string Indent(int indentCount) { return "".PadLeft(indentCount) + (indentCount > 0 ? "- " : ""); } + /// Write a TamlKeyValuePair to the StringBuilder. + /// If the value is both a TamlValue and TamlArray then write only the "Key" with YAML 'Mapping Key'. + /// Then either: + /// a) a TamlArray, then write each TamlKeyValuePair recursively + /// b) a TamlValue, then write the Key and Value + /// c) neither, then simply write the Key private static void WriteKeyWithTamlValue(int indentCount, TamlKeyValuePair tamlKvp, StringBuilder stringBuilder) { var isTamlValue = tamlKvp.Value is TamlValue; @@ -52,7 +62,7 @@ private static void WriteKeyWithTamlValue(int indentCount, TamlKeyValuePair taml } else { - stringBuilder.AppendLine($"{Indent(indentCount)}{ tamlKvp.Key}"); + stringBuilder.AppendLine($"{Indent(indentCount)}{tamlKvp.Key}"); } } } From 20e7d9353903fe3efaff5d46d260166e4b4cb416 Mon Sep 17 00:00:00 2001 From: Craig Gleadall Date: Sat, 16 Jan 2021 15:06:30 -0500 Subject: [PATCH 5/8] fix issue from merge from main --- .../GivenChildArrays/WhenWriterGivesYaml.cs | 4 +--- .../GivenComplexChildDocument/WhenParsingSampleOne.cs | 4 +--- .../GivenSimpleArray/WhenWritingYaml.cs | 4 +--- .../Spec_1-1/GivenComments/WhenReadingComments.cs | 2 +- .../Test.Yaml.Writer.Taml.NET.csproj | 4 ++-- .../Yaml.Writer.Cli/Yaml.Writer.Cli.csproj | 2 +- .../Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET.csproj | 2 +- 7 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenChildArrays/WhenWriterGivesYaml.cs b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenChildArrays/WhenWriterGivesYaml.cs index 7c02710..e1c11d6 100644 --- a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenChildArrays/WhenWriterGivesYaml.cs +++ b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenChildArrays/WhenWriterGivesYaml.cs @@ -1,9 +1,7 @@ using System; -using System.Collections.Generic; -using System.Text; using TAML; using TAML.Writer.Yaml; -using Test.Taml.NET; +using Test.Taml; using Xunit; namespace Test.Yaml.Writer.Taml.NET.GivenChildArrays diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenComplexChildDocument/WhenParsingSampleOne.cs b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenComplexChildDocument/WhenParsingSampleOne.cs index a25cc19..9441034 100644 --- a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenComplexChildDocument/WhenParsingSampleOne.cs +++ b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenComplexChildDocument/WhenParsingSampleOne.cs @@ -1,9 +1,7 @@ using System; -using System.Collections.Generic; -using System.Text; using TAML; using TAML.Writer.Yaml; -using Test.Taml.NET; +using Test.Taml; using Xunit; namespace Test.Yaml.Writer.Taml.NET.GivenComplexChildDocument diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenSimpleArray/WhenWritingYaml.cs b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenSimpleArray/WhenWritingYaml.cs index 481c84f..5b0592a 100644 --- a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenSimpleArray/WhenWritingYaml.cs +++ b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenSimpleArray/WhenWritingYaml.cs @@ -1,8 +1,6 @@ using System; -using System.Collections.Generic; -using System.Text; using Xunit; -using Test.Taml.NET; +using Test.Taml; using TAML; using TAML.Writer.Yaml; diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/Spec_1-1/GivenComments/WhenReadingComments.cs b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/Spec_1-1/GivenComments/WhenReadingComments.cs index e3c633c..d34a858 100644 --- a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/Spec_1-1/GivenComments/WhenReadingComments.cs +++ b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/Spec_1-1/GivenComments/WhenReadingComments.cs @@ -1,6 +1,6 @@ using TAML; using TAML.Writer.Yaml; -using Test.Taml.NET; +using Test.Taml; using Xunit; namespace Test.Yaml.Writer.Taml.NET.Spec_1_1.GivenComments diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET.csproj b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET.csproj index d88f1ab..be1e3b3 100644 --- a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET.csproj +++ b/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET.csproj @@ -20,8 +20,8 @@ - - + + diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/Yaml.Writer.Cli.csproj b/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/Yaml.Writer.Cli.csproj index 184cd15..1f27f57 100644 --- a/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/Yaml.Writer.Cli.csproj +++ b/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/Yaml.Writer.Cli.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET.csproj b/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET.csproj index 496b24c..00fa1eb 100644 --- a/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET.csproj +++ b/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET.csproj @@ -14,7 +14,7 @@ - + From 01f2f37edcbc615dc1fc553c550feb4ffb13d223 Mon Sep 17 00:00:00 2001 From: Craig Gleadall Date: Sat, 16 Jan 2021 15:18:17 -0500 Subject: [PATCH 6/8] remove project reference --- src/dotnet/Taml.sln | 1 - 1 file changed, 1 deletion(-) diff --git a/src/dotnet/Taml.sln b/src/dotnet/Taml.sln index 802fc9d..b070e55 100644 --- a/src/dotnet/Taml.sln +++ b/src/dotnet/Taml.sln @@ -125,7 +125,6 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {069403C6-DE0A-4043-8D92-88DADE3DB3E2} = {D8BF9D98-AE40-4736-B471-1A0CD71184C7} {2CF41FAB-4607-4772-8544-8D2EF8FF9DB8} = {D8BF9D98-AE40-4736-B471-1A0CD71184C7} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution From 2888f48d26f5420603b9d80306925cf299db0b33 Mon Sep 17 00:00:00 2001 From: Craig Gleadall Date: Sat, 16 Jan 2021 18:15:44 -0500 Subject: [PATCH 7/8] rename Yaml projects - remove .NET --- src/dotnet/Taml.sln | 9 ++++----- .../GivenChildArrays/WhenWriterGivesYaml.cs | 0 .../GivenChildArrays/childarrays.taml | 0 .../GivenComplexChildDocument/WhenParsingSampleOne.cs | 0 .../GivenComplexChildDocument/sample1.taml | 0 .../GivenComplexChildDocument/sample2.taml | 0 .../GivenSimpleArray/WhenWritingYaml.cs | 0 .../Test.Yaml.Writer.Taml}/GivenSimpleArray/simple.taml | 0 .../Spec_1-1/GivenComments/WhenReadingComments.cs | 0 .../Spec_1-1/GivenComments/simple.taml | 0 .../Test.Yaml.Writer.Taml/Test.Yaml.Writer.Taml.csproj} | 2 +- .../Yaml.Writer.Cli/Program.cs | 0 .../Yaml.Writer.Cli/Yaml.Writer.Cli.csproj | 2 +- .../Yaml.Writer.Cli/sample1.taml | 0 .../Yaml.Writer.Cli/sample2.taml | 0 .../Yaml.Writer.Taml/Yaml.Writer.Taml.csproj} | 0 .../Yaml.Writer.Taml}/YamlWriter.cs | 0 17 files changed, 6 insertions(+), 7 deletions(-) rename src/dotnet/{Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET => Yaml.Writer.Taml/Test.Yaml.Writer.Taml}/GivenChildArrays/WhenWriterGivesYaml.cs (100%) rename src/dotnet/{Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET => Yaml.Writer.Taml/Test.Yaml.Writer.Taml}/GivenChildArrays/childarrays.taml (100%) rename src/dotnet/{Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET => Yaml.Writer.Taml/Test.Yaml.Writer.Taml}/GivenComplexChildDocument/WhenParsingSampleOne.cs (100%) rename src/dotnet/{Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET => Yaml.Writer.Taml/Test.Yaml.Writer.Taml}/GivenComplexChildDocument/sample1.taml (100%) rename src/dotnet/{Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET => Yaml.Writer.Taml/Test.Yaml.Writer.Taml}/GivenComplexChildDocument/sample2.taml (100%) rename src/dotnet/{Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET => Yaml.Writer.Taml/Test.Yaml.Writer.Taml}/GivenSimpleArray/WhenWritingYaml.cs (100%) rename src/dotnet/{Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET => Yaml.Writer.Taml/Test.Yaml.Writer.Taml}/GivenSimpleArray/simple.taml (100%) rename src/dotnet/{Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET => Yaml.Writer.Taml/Test.Yaml.Writer.Taml}/Spec_1-1/GivenComments/WhenReadingComments.cs (100%) rename src/dotnet/{Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET => Yaml.Writer.Taml/Test.Yaml.Writer.Taml}/Spec_1-1/GivenComments/simple.taml (100%) rename src/dotnet/{Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET.csproj => Yaml.Writer.Taml/Test.Yaml.Writer.Taml/Test.Yaml.Writer.Taml.csproj} (94%) rename src/dotnet/{Yaml.Writer.Taml.NET => Yaml.Writer.Taml}/Yaml.Writer.Cli/Program.cs (100%) rename src/dotnet/{Yaml.Writer.Taml.NET => Yaml.Writer.Taml}/Yaml.Writer.Cli/Yaml.Writer.Cli.csproj (75%) rename src/dotnet/{Yaml.Writer.Taml.NET => Yaml.Writer.Taml}/Yaml.Writer.Cli/sample1.taml (100%) rename src/dotnet/{Yaml.Writer.Taml.NET => Yaml.Writer.Taml}/Yaml.Writer.Cli/sample2.taml (100%) rename src/dotnet/{Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET.csproj => Yaml.Writer.Taml/Yaml.Writer.Taml/Yaml.Writer.Taml.csproj} (100%) rename src/dotnet/{Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET => Yaml.Writer.Taml/Yaml.Writer.Taml}/YamlWriter.cs (100%) diff --git a/src/dotnet/Taml.sln b/src/dotnet/Taml.sln index b070e55..56fd5ec 100644 --- a/src/dotnet/Taml.sln +++ b/src/dotnet/Taml.sln @@ -15,17 +15,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Directory.Build.props = Directory.Build.props EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yaml.Writer.Taml.NET", "Yaml.Writer.Taml.NET\Yaml.Writer.Taml.NET\Yaml.Writer.Taml.NET.csproj", "{8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yaml.Writer.Taml", "Yaml.Writer.Taml\Yaml.Writer.Taml\Yaml.Writer.Taml.csproj", "{8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.Yaml.Writer.Taml.NET", "Yaml.Writer.Taml.NET\Test.Yaml.Writer.Taml.NET\Test.Yaml.Writer.Taml.NET.csproj", "{392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.Yaml.Writer.Taml", "Yaml.Writer.Taml\Test.Yaml.Writer.Taml\Test.Yaml.Writer.Taml.csproj", "{392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yaml.Writer.Cli", "Yaml.Writer.Taml\Yaml.Writer.Cli\Yaml.Writer.Cli.csproj", "{BB383A98-D380-422B-9347-8FCC5F58357F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yaml.Writer.Cli", "Yaml.Writer.Taml.NET\Yaml.Writer.Cli\Yaml.Writer.Cli.csproj", "{BB383A98-D380-422B-9347-8FCC5F58357F}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Taml.Configuration", "Taml.Configuration\Taml.Configuration\Taml.Configuration.csproj", "{069403C6-DE0A-4043-8D92-88DADE3DB3E2}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.Taml.Configuration", "Taml.Configuration\Test.Taml.Configuration\Test.Taml.Configuration.csproj", "{2CF41FAB-4607-4772-8544-8D2EF8FF9DB8}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Taml.Configuration", "Taml.Configuration", "{D8BF9D98-AE40-4736-B471-1A0CD71184C7}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenChildArrays/WhenWriterGivesYaml.cs b/src/dotnet/Yaml.Writer.Taml/Test.Yaml.Writer.Taml/GivenChildArrays/WhenWriterGivesYaml.cs similarity index 100% rename from src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenChildArrays/WhenWriterGivesYaml.cs rename to src/dotnet/Yaml.Writer.Taml/Test.Yaml.Writer.Taml/GivenChildArrays/WhenWriterGivesYaml.cs diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenChildArrays/childarrays.taml b/src/dotnet/Yaml.Writer.Taml/Test.Yaml.Writer.Taml/GivenChildArrays/childarrays.taml similarity index 100% rename from src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenChildArrays/childarrays.taml rename to src/dotnet/Yaml.Writer.Taml/Test.Yaml.Writer.Taml/GivenChildArrays/childarrays.taml diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenComplexChildDocument/WhenParsingSampleOne.cs b/src/dotnet/Yaml.Writer.Taml/Test.Yaml.Writer.Taml/GivenComplexChildDocument/WhenParsingSampleOne.cs similarity index 100% rename from src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenComplexChildDocument/WhenParsingSampleOne.cs rename to src/dotnet/Yaml.Writer.Taml/Test.Yaml.Writer.Taml/GivenComplexChildDocument/WhenParsingSampleOne.cs diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenComplexChildDocument/sample1.taml b/src/dotnet/Yaml.Writer.Taml/Test.Yaml.Writer.Taml/GivenComplexChildDocument/sample1.taml similarity index 100% rename from src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenComplexChildDocument/sample1.taml rename to src/dotnet/Yaml.Writer.Taml/Test.Yaml.Writer.Taml/GivenComplexChildDocument/sample1.taml diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenComplexChildDocument/sample2.taml b/src/dotnet/Yaml.Writer.Taml/Test.Yaml.Writer.Taml/GivenComplexChildDocument/sample2.taml similarity index 100% rename from src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenComplexChildDocument/sample2.taml rename to src/dotnet/Yaml.Writer.Taml/Test.Yaml.Writer.Taml/GivenComplexChildDocument/sample2.taml diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenSimpleArray/WhenWritingYaml.cs b/src/dotnet/Yaml.Writer.Taml/Test.Yaml.Writer.Taml/GivenSimpleArray/WhenWritingYaml.cs similarity index 100% rename from src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenSimpleArray/WhenWritingYaml.cs rename to src/dotnet/Yaml.Writer.Taml/Test.Yaml.Writer.Taml/GivenSimpleArray/WhenWritingYaml.cs diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenSimpleArray/simple.taml b/src/dotnet/Yaml.Writer.Taml/Test.Yaml.Writer.Taml/GivenSimpleArray/simple.taml similarity index 100% rename from src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/GivenSimpleArray/simple.taml rename to src/dotnet/Yaml.Writer.Taml/Test.Yaml.Writer.Taml/GivenSimpleArray/simple.taml diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/Spec_1-1/GivenComments/WhenReadingComments.cs b/src/dotnet/Yaml.Writer.Taml/Test.Yaml.Writer.Taml/Spec_1-1/GivenComments/WhenReadingComments.cs similarity index 100% rename from src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/Spec_1-1/GivenComments/WhenReadingComments.cs rename to src/dotnet/Yaml.Writer.Taml/Test.Yaml.Writer.Taml/Spec_1-1/GivenComments/WhenReadingComments.cs diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/Spec_1-1/GivenComments/simple.taml b/src/dotnet/Yaml.Writer.Taml/Test.Yaml.Writer.Taml/Spec_1-1/GivenComments/simple.taml similarity index 100% rename from src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/Spec_1-1/GivenComments/simple.taml rename to src/dotnet/Yaml.Writer.Taml/Test.Yaml.Writer.Taml/Spec_1-1/GivenComments/simple.taml diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET.csproj b/src/dotnet/Yaml.Writer.Taml/Test.Yaml.Writer.Taml/Test.Yaml.Writer.Taml.csproj similarity index 94% rename from src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET.csproj rename to src/dotnet/Yaml.Writer.Taml/Test.Yaml.Writer.Taml/Test.Yaml.Writer.Taml.csproj index be1e3b3..0bcb3dd 100644 --- a/src/dotnet/Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET/Test.Yaml.Writer.Taml.NET.csproj +++ b/src/dotnet/Yaml.Writer.Taml/Test.Yaml.Writer.Taml/Test.Yaml.Writer.Taml.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/Program.cs b/src/dotnet/Yaml.Writer.Taml/Yaml.Writer.Cli/Program.cs similarity index 100% rename from src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/Program.cs rename to src/dotnet/Yaml.Writer.Taml/Yaml.Writer.Cli/Program.cs diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/Yaml.Writer.Cli.csproj b/src/dotnet/Yaml.Writer.Taml/Yaml.Writer.Cli/Yaml.Writer.Cli.csproj similarity index 75% rename from src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/Yaml.Writer.Cli.csproj rename to src/dotnet/Yaml.Writer.Taml/Yaml.Writer.Cli/Yaml.Writer.Cli.csproj index 1f27f57..b4b3e9f 100644 --- a/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/Yaml.Writer.Cli.csproj +++ b/src/dotnet/Yaml.Writer.Taml/Yaml.Writer.Cli/Yaml.Writer.Cli.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/sample1.taml b/src/dotnet/Yaml.Writer.Taml/Yaml.Writer.Cli/sample1.taml similarity index 100% rename from src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/sample1.taml rename to src/dotnet/Yaml.Writer.Taml/Yaml.Writer.Cli/sample1.taml diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/sample2.taml b/src/dotnet/Yaml.Writer.Taml/Yaml.Writer.Cli/sample2.taml similarity index 100% rename from src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Cli/sample2.taml rename to src/dotnet/Yaml.Writer.Taml/Yaml.Writer.Cli/sample2.taml diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET.csproj b/src/dotnet/Yaml.Writer.Taml/Yaml.Writer.Taml/Yaml.Writer.Taml.csproj similarity index 100% rename from src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET.csproj rename to src/dotnet/Yaml.Writer.Taml/Yaml.Writer.Taml/Yaml.Writer.Taml.csproj diff --git a/src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET/YamlWriter.cs b/src/dotnet/Yaml.Writer.Taml/Yaml.Writer.Taml/YamlWriter.cs similarity index 100% rename from src/dotnet/Yaml.Writer.Taml.NET/Yaml.Writer.Taml.NET/YamlWriter.cs rename to src/dotnet/Yaml.Writer.Taml/Yaml.Writer.Taml/YamlWriter.cs From 1b647a920e5cf557fd4b31119f88e1cf5dead267 Mon Sep 17 00:00:00 2001 From: Craig Gleadall Date: Sat, 16 Jan 2021 18:23:47 -0500 Subject: [PATCH 8/8] reset SLN file and readded Yaml writer projects --- src/dotnet/Taml.sln | 90 ++++++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 41 deletions(-) diff --git a/src/dotnet/Taml.sln b/src/dotnet/Taml.sln index 56fd5ec..ebb172a 100644 --- a/src/dotnet/Taml.sln +++ b/src/dotnet/Taml.sln @@ -15,15 +15,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Directory.Build.props = Directory.Build.props EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yaml.Writer.Taml", "Yaml.Writer.Taml\Yaml.Writer.Taml\Yaml.Writer.Taml.csproj", "{8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Taml.Configuration", "Taml.Configuration\Taml.Configuration\Taml.Configuration.csproj", "{069403C6-DE0A-4043-8D92-88DADE3DB3E2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.Yaml.Writer.Taml", "Yaml.Writer.Taml\Test.Yaml.Writer.Taml\Test.Yaml.Writer.Taml.csproj", "{392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.Taml.Configuration", "Taml.Configuration\Test.Taml.Configuration\Test.Taml.Configuration.csproj", "{2CF41FAB-4607-4772-8544-8D2EF8FF9DB8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yaml.Writer.Cli", "Yaml.Writer.Taml\Yaml.Writer.Cli\Yaml.Writer.Cli.csproj", "{BB383A98-D380-422B-9347-8FCC5F58357F}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Taml.Configuration", "Taml.Configuration", "{D8BF9D98-AE40-4736-B471-1A0CD71184C7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Taml.Configuration", "Taml.Configuration\Taml.Configuration\Taml.Configuration.csproj", "{069403C6-DE0A-4043-8D92-88DADE3DB3E2}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Yaml.Writer.Taml", "Yaml.Writer.Taml", "{B52120A4-96ED-42B3-8504-69D315916E5F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.Taml.Configuration", "Taml.Configuration\Test.Taml.Configuration\Test.Taml.Configuration.csproj", "{2CF41FAB-4607-4772-8544-8D2EF8FF9DB8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yaml.Writer.Taml", "Yaml.Writer.Taml\Yaml.Writer.Taml\Yaml.Writer.Taml.csproj", "{80257695-D4DF-4CFB-BCAF-0B9AA559064B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.Yaml.Writer.Taml", "Yaml.Writer.Taml\Test.Yaml.Writer.Taml\Test.Yaml.Writer.Taml.csproj", "{6A469558-7825-4D6B-8A19-758C6C2A7C9E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yaml.Writer.Cli", "Yaml.Writer.Taml\Yaml.Writer.Cli\Yaml.Writer.Cli.csproj", "{20A28BFB-F449-4EB8-9DF2-5732CEC3213C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -59,42 +63,6 @@ Global {CD41ADB4-BC4F-4AB3-9CB3-3D1ABDB32AA1}.Release|x64.Build.0 = Release|Any CPU {CD41ADB4-BC4F-4AB3-9CB3-3D1ABDB32AA1}.Release|x86.ActiveCfg = Release|Any CPU {CD41ADB4-BC4F-4AB3-9CB3-3D1ABDB32AA1}.Release|x86.Build.0 = Release|Any CPU - {8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}.Debug|x64.ActiveCfg = Debug|Any CPU - {8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}.Debug|x64.Build.0 = Debug|Any CPU - {8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}.Debug|x86.ActiveCfg = Debug|Any CPU - {8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}.Debug|x86.Build.0 = Debug|Any CPU - {8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}.Release|Any CPU.Build.0 = Release|Any CPU - {8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}.Release|x64.ActiveCfg = Release|Any CPU - {8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}.Release|x64.Build.0 = Release|Any CPU - {8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}.Release|x86.ActiveCfg = Release|Any CPU - {8ADC8A76-9520-4805-B8F5-3A5BC6EDF0A3}.Release|x86.Build.0 = Release|Any CPU - {392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}.Debug|x64.ActiveCfg = Debug|Any CPU - {392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}.Debug|x64.Build.0 = Debug|Any CPU - {392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}.Debug|x86.ActiveCfg = Debug|Any CPU - {392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}.Debug|x86.Build.0 = Debug|Any CPU - {392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}.Release|Any CPU.Build.0 = Release|Any CPU - {392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}.Release|x64.ActiveCfg = Release|Any CPU - {392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}.Release|x64.Build.0 = Release|Any CPU - {392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}.Release|x86.ActiveCfg = Release|Any CPU - {392DCAA9-1C16-44CC-880C-F9BF5DE45FFF}.Release|x86.Build.0 = Release|Any CPU - {BB383A98-D380-422B-9347-8FCC5F58357F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB383A98-D380-422B-9347-8FCC5F58357F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB383A98-D380-422B-9347-8FCC5F58357F}.Debug|x64.ActiveCfg = Debug|Any CPU - {BB383A98-D380-422B-9347-8FCC5F58357F}.Debug|x64.Build.0 = Debug|Any CPU - {BB383A98-D380-422B-9347-8FCC5F58357F}.Debug|x86.ActiveCfg = Debug|Any CPU - {BB383A98-D380-422B-9347-8FCC5F58357F}.Debug|x86.Build.0 = Debug|Any CPU - {BB383A98-D380-422B-9347-8FCC5F58357F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB383A98-D380-422B-9347-8FCC5F58357F}.Release|Any CPU.Build.0 = Release|Any CPU - {BB383A98-D380-422B-9347-8FCC5F58357F}.Release|x64.ActiveCfg = Release|Any CPU - {BB383A98-D380-422B-9347-8FCC5F58357F}.Release|x64.Build.0 = Release|Any CPU - {BB383A98-D380-422B-9347-8FCC5F58357F}.Release|x86.ActiveCfg = Release|Any CPU - {BB383A98-D380-422B-9347-8FCC5F58357F}.Release|x86.Build.0 = Release|Any CPU {069403C6-DE0A-4043-8D92-88DADE3DB3E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {069403C6-DE0A-4043-8D92-88DADE3DB3E2}.Debug|Any CPU.Build.0 = Debug|Any CPU {069403C6-DE0A-4043-8D92-88DADE3DB3E2}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -119,12 +87,52 @@ Global {2CF41FAB-4607-4772-8544-8D2EF8FF9DB8}.Release|x64.Build.0 = Release|Any CPU {2CF41FAB-4607-4772-8544-8D2EF8FF9DB8}.Release|x86.ActiveCfg = Release|Any CPU {2CF41FAB-4607-4772-8544-8D2EF8FF9DB8}.Release|x86.Build.0 = Release|Any CPU + {80257695-D4DF-4CFB-BCAF-0B9AA559064B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {80257695-D4DF-4CFB-BCAF-0B9AA559064B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {80257695-D4DF-4CFB-BCAF-0B9AA559064B}.Debug|x64.ActiveCfg = Debug|Any CPU + {80257695-D4DF-4CFB-BCAF-0B9AA559064B}.Debug|x64.Build.0 = Debug|Any CPU + {80257695-D4DF-4CFB-BCAF-0B9AA559064B}.Debug|x86.ActiveCfg = Debug|Any CPU + {80257695-D4DF-4CFB-BCAF-0B9AA559064B}.Debug|x86.Build.0 = Debug|Any CPU + {80257695-D4DF-4CFB-BCAF-0B9AA559064B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {80257695-D4DF-4CFB-BCAF-0B9AA559064B}.Release|Any CPU.Build.0 = Release|Any CPU + {80257695-D4DF-4CFB-BCAF-0B9AA559064B}.Release|x64.ActiveCfg = Release|Any CPU + {80257695-D4DF-4CFB-BCAF-0B9AA559064B}.Release|x64.Build.0 = Release|Any CPU + {80257695-D4DF-4CFB-BCAF-0B9AA559064B}.Release|x86.ActiveCfg = Release|Any CPU + {80257695-D4DF-4CFB-BCAF-0B9AA559064B}.Release|x86.Build.0 = Release|Any CPU + {6A469558-7825-4D6B-8A19-758C6C2A7C9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6A469558-7825-4D6B-8A19-758C6C2A7C9E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6A469558-7825-4D6B-8A19-758C6C2A7C9E}.Debug|x64.ActiveCfg = Debug|Any CPU + {6A469558-7825-4D6B-8A19-758C6C2A7C9E}.Debug|x64.Build.0 = Debug|Any CPU + {6A469558-7825-4D6B-8A19-758C6C2A7C9E}.Debug|x86.ActiveCfg = Debug|Any CPU + {6A469558-7825-4D6B-8A19-758C6C2A7C9E}.Debug|x86.Build.0 = Debug|Any CPU + {6A469558-7825-4D6B-8A19-758C6C2A7C9E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6A469558-7825-4D6B-8A19-758C6C2A7C9E}.Release|Any CPU.Build.0 = Release|Any CPU + {6A469558-7825-4D6B-8A19-758C6C2A7C9E}.Release|x64.ActiveCfg = Release|Any CPU + {6A469558-7825-4D6B-8A19-758C6C2A7C9E}.Release|x64.Build.0 = Release|Any CPU + {6A469558-7825-4D6B-8A19-758C6C2A7C9E}.Release|x86.ActiveCfg = Release|Any CPU + {6A469558-7825-4D6B-8A19-758C6C2A7C9E}.Release|x86.Build.0 = Release|Any CPU + {20A28BFB-F449-4EB8-9DF2-5732CEC3213C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {20A28BFB-F449-4EB8-9DF2-5732CEC3213C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {20A28BFB-F449-4EB8-9DF2-5732CEC3213C}.Debug|x64.ActiveCfg = Debug|Any CPU + {20A28BFB-F449-4EB8-9DF2-5732CEC3213C}.Debug|x64.Build.0 = Debug|Any CPU + {20A28BFB-F449-4EB8-9DF2-5732CEC3213C}.Debug|x86.ActiveCfg = Debug|Any CPU + {20A28BFB-F449-4EB8-9DF2-5732CEC3213C}.Debug|x86.Build.0 = Debug|Any CPU + {20A28BFB-F449-4EB8-9DF2-5732CEC3213C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {20A28BFB-F449-4EB8-9DF2-5732CEC3213C}.Release|Any CPU.Build.0 = Release|Any CPU + {20A28BFB-F449-4EB8-9DF2-5732CEC3213C}.Release|x64.ActiveCfg = Release|Any CPU + {20A28BFB-F449-4EB8-9DF2-5732CEC3213C}.Release|x64.Build.0 = Release|Any CPU + {20A28BFB-F449-4EB8-9DF2-5732CEC3213C}.Release|x86.ActiveCfg = Release|Any CPU + {20A28BFB-F449-4EB8-9DF2-5732CEC3213C}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution + {069403C6-DE0A-4043-8D92-88DADE3DB3E2} = {D8BF9D98-AE40-4736-B471-1A0CD71184C7} {2CF41FAB-4607-4772-8544-8D2EF8FF9DB8} = {D8BF9D98-AE40-4736-B471-1A0CD71184C7} + {80257695-D4DF-4CFB-BCAF-0B9AA559064B} = {B52120A4-96ED-42B3-8504-69D315916E5F} + {6A469558-7825-4D6B-8A19-758C6C2A7C9E} = {B52120A4-96ED-42B3-8504-69D315916E5F} + {20A28BFB-F449-4EB8-9DF2-5732CEC3213C} = {B52120A4-96ED-42B3-8504-69D315916E5F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {407D8799-35B4-4DDC-A878-538CAC2A5CE5}