Fix yet more random test failures on ILC (#19778)

* Fix yet more random test failures on ILC

- FileVersionInfo.Tests

  TestAssembly.dll needs to exist (in its IL form)
  in the test directory - Fix is to mangle the file
  extension so that ILC treats it as a data asset
  rather as IL to be merged into the executable.

- Other stuff is self-explanatory.

* Remove checked in binary.

* Fix Unix test failure.

* Fix another Unix test failure.

Author: atsushikan

src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/FileVersionInfoTest.cs

@@ -10,7 +10,9 @@ namespace System.Diagnostics.Tests
 {
     public partial class FileVersionInfoTest : FileCleanupTestBase
     {
-        private const string TestAssemblyFileName = "System.Diagnostics.FileVersionInfo.TestAssembly.dll";
+        // The extension is ".ildll" rather than ".dll" to prevent ILC from treating TestAssembly.dll as IL to subsume into executable.
+        private const string TestAssemblyFileName = "System.Diagnostics.FileVersionInfo.TestAssembly.ildll";
+        private const string OriginalTestAssemblyFileName = "System.Diagnostics.FileVersionInfo.TestAssembly.dll";
         private const string TestCsFileName = "Assembly1.cs";
         private const string TestNotFoundFileName = "notfound.dll";
 
@@ -29,7 +31,8 @@ public void FileVersionInfo_CustomManagedAssembly()
                 FileName = Path.Combine(Directory.GetCurrentDirectory(), TestAssemblyFileName),
                 FilePrivatePart = 1,
                 FileVersion = "4.3.2.1",
-                InternalName = TestAssemblyFileName,
+                //https://github.com/dotnet/corefx/issues/19784  InternalName different behavior on Unix.
+                InternalName = PlatformDetection.IsWindows ? OriginalTestAssemblyFileName : TestAssemblyFileName,
                 IsDebug = false,
                 IsPatched = false,
                 IsPrivateBuild = false,
@@ -38,7 +41,8 @@ public void FileVersionInfo_CustomManagedAssembly()
                 Language = GetFileVersionLanguage(0x0000),
                 LegalCopyright = "Copyright, you betcha!",
                 LegalTrademarks = "TM",
-                OriginalFilename = TestAssemblyFileName,
+                //https://github.com/dotnet/corefx/issues/19784  OriginalFilename different behavior on Unix.
+                OriginalFilename = PlatformDetection.IsWindows ? OriginalTestAssemblyFileName : TestAssemblyFileName,
                 PrivateBuild = "",
                 ProductBuildPart = 3,
                 ProductMajorPart = 1,

src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj

@@ -30,6 +30,9 @@
     <Compile Include="$(CommonTestPath)\System\IO\FileCleanupTestBase.cs">
       <Link>Common\System\IO\FileCleanupTestBase.cs</Link>
     </Compile>
+    <Compile Include="$(CommonTestPath)\System\PlatformDetection.cs">
+      <Link>Common\System\PlatformDetection.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
     <Compile Include="FileVersionInfoTest.Windows.cs" />
@@ -51,4 +54,13 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
+
+  <PropertyGroup>
+    <BuildDependsOn>$(BuildDependsOn);MangleTestAssemblyExtension</BuildDependsOn>
+  </PropertyGroup>
+  <Target Name="MangleTestAssemblyExtension">
+    <!-- Copy TestAssembly to file without .dll extension so that ILC preserves it as a data file rather than feeding it to the output executable. -->
+    <Copy SourceFiles="$(OutputPath)\System.Diagnostics.FileVersionInfo.TestAssembly.dll" DestinationFiles="$(OutputPath)\System.Diagnostics.FileVersionInfo.TestAssembly.ildll" />
+  </Target>
+
+</Project>

src/System.Net.Primitives/tests/FunctionalTests/CookieTest.cs

@@ -241,7 +241,7 @@ public static void Value_GetSet_Success()
         }
 
         [Fact]
-        [SkipOnTargetFramework(TargetFrameworkMonikers.Netcoreapp | TargetFrameworkMonikers.Uap)]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.Netcoreapp | TargetFrameworkMonikers.Uap | TargetFrameworkMonikers.UapAot)] // Cookie.Value returns null on full framework, empty string on .NETCore
         public static void Value_PassNullToCtor_GetReturnsEmptyString_net46()
         {
             var cookie = new Cookie("SomeName", null);
@@ -250,7 +250,7 @@ public static void Value_PassNullToCtor_GetReturnsEmptyString_net46()
         }
 
         [Fact]
-        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] // Cookie.Value returns null on full framework, empty string on .NETCore
         public static void Value_PassNullToCtor_GetReturnsEmptyString()
         {
             var cookie = new Cookie("SomeName", null);

src/System.Net.Primitives/tests/FunctionalTests/LoggingTest.cs

@@ -12,7 +12,7 @@ namespace System.Net.Primitives.Functional.Tests
     public class LoggingTest : RemoteExecutorTestBase
     {
         [Fact]
-        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "NetEventSource is only part of .NET Core")]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework | TargetFrameworkMonikers.UapAot, "NetEventSource is only part of .NET Core and requires internal Reflection")]
         public void EventSource_ExistsWithCorrectId()
         {
             Type esType = typeof(IPAddress).Assembly.GetType("System.Net.NetEventSource", throwOnError: true, ignoreCase: false);

src/System.Private.Xml/tests/XmlDocument/XmlAttributeCollectionTests/InsertAfterTests.cs

@@ -231,7 +231,7 @@ public void InsertAfterRemovesDupRefAttrAtTheEnd()
         }
 
         [Fact]
