Update IL tools (#39049)

* Update IL tools

Enable calling convention tests with updated IL tooling.

* Disable new calling convention tests on mono

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 97502a6..dc4ab56 100644 (file)
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -162,13 +162,13 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>cf64918877d98577363bb40d5eafac52beb80a79</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.0-preview.7.20316.4">
+    <Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.0-preview.8.20359.4">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>382dce3b4d205dd00f43564727d838404141e5e6</Sha>
+      <Sha>bdfbf0cf85878673a80d7822cc11bde5c9fda30c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.IL" Version="5.0.0-preview.7.20316.4">
+    <Dependency Name="Microsoft.NET.Sdk.IL" Version="5.0.0-preview.8.20359.4">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>382dce3b4d205dd00f43564727d838404141e5e6</Sha>
+      <Sha>bdfbf0cf85878673a80d7822cc11bde5c9fda30c</Sha>
     </Dependency>
     <Dependency Name="System.Text.Json" Version="5.0.0-preview.4.20202.18">
       <Uri>https://github.com/dotnet/runtime</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
index 246794d..098d4b7 100644 (file)
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -67,7 +67,7 @@
     <MicrosoftNETCoreDotNetHostPolicyVersion>5.0.0-preview.4.20202.18</MicrosoftNETCoreDotNetHostPolicyVersion>
     <MicrosoftExtensionsDependencyModelVersion>3.1.0</MicrosoftExtensionsDependencyModelVersion>
     <!-- CoreClr dependencies -->
-    <MicrosoftNETCoreILAsmVersion>5.0.0-preview.7.20316.4</MicrosoftNETCoreILAsmVersion>
+    <MicrosoftNETCoreILAsmVersion>5.0.0-preview.8.20359.4</MicrosoftNETCoreILAsmVersion>
     <!-- Libraries dependencies -->
     <SystemTextJsonVersion>5.0.0-preview.4.20202.18</SystemTextJsonVersion>
     <runtimenativeSystemIOPortsVersion>5.0.0-alpha.1.19563.3</runtimenativeSystemIOPortsVersion>

diff --git a/global.json b/global.json
index 8016db1..2cbc796 100644 (file)
--- a/global.json
+++ b/global.json
@@ -17,7 +17,7 @@
     "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20330.3",
     "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20330.3",
     "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
-    "Microsoft.NET.Sdk.IL": "5.0.0-preview.7.20316.4",
+    "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4",
     "Microsoft.Build.NoTargets": "1.0.53",
     "Microsoft.Build.Traversal": "2.0.34"
   }

