remove obsolete configs

Author: arturcic

src/GitVersionCore.Tests/ConfigProviderTests.cs

@@ -42,34 +42,6 @@ public void Setup()
             ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestAttribute>();
         }
 
-        [Test]
-        public void CanReadOldDocument()
-        {
-            const string text = @"
-assemblyVersioningScheme: MajorMinor
-develop-branch-tag: alpha
-release-branch-tag: rc
-branches:
-    master:
-        mode: ContinuousDeployment
-    dev(elop)?(ment)?$:
-        mode: ContinuousDeployment
-        tag: dev
-    release[/-]:
-       mode: continuousDeployment
-       tag: rc
-";
-            SetupConfigFileContent(text);
-            var error = Should.Throw<OldConfigurationException>(() => configProvider.Provide(repoPath));
-            error.Message.ShouldContainWithoutWhitespace(@"GitVersion configuration file contains old configuration, please fix the following errors:
-GitVersion branch configs no longer are keyed by regexes, update:
-    dev(elop)?(ment)?$  -> develop
-    release[/-]         -> release
-assemblyVersioningScheme has been replaced by assembly-versioning-scheme
-develop-branch-tag has been replaced by branch specific configuration.See https://gitversion.net/docs/configuration/#branch-configuration
-release-branch-tag has been replaced by branch specific configuration.See https://gitversion.net/docs/configuration/#branch-configuration");
-        }
-
         [Test]
         public void OverwritesDefaultsWithProvidedConfig()
         {

src/GitVersionCore.Tests/DefaultConfigFileLocatorTests.cs

@@ -41,41 +41,7 @@ public void Setup()
             ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestAttribute>();
         }
 
-        [TestCase(DefaultRepoPath)]
-        [TestCase(DefaultWorkingPath)]
-        public void WarnOnExistingGitVersionConfigYamlFile(string path)
-        {
-            SetupConfigFileContent(string.Empty, DefaultConfigFileLocator.ObsoleteFileName, path);
-
-            var output = WithDefaultConfigFileLocator(configFileLocator =>
-            {
-                configFileLocator.Verify(workingPath, repoPath);
-            });
-
-            var configFileDeprecatedWarning = $"{DefaultConfigFileLocator.ObsoleteFileName}' is deprecated, use '{DefaultConfigFileLocator.DefaultFileName}' instead";
-            output.Contains(configFileDeprecatedWarning).ShouldBe(true);
-        }
-
-        [TestCase(DefaultRepoPath)]
-        [TestCase(DefaultWorkingPath)]
-        public void WarnOnAmbiguousConfigFilesAtTheSameProjectRootDirectory(string path)
-        {
-            SetupConfigFileContent(string.Empty, DefaultConfigFileLocator.ObsoleteFileName, path);
-            SetupConfigFileContent(string.Empty, DefaultConfigFileLocator.DefaultFileName, path);
-
-            var output = WithDefaultConfigFileLocator(configFileLocator =>
-            {
-                configFileLocator.Verify(workingPath, repoPath);
-            });
-
-            var configFileDeprecatedWarning = $"Ambiguous config files at '{path}'";
-            output.Contains(configFileDeprecatedWarning).ShouldBe(true);
-        }
-
         [TestCase(DefaultConfigFileLocator.DefaultFileName, DefaultConfigFileLocator.DefaultFileName)]
-        [TestCase(DefaultConfigFileLocator.DefaultFileName, DefaultConfigFileLocator.ObsoleteFileName)]
-        [TestCase(DefaultConfigFileLocator.ObsoleteFileName, DefaultConfigFileLocator.DefaultFileName)]
-        [TestCase(DefaultConfigFileLocator.ObsoleteFileName, DefaultConfigFileLocator.ObsoleteFileName)]
         public void ThrowsExceptionOnAmbiguousConfigFileLocation(string repoConfigFile, string workingConfigFile)
         {
             var repositoryConfigFilePath = SetupConfigFileContent(string.Empty, repoConfigFile, repoPath);
@@ -106,25 +72,6 @@ public void NoWarnOnGitVersionYmlFile()
             output.Length.ShouldBe(0);
         }
 
-        [Test]
-        public void WarnOnObsoleteIsDevelopBranchConfigurationSetting()
-        {
-            const string text = @"
-assembly-versioning-scheme: MajorMinorPatch
-branches:
-  master:
-    tag: beta
-    is-develop: true";
-
-            var exception = Should.Throw<OldConfigurationException>(() =>
-            {
-                LegacyConfigNotifier.Notify(new StringReader(text));
-            });
-
-            const string expectedMessage = "'is-develop' is deprecated, use 'tracks-release-branches' instead.";
-            exception.Message.ShouldContain(expectedMessage);
-        }
-
         private string SetupConfigFileContent(string text, string fileName, string path)
         {
             var fullPath = Path.Combine(path, fileName);

src/GitVersionCore.Tests/GitVersionExecutorTests.cs

@@ -297,7 +297,7 @@ public void ConfigChangeInvalidatesCache()
             versionVariables = gitVersionCalculator.CalculateVersionVariables();
             versionVariables.AssemblySemVer.ShouldBe("4.10.3.0");
 
-            var configPath = Path.Combine(fixture.RepositoryPath, "GitVersionConfig.yaml");
+            var configPath = Path.Combine(fixture.RepositoryPath, DefaultConfigFileLocator.DefaultFileName);
             fileSystem.WriteAllText(configPath, "next-version: 5.0");
 
             versionVariables = gitVersionCalculator.CalculateVersionVariables();

src/GitVersionCore/Configuration/ConfigFileLocator.cs

@@ -41,7 +41,6 @@ public Config ReadConfig(string workingDirectory)
             if (FileSystem.Exists(configFilePath))
             {
                 var readAllText = FileSystem.ReadAllText(configFilePath);
-                LegacyConfigNotifier.Notify(new StringReader(readAllText));
                 return ConfigSerializer.Read(new StringReader(readAllText));
             }
 

src/GitVersionCore/Configuration/DefaultConfigFileLocator.cs

@@ -8,13 +8,10 @@ public class DefaultConfigFileLocator : ConfigFileLocator
     {
         public DefaultConfigFileLocator(IFileSystem fileSystem, ILog log) : base(fileSystem, log)
         {
-
         }
 
         public const string DefaultFileName = "GitVersion.yml";
 
-        public const string ObsoleteFileName = "GitVersionConfig.yaml";
-
         public override bool HasConfigFileAt(string workingDirectory)
         {
             var defaultConfigFilePath = Path.Combine(workingDirectory, DefaultFileName);
@@ -23,12 +20,6 @@ public override bool HasConfigFileAt(string workingDirectory)
                 return true;
             }
 
-            var deprecatedConfigFilePath = Path.Combine(workingDirectory, ObsoleteFileName);
-            if (FileSystem.Exists(deprecatedConfigFilePath))
-            {
-                return true;
-            }
-
             return false;
         }
 
@@ -40,26 +31,16 @@ public override string GetConfigFilePath(string workingDirectory)
                 return ymlPath;
             }
 
-            var deprecatedPath = Path.Combine(workingDirectory, ObsoleteFileName);
-            if (FileSystem.Exists(deprecatedPath))
-            {
-                return deprecatedPath;
-            }
-
             return ymlPath;
         }
 
         public override void Verify(string workingDirectory, string projectRootDirectory)
         {
             if (FileSystem.PathsEqual(workingDirectory, projectRootDirectory))
             {
-                WarnAboutObsoleteConfigFile(workingDirectory);
                 return;
             }
 
-            WarnAboutObsoleteConfigFile(workingDirectory);
-            WarnAboutObsoleteConfigFile(projectRootDirectory);
-
             WarnAboutAmbiguousConfigFileSelection(workingDirectory, projectRootDirectory);
         }
 
@@ -75,25 +56,5 @@ private void WarnAboutAmbiguousConfigFileSelection(string workingDirectory, stri
                 throw new WarningException($"Ambiguous config file selection from '{workingConfigFile}' and '{projectRootConfigFile}'");
             }
         }
-
-        private void WarnAboutObsoleteConfigFile(string workingDirectory)
-        {
-            var deprecatedConfigFilePath = Path.Combine(workingDirectory, ObsoleteFileName);
-            if (!FileSystem.Exists(deprecatedConfigFilePath))
-            {
-                return;
-            }
-
-            var defaultConfigFilePath = Path.Combine(workingDirectory, DefaultFileName);
-            if (FileSystem.Exists(defaultConfigFilePath))
-            {
-                Log.Warning(string.Format("Ambiguous config files at '{0}': '{1}' (deprecated) and '{2}'. Will be used '{2}'", workingDirectory, ObsoleteFileName, DefaultFileName));
-                return;
-            }
-
-            Log.Warning($"'{deprecatedConfigFilePath}' is deprecated, use '{DefaultFileName}' instead.");
-        }
-
     }
-
 }