Merge CoreMangLib, Exceptions and Interop folders (#91901)

dotnet · Oct 12, 2023 · 5280006 · 5280006
1 parent d6fa6bb
commit 5280006
Show file tree

Hide file tree

Showing 371 changed files with 1,684 additions and 1,019 deletions.
diff --git a/src/tests/CoreMangLib/CoreMangLib.csproj b/src/tests/CoreMangLib/CoreMangLib.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <MergedWrapperProjectReference Include="*/**/*.??proj" />
+  </ItemGroup>
+
+  <Import Project="$(TestSourceDir)MergedTestRunner.targets" />
+</Project>
diff --git a/src/tests/CoreMangLib/Directory.Build.props b/src/tests/CoreMangLib/Directory.Build.props
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Merged.props', $(MSBuildThisFileDirectory)..))" />
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', $(MSBuildThisFileDirectory)..))" />
+
+  <PropertyGroup>
+    <RunAnalyzers>true</RunAnalyzers>
+    <NoWarn>$(NoWarn);xUnit1013</NoWarn>
+    <EnableNETAnalyzers>false</EnableNETAnalyzers>
+  </PropertyGroup>
+</Project>
diff --git a/src/tests/CoreMangLib/system/buffer/ASURT_99893.csproj b/src/tests/CoreMangLib/system/buffer/ASURT_99893.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>

diff --git a/src/tests/CoreMangLib/system/buffer/asurt_99893.cs b/src/tests/CoreMangLib/system/buffer/asurt_99893.cs
@@ -5,12 +5,14 @@
 // and thus one could define a new System.Int32 (as below) and use that instead.
 
 using System;
+using Xunit;
 
 namespace System
 {
-    class ASURT_99893
+    public class ASURT_99893
     {
-	static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	    Boolean pass=true;
 #pragma warning disable 0436

diff --git a/src/tests/CoreMangLib/system/delegate/VSD/OpenDelegate.cs b/src/tests/CoreMangLib/system/delegate/VSD/OpenDelegate.cs
@@ -3,8 +3,9 @@
 using System;
 using System.Reflection;
 using System.Collections.Generic;
+using Xunit;
 
-class Program
+public class Program
 {
     public class ClassA
     {
@@ -28,7 +29,8 @@ public static MethodInfo GetMethod(Type t, string method)
         }
         return result;
     }
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         Type typeTestClass = typeof(ClassA);
         ClassA TestClass = (ClassA)Activator.CreateInstance(typeTestClass);

diff --git a/src/tests/CoreMangLib/system/delegate/VSD/OpenDelegate.csproj b/src/tests/CoreMangLib/system/delegate/VSD/OpenDelegate.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>

diff --git a/src/tests/CoreMangLib/system/delegate/delegate/DelegateCombine1.csproj b/src/tests/CoreMangLib/system/delegate/delegate/DelegateCombine1.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>

diff --git a/src/tests/CoreMangLib/system/delegate/delegate/DelegateCombineImpl.csproj b/src/tests/CoreMangLib/system/delegate/delegate/DelegateCombineImpl.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>

diff --git a/src/tests/CoreMangLib/system/delegate/delegate/DelegateEquals1.csproj b/src/tests/CoreMangLib/system/delegate/delegate/DelegateEquals1.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>

diff --git a/src/tests/CoreMangLib/system/delegate/delegate/DelegateGetHashCode1.csproj b/src/tests/CoreMangLib/system/delegate/delegate/DelegateGetHashCode1.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>

diff --git a/src/tests/CoreMangLib/system/delegate/delegate/DelegateGetInvocationList1.csproj b/src/tests/CoreMangLib/system/delegate/delegate/DelegateGetInvocationList1.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>

diff --git a/src/tests/CoreMangLib/system/delegate/delegate/DelegateRemove.csproj b/src/tests/CoreMangLib/system/delegate/delegate/DelegateRemove.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>

diff --git a/src/tests/CoreMangLib/system/delegate/delegate/delegateRemoveImpl.csproj b/src/tests/CoreMangLib/system/delegate/delegate/delegateRemoveImpl.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>

diff --git a/src/tests/CoreMangLib/system/delegate/delegate/delegatecombine1.cs b/src/tests/CoreMangLib/system/delegate/delegate/delegatecombine1.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Globalization;
 using System.Collections;
+using Xunit;
 //create for delegate combine(delegate a,delegate b) testing
 namespace DelegateTest
 {
@@ -26,7 +27,8 @@ enum identify_null
         booldelegate starkWork;
         booldelegate working;
         voiddelegate completeWork;
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             DelegateCombine1 delegateCombine1 = new DelegateCombine1();
 

diff --git a/src/tests/CoreMangLib/system/delegate/delegate/delegatecombineimpl.cs b/src/tests/CoreMangLib/system/delegate/delegate/delegatecombineimpl.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Globalization;
 using System.Collections;
+using Xunit;
 //create for delegate combine(delegate a,delegate b) testing
 namespace DelegateTest
 {
@@ -25,7 +26,8 @@ enum identify_null
         }
         booldelegate starkWork;
         booldelegate working;
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             DelegateCombineImpl delegateCombineImpl = new DelegateCombineImpl();
 

diff --git a/src/tests/CoreMangLib/system/delegate/delegate/delegateequals1.cs b/src/tests/CoreMangLib/system/delegate/delegate/delegateequals1.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Globalization;
+using Xunit;
 //test case for delegate Equals method.
 namespace DelegateTest
 {
@@ -12,7 +13,8 @@ public class DelegateEquals
 
         object starkWork;
 
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             DelegateEquals DelegateEquals = new DelegateEquals();
 

diff --git a/src/tests/CoreMangLib/system/delegate/delegate/delegategethashcode1.cs b/src/tests/CoreMangLib/system/delegate/delegate/delegategethashcode1.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Globalization;
+using Xunit;
 //test case for delegate GetHashCode method.
 namespace DelegateTest
 {
@@ -14,7 +15,8 @@ public class DelegateGetHashCode
     {
 
 
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             DelegateGetHashCode DelegateGetHashCode = new DelegateGetHashCode();
 

diff --git a/src/tests/CoreMangLib/system/delegate/delegate/delegategetinvocationlist1.cs b/src/tests/CoreMangLib/system/delegate/delegate/delegategetinvocationlist1.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Globalization;
+using Xunit;
 //test case for delegate GetInvocationList method.
 namespace DelegateTest
 {
@@ -12,7 +13,8 @@ public class DelegateGetInvocationList
 
         booldelegate starkWork;
 
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             DelegateGetInvocationList delegateGetInvocationList = new DelegateGetInvocationList();
 

diff --git a/src/tests/CoreMangLib/system/delegate/delegate/delegateremove.cs b/src/tests/CoreMangLib/system/delegate/delegate/delegateremove.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Globalization;
+using Xunit;
 //test case for delegate Remove(System.Delegate,System.Delegate) method.
 namespace DelegateTest
 {
@@ -13,7 +14,8 @@ public class DelegateRemove
 
         booldelegate starkWork;
 
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             DelegateRemove delegateRemoveImpl = new DelegateRemove();
 

diff --git a/src/tests/CoreMangLib/system/delegate/delegate/delegateremoveimpl.cs b/src/tests/CoreMangLib/system/delegate/delegate/delegateremoveimpl.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Globalization;
+using Xunit;
 //test case for delegate RemoveImpl(System.Delegate) method.
 namespace DelegateTest
 {
@@ -12,7 +13,8 @@ public class DelegateRemoveImpl
 
         booldelegate starkWork;
 
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             DelegateRemoveImpl delegateRemoveImpl = new DelegateRemoveImpl();
 

diff --git a/src/tests/CoreMangLib/system/delegate/generics/NG_Standard.csproj b/src/tests/CoreMangLib/system/delegate/generics/NG_Standard.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>

diff --git a/src/tests/CoreMangLib/system/delegate/generics/NegativeGenerics.csproj b/src/tests/CoreMangLib/system/delegate/generics/NegativeGenerics.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>

diff --git a/src/tests/CoreMangLib/system/delegate/generics/negativegenerics.cs b/src/tests/CoreMangLib/system/delegate/generics/negativegenerics.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 //Covers various negative binding cases for delegates and generics...
 using System;
+using Xunit;
 
 
 //Define some classes and method for use in our scenarios...
@@ -18,10 +19,11 @@ public override void GMeth<U>(){}
 delegate void Open(B<int> b);
 delegate void GClosed<T>();
 
-class Test_negativegenerics{
+public class Test_negativegenerics{
 	public static int retVal=100;
 
-	public static int Main(){
+	[Fact]
+	public static int TestEntryPoint(){
 		//Try to create an open-instance delegate to a virtual generic method (@TODO - Need early bound case here too)
 		//Try to create a generic delegate of a non-instantiated type
 		//Try to create a delegate over a non-instantiated target type

diff --git a/src/tests/CoreMangLib/system/delegate/generics/ng_standard.cs b/src/tests/CoreMangLib/system/delegate/generics/ng_standard.cs
@@ -1,9 +1,11 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
+using Xunit;
 
-class Test_ng_standard{
-	public static int Main(){
+public class Test_ng_standard{
+	[Fact]
+	public static void TestEntryPoint(){
 		Console.WriteLine("Test creation/invocation of non-generic closed instance or open static delegates over various generic methods");
 
 		GenericClass<EQStruct<long>> refr = new GenericClass<EQStruct<long>>();
@@ -102,8 +104,5 @@ public static int Main(){
 		d9(50,new EQClass<long>(50));
 		d9 = new dc7(GenericStruct<EQStruct<long>>.SM9<EQClass<long>>);
 		d9(50,new EQClass<long>(50));		
-
-		Console.WriteLine("Done - Passed");
-		return 100;
 	}
 }
diff --git a/src/tests/CoreMangLib/system/delegate/miscellaneous/ClosedStatic.cs b/src/tests/CoreMangLib/system/delegate/miscellaneous/ClosedStatic.cs
@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Reflection;
+using Xunit;
 
-class Program
+public class Program
 {
     public int scale;
 
@@ -15,7 +16,9 @@ public static decimal getfunc(Program prog,int constituent)
     {
         return new decimal(constituent/prog.scale);
     }
-    static int Main()
+
+    [Fact]
+    public static int TestEntryPoint()
     {
         int result = -1;
 

diff --git a/src/tests/CoreMangLib/system/delegate/miscellaneous/ClosedStatic.csproj b/src/tests/CoreMangLib/system/delegate/miscellaneous/ClosedStatic.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>

diff --git a/src/tests/CoreMangLib/system/delegate/miscellaneous/Co6010DelegateEqualsTwo.csproj b/src/tests/CoreMangLib/system/delegate/miscellaneous/Co6010DelegateEqualsTwo.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>

diff --git a/src/tests/CoreMangLib/system/delegate/miscellaneous/Co6031GetHashCode.csproj b/src/tests/CoreMangLib/system/delegate/miscellaneous/Co6031GetHashCode.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>

diff --git a/src/tests/CoreMangLib/system/delegate/miscellaneous/co6010delegateequalstwo.cs b/src/tests/CoreMangLib/system/delegate/miscellaneous/co6010delegateequalstwo.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Diagnostics;
+using Xunit;
 
 delegate void Void_VoidDelegate();
 public class TestClass
@@ -20,7 +21,8 @@ static Delegate DelegateCombine(params Delegate[] delegates) {
 		return a;
 	}
 
-	public static int Main() {
+	[Fact]
+	public static int TestEntryPoint() {
 		int iErrorCount = 0;
 		int iTestCount = 0;
 		{