(test) Cleanup NoMono test category, now it applies to mono only, fixed .net core unix tests

arturcic · arturcic · commit af4e947b20e8 · 2019-08-22T13:05:44.000+03:00
diff --git a/build/pack.cake b/build/pack.cake
@@ -63,7 +63,7 @@ Task("Test")
                     CoverletOutputName = $"{projectName}.coverage.xml"
                 };
 
-                if (IsRunningOnUnix())
+                if (IsRunningOnUnix() && string.Equals(framework, parameters.FullFxVersion))
                 {
                     settings.Filter = "TestCategory!=NoMono";
                 }
diff --git a/src/GitVersionCore.Tests/AssemblyInfoFileUpdaterTests.cs b/src/GitVersionCore.Tests/AssemblyInfoFileUpdaterTests.cs
@@ -10,7 +10,7 @@
 
 [TestFixture]
 [Parallelizable(ParallelScope.None)]
-public class AssemblyInfoFileUpdaterTests
+public class AssemblyInfoFileUpdaterTests : TestBase
 {
     [SetUp]
     public void Setup()
@@ -143,8 +143,6 @@ public void ShouldStartSearchFromWorkingDirectory()
     [TestCase("cs", "[assembly: AssemblyVersion(\"1.0.0.0\")]\r\n[assembly: AssemblyInformationalVersion(\"1.0.0.0\")]\r\n[assembly: AssemblyFileVersion(\"1.0.0.0\")]")]
     [TestCase("fs", "[<assembly: AssemblyVersion(\"1.0.0.0\")>]\r\n[<assembly: AssemblyInformationalVersion(\"1.0.0.0\")>]\r\n[<assembly: AssemblyFileVersion(\"1.0.0.0\")>]")]
     [TestCase("vb", "<Assembly: AssemblyVersion(\"1.0.0.0\")>\r\n<Assembly: AssemblyInformationalVersion(\"1.0.0.0\")>\r\n<Assembly: AssemblyFileVersion(\"1.0.0.0\")>")]
-    [Category("NoMono")]
-    [Description("Won't run on Mono due to source information not being available for ShouldMatchApproved.")]
     public void ShouldReplaceAssemblyVersion(string fileExtension, string assemblyFileContent)
     {
         var workingDir = Path.GetTempPath();
@@ -191,8 +189,6 @@ public void ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone(string fileEx
     [TestCase("cs", "[assembly: AssemblyVersion(\"1.0.0.0\")]\r\n[assembly: AssemblyInformationalVersion(\"1.0.0.0\")]\r\n[assembly: AssemblyFileVersion(\"1.0.0.0\")]")]
     [TestCase("fs", "[<assembly: AssemblyVersion(\"1.0.0.0\")>]\r\n[<assembly: AssemblyInformationalVersion(\"1.0.0.0\")>]\r\n[<assembly: AssemblyFileVersion(\"1.0.0.0\")>]")]
     [TestCase("vb", "<Assembly: AssemblyVersion(\"1.0.0.0\")>\r\n<Assembly: AssemblyInformationalVersion(\"1.0.0.0\")>\r\n<Assembly: AssemblyFileVersion(\"1.0.0.0\")>")]
-    [Category("NoMono")]
-    [Description("Won't run on Mono due to source information not being available for ShouldMatchApproved.")]
     public void ShouldReplaceAssemblyVersionInRelativePath(string fileExtension, string assemblyFileContent)
     {
         var workingDir = Path.GetTempPath();
@@ -239,8 +235,6 @@ public void ShouldReplaceAssemblyVersionInRelativePathWithWhiteSpace(string file
     [TestCase("cs", "[assembly: AssemblyVersion(\"1.0.0.*\")]\r\n[assembly: AssemblyInformationalVersion(\"1.0.0.*\")]\r\n[assembly: AssemblyFileVersion(\"1.0.0.*\")]")]
     [TestCase("fs", "[<assembly: AssemblyVersion(\"1.0.0.*\")>]\r\n[<assembly: AssemblyInformationalVersion(\"1.0.0.*\")>]\r\n[<assembly: AssemblyFileVersion(\"1.0.0.*\")>]")]
     [TestCase("vb", "<Assembly: AssemblyVersion(\"1.0.0.*\")>\r\n<Assembly: AssemblyInformationalVersion(\"1.0.0.*\")>\r\n<Assembly: AssemblyFileVersion(\"1.0.0.*\")>")]
-    [Category("NoMono")]
-    [Description("Won't run on Mono due to source information not being available for ShouldMatchApproved.")]
     public void ShouldReplaceAssemblyVersionWithStar(string fileExtension, string assemblyFileContent)
     {
         var workingDir = Path.GetTempPath();
@@ -264,8 +258,6 @@ public void ShouldReplaceAssemblyVersionWithStar(string fileExtension, string as
     [TestCase("cs", "[assembly: AssemblyVersionAttribute(\"1.0.0.0\")]\r\n[assembly: AssemblyInformationalVersionAttribute(\"1.0.0.0\")]\r\n[assembly: AssemblyFileVersionAttribute(\"1.0.0.0\")]")]
     [TestCase("fs", "[<assembly: AssemblyVersionAttribute(\"1.0.0.0\")>]\r\n[<assembly: AssemblyInformationalVersionAttribute(\"1.0.0.0\")>]\r\n[<assembly: AssemblyFileVersionAttribute(\"1.0.0.0\")>]")]
     [TestCase("vb", "<Assembly: AssemblyVersionAttribute(\"1.0.0.0\")>\r\n<Assembly: AssemblyInformationalVersionAttribute(\"1.0.0.0\")>\r\n<Assembly: AssemblyFileVersionAttribute(\"1.0.0.0\")>")]
-    [Category("NoMono")]
-    [Description("Won't run on Mono due to source information not being available for ShouldMatchApproved.")]
     public void ShouldReplaceAssemblyVersionWithAtttributeSuffix(string fileExtension, string assemblyFileContent)
     {
         var workingDir = Path.GetTempPath();
@@ -315,8 +307,6 @@ public void ShouldAddAssemblyVersionIfMissingFromInfoFile(string fileExtension)
     [TestCase("cs", "[assembly: AssemblyVersion(\"2.2.0.0\")]\r\n[assembly: AssemblyInformationalVersion(\"2.2.0+5.Branch.foo.Sha.hash\")]\r\n[assembly: AssemblyFileVersion(\"2.2.0.0\")]")]
     [TestCase("fs", "[<assembly: AssemblyVersion(\"2.2.0.0\")>]\r\n[<assembly: AssemblyInformationalVersion(\"2.2.0+5.Branch.foo.Sha.hash\")>]\r\n[<assembly: AssemblyFileVersion(\"2.2.0.0\")>]")]
     [TestCase("vb", "<Assembly: AssemblyVersion(\"2.2.0.0\")>\r\n<Assembly: AssemblyInformationalVersion(\"2.2.0+5.Branch.foo.Sha.hash\")>\r\n<Assembly: AssemblyFileVersion(\"2.2.0.0\")>")]
-    [Category("NoMono")]
-    [Description("Won't run on Mono due to source information not being available for ShouldMatchApproved.")]
     public void ShouldReplaceAlreadySubstitutedValues(string fileExtension, string assemblyFileContent)
     {
         var workingDir = Path.GetTempPath();
@@ -340,8 +330,6 @@ public void ShouldReplaceAlreadySubstitutedValues(string fileExtension, string a
     [TestCase("cs", "[assembly: AssemblyVersion(\"1.0.0.0\")]\r\n[assembly: AssemblyInformationalVersion(\"1.0.0.0\")]\r\n[assembly: AssemblyFileVersion(\"1.0.0.0\")]")]
     [TestCase("fs", "[<assembly: AssemblyVersion(\"1.0.0.0\")>]\r\n[<assembly: AssemblyInformationalVersion(\"1.0.0.0\")>]\r\n[<assembly: AssemblyFileVersion(\"1.0.0.0\")>]")]
     [TestCase("vb", "<Assembly: AssemblyVersion(\"1.0.0.0\")>\r\n<Assembly: AssemblyInformationalVersion(\"1.0.0.0\")>\r\n<Assembly: AssemblyFileVersion(\"1.0.0.0\")>")]
-    [Category("NoMono")]
-    [Description("Won't run on Mono due to source information not being available for ShouldMatchApproved.")]
     public void ShouldReplaceAssemblyVersionWhenCreatingAssemblyVersionFileAndEnsureAssemblyInfo(string fileExtension, string assemblyFileContent)
     {
         var workingDir = Path.GetTempPath();
diff --git a/src/GitVersionCore.Tests/ConfigProviderTests.cs b/src/GitVersionCore.Tests/ConfigProviderTests.cs
@@ -179,9 +179,9 @@ public void NextVersionCanHavePatch()
     }
 
     [Test]
+    [MethodImpl(MethodImplOptions.NoInlining)]
     [Category("NoMono")]
     [Description("Won't run on Mono due to source information not being available for ShouldMatchApproved.")]
-    [MethodImpl(MethodImplOptions.NoInlining)]
     public void CanWriteOutEffectiveConfiguration()
     {
         var config = ConfigurationProvider.GetEffectiveConfigAsString(repoPath, fileSystem, configFileLocator);
diff --git a/src/GitVersionCore.Tests/Init/InitScenarios.cs b/src/GitVersionCore.Tests/Init/InitScenarios.cs
@@ -1,5 +1,7 @@
 namespace GitVersionCore.Tests.Init
 {
+    using System.IO;
+    using System.Runtime.InteropServices;
     using GitVersion;
     using NUnit.Framework;
     using Shouldly;
@@ -21,9 +23,10 @@ public void CanSetNextVersion()
             var testFileSystem = new TestFileSystem();
             var testConsole = new TestConsole("3", "2.0.0", "0");
             var configFileLocator = new DefaultConfigFileLocator();
-            ConfigurationProvider.Init("c:\\proj", testFileSystem, testConsole, configFileLocator);
+            var workingDirectory = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "c:\\proj" : "/proj";
+            ConfigurationProvider.Init(workingDirectory, testFileSystem, testConsole, configFileLocator);
 
-            testFileSystem.ReadAllText("c:\\proj\\GitVersion.yml").ShouldMatchApproved();
+            testFileSystem.ReadAllText(Path.Combine(workingDirectory, "GitVersion.yml")).ShouldMatchApproved();
         }
     }
 }
diff --git a/src/GitVersionCore.Tests/WixFileTests.cs b/src/GitVersionCore.Tests/WixFileTests.cs
@@ -46,10 +46,9 @@ public void UpdateWixVersionFile()
             using (var wixVersionFileUpdater = new WixVersionFileUpdater(workingDir, vars, fileSystem))
             {
                 wixVersionFileUpdater.Update();
+                fileSystem.ReadAllText(wixVersionFileUpdater.WixVersionFile).
+                    ShouldMatchApproved(c => c.SubFolder(Path.Combine("Approved")));
             }
-
-            fileSystem.ReadAllText(WixVersionFileUpdater.GetWixVersionFileName()).
-                ShouldMatchApproved(c => c.SubFolder(Path.Combine("Approved")));
         }
     }
 }
diff --git a/src/GitVersionCore/VersionAssemblyInfoResources/AssemblyInfoFileUpdater.cs b/src/GitVersionCore/VersionAssemblyInfoResources/AssemblyInfoFileUpdater.cs
@@ -19,6 +19,8 @@ public class AssemblyInfoFileUpdater : IDisposable
             {".vb", new Regex( @"(\s*\<Assembly:\s*(?:.*)\>\s*$(\r?\n)?)", RegexOptions.Multiline) },
         };
 
+        private const string NewLine = "\r\n";
+
         ISet<string> assemblyInfoFileNames;
         string workingDirectory;
         VersionVariables variables;
@@ -62,9 +64,9 @@ public void Update()
 
             foreach (var assemblyInfoFile in assemblyInfoFiles)
             {
-                var backupAssemblyInfo = assemblyInfoFile.FullName + ".bak";
                 var localAssemblyInfo = assemblyInfoFile.FullName;
-                fileSystem.Copy(assemblyInfoFile.FullName, backupAssemblyInfo, true);
+                var backupAssemblyInfo = localAssemblyInfo + ".bak";
+                fileSystem.Copy(localAssemblyInfo, backupAssemblyInfo, true);
 
                 restoreBackupTasks.Add(() =>
                 {
@@ -78,7 +80,7 @@ public void Update()
 
                 cleanupBackupTasks.Add(() => fileSystem.Delete(backupAssemblyInfo));
 
-                var originalFileContents = fileSystem.ReadAllText(assemblyInfoFile.FullName);
+                var originalFileContents = fileSystem.ReadAllText(localAssemblyInfo);
                 var fileContents = originalFileContents;
                 var appendedAttributes = false;
 
@@ -97,12 +99,12 @@ public void Update()
                 if (appendedAttributes)
                 {
                     // If we appended any attributes, put a new line after them
-                    fileContents += Environment.NewLine;
+                    fileContents += NewLine;
                 }
 
                 if (originalFileContents != fileContents)
                 {
-                    fileSystem.WriteAllText(assemblyInfoFile.FullName, fileContents);
+                    fileSystem.WriteAllText(localAssemblyInfo, fileContents);
                 }
             }
         }
@@ -123,14 +125,14 @@ string ReplaceOrInsertAfterLastAssemblyAttributeOrAppend(Regex replaceRegex, str
                 {
                     var lastMatch = assemblyMatches[assemblyMatches.Count - 1];
                     var replacementString = lastMatch.Value;
-                    if (!lastMatch.Value.EndsWith(Environment.NewLine)) replacementString += Environment.NewLine;
+                    if (!lastMatch.Value.EndsWith(NewLine)) replacementString += NewLine;
                     replacementString += string.Format(assemblyAddFormat, replaceString);
-                    replacementString += Environment.NewLine;
+                    replacementString += NewLine;
                     return inputString.Replace(lastMatch.Value, replacementString);
                 }
             }
 			
-            inputString += Environment.NewLine + string.Format(assemblyAddFormat, replaceString);
+            inputString += NewLine + string.Format(assemblyAddFormat, replaceString);
             appendedAttributes = true;
             return inputString;
         }
diff --git a/src/GitVersionCore/WixVersionFileUpdater.cs b/src/GitVersionCore/WixVersionFileUpdater.cs
@@ -3,26 +3,22 @@ namespace GitVersion
     using Helpers;
 
     using System;
+    using System.IO;
     using System.Text;
     using System.Xml;
 
     public class WixVersionFileUpdater : IDisposable
     {
-        string workingDirectory;
         VersionVariables variables;
         IFileSystem fileSystem;
-        private const string WIX_VERSION_FILE = "GitVersion_WixVersion.wxi ";
+        public string WixVersionFile { get; }
+        public const string WIX_VERSION_FILE = "GitVersion_WixVersion.wxi";
 
         public WixVersionFileUpdater(string workingDirectory, VersionVariables variables, IFileSystem fileSystem)
         {
-            this.workingDirectory = workingDirectory;
             this.variables = variables;
             this.fileSystem = fileSystem;
-        }
-                
-        public static string GetWixVersionFileName()
-        {
-            return WIX_VERSION_FILE;
+            this.WixVersionFile = Path.Combine(workingDirectory, WIX_VERSION_FILE);
         }
 
         public void Update()
@@ -36,7 +32,7 @@ public void Update()
             XmlElement root = doc.DocumentElement;
             doc.InsertBefore(xmlDecl, root);
 
-            using (var fs = fileSystem.OpenWrite(WIX_VERSION_FILE))
+            using (var fs = fileSystem.OpenWrite(WixVersionFile))
             {
                 doc.Save(fs);
             }
@@ -58,7 +54,7 @@ private string GetWixFormatFromVersionVariables()
 
         public void Dispose()
         {
-            Logger.WriteInfo($"Done writing {WIX_VERSION_FILE}");
+            Logger.WriteInfo($"Done writing {WixVersionFile}");
         }
     }
 }
diff --git a/src/GitVersionExe.Tests/ArgumentBuilder.cs b/src/GitVersionExe.Tests/ArgumentBuilder.cs
@@ -1,4 +1,4 @@
-﻿using System.Text;
+using System.Text;
 
 public class ArgumentBuilder
 {
@@ -40,7 +40,7 @@ public override string ToString()
     {
         var arguments = new StringBuilder();
 
-        arguments.AppendFormat("\"{0}\"", workingDirectory);
+        arguments.AppendFormat(" /targetpath \"{0}\"", workingDirectory);
 
         if (!string.IsNullOrWhiteSpace(exec))
         {
@@ -62,13 +62,13 @@ public override string ToString()
             arguments.AppendFormat(" /projargs \"{0}\"", projectArgs);
         }
 
-        arguments.Append(additionalArguments);
-
         if (!string.IsNullOrWhiteSpace(logFile))
         {
             arguments.AppendFormat(" /l \"{0}\"", logFile);
         }
 
+        arguments.Append(additionalArguments);
+
         return arguments.ToString();
     }
 
@@ -81,4 +81,4 @@ public override string ToString()
     readonly string projectArgs;
     readonly string projectFile;
     readonly string workingDirectory;
-}
+}
diff --git a/src/GitVersionExe.Tests/ExecCmdLineArgumentTest.cs b/src/GitVersionExe.Tests/ExecCmdLineArgumentTest.cs
@@ -89,15 +89,16 @@ public void WorkingDirectoryWithoutGitFolderCrashesWithInformativeMessage()
     }
 
     [Test]
-    [Category("NoMono")]
-    [Description("Doesn't work on Mono/Unix because of the path heuristics that needs to be done there in order to figure out whether the first argument actually is a path.")]
     public void WorkingDirectoryDoesNotExistCrashesWithInformativeMessage()
     {
         var workingDirectory = Path.Combine(PathHelper.GetCurrentDirectory(), Guid.NewGuid().ToString("N"));
         var executable = PathHelper.GetExecutable();
 
         var output = new StringBuilder();
-        var args = PathHelper.GetExecutableArgs(workingDirectory);
+        var args = PathHelper.GetExecutableArgs($" /targetpath {workingDirectory} ");
+
+        Console.WriteLine("Executing: {0} {1}", executable, args);
+        Console.WriteLine();
 
         var exitCode = ProcessHelper.Run(
             s => output.AppendLine(s),
diff --git a/src/GitVersionExe.Tests/GitVersionHelper.cs b/src/GitVersionExe.Tests/GitVersionHelper.cs
@@ -32,8 +32,6 @@ static ExecutionResults ExecuteIn(ArgumentBuilder arguments)
         var executable = PathHelper.GetExecutable();
         var output = new StringBuilder();
 
-        Console.WriteLine("Executing: {0} {1}", executable, arguments);
-        Console.WriteLine();
         var environmentalVariables =
             new[]
             {
@@ -49,9 +47,16 @@ static ExecutionResults ExecuteIn(ArgumentBuilder arguments)
         {
             var args = PathHelper.GetExecutableArgs(arguments.ToString());
 
+            Console.WriteLine("Executing: {0} {1}", executable, args);
+            Console.WriteLine();
+
             exitCode = ProcessHelper.Run(
-                s => output.AppendLine(s), s => output.AppendLine(s), null,
-                executable, args, arguments.WorkingDirectory,
+                s => output.AppendLine(s),
+                s => output.AppendLine(s),
+                null,
+                executable,
+                args,
+                arguments.WorkingDirectory,
                 environmentalVariables);
         }
         catch (Exception exception)
diff --git a/src/GitVersionExe.Tests/UpdateWixVersionFileTests.cs b/src/GitVersionExe.Tests/UpdateWixVersionFileTests.cs
@@ -18,27 +18,23 @@ class UpdateWixVersionFileTests
         [SetUp]
         public void Setup()
         {
-            WixVersionFileName = WixVersionFileUpdater.GetWixVersionFileName();
+            WixVersionFileName = WixVersionFileUpdater.WIX_VERSION_FILE;
         }
 
         [Test]
-        [Category("NoMono")]
-        [Description("Doesn't work on Mono/Unix because of the path heuristics that needs to be done there in order to figure out whether the first argument actually is a path.")]
         public void WixVersionFileCreationTest()
         {
             using (var fixture = new EmptyRepositoryFixture())
             {
                 fixture.MakeATaggedCommit("1.2.3");
                 fixture.MakeACommit();
 
-                GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: " -updatewixversionfile");
+                GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: " /updatewixversionfile");
                 Assert.IsTrue(File.Exists(Path.Combine(fixture.RepositoryPath, WixVersionFileName)));
             }
         }
 
         [Test]
-        [Category("NoMono")]
-        [Description("Doesn't work on Mono/Unix because of the path heuristics that needs to be done there in order to figure out whether the first argument actually is a path.")]
         public void WixVersionFileVarCountTest()
         {
             //Make sure we have captured all the version variables by count in the Wix version file
@@ -50,7 +46,7 @@ public void WixVersionFileVarCountTest()
                 var gitVersionExecutionResults = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: null);
                 var vars = gitVersionExecutionResults.OutputVariables;
 
-                GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: " -updatewixversionfile");
+                GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: " /updatewixversionfile");
 
                 var gitVersionVarsInWix = GetGitVersionVarsInWixFile(Path.Combine(fixture.RepositoryPath, WixVersionFileName));
                 var gitVersionVars = VersionVariables.AvailableVariables;
@@ -60,8 +56,6 @@ public void WixVersionFileVarCountTest()
         }
 
         [Test]
