Bugfix copied project settings (#2056)

* Bugfix copied project settings

Fixes #2055

* Make copied settings more readable in generated csproj

* Adjust tests

Author: mawosoft

src/BenchmarkDotNet/Templates/CsProj.txt

@@ -19,8 +19,10 @@
     <Deterministic>true</Deterministic>
     <!-- needed for custom build configurations (only "Release" builds are optimized by default) -->
     <Optimize Condition=" '$(Configuration)' != 'Debug' ">true</Optimize>
+    <!-- Begin copied settings from benchmarks project -->
     $COPIEDSETTINGS$
-    <!-- we set LangVersion after $COPIEDSETTINGS$ which might contain LangVersion copied from the benchmarks project -->
+    <!-- End copied settings -->
+    <!-- we set LangVersion after any copied settings which might contain LangVersion copied from the benchmarks project -->
     <LangVersion Condition="'$(LangVersion)' == '' Or ($([System.Char]::IsDigit('$(LangVersion)', 0)) And '$(LangVersion)' &lt; '7.3')">latest</LangVersion>
     <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
     <!-- fix for NETSDK1150: https://docs.microsoft.com/en-us/dotnet/core/compatibility/sdk/5.0/referencing-executable-generates-error -->

src/BenchmarkDotNet/Toolchains/CsProj/CsProjGenerator.cs

@@ -112,7 +112,7 @@ protected virtual string GetRuntimeSettings(GcMode gcMode, IResolver resolver)
 
                 foreach (string setting in SettingsWeWantToCopy)
                     if (trimmedLine.Contains(setting))
-                        customProperties.Append(trimmedLine);
+                        customProperties.AppendLine(trimmedLine);
 
                 if (trimmedLine.StartsWith("<Import Project"))
                 {

tests/BenchmarkDotNet.Tests/CsProjGeneratorTests.cs

@@ -1,4 +1,5 @@
-using System.IO;
+using System;
+using System.IO;
 using System.Linq;
 using System.Reflection;
 using BenchmarkDotNet.Characteristics;
@@ -82,7 +83,7 @@ public void UseWpfSettingGetsCopied()
             {
                 var (customProperties, sdkName) = sut.GetSettingsThatNeedsToBeCopied(reader, TestAssemblyFileInfo);
 
-                Assert.Equal("<UseWpf>true</UseWpf>", customProperties);
+                Assert.Equal("<UseWpf>true</UseWpf>" + Environment.NewLine, customProperties);
                 Assert.Equal("Microsoft.NET.Sdk", sdkName);
             }
         }
@@ -111,7 +112,7 @@ public void SettingsFromPropsFileImportedUsingAbsolutePathGetCopies()
             {
                 var (customProperties, sdkName) = sut.GetSettingsThatNeedsToBeCopied(reader, TestAssemblyFileInfo);
 
-                Assert.Equal("<LangVersion>9.9</LangVersion>", customProperties);
+                Assert.Equal("<LangVersion>9.9</LangVersion>" + Environment.NewLine, customProperties);
                 Assert.Equal("Microsoft.NET.Sdk", sdkName);
             }
 
@@ -142,7 +143,7 @@ public void SettingsFromPropsFileImportedUsingRelativePathGetCopies()
             {
                 var (customProperties, sdkName) = sut.GetSettingsThatNeedsToBeCopied(reader, TestAssemblyFileInfo);
 
-                Assert.Equal("<LangVersion>9.9</LangVersion>", customProperties);
+                Assert.Equal("<LangVersion>9.9</LangVersion>" + Environment.NewLine, customProperties);
                 Assert.Equal("Microsoft.NET.Sdk", sdkName);
             }