diff --git a/src/coreclr/tests/issues.targets b/src/coreclr/tests/issues.targets
index 0962c1b..f05ee47 100644 (file)
--- a/src/coreclr/tests/issues.targets
+++ b/src/coreclr/tests/issues.targets
@@ -993,6 +993,9 @@
         <ExcludeList Include="$(XunitTestBinBase)/baseservices/exceptions/stackoverflow/stackoverflowtester/**">
             <Issue>needs triage</Issue>
         </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/callconvs/TestCallingConventions/**">
+            <Issue>needs triage</Issue>
+        </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)/GC/API/GC/Collect1/**">
             <Issue>needs triage</Issue>
         </ExcludeList>
@@ -1847,43 +1850,42 @@
         <ExcludeList Include = "$(XunitTestBinBase)tracing/eventsource/eventsourcetrace/eventsourcetrace/**">
             <Issue>needs triage</Issue>
         </ExcludeList>
-
-       <ExcludeList Include = "$(XunitTestBinBase)/JIT/HardwareIntrinsics/X86/Ssse3/Ssse3_ro/**">
-           <Issue>needs triage</Issue>
-       </ExcludeList>
-       <ExcludeList Include = "$(XunitTestBinBase)/JIT/Stress/ABI/pinvokes_d/**">
-           <Issue>needs triage</Issue>
-       </ExcludeList>
-       <ExcludeList Include = "$(XunitTestBinBase)/JIT/Stress/ABI/pinvokes_do/**">
-           <Issue>needs triage</Issue>
-       </ExcludeList>
-       <ExcludeList Include = "$(XunitTestBinBase)/JIT/Stress/ABI/stubs_do/**">
-           <Issue>needs triage</Issue>
-       </ExcludeList>
-       <ExcludeList Include = "$(XunitTestBinBase)/JIT/Stress/ABI/tailcalls_d/**">
-           <Issue>needs triage</Issue>
-       </ExcludeList>
-       <ExcludeList Include = "$(XunitTestBinBase)/JIT/Stress/ABI/tailcalls_do/**">
-           <Issue>needs triage</Issue>
-       </ExcludeList>
-       <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventpipe/providervalidation/providervalidation/**">
-           <Issue>needs triage</Issue>
-       </ExcludeList>
-       <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventpipe/rundownvalidation/rundownvalidation/**">
-           <Issue>needs triage</Issue>
-       </ExcludeList>
-       <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventpipe/buffersize/buffersize/**">
-           <Issue>needs triage</Issue>
-       </ExcludeList>
-       <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventpipe/reverse/reverse/**">
-           <Issue>needs triage</Issue>
-       </ExcludeList>
-       <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventpipe/eventsourceerror/eventsourceerror/**">
-           <Issue>needs triage</Issue>
-       </ExcludeList>
-       <ExcludeList Include = "$(XunitTestBinBase)tracing/eventsource/eventsourcetrace/eventsourcetrace/**">
-           <Issue>needs triage</Issue>
-       </ExcludeList>
+        <ExcludeList Include = "$(XunitTestBinBase)/JIT/HardwareIntrinsics/X86/Ssse3/Ssse3_ro/**">
+            <Issue>needs triage</Issue>
+        </ExcludeList>
+        <ExcludeList Include = "$(XunitTestBinBase)/JIT/Stress/ABI/pinvokes_d/**">
+            <Issue>needs triage</Issue>
+        </ExcludeList>
+        <ExcludeList Include = "$(XunitTestBinBase)/JIT/Stress/ABI/pinvokes_do/**">
+            <Issue>needs triage</Issue>
+        </ExcludeList>
+        <ExcludeList Include = "$(XunitTestBinBase)/JIT/Stress/ABI/stubs_do/**">
+            <Issue>needs triage</Issue>
+        </ExcludeList>
+        <ExcludeList Include = "$(XunitTestBinBase)/JIT/Stress/ABI/tailcalls_d/**">
+            <Issue>needs triage</Issue>
+        </ExcludeList>
+        <ExcludeList Include = "$(XunitTestBinBase)/JIT/Stress/ABI/tailcalls_do/**">
+            <Issue>needs triage</Issue>
+        </ExcludeList>
+        <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventpipe/providervalidation/providervalidation/**">
+            <Issue>needs triage</Issue>
+        </ExcludeList>
+        <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventpipe/rundownvalidation/rundownvalidation/**">
+            <Issue>needs triage</Issue>
+        </ExcludeList>
+        <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventpipe/buffersize/buffersize/**">
+            <Issue>needs triage</Issue>
+        </ExcludeList>
+        <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventpipe/reverse/reverse/**">
+            <Issue>needs triage</Issue>
+        </ExcludeList>
+        <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventpipe/eventsourceerror/eventsourceerror/**">
+            <Issue>needs triage</Issue>
+        </ExcludeList>
+        <ExcludeList Include = "$(XunitTestBinBase)tracing/eventsource/eventsourcetrace/eventsourcetrace/**">
+            <Issue>needs triage</Issue>
+        </ExcludeList>
 
         <!-- The following only fail in the mono interpreter, but we don't have a way to exclude based on scenario yet -->
 

diff --git a/src/tests/baseservices/callconvs/CallFunctionPointers.ilproj b/src/tests/baseservices/callconvs/CallFunctionPointers.ilproj
index 726b6cd..b2aad8a 100644 (file)
--- a/src/tests/baseservices/callconvs/CallFunctionPointers.ilproj
+++ b/src/tests/baseservices/callconvs/CallFunctionPointers.ilproj
@@ -1,9 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
     <OutputType>library</OutputType>
-
-    <!-- Disable test until we get new IL build tools -->
-    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CallFunctionPointers.il" />

diff --git a/src/tests/baseservices/callconvs/NativeFunctions.cpp b/src/tests/baseservices/callconvs/NativeFunctions.cpp
index ea55fef..3f05e0a 100644 (file)
--- a/src/tests/baseservices/callconvs/NativeFunctions.cpp
+++ b/src/tests/baseservices/callconvs/NativeFunctions.cpp
@@ -11,6 +11,9 @@ namespace
     }
 }
 
+#if defined HOST_X86
+#pragma comment(linker, "/export:DoubleInt=_DoubleInt@4")
+#endif
 extern "C" DLL_EXPORT int DoubleInt(int a)
 {
     return DoubleIntImpl(a);
@@ -21,6 +24,9 @@ extern "C" DLL_EXPORT int __cdecl DoubleIntCdecl(int a)
     return DoubleIntImpl(a);
 }
 
+#if defined HOST_X86
+#pragma comment(linker, "/export:DoubleIntStdcall=_DoubleIntStdcall@4")
+#endif
 extern "C" DLL_EXPORT int __stdcall DoubleIntStdcall(int a)
 {
     return DoubleIntImpl(a);
@@ -36,6 +42,9 @@ namespace
     }
 }
 
+#if defined HOST_X86
+#pragma comment(linker, "/export:ToUpper=_ToUpper@4")
+#endif
 extern "C" DLL_EXPORT WCHAR ToUpper(WCHAR a)
 {
     return ToUpperImpl(a);
@@ -46,6 +55,9 @@ extern "C" DLL_EXPORT WCHAR __cdecl ToUpperCdecl(WCHAR a)
     return ToUpperImpl(a);
 }
 
+#if defined HOST_X86
+#pragma comment(linker, "/export:ToUpperStdcall=_ToUpperStdcall@4")
+#endif
 extern "C" DLL_EXPORT WCHAR __stdcall ToUpperStdcall(WCHAR a)
 {
     return ToUpperImpl(a);

diff --git a/src/tests/baseservices/callconvs/TestCallingConventions.csproj b/src/tests/baseservices/callconvs/TestCallingConventions.csproj
index 6daa76b..8bf9e63 100644 (file)
--- a/src/tests/baseservices/callconvs/TestCallingConventions.csproj
+++ b/src/tests/baseservices/callconvs/TestCallingConventions.csproj
@@ -2,9 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-
-    <!-- Disable test until we get new IL build tools -->
-    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="TestCallingConventions.cs" />