Moved the GitVersionTask and GitVersionTask.MsBuild under GitVersion.MSBuildTask namespace

arturcic · arturcic · commit 9e8a18f1a9b2 · 2019-10-25T23:45:03.000+03:00
diff --git a/src/GitVersionTask.MsBuild/GitVersionTaskBase.cs b/src/GitVersionTask.MsBuild/GitVersionTaskBase.cs
@@ -1,7 +1,7 @@
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 
-namespace GitVersionTask.MsBuild
+namespace GitVersion.MSBuildTask
 {
     public abstract class GitVersionTaskBase : Task
     {
diff --git a/src/GitVersionTask.MsBuild/LibGit2Sharp/GitLoaderContext.cs b/src/GitVersionTask.MsBuild/LibGit2Sharp/GitLoaderContext.cs
@@ -8,7 +8,7 @@
 using System.Runtime.Loader;
 using RuntimeEnvironment = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment;
 
-namespace GitVersionTask.MsBuild.LibGit2Sharp
+namespace GitVersion.MSBuildTask.LibGit2Sharp
 {
     public sealed class GitLoaderContext : AssemblyLoadContext
     {
diff --git a/src/GitVersionTask.MsBuild/LibGit2Sharp/LibGit2SharpLoader.cs b/src/GitVersionTask.MsBuild/LibGit2Sharp/LibGit2SharpLoader.cs
@@ -8,7 +8,7 @@
 using System.IO;
 using System.Reflection;
 
-namespace GitVersionTask.MsBuild.LibGit2Sharp
+namespace GitVersion.MSBuildTask.LibGit2Sharp
 {
     public class LibGit2SharpLoader
     {
diff --git a/src/GitVersionTask.MsBuild/LibGit2Sharp/RuntimeIdMap.cs b/src/GitVersionTask.MsBuild/LibGit2Sharp/RuntimeIdMap.cs
@@ -3,7 +3,7 @@
 using System;
 using System.Diagnostics;
 
-namespace GitVersionTask.MsBuild.LibGit2Sharp
+namespace GitVersion.MSBuildTask.LibGit2Sharp
 {
     internal static class RuntimeIdMap
     {
diff --git a/src/GitVersionTask.MsBuild/TaskProxy.cs b/src/GitVersionTask.MsBuild/TaskProxy.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Reflection;
-using GitVersionTask.MsBuild.LibGit2Sharp;
-using GitVersionTask.MsBuild.Tasks;
+using GitVersion.MSBuildTask.LibGit2Sharp;
+using GitVersion.MSBuildTask.Tasks;
 
-namespace GitVersionTask.MsBuild
+namespace GitVersion.MSBuildTask
 {
     public static class TaskProxy
     {
@@ -19,7 +19,7 @@ static TaskProxy()
 #endif
             LibGit2SharpLoader.LoadAssembly("GitVersionTask");
 
-            var type = LibGit2SharpLoader.Instance.Assembly.GetType("GitVersionTask.GitVersionTasks", throwOnError: true).GetTypeInfo();
+            var type = LibGit2SharpLoader.Instance.Assembly.GetType("GitVersion.MSBuildTask.GitVersionTasks", throwOnError: true).GetTypeInfo();
 
             GetVersion                    = GetMethod<GetVersion>(type, nameof(GetVersion));
             GenerateGitVersionInformation = GetMethod<GenerateGitVersionInformation>(type, nameof(GenerateGitVersionInformation));
diff --git a/src/GitVersionTask.MsBuild/Tasks/GenerateGitVersionInformation.cs b/src/GitVersionTask.MsBuild/Tasks/GenerateGitVersionInformation.cs
@@ -1,6 +1,6 @@
 using Microsoft.Build.Framework;
 
-namespace GitVersionTask.MsBuild.Tasks
+namespace GitVersion.MSBuildTask.Tasks
 {
     public class GenerateGitVersionInformation : GitVersionTaskBase
     {
diff --git a/src/GitVersionTask.MsBuild/Tasks/GetVersion.cs b/src/GitVersionTask.MsBuild/Tasks/GetVersion.cs
@@ -1,6 +1,6 @@
 using Microsoft.Build.Framework;
 
-namespace GitVersionTask.MsBuild.Tasks
+namespace GitVersion.MSBuildTask.Tasks
 {
     public class GetVersion : GitVersionTaskBase
     {
diff --git a/src/GitVersionTask.MsBuild/Tasks/UpdateAssemblyInfo.cs b/src/GitVersionTask.MsBuild/Tasks/UpdateAssemblyInfo.cs
@@ -1,6 +1,6 @@
 using Microsoft.Build.Framework;
 
-namespace GitVersionTask.MsBuild.Tasks
+namespace GitVersion.MSBuildTask.Tasks
 {
     public class UpdateAssemblyInfo : GitVersionTaskBase
     {
diff --git a/src/GitVersionTask.MsBuild/Tasks/WriteVersionInfoToBuildLog.cs b/src/GitVersionTask.MsBuild/Tasks/WriteVersionInfoToBuildLog.cs
@@ -1,4 +1,4 @@
-namespace GitVersionTask.MsBuild.Tasks
+namespace GitVersion.MSBuildTask.Tasks
 {
     public class WriteVersionInfoToBuildLog : GitVersionTaskBase
     {
diff --git a/src/GitVersionTask.Tests/AssemblyLocation.cs b/src/GitVersionTask.Tests/AssemblyLocation.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using System.IO;
 
-namespace GitVersionTask.Tests
+namespace GitVersion.MSBuildTask.Tests
 {
     public static class AssemblyLocation
     {
diff --git a/src/GitVersionTask.Tests/GetVersionTaskTests.cs b/src/GitVersionTask.Tests/GetVersionTaskTests.cs
@@ -3,9 +3,9 @@
 using NUnit.Framework;
 using Shouldly;
 using GitVersion.OutputVariables;
-using GitVersionTask.MsBuild.Tasks;
+using GitVersion.MSBuildTask.Tasks;
 
-namespace GitVersionTask.Tests
+namespace GitVersion.MSBuildTask.Tests
 {
     [TestFixture]
     public class GetVersionTaskTests : TestBase
diff --git a/src/GitVersionTask.Tests/GitVersionTaskDirectoryTests.cs b/src/GitVersionTask.Tests/GitVersionTaskDirectoryTests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using GitVersion;
 using GitVersion.Cache;
 using GitVersion.Configuration;
 using GitVersion.Configuration.Init.Wizard;
@@ -9,10 +8,10 @@
 using GitVersion.VersionCalculation;
 using LibGit2Sharp;
 using NUnit.Framework;
-using GitVersionTask.Tests.Helpers;
 using Microsoft.Extensions.Options;
+using GitVersion.MSBuildTask.Tests.Helpers;
 
-namespace GitVersionTask.Tests
+namespace GitVersion.MSBuildTask.Tests
 {
     [TestFixture]
     public class GitVersionTaskDirectoryTests : TestBase
diff --git a/src/GitVersionTask.Tests/Helpers/DirectoryHelper.cs b/src/GitVersionTask.Tests/Helpers/DirectoryHelper.cs
@@ -1,9 +1,8 @@
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 
-namespace GitVersionTask.Tests.Helpers
+namespace GitVersion.MSBuildTask.Tests.Helpers
 {
     public static class DirectoryHelper
     {
@@ -79,8 +78,8 @@ public static void DeleteDirectory(string directoryPath)
                                               "{0}Known and common causes include:" +
                                               "{0}- Windows Search Indexer (go to the Indexing Options, in the Windows Control Panel, and exclude the bin folder of LibGit2Sharp.Tests)" +
                                               "{0}- Antivirus (exclude the bin folder of LibGit2Sharp.Tests from the paths scanned by your real-time antivirus){0}",
-                    Environment.NewLine, Path.GetFullPath(directoryPath)));
+                    System.Environment.NewLine, Path.GetFullPath(directoryPath)));
             }
         }
     }
-}
+}
diff --git a/src/GitVersionTask.Tests/Helpers/IPostTestDirectoryRemover.cs b/src/GitVersionTask.Tests/Helpers/IPostTestDirectoryRemover.cs
@@ -1,4 +1,4 @@
-﻿namespace GitVersionTask.Tests.Helpers
+﻿namespace GitVersion.MSBuildTask.Tests.Helpers
 {
     public interface IPostTestDirectoryRemover
     {
diff --git a/src/GitVersionTask.Tests/Helpers/PathHelper.cs b/src/GitVersionTask.Tests/Helpers/PathHelper.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Reflection;
 
-namespace GitVersionTask.Tests.Helpers
+namespace GitVersion.MSBuildTask.Tests.Helpers
 {
     public static class PathHelper
     {
diff --git a/src/GitVersionTask.Tests/Helpers/Scrubbers.cs b/src/GitVersionTask.Tests/Helpers/Scrubbers.cs
@@ -1,6 +1,6 @@
 using System.Text.RegularExpressions;
 
-namespace GitVersionTask.Tests.Helpers
+namespace GitVersion.MSBuildTask.Tests.Helpers
 {
     public static class Scrubbers
     {
diff --git a/src/GitVersionTask.Tests/Helpers/SelfCleaningDirectory.cs b/src/GitVersionTask.Tests/Helpers/SelfCleaningDirectory.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using System.IO;
 
-namespace GitVersionTask.Tests.Helpers
+namespace GitVersion.MSBuildTask.Tests.Helpers
 {
     public class SelfCleaningDirectory
     {
diff --git a/src/GitVersionTask.Tests/Helpers/TestEffectiveConfiguration.cs b/src/GitVersionTask.Tests/Helpers/TestEffectiveConfiguration.cs
@@ -1,12 +1,11 @@
 using System.Collections.Generic;
 using System.Linq;
-using GitVersion;
 using GitVersion.Configuration;
 using GitVersion.VersionFilters;
 using GitVersion.VersioningModes;
 using GitVersion.Extensions;
 
-namespace GitVersionTask.Tests.Helpers
+namespace GitVersion.MSBuildTask.Tests.Helpers
 {
     public class TestEffectiveConfiguration : EffectiveConfiguration
     {
@@ -47,4 +46,4 @@ public TestEffectiveConfiguration(
         {
         }
     }
-}
+}
diff --git a/src/GitVersionTask.Tests/Helpers/TestEnvironment.cs b/src/GitVersionTask.Tests/Helpers/TestEnvironment.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
-using GitVersion;
 
-namespace GitVersionTask.Tests.Helpers
+namespace GitVersion.MSBuildTask.Tests.Helpers
 {
     public class TestEnvironment : IEnvironment
     {
diff --git a/src/GitVersionTask.Tests/Helpers/TestFileSystem.cs b/src/GitVersionTask.Tests/Helpers/TestFileSystem.cs
@@ -3,9 +3,8 @@
 using System.IO;
 using System.Text;
 using GitVersion.Helpers;
-using GitVersion;
 
-namespace GitVersionTask.Tests.Helpers
+namespace GitVersion.MSBuildTask.Tests.Helpers
 {
     public class TestFileSystem : IFileSystem
     {
diff --git a/src/GitVersionTask.Tests/Helpers/TestStream.cs b/src/GitVersionTask.Tests/Helpers/TestStream.cs
@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace GitVersionTask.Tests.Helpers
+namespace GitVersion.MSBuildTask.Tests.Helpers
 {
     public class TestStream : Stream
     {
diff --git a/src/GitVersionTask.Tests/InvalidFileCheckerTests.cs b/src/GitVersionTask.Tests/InvalidFileCheckerTests.cs
@@ -1,11 +1,11 @@
 using System;
 using System.IO;
-using GitVersionTask.Tests.Mocks;
 using Microsoft.Build.Framework;
 using NUnit.Framework;
 using GitVersion.Exceptions;
+using GitVersion.MSBuildTask.Tests.Mocks;
 
-namespace GitVersionTask.Tests
+namespace GitVersion.MSBuildTask.Tests
 {
     [TestFixture]
     public class InvalidFileCheckerTests : TestBase
diff --git a/src/GitVersionTask.Tests/Mocks/MockTaskItem.cs b/src/GitVersionTask.Tests/Mocks/MockTaskItem.cs
@@ -2,7 +2,7 @@
 using System.Collections;
 using Microsoft.Build.Framework;
 
-namespace GitVersionTask.Tests.Mocks
+namespace GitVersion.MSBuildTask.Tests.Mocks
 {
     internal class MockTaskItem : ITaskItem
     {
diff --git a/src/GitVersionTask.Tests/TestBase.cs b/src/GitVersionTask.Tests/TestBase.cs
@@ -1,4 +1,4 @@
-namespace GitVersionTask.Tests
+namespace GitVersion.MSBuildTask.Tests
 {
     public class TestBase
     {
diff --git a/src/GitVersionTask/FileHelper.cs b/src/GitVersionTask/FileHelper.cs
@@ -6,7 +6,7 @@
 using Microsoft.Build.Framework;
 using GitVersion.Exceptions;
 
-namespace GitVersionTask
+namespace GitVersion.MSBuildTask
 {
     public sealed class FileWriteInfo
     {
@@ -104,7 +104,7 @@ private static bool CSharpFileContainsVersionAttribute(string compileFile, strin
 
             var noCommentsOrStrings = Regex.Replace(allText,
                 blockComments + "|" + lineComments + "|" + strings + "|" + verbatimStrings,
-                me => me.Value.StartsWith("//") ? Environment.NewLine : string.Empty,
+                me => me.Value.StartsWith("//") ? System.Environment.NewLine : string.Empty,
                 RegexOptions.Singleline);
 
             return Regex.IsMatch(noCommentsOrStrings, @"(?x) # IgnorePatternWhitespace
@@ -128,7 +128,7 @@ private static bool VisualBasicFileContainsVersionAttribute(string compileFile,
 
             var noCommentsOrStrings = Regex.Replace(allText,
                 lineComments + "|" + strings,
-                me => me.Value.StartsWith("'") ? Environment.NewLine : string.Empty,
+                me => me.Value.StartsWith("'") ? System.Environment.NewLine : string.Empty,
                 RegexOptions.Singleline);
 
             return Regex.IsMatch(noCommentsOrStrings, @"(?x) # IgnorePatternWhitespace
diff --git a/src/GitVersionTask/GitVersionTaskExecutor.cs b/src/GitVersionTask/GitVersionTaskExecutor.cs
@@ -1,13 +1,12 @@
 using System;
 using System.IO;
-using GitVersion;
 using GitVersion.Extensions.GitVersionInformationResources;
 using GitVersion.Extensions.VersionAssemblyInfoResources;
 using GitVersion.Logging;
 using GitVersion.OutputFormatters;
-using GitVersionTask.MsBuild.Tasks;
+using GitVersion.MSBuildTask.Tasks;
 
-namespace GitVersionTask
+namespace GitVersion.MSBuildTask
 {
     public class GitVersionTaskExecutor : IGitVersionTaskExecutor
     {
diff --git a/src/GitVersionTask/GitVersionTasks.cs b/src/GitVersionTask/GitVersionTasks.cs
@@ -1,13 +1,11 @@
 using System;
-using GitVersion;
 using GitVersion.Exceptions;
 using GitVersion.Extensions;
-using GitVersionTask.MsBuild;
-using GitVersionTask.MsBuild.Tasks;
+using GitVersion.MSBuildTask.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
-namespace GitVersionTask
+namespace GitVersion.MSBuildTask
 {
     public static class GitVersionTasks
     {
diff --git a/src/GitVersionTask/IGitVersionTaskExecutor.cs b/src/GitVersionTask/IGitVersionTaskExecutor.cs
@@ -1,6 +1,6 @@
-using GitVersionTask.MsBuild.Tasks;
+using GitVersion.MSBuildTask.Tasks;
 
-namespace GitVersionTask
+namespace GitVersion.MSBuildTask
 {
     public interface IGitVersionTaskExecutor
     {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using Microsoft.Build.Framework;`
`2`	`2`	`using Microsoft.Build.Utilities;`
`3`	`3`
`4`		`-namespace GitVersionTask.MsBuild`
	`4`	`+namespace GitVersion.MSBuildTask`
`5`	`5`	`{`
`6`	`6`	`public abstract class GitVersionTaskBase : Task`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`using System.Runtime.Loader;`
`9`	`9`	`using RuntimeEnvironment = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment;`
`10`	`10`
`11`		`-namespace GitVersionTask.MsBuild.LibGit2Sharp`
	`11`	`+namespace GitVersion.MSBuildTask.LibGit2Sharp`
`12`	`12`	`{`
`13`	`13`	`public sealed class GitLoaderContext : AssemblyLoadContext`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`using System.IO;`
`9`	`9`	`using System.Reflection;`
`10`	`10`
`11`		`-namespace GitVersionTask.MsBuild.LibGit2Sharp`
	`11`	`+namespace GitVersion.MSBuildTask.LibGit2Sharp`
`12`	`12`	`{`
`13`	`13`	`public class LibGit2SharpLoader`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using System;`
`4`	`4`	`using System.Diagnostics;`
`5`	`5`
`6`		`-namespace GitVersionTask.MsBuild.LibGit2Sharp`
	`6`	`+namespace GitVersion.MSBuildTask.LibGit2Sharp`
`7`	`7`	`{`
`8`	`8`	`internal static class RuntimeIdMap`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using Microsoft.Build.Framework;`
`2`	`2`
`3`		`-namespace GitVersionTask.MsBuild.Tasks`
	`3`	`+namespace GitVersion.MSBuildTask.Tasks`
`4`	`4`	`{`
`5`	`5`	`public class GenerateGitVersionInformation : GitVersionTaskBase`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace GitVersionTask.MsBuild.Tasks`
	`1`	`+namespace GitVersion.MSBuildTask.Tasks`
`2`	`2`	`{`
`3`	`3`	`public class WriteVersionInfoToBuildLog : GitVersionTaskBase`
`4`	`4`	`{`