-        [Category("NoMono")]
-        [Description("Doesn't work on Mono/Unix because of the path heuristics that needs to be done there in order to figure out whether the first argument actually is a path.")]
         public void WixVersionFileContentTest()
         {
             using (var fixture = new EmptyRepositoryFixture())
@@ -72,7 +66,7 @@ public void WixVersionFileContentTest()
                 var gitVersionExecutionResults = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: null);
                 VersionVariables vars = gitVersionExecutionResults.OutputVariables;
 
-                GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: " -updatewixversionfile");
+                GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: " /updatewixversionfile");
 
                 var gitVersionVarsInWix = GetGitVersionVarsInWixFile(Path.Combine(fixture.RepositoryPath, WixVersionFileName));
                 var gitVersionVars = VersionVariables.AvailableVariables;
diff --git a/src/GitVersionExe.Tests/VersionWriterTests.cs b/src/GitVersionExe.Tests/VersionWriterTests.cs
@@ -23,8 +23,6 @@ public void WriteVersion_ShouldWriteFileVersion_WithNoPrereleaseTag()
         }
 
         [Test]
-        [Category("NoMono")]
-        [Description("Seems assembly info is slightly different on mono, this test fails with no pre-release info.")]
         public void WriteVersion_ShouldWriteFileVersion_WithPrereleaseTag()
         {
             var asm = GenerateAssembly(new Version(1, 0, 0), "-beta0004");

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ Task("Test")`
`63`	`63`	`CoverletOutputName = $"{projectName}.coverage.xml"`
`64`	`64`	`};`
`65`	`65`
`66`		`- if (IsRunningOnUnix())`
	`66`	`+ if (IsRunningOnUnix() && string.Equals(framework, parameters.FullFxVersion))`
`67`	`67`	`{`
`68`	`68`	`settings.Filter = "TestCategory!=NoMono";`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -179,9 +179,9 @@ public void NextVersionCanHavePatch()`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`[Test]`
	`182`	`+ [MethodImpl(MethodImplOptions.NoInlining)]`
`182`	`183`	`[Category("NoMono")]`
`183`	`184`	`[Description("Won't run on Mono due to source information not being available for ShouldMatchApproved.")]`
`184`		`- [MethodImpl(MethodImplOptions.NoInlining)]`
`185`	`185`	`public void CanWriteOutEffectiveConfiguration()`
`186`	`186`	`{`
`187`	`187`	`var config = ConfigurationProvider.GetEffectiveConfigAsString(repoPath, fileSystem, configFileLocator);`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`namespace GitVersionCore.Tests.Init`
`2`	`2`	`{`
	`3`	`+ using System.IO;`
	`4`	`+ using System.Runtime.InteropServices;`
`3`	`5`	`using GitVersion;`
`4`	`6`	`using NUnit.Framework;`
`5`	`7`	`using Shouldly;`
`@@ -21,9 +23,10 @@ public void CanSetNextVersion()`
`21`	`23`	`var testFileSystem = new TestFileSystem();`
`22`	`24`	`var testConsole = new TestConsole("3", "2.0.0", "0");`
`23`	`25`	`var configFileLocator = new DefaultConfigFileLocator();`
`24`		`- ConfigurationProvider.Init("c:\\proj", testFileSystem, testConsole, configFileLocator);`
	`26`	`+ var workingDirectory = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "c:\\proj" : "/proj";`
	`27`	`+ ConfigurationProvider.Init(workingDirectory, testFileSystem, testConsole, configFileLocator);`
`25`	`28`
`26`		`- testFileSystem.ReadAllText("c:\\proj\\GitVersion.yml").ShouldMatchApproved();`
	`29`	`+ testFileSystem.ReadAllText(Path.Combine(workingDirectory, "GitVersion.yml")).ShouldMatchApproved();`
`27`	`30`	`}`
`28`	`31`	`}`
`29`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,10 +46,9 @@ public void UpdateWixVersionFile()`
`46`	`46`	`using (var wixVersionFileUpdater = new WixVersionFileUpdater(workingDir, vars, fileSystem))`
`47`	`47`	`{`
`48`	`48`	`wixVersionFileUpdater.Update();`
	`49`	`+ fileSystem.ReadAllText(wixVersionFileUpdater.WixVersionFile).`
	`50`	`+ ShouldMatchApproved(c => c.SubFolder(Path.Combine("Approved")));`
`49`	`51`	`}`
`50`		`-`
`51`		`- fileSystem.ReadAllText(WixVersionFileUpdater.GetWixVersionFileName()).`
`52`		`- ShouldMatchApproved(c => c.SubFolder(Path.Combine("Approved")));`
`53`	`52`	`}`
`54`	`53`	`}`
`55`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@ public class AssemblyInfoFileUpdater : IDisposable`
`19`	`19`	`{".vb", new Regex( @"(\s\<Assembly:\s(?:.)\>\s$(\r?\n)?)", RegexOptions.Multiline) },`
`20`	`20`	`};`
`21`	`21`
	`22`	`+ private const string NewLine = "\r\n";`
	`23`	`+`
