Fixed multiline msapp pack errors (#486)

Co-authored-by: Andrew Petrochuk <anpetroc@microsoft.com>
microsoft · Jul 20, 2023 · 1e36981 · 1e36981
1 parent b161f8a
commit 1e36981
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/PAModel/PAConvert/Yaml/YamlLexer.cs b/src/PAModel/PAConvert/Yaml/YamlLexer.cs
@@ -119,7 +119,7 @@ public override string ToString()
     /// </summary>
     internal class YamlLexer
     {
-        private static string NewLine = "\r\n";
+        private static string NewLine = "\n";
 
         // The actual contents to read. 
         private readonly TextReader _reader;

diff --git a/src/PAModelTests/PAModelTests.csproj b/src/PAModelTests/PAModelTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>../../35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
@@ -10,13 +10,13 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
     <PackageReference Include="coverlet.collector" Version="1.2.0" />
     <PackageReference Include="YamlDotNet" Version="11.2.1" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/PAModelTests/YamlTest.cs b/src/PAModelTests/YamlTest.cs
@@ -516,7 +516,7 @@ static void AssertLexError(YamlLexer y)
         static void AssertLex(string expected, YamlLexer y)
         {
             var p = y.ReadNext();
-            Assert.AreEqual(expected, p.ToString());
+            Assert.AreEqual(NormNewlines(expected), p.ToString());
         }
 
         static void AssertLex(string expected, YamlLexer y, string sourceSpan)