From 28115ad4810e6442b6e61195d763748c46996c67 Mon Sep 17 00:00:00 2001
From: Roman Zagorowski <r.zagorowski@samsung.com>
Date: Tue, 19 Mar 2024 14:06:30 +0100
Subject: [PATCH 1/2] LogicalName added for EmbeddedResource

---
 .../Regressions/coreclr/GitHub_22888/test22888resources.csproj | 2 +-
 src/tests/issues.targets                                       | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/tests/Regressions/coreclr/GitHub_22888/test22888resources.csproj b/src/tests/Regressions/coreclr/GitHub_22888/test22888resources.csproj
index ca6163be24fcdd..8db6492ea2e36d 100644
--- a/src/tests/Regressions/coreclr/GitHub_22888/test22888resources.csproj
+++ b/src/tests/Regressions/coreclr/GitHub_22888/test22888resources.csproj
@@ -9,7 +9,7 @@
     <Compile Include="test22888resources.cs" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="test22888.resx">
+    <EmbeddedResource Include="test22888.resx" LogicalName="test22888resources.test22888.resources">
       <Generator>ResXFileCodeGenerator</Generator>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/src/tests/issues.targets b/src/tests/issues.targets
index 01b2f9aab129d4..a4f0cbfec3ab75 100644
--- a/src/tests/issues.targets
+++ b/src/tests/issues.targets
@@ -5,9 +5,6 @@
         <ExcludeList Include="$(XunitTestBinBase)/readytorun/DynamicMethodGCStress/DynamicMethodGCStress/*">
             <Issue>timeout</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/Regressions/coreclr/GitHub_22888/test22888/*">
-            <Issue>https://github.com/dotnet/runtime/issues/13703</Issue>
-        </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)/Interop/PInvoke/Int128/Int128Test/*">
             <Issue>https://github.com/dotnet/runtime/issues/74209</Issue>
         </ExcludeList>

From 42315be210ee6fd0738ed1be02178370928a15b2 Mon Sep 17 00:00:00 2001
From: Roman Zagorowski <r.zagorowski@samsung.com>
Date: Wed, 20 Mar 2024 18:38:35 +0100
Subject: [PATCH 2/2] Disable test22888 on Mono

Mono does not support collectible assemblies that this test is exercising.
---
 src/tests/issues.targets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/tests/issues.targets b/src/tests/issues.targets
index a4f0cbfec3ab75..33a2c52f4dfb8d 100644
--- a/src/tests/issues.targets
+++ b/src/tests/issues.targets
@@ -1409,6 +1409,9 @@
         <ExcludeList Include="$(XunitTestBinBase)/Interop/ICustomMarshaler/ConflictingNames/MultipleALCs/**">
             <Issue>https://github.com/dotnet/runtime/issues/34072</Issue>
         </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/Regressions/coreclr/GitHub_22888/test22888/*">
+            <Issue>https://github.com/dotnet/runtime/issues/34072</Issue>
+        </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)/Interop/ICustomMarshaler/Primitives/ICustomMarshaler_TargetUnix/**">
             <Issue>https://github.com/dotnet/runtime/issues/34374</Issue>
         </ExcludeList>