`22`	`24`	`ISet<string> assemblyInfoFileNames;`
`23`	`25`	`string workingDirectory;`
`24`	`26`	`VersionVariables variables;`
`@@ -62,9 +64,9 @@ public void Update()`
`62`	`64`
`63`	`65`	`foreach (var assemblyInfoFile in assemblyInfoFiles)`
`64`	`66`	`{`
`65`		`- var backupAssemblyInfo = assemblyInfoFile.FullName + ".bak";`
`66`	`67`	`var localAssemblyInfo = assemblyInfoFile.FullName;`
`67`		`- fileSystem.Copy(assemblyInfoFile.FullName, backupAssemblyInfo, true);`
	`68`	`+ var backupAssemblyInfo = localAssemblyInfo + ".bak";`
	`69`	`+ fileSystem.Copy(localAssemblyInfo, backupAssemblyInfo, true);`
`68`	`70`
`69`	`71`	`restoreBackupTasks.Add(() =>`
`70`	`72`	`{`
`@@ -78,7 +80,7 @@ public void Update()`
`78`	`80`
`79`	`81`	`cleanupBackupTasks.Add(() => fileSystem.Delete(backupAssemblyInfo));`
`80`	`82`
`81`		`- var originalFileContents = fileSystem.ReadAllText(assemblyInfoFile.FullName);`
	`83`	`+ var originalFileContents = fileSystem.ReadAllText(localAssemblyInfo);`