-        [SkipOnTargetFramework(TargetFrameworkMonikers.Netcoreapp | TargetFrameworkMonikers.Uap)]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.Netcoreapp | TargetFrameworkMonikers.Uap | TargetFrameworkMonikers.UapAot)] //Fix for this edge case was only made in NetCore
         public void InsertAfterThrowsArgumentOutOfRangeExceptionForDupRefAttrAtTheEnd_OldBehavior()
         {
             const string attributeName = "existingAttr";
@@ -276,7 +276,7 @@ public void InsertAfterReplacesDupRefAttr()
         }
 
         [Fact]
-        [SkipOnTargetFramework(TargetFrameworkMonikers.Netcoreapp | TargetFrameworkMonikers.Uap)]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.Netcoreapp | TargetFrameworkMonikers.Uap | TargetFrameworkMonikers.UapAot)] //Fix for this edge case was only made in NetCore
         public void InsertAfterDoesNotReplaceDupRefAttr_OldBehavior()
         {
             const string attributeName = "existingAttr";

src/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/System.Xml.XmlSchemaSet.Tests.csproj

@@ -40,10 +40,13 @@
     <Compile Include="TC_SchemaSet_ValidationEventHandler.cs" />
     <Compile Include="TC_SchemaSet_XmlNameTable.cs" />
     <Compile Include="TC_SchemaSet_XmlResolver.cs" />
+    <Compile Include="$(CommonTestPath)\System\PlatformDetection.cs">
+      <Link>Common\System\PlatformDetection.cs</Link>
+    </Compile>
     <SupplementalTestData Include="..\TestFiles\**\*.*">
       <Link>TestFiles\%(RecursiveDir)%(Filename)%(Extension)</Link>
       <DestinationDir>TestFiles\%(RecursiveDir)</DestinationDir>
     </SupplementalTestData>
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
+</Project>

src/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Misc.cs

@@ -1068,6 +1068,9 @@ public void Dev10_40561()
             return;
         }
 
+        // Test failure on ILC: Test depends on Xml Serialization and requires reflection on a LOT of types under System.Xml.Schema namespace.
+        // Rd.xml with "<Namespace Name="System.Xml.Schema" Dynamic="Required Public" />" lets this test pass but we should probably be
+        // fixing up XmlSerializer's own rd.xml rather than the test here.
         [Fact]
         public void GetBuiltinSimpleTypeWorksAsEcpected()
         {
@@ -1256,7 +1259,10 @@ private void OnValidationEvent(object sender, ValidationEventArgs e)
                 CError.Compare(exception.SourceObject != null, "SourceObject == null");
                 return;
             }
-            CError.Compare(exception.SourceObject.GetType().ToString(), "MS.Internal.Xml.Cache.XPathDocumentNavigator", "SourceObject.GetType");
+            if (!PlatformDetection.IsNetNative) // Cannot get names of internal framework types
+            {
+                CError.Compare(exception.SourceObject.GetType().ToString(), "MS.Internal.Xml.Cache.XPathDocumentNavigator", "SourceObject.GetType");
+            }
             _output.WriteLine("Exc: " + exception);
         }
 

src/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ExceptionVerifier.cs

@@ -260,16 +260,21 @@ private void CompareMessages()
             // ignore case
             _expectedMessage = _expectedMessage.ToLowerInvariant();
             _actualMessage = _actualMessage.ToLowerInvariant();
-            if (Regex.Match(_actualMessage, _expectedMessage, RegexOptions.Singleline).ToString() != _actualMessage)
+
+
+            if (!PlatformDetection.IsNetNative) // .Net Native toolchain optimizes away Exception messages
             {
-                // Unescape before printing the expected message string
-                _expectedMessage = Regex.Unescape(_expectedMessage);
-                _output.WriteLine("Mismatch in error message");
-                _output.WriteLine("===== Expected Message =====\n" + _expectedMessage);
-                _output.WriteLine("===== Expected Message Length =====\n" + _expectedMessage.Length);
-                _output.WriteLine("===== Actual Message =====\n" + _actualMessage);
-                _output.WriteLine("===== Actual Message Length =====\n" + _actualMessage.Length);
-                throw new VerifyException("Mismatch in error message");
+                if (Regex.Match(_actualMessage, _expectedMessage, RegexOptions.Singleline).ToString() != _actualMessage)
+                {
+                    // Unescape before printing the expected message string
+                    _expectedMessage = Regex.Unescape(_expectedMessage);
+                    _output.WriteLine("Mismatch in error message");
+                    _output.WriteLine("===== Expected Message =====\n" + _expectedMessage);
+                    _output.WriteLine("===== Expected Message Length =====\n" + _expectedMessage.Length);
+                    _output.WriteLine("===== Actual Message =====\n" + _actualMessage);
+                    _output.WriteLine("===== Actual Message Length =====\n" + _actualMessage.Length);
+                    throw new VerifyException("Mismatch in error message");
+                }
             }
         }
 
@@ -396,4 +401,4 @@ public VerifyException(string msg)
             : base(msg)
         { }
     }
-}
+}

src/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests.csproj

@@ -27,10 +27,13 @@
     <Compile Include="ValidatorModule.cs" />
     <Compile Include="XmlTestSettings.cs" />
     <Compile Include="CXmlTestResolver.cs" />
+    <Compile Include="$(CommonTestPath)\System\PlatformDetection.cs">
+      <Link>Common\System\PlatformDetection.cs</Link>
+    </Compile>
     <SupplementalTestData Include="..\TestFiles\**\*.*">
       <Link>TestFiles\%(RecursiveDir)%(Filename)%(Extension)</Link>
       <DestinationDir>TestFiles\%(RecursiveDir)</DestinationDir>
     </SupplementalTestData>
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
+</Project>