Put config files into namespaces

Author: JakeGinnivan

GitVersionCore.Tests/ConfigReaderTests.cs

@@ -1,4 +1,6 @@
 using System.IO;
+using GitVersion;
+using GitVersion.Configuration;
 using NUnit.Framework;
 
 [TestFixture]

GitVersionCore/AssemblyVersioningScheme.cs

@@ -1,6 +1,9 @@
-public enum AssemblyVersioningScheme
+namespace GitVersion
 {
-    MajorMinorPatch,
-    MajorMinor,
-    Major,
+    public enum AssemblyVersioningScheme
+    {
+        MajorMinorPatch,
+        MajorMinor,
+        Major,
+    }
 }

GitVersionCore/Configuration/Config.cs

@@ -1,4 +1,7 @@
-public class Config
+namespace GitVersion.Configuration
 {
-    public AssemblyVersioningScheme AssemblyVersioningScheme { get; set; }
+    public class Config
+    {
+        public AssemblyVersioningScheme AssemblyVersioningScheme { get; set; }
+    }
 }

GitVersionCore/Configuration/ConfigReader.cs

@@ -2,16 +2,19 @@
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
 
-public class ConfigReader
+namespace GitVersion.Configuration
 {
-    public static Config Read(TextReader reader)
+    public class ConfigReader
     {
-        var deserializer = new Deserializer(null, new CamelCaseNamingConvention());
-        var deserialize = deserializer.Deserialize<Config>(reader);
-        if (deserialize == null)
+        public static Config Read(TextReader reader)
         {
-            return new Config();
+            var deserializer = new Deserializer(null, new CamelCaseNamingConvention());
+            var deserialize = deserializer.Deserialize<Config>(reader);
+            if (deserialize == null)
+            {
+                return new Config();
+            }
+            return deserialize;
         }
-        return deserialize;
     }
 }

GitVersionTask.Tests/GitVersionTask.Tests.csproj

@@ -243,9 +243,7 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="OutputVariables\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>

GitVersionTask/AssemblyInfoBuilder/UpdateAssemblyInfo.cs

@@ -3,6 +3,7 @@
     using System;
     using System.IO;
     using GitVersion;
+    using GitVersion.Configuration;
     using Microsoft.Build.Framework;
     using Microsoft.Build.Utilities;
     using Logger = GitVersion.Logger;
@@ -85,7 +86,7 @@ AssemblyVersioningScheme GetAssemblyVersioningScheme()
                         return ConfigReader.Read(reader).AssemblyVersioningScheme;
                     }
                 }
-                return global::AssemblyVersioningScheme.MajorMinorPatch;
+                return GitVersion.AssemblyVersioningScheme.MajorMinorPatch;
             }
 
             AssemblyVersioningScheme versioningScheme;