`82`	`84`	`var fileContents = originalFileContents;`
`83`	`85`	`var appendedAttributes = false;`
`84`	`86`
`@@ -97,12 +99,12 @@ public void Update()`
`97`	`99`	`if (appendedAttributes)`
`98`	`100`	`{`
`99`	`101`	`// If we appended any attributes, put a new line after them`
`100`		`- fileContents += Environment.NewLine;`
	`102`	`+ fileContents += NewLine;`
`101`	`103`	`}`
`102`	`104`
`103`	`105`	`if (originalFileContents != fileContents)`
`104`	`106`	`{`
`105`		`- fileSystem.WriteAllText(assemblyInfoFile.FullName, fileContents);`
	`107`	`+ fileSystem.WriteAllText(localAssemblyInfo, fileContents);`
`106`	`108`	`}`
`107`	`109`	`}`
`108`	`110`	`}`
`@@ -123,14 +125,14 @@ string ReplaceOrInsertAfterLastAssemblyAttributeOrAppend(Regex replaceRegex, str`
`123`	`125`	`{`
`124`	`126`	`var lastMatch = assemblyMatches[assemblyMatches.Count - 1];`
`125`	`127`	`var replacementString = lastMatch.Value;`
`126`		`- if (!lastMatch.Value.EndsWith(Environment.NewLine)) replacementString += Environment.NewLine;`
	`128`	`+ if (!lastMatch.Value.EndsWith(NewLine)) replacementString += NewLine;`
`127`	`129`	`replacementString += string.Format(assemblyAddFormat, replaceString);`
`128`		`- replacementString += Environment.NewLine;`
	`130`	`+ replacementString += NewLine;`
`129`	`131`	`return inputString.Replace(lastMatch.Value, replacementString);`
`130`	`132`	`}`
`131`	`133`	`}`
`132`	`134`
`133`		`- inputString += Environment.NewLine + string.Format(assemblyAddFormat, replaceString);`
	`135`	`+ inputString += NewLine + string.Format(assemblyAddFormat, replaceString);`
`134`	`136`	`appendedAttributes = true;`
`135`	`137`	`return inputString;`
`136`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,26 +3,22 @@ namespace GitVersion`
`3`	`3`	`using Helpers;`
`4`	`4`
`5`	`5`	`using System;`
	`6`	`+ using System.IO;`
`6`	`7`	`using System.Text;`
`7`	`8`	`using System.Xml;`
`8`	`9`
`9`	`10`	`public class WixVersionFileUpdater : IDisposable`
`10`	`11`	`{`
`11`		`- string workingDirectory;`
`12`	`12`	`VersionVariables variables;`
`13`	`13`	`IFileSystem fileSystem;`
`14`		`- private const string WIX_VERSION_FILE = "GitVersion_WixVersion.wxi ";`
	`14`	`+ public string WixVersionFile { get; }`
	`15`	`+ public const string WIX_VERSION_FILE = "GitVersion_WixVersion.wxi";`
`15`	`16`
`16`	`17`	`public WixVersionFileUpdater(string workingDirectory, VersionVariables variables, IFileSystem fileSystem)`
`17`	`18`	`{`
`18`		`- this.workingDirectory = workingDirectory;`
`19`	`19`	`this.variables = variables;`
`20`	`20`	`this.fileSystem = fileSystem;`
`21`		`- }`
`22`		`-`
`23`		`- public static string GetWixVersionFileName()`
`24`		`- {`
`25`		`- return WIX_VERSION_FILE;`
	`21`	`+ this.WixVersionFile = Path.Combine(workingDirectory, WIX_VERSION_FILE);`
`26`	`22`	`}`
`27`	`23`
`28`	`24`	`public void Update()`
`@@ -36,7 +32,7 @@ public void Update()`
`36`	`32`	`XmlElement root = doc.DocumentElement;`
`37`	`33`	`doc.InsertBefore(xmlDecl, root);`
`38`	`34`
`39`		`- using (var fs = fileSystem.OpenWrite(WIX_VERSION_FILE))`
	`35`	`+ using (var fs = fileSystem.OpenWrite(WixVersionFile))`
`40`	`36`	`{`
`41`	`37`	`doc.Save(fs);`
`42`	`38`	`}`
`@@ -58,7 +54,7 @@ private string GetWixFormatFromVersionVariables()`
`58`	`54`
`59`	`55`	`public void Dispose()`
`60`	`56`	`{`
`61`		`- Logger.WriteInfo($"Done writing {WIX_VERSION_FILE}");`
	`57`	`+ Logger.WriteInfo($"Done writing {WixVersionFile}");`
`62`	`58`	`}`
`63`	`59`	`}`
`64`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System.Text;`
	`1`	`+using System.Text;`
