tests for both netfx and netcore

microsoft · Jan 19, 2024 · 8a5a613 · 8a5a613
1 parent 1afc6d3
commit 8a5a613
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 2 deletions.
diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml
@@ -32,5 +32,10 @@ jobs:
         run: |
           .\disableStrongName.ps1
 
-      - name: Run tests
+      - name: Run tests Windows
+        if: matrix.os == 'windows-latest'
         run: dotnet test
+
+      - name: Run tests Linux
+        if: matrix.os == 'ubuntu-latest'
+        run: dotnet test /p:TargetFramework=net6.0
diff --git a/Test/Directory.Build.props b/Test/Directory.Build.props
@@ -28,7 +28,7 @@
     <BaseIntermediateOutputPath Condition=" '$(BaseIntermediateOutputPath)' == '' ">$(EnlistmentRoot)\obj\$([MSBuild]::MakeRelative('$(EnlistmentRoot)\', $(MSBuildProjectDirectory)))</BaseIntermediateOutputPath>
 
     <!-- Test on netcore to cover all platforms -->
-    <TargetFrameworks>$(NetCoreVersion)</TargetFrameworks>
+    <TargetFrameworks>$(NetfxVersion);$(NetCoreVersion)</TargetFrameworks>
 
     <!-- The TargetGroup can be used to express condition that are common to more than one TargetFramework (currently not used)-->
     <TargetGroup Condition="'$(TargetFramework)'=='netstandard2.0' Or '$(TargetFramework)'=='netstandard2.1' Or '$(TargetFramework)'=='netstandard2.2'">netstandard</TargetGroup>

diff --git a/Test/SqlDom/LexingEntryPointsTests.cs b/Test/SqlDom/LexingEntryPointsTests.cs
@@ -202,6 +202,7 @@ public void GetTokenStreamWithErrorTestImpl(TSqlParser parser)
 		[SqlStudioTestCategory(Category.UnitTest)]
         public void LexingErrorHandler()
         {
+            #if NET
             if (System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Windows))
             {
                 ParserTestUtils.ExecuteTestForAllParsers(delegate(TSqlParser parser)
@@ -215,6 +216,18 @@ public void LexingErrorHandler()
                     }
                 }, false);
             }
+            #else
+            ParserTestUtils.ExecuteTestForAllParsers(delegate(TSqlParser parser)
+            {
+                using (TextReader sr = new StreamReader(Path.Combine(System.Environment.GetEnvironmentVariable("windir"), @"system32\notepad.exe")))
+                {
+                    IList<ParseError> errors;
+                    parser.GetTokenStream(sr, out errors);
+                    ParserTestUtils.LogErrors(errors);
+                    Assert.AreEqual<int>(1, errors.Count);
+                }
+            }, false);
+            #endif
         }
 
 

diff --git a/Test/SqlDom/TestUtilities.cs b/Test/SqlDom/TestUtilities.cs
@@ -276,9 +276,11 @@ public static string GetStringFromResource(string resourceName)
                 result = sr.ReadToEnd();
             }
 
+            #if NET
             // Convert line endings from \n to \r\n
             if (System.Environment.NewLine == "\n")
                 result = result.ReplaceLineEndings("\r\n");
+            #endif
 
             return result;
         }
@@ -379,9 +381,11 @@ public static TSqlFragment ParseFromResource(TSqlParser parser, string sourceFil
                 source = sr.ReadToEnd();
             }
 
+            #if NET
             // Convert line endings from \n to \r\n
             if (System.Environment.NewLine == "\n")
                 source = source.ReplaceLineEndings("\r\n");
+            #endif
 
             using(TextReader tr = new StringReader(source))
             {
@@ -397,9 +401,11 @@ public static IList<TSqlParserToken> ParseTokensFromResource(TSqlParser parser,
                 source = sr.ReadToEnd();
             }
 
+            #if NET
             // Convert line endings from \n to \r\n
             if (System.Environment.NewLine == "\n")
                 source = source.ReplaceLineEndings("\r\n");
+            #endif
 
             using (TextReader tr = new StringReader(source))
             {