`2`	`2`
`3`	`3`	`public class ArgumentBuilder`
`4`	`4`	`{`
`@@ -40,7 +40,7 @@ public override string ToString()`
`40`	`40`	`{`
`41`	`41`	`var arguments = new StringBuilder();`
`42`	`42`
`43`		`- arguments.AppendFormat("\"{0}\"", workingDirectory);`
	`43`	`+ arguments.AppendFormat(" /targetpath \"{0}\"", workingDirectory);`
`44`	`44`
`45`	`45`	`if (!string.IsNullOrWhiteSpace(exec))`
`46`	`46`	`{`
`@@ -62,13 +62,13 @@ public override string ToString()`
`62`	`62`	`arguments.AppendFormat(" /projargs \"{0}\"", projectArgs);`
`63`	`63`	`}`
`64`	`64`
`65`		`- arguments.Append(additionalArguments);`
`66`		`-`
`67`	`65`	`if (!string.IsNullOrWhiteSpace(logFile))`
`68`	`66`	`{`
`69`	`67`	`arguments.AppendFormat(" /l \"{0}\"", logFile);`
`70`	`68`	`}`
`71`	`69`
	`70`	`+ arguments.Append(additionalArguments);`
	`71`	`+`
`72`	`72`	`return arguments.ToString();`
`73`	`73`	`}`
`74`	`74`
`@@ -81,4 +81,4 @@ public override string ToString()`
`81`	`81`	`readonly string projectArgs;`
`82`	`82`	`readonly string projectFile;`
`83`	`83`	`readonly string workingDirectory;`
`84`		`-}`
	`84`	`+}`