data/raw/sample/diffs/0003313fc63699ca6458caea66add9d4ccf0336b.diff

diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml
index 1f41fae7575455..76452e320e54c8 100644
--- a/eng/pipelines/common/templates/runtimes/run-test-job.yml
+++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml
@@ -64,9 +64,10 @@ jobs:
       - ${{ if notIn(parameters.testGroup, 'innerloop', 'clrinterpreter') }}:
         - '${{ parameters.runtimeFlavor }}_common_test_build_p1_AnyOS_AnyCPU_${{parameters.buildConfig }}'
       - ${{ if ne(parameters.stagedBuild, true) }}:
-        - ${{ if or( eq(parameters.runtimeVariant, 'minijit'), eq(parameters.runtimeVariant, 'monointerpreter'))  }}:
+        - ${{ if or( eq(parameters.runtimeVariant, 'minijit'), eq(parameters.runtimeVariant, 'monointerpreter'), eq(parameters.runtimeVariant, 'llvmaot'), eq(parameters.runtimeVariant, 'llvmfullaot'))  }}:
           # This is needed for creating a CORE_ROOT in the current design.
           - ${{ format('coreclr_{0}_product_build_{1}{2}_{3}_{4}', '', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
+        - ${{ if or( eq(parameters.runtimeVariant, 'minijit'), eq(parameters.runtimeVariant, 'monointerpreter')) }} :
           # minijit and mono interpreter runtimevariants do not require any special build of the runtime
           - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', parameters.runtimeFlavor, '', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
         - ${{ if not(or(eq(parameters.runtimeVariant, 'minijit'), eq(parameters.runtimeVariant, 'monointerpreter')))  }}:
diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index d6a4d13e979e40..53f3274b9e45d0 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -213,6 +213,8 @@
     </ItemGroup>
   </Target>
 
+  <Import Project="$(MSBuildThisFileDirectory)workloads-testing.targets" />
+
   <Target Name="PublishTestAsSelfContained"
           Condition="'$(IsCrossTargetingBuild)' != 'true'"
           AfterTargets="Build"
diff --git a/src/libraries/workloads-testing.targets b/eng/testing/workloads-testing.targets
similarity index 92%
rename from src/libraries/workloads-testing.targets
rename to eng/testing/workloads-testing.targets
index 6a8fa5055bbbb3..712a29a717f5cf 100644
--- a/src/libraries/workloads-testing.targets
+++ b/eng/testing/workloads-testing.targets
@@ -1,4 +1,10 @@
 <Project>
+
+  <PropertyGroup Condition="'$(TestUsingWorkloads)' == 'true'">
+    <!-- for non-ci builds, we install the sdk when tests are run -->
+    <InstallWorkloadForTesting Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(ArchiveTests)' == 'true'">true</InstallWorkloadForTesting>
+  </PropertyGroup>
+
   <Target Name="ProvisionSdkForWorkloadTesting"
           DependsOnTargets="_ProvisionSdkWithNoWorkload"
           Condition="!Exists($(SdkWithNoWorkloadStampPath)) or !Exists($(SdkWithWorkloadStampPath))">
@@ -88,8 +94,10 @@
     </ItemGroup>
 
     <PropertyGroup>
+      <_PackageVersion>$(PackageVersion)</_PackageVersion>
+      <_PackageVersion Condition="'$(StabilizePackageVersion)' == 'true'">$(ProductVersion)</_PackageVersion>
       <!-- Eg. Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.browser-wasm.6.0.0-dev.nupkg -->
-      <_AOTCrossNuGetPath>$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.AOT.$(NETCoreSdkRuntimeIdentifier).Cross.$(RuntimeIdentifier).$(PackageVersion).nupkg</_AOTCrossNuGetPath>
+      <_AOTCrossNuGetPath>$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.AOT.$(NETCoreSdkRuntimeIdentifier).Cross.$(RuntimeIdentifier).$(_PackageVersion).nupkg</_AOTCrossNuGetPath>
     </PropertyGroup>
 
     <Error Text="Could not find cross compiler nupkg at $(_AOTCrossNuGetPath). Found packages: @(_BuiltNuGets)"
diff --git a/src/libraries/Common/tests/Tests/System/StringTests.cs b/src/libraries/Common/tests/Tests/System/StringTests.cs
index 08a2f6a3509b5d..c9c617ca640db9 100644
--- a/src/libraries/Common/tests/Tests/System/StringTests.cs
+++ b/src/libraries/Common/tests/Tests/System/StringTests.cs
@@ -2918,6 +2918,7 @@ public static void IndexOf_AllSubstrings(string s, string value, int startIndex,
         }
 
         [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotInvariantGlobalization))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/60568", TestPlatforms.Android)]
         public static void IndexOf_TurkishI_TurkishCulture()
         {
             using (new ThreadCultureChange("tr-TR"))
@@ -3001,6 +3002,7 @@ public static void IndexOf_TurkishI_EnglishUSCulture()
         }
 
         [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotInvariantGlobalization))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/60568", TestPlatforms.Android)]
         public static void IndexOf_HungarianDoubleCompression_HungarianCulture()
         {
             using (new ThreadCultureChange("hu-HU"))
@@ -5123,20 +5125,24 @@ public static void ToLower_String(string s, string expected)
 
         private static IEnumerable<object[]> ToLower_Culture_TestData()
         {
-            var tuples = new[]
+            List<Tuple<char, char, CultureInfo>> tuples = new List<Tuple<char, char, CultureInfo>>();
+
+            // Android has different results w/ tr-TR
+            // See https://github.com/dotnet/runtime/issues/60568
+            if (!PlatformDetection.IsAndroid)
             {
-                Tuple.Create('\u0049', '\u0131', new CultureInfo("tr-TR")),
-                Tuple.Create('\u0130', '\u0069', new CultureInfo("tr-TR")),
-                Tuple.Create('\u0131', '\u0131', new CultureInfo("tr-TR")),
+                tuples.Add(Tuple.Create('\u0049', '\u0131', new CultureInfo("tr-TR")));
+                tuples.Add(Tuple.Create('\u0130', '\u0069', new CultureInfo("tr-TR")));
+                tuples.Add(Tuple.Create('\u0131', '\u0131', new CultureInfo("tr-TR")));
+            }
 
-                Tuple.Create('\u0049', '\u0069', new CultureInfo("en-US")),
-                Tuple.Create('\u0130', '\u0069', new CultureInfo("en-US")),
-                Tuple.Create('\u0131', '\u0131', new CultureInfo("en-US")),
+            tuples.Add(Tuple.Create('\u0049', '\u0069', new CultureInfo("en-US")));
+            tuples.Add(Tuple.Create('\u0130', '\u0069', new CultureInfo("en-US")));
+            tuples.Add(Tuple.Create('\u0131', '\u0131', new CultureInfo("en-US")));
 
-                Tuple.Create('\u0049', '\u0069', CultureInfo.InvariantCulture),
-                Tuple.Create('\u0130', '\u0130', CultureInfo.InvariantCulture),
-                Tuple.Create('\u0131', '\u0131', CultureInfo.InvariantCulture),
-            };
+            tuples.Add(Tuple.Create('\u0049', '\u0069', CultureInfo.InvariantCulture));
+            tuples.Add(Tuple.Create('\u0130', '\u0130', CultureInfo.InvariantCulture));
+            tuples.Add(Tuple.Create('\u0131', '\u0131', CultureInfo.InvariantCulture));
 
             foreach (Tuple<char, char, CultureInfo> tuple in tuples)
             {
@@ -5610,9 +5616,14 @@ public static void MakeSureNoToUpperChecksGoOutOfRange()
 
         public static IEnumerable<object[]> ToUpper_Culture_TestData()
         {
-            yield return new object[] { "h\u0069 world", "H\u0130 WORLD", new CultureInfo("tr-TR") };
-            yield return new object[] { "h\u0130 world", "H\u0130 WORLD", new CultureInfo("tr-TR") };
-            yield return new object[] { "h\u0131 world", "H\u0049 WORLD", new CultureInfo("tr-TR") };
+            // Android has different results w/ tr-TR
+            // See https://github.com/dotnet/runtime/issues/60568
+            if (!PlatformDetection.IsAndroid)
+            {
+                yield return new object[] { "h\u0069 world", "H\u0130 WORLD", new CultureInfo("tr-TR") };
+                yield return new object[] { "h\u0130 world", "H\u0130 WORLD", new CultureInfo("tr-TR") };
+                yield return new object[] { "h\u0131 world", "H\u0049 WORLD", new CultureInfo("tr-TR") };
+            }
 
             yield return new object[] { "h\u0069 world", "H\u0049 WORLD", new CultureInfo("en-US") };
             yield return new object[] { "h\u0130 world", "H\u0130 WORLD", new CultureInfo("en-US") };
@@ -5683,6 +5694,7 @@ public static IEnumerable<object[]> ToUpper_TurkishI_TurkishCulture_MemberData()
 
         [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotInvariantGlobalization))]
         [MemberData(nameof(ToUpper_TurkishI_TurkishCulture_MemberData))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/60568", TestPlatforms.Android)]
         public static void ToUpper_TurkishI_TurkishCulture(string s, string expected)
         {
             using (new ThreadCultureChange("tr-TR"))
@@ -6774,7 +6786,9 @@ public static IEnumerable<object[]> CompareTest_TestData()
             yield return new object[] { "",                 null,         "en-us",    true,         1  };
             yield return new object[] { "",                 null,         null,       true,         1  };
 
-            if (PlatformDetection.IsNotInvariantGlobalization)
+            // Android has different results w/ tr-TR
+            // See https://github.com/dotnet/runtime/issues/60568
+            if (PlatformDetection.IsNotInvariantGlobalization && !PlatformDetection.IsAndroid)
             {
                 yield return new object[] { "latin i",         "Latin I",     "tr-TR",    false,        1  };
                 yield return new object[] { "latin i",         "Latin I",     "tr-TR",    true,         1  };
@@ -6794,8 +6808,13 @@ public static IEnumerable<object[]> UpperLowerCasing_TestData()
 
             if (PlatformDetection.IsNotInvariantGlobalization)
             {
-                yield return new object[] { "turky \u0131",     "TURKY I",      "tr-TR" };
-                yield return new object[] { "turky i",          "TURKY \u0130", "tr-TR" };
+                // Android has different results w/ tr-TR
+                // See https://github.com/dotnet/runtime/issues/60568
+                if (!PlatformDetection.IsAndroid)
+                {
+                    yield return new object[] { "turky \u0131",     "TURKY I",      "tr-TR" };
+                    yield return new object[] { "turky i",          "TURKY \u0130", "tr-TR" };
+                }
                 yield return new object[] { "\ud801\udc29",     PlatformDetection.IsWindows7 ? "\ud801\udc29" : "\ud801\udc01", "en-US" };
             }
         }
@@ -6810,7 +6829,9 @@ public static IEnumerable<object[]> StartEndWith_TestData()
             yield return new object[] { "ABcd",                  "ab",      "CD",   "en-US",    false,       false  };
             yield return new object[] { "abcd",                  "AB",      "CD",   "en-US",    true,        true   };
 
-            if (PlatformDetection.IsNotInvariantGlobalization)
+            // Android has different results w/ tr-TR
+            // See https://github.com/dotnet/runtime/issues/60568
+            if (PlatformDetection.IsNotInvariantGlobalization && !PlatformDetection.IsAndroid)
             {
                 yield return new object[] { "i latin i",             "I Latin", "I",    "tr-TR",    false,       false  };
                 yield return new object[] { "i latin i",             "I Latin", "I",    "tr-TR",    true,        false  };
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index 29bd80118ee7d7..362a93ebef916d 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -7,11 +7,6 @@
     <StrongNameKeyId Condition="'$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true'">$(TestStrongNameKeyId)</StrongNameKeyId>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TestUsingWorkloads)' == 'true'">
-    <!-- for non-ci builds, we install the sdk when tests are run -->
-    <InstallWorkloadForTesting Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(ArchiveTests)' == 'true'">true</InstallWorkloadForTesting>
-  </PropertyGroup>
-
   <!-- resources.targets need to be imported before the Arcade SDK. -->
   <Import Project="$(RepositoryEngineeringDir)resources.targets" />
   <Import Project="..\..\Directory.Build.targets" />
@@ -272,6 +267,4 @@
     <Error Condition="'%(_AnalyzerPackFile.TargetFramework)' != 'netstandard2.0'"
            Text="Analyzers must only target netstandard2.0 since they run in the compiler which targets netstandard2.0. The following files were found to target '%(_AnalyzerPackFile.TargetFramework)': @(_AnalyzerPackFile)" />
   </Target>
-
-  <Import Project="$(MSBuildThisFileDirectory)workloads-testing.targets" />
 </Project>
diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/XmlWriterTraceListenerTests.cs b/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/XmlWriterTraceListenerTests.cs
index 418e7b04d952f0..d71818e9fd097a 100644
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/XmlWriterTraceListenerTests.cs
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/XmlWriterTraceListenerTests.cs
@@ -160,7 +160,6 @@ public void ListenerWithFilter()
         [InlineData("<Escaped Message>", "&lt;Escaped Message&gt;")]
         [InlineData("&\"\'", "&amp;\"\'")]
         [InlineData("Hello\n\r", "Hello\n\r")]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/50925", TestPlatforms.Android)]
         public void WriteTest(string message, string expectedXml)
         {
             string file = GetTestFilePath();
@@ -187,7 +186,6 @@ public void WriteTest(string message, string expectedXml)
         [Theory]
         [InlineData("Fail:", null)]
         [InlineData("Fail:", "the process failed when running")]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/50925", TestPlatforms.Android)]
         public void FailTest(string message, string detailMessage)
         {
             string file = GetTestFilePath();
diff --git a/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/PipeReader.cs b/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/PipeReader.cs
index 52a5a3caff92bb..5c1beb95c6b9a6 100644
--- a/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/PipeReader.cs
+++ b/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/PipeReader.cs
@@ -15,7 +15,15 @@ public abstract partial class PipeReader
         /// <summary>Attempts to synchronously read data from the <see cref="System.IO.Pipelines.PipeReader" />.</summary>
         /// <param name="result">When this method returns <see langword="true" />, this value is set to a <see cref="System.IO.Pipelines.ReadResult" /> instance that represents the result of the read call; otherwise, this value is set to <see langword="default" />.</param>
         /// <returns><see langword="true" /> if data was available, or if the call was canceled or the writer was completed; otherwise, <see langword="false" />.</returns>
-        /// <remarks>If the pipe returns <see langword="false" />, there is no need to call <see cref="System.IO.Pipelines.PipeReader.AdvanceTo(System.SequencePosition,System.SequencePosition)" />.</remarks>
+        /// <remarks><format type="text/markdown"><![CDATA[
+        /// If the pipe returns <see langword="false" />, there is no need to call <see cref="System.IO.Pipelines.PipeReader.AdvanceTo(System.SequencePosition,System.SequencePosition)" />.
+        /// [!IMPORTANT]
+        /// The `System.IO.Pipelines.PipeReader` implementation returned by `System.IO.Pipelines.PipeReader.Create(System.IO.Stream, System.IO.Pipelines.StreamPipeReaderOptions?)`
+        /// will not read new data from the backing `System.IO.Stream` when `System.IO.Pipelines.PipeReader.TryRead(out System.IO.Pipelines.ReadResult)` is called.
+        ///
+        /// `System.IO.Pipelines.PipeReader.ReadAsync(System.Threading.CancellationToken)` must be called to read new data from the backing `System.IO.Stream`.
+        /// Any unconsumed data from a previous asynchronous read will be available to `System.IO.Pipelines.PipeReader.TryRead(out System.IO.Pipelines.ReadResult)`.
+        /// ]]></format></remarks>
         public abstract bool TryRead(out ReadResult result);
 
         /// <summary>Asynchronously reads a sequence of bytes from the current <see cref="System.IO.Pipelines.PipeReader" />.</summary>
diff --git a/src/libraries/System.Private.CoreLib/src/System/Resources/ResourceReader.cs b/src/libraries/System.Private.CoreLib/src/System/Resources/ResourceReader.cs
index 16e2b161fc0dbf..9aa2c73bb74719 100644
--- a/src/libraries/System.Private.CoreLib/src/System/Resources/ResourceReader.cs
+++ b/src/libraries/System.Private.CoreLib/src/System/Resources/ResourceReader.cs
@@ -575,7 +575,11 @@ private unsafe string AllocateStringForNameIndex(int index, out int dataOffset)
                 return new TimeSpan(_store.ReadInt64());
             else if (type == typeof(decimal))
             {
+#if RESOURCES_EXTENSIONS
                 int[] bits = new int[4];
+#else
+                Span<int> bits = stackalloc int[4];
+#endif
                 for (int i = 0; i < bits.Length; i++)
                     bits[i] = _store.ReadInt32();
                 return new decimal(bits);
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/BooleanTests.cs b/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/BooleanTests.cs
index 063174d3e35771..2d703c3abdb2ff 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/BooleanTests.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/BooleanTests.cs
@@ -90,6 +90,7 @@ public class BooleanTests
         const ushort VARIANT_FALSE = 0;
 
         [Fact]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/60649", TestRuntimes.Mono)]
         public void ValidateBoolIsMarshalledAsExpected()
         {
             Assert.Equal((uint)1, NativeExportsNE.ReturnByteBoolAsUInt(true));
diff --git a/src/libraries/System.Runtime/tests/System/DateTimeOffsetTests.cs b/src/libraries/System.Runtime/tests/System/DateTimeOffsetTests.cs
index 67c3f9a678b298..043fa669ccdb7b 100644
--- a/src/libraries/System.Runtime/tests/System/DateTimeOffsetTests.cs
+++ b/src/libraries/System.Runtime/tests/System/DateTimeOffsetTests.cs
@@ -1255,6 +1255,7 @@ public static IEnumerable<object[]> ToString_MatchesExpected_MemberData()
 
         [Theory]
         [MemberData(nameof(ToString_MatchesExpected_MemberData))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/60562", TestPlatforms.Android)]
         public static void ToString_MatchesExpected(DateTimeOffset dateTimeOffset, string format, IFormatProvider provider, string expected)
         {
             if (provider == null)
@@ -1354,6 +1355,7 @@ public static void TryFormat_ToString_EqualResults()
 
         [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotInvariantGlobalization))]
         [MemberData(nameof(ToString_MatchesExpected_MemberData))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/60562", TestPlatforms.Android)]
         public static void TryFormat_MatchesExpected(DateTimeOffset dateTimeOffset, string format, IFormatProvider provider, string expected)
         {
             var destination = new char[expected.Length];
diff --git a/src/libraries/System.Runtime/tests/System/DateTimeTests.cs b/src/libraries/System.Runtime/tests/System/DateTimeTests.cs
index d2b40c647dfd3c..1a9a487ecd4849 100644
--- a/src/libraries/System.Runtime/tests/System/DateTimeTests.cs
+++ b/src/libraries/System.Runtime/tests/System/DateTimeTests.cs
@@ -2110,6 +2110,7 @@ public static void ParseExact_Span_InvalidInputs_Fail(string input, string forma
 
         [Theory]
         [MemberData(nameof(ToString_MatchesExpected_MemberData))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/60562", TestPlatforms.Android)]
         public void ToString_Invoke_ReturnsExpected(DateTime dateTime, string format, IFormatProvider provider, string expected)
         {
             if (provider == null)
@@ -2355,6 +2356,7 @@ public static void TryFormat_MatchesToString(string format)
 
         [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotInvariantGlobalization))]
         [MemberData(nameof(ToString_MatchesExpected_MemberData))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/60562", TestPlatforms.Android)]
         public static void TryFormat_MatchesExpected(DateTime dateTime, string format, IFormatProvider provider, string expected)
         {
             var destination = new char[expected.Length];
diff --git a/src/libraries/System.Runtime/tests/System/Reflection/ModuleTests.cs b/src/libraries/System.Runtime/tests/System/Reflection/ModuleTests.cs
index 7ebf93afcc3fe6..9d44bbce1d0122 100644
--- a/src/libraries/System.Runtime/tests/System/Reflection/ModuleTests.cs
+++ b/src/libraries/System.Runtime/tests/System/Reflection/ModuleTests.cs
@@ -163,6 +163,7 @@ public void GetField_NullName()
         }
 
         [Fact]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/60558", TestPlatforms.Android)]
         public void GetField()
         {
             FieldInfo testInt = TestModule.GetField("TestInt", BindingFlags.Public | BindingFlags.Static);
diff --git a/src/libraries/System.Runtime/tests/System/StringTests.cs b/src/libraries/System.Runtime/tests/System/StringTests.cs
index b0786bb2370fb5..993f5c9eba34aa 100644
--- a/src/libraries/System.Runtime/tests/System/StringTests.cs
+++ b/src/libraries/System.Runtime/tests/System/StringTests.cs
@@ -315,6 +315,7 @@ public static void Contains_String_StringComparison(string s, string value, Stri
         }
 
         [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotInvariantGlobalization))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/60568", TestPlatforms.Android)]
         public static void Contains_StringComparison_TurkishI()
         {
             const string Source = "\u0069\u0130";
@@ -782,6 +783,7 @@ public void Replace_StringComparison_ReturnsExpected(string original, string old
         }
 
         [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotInvariantGlobalization))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/60568", TestPlatforms.Android)]
         public void Replace_StringComparison_TurkishI()
         {
             const string Source = "\u0069\u0130";
@@ -826,8 +828,14 @@ public static IEnumerable<object[]> Replace_StringComparisonCulture_TestData()
                 yield return new object[] { "abc", "abc" + SoftHyphen, "def", false, CultureInfo.InvariantCulture, "def" };
                 yield return new object[] { "abc", "abc" + SoftHyphen, "def", true, CultureInfo.InvariantCulture, "def" };
 
-                yield return new object[] { "\u0069\u0130", "\u0069", "a", false, new CultureInfo("tr-TR"), "a\u0130" };
-                yield return new object[] { "\u0069\u0130", "\u0069", "a", true, new CultureInfo("tr-TR"), "aa" };
+                // Android has different results w/ tr-TR
+                // See https://github.com/dotnet/runtime/issues/60568
+                if (!PlatformDetection.IsAndroid)
+                {
+                    yield return new object[] { "\u0069\u0130", "\u0069", "a", false, new CultureInfo("tr-TR"), "a\u0130" };
+                    yield return new object[] { "\u0069\u0130", "\u0069", "a", true, new CultureInfo("tr-TR"), "aa" };
+                }
+
                 yield return new object[] { "\u0069\u0130", "\u0069", "a", false, CultureInfo.InvariantCulture, "a\u0130" };
                 yield return new object[] { "\u0069\u0130", "\u0069", "a", true, CultureInfo.InvariantCulture, "a\u0130" };
             }
@@ -1104,6 +1112,7 @@ public static void IndexOf_SingleLetter_StringComparison(string s, char target,
         }
 
         [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotInvariantGlobalization))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/60568", TestPlatforms.Android)]
         public static void IndexOf_TurkishI_TurkishCulture_Char()
         {
             using (new ThreadCultureChange("tr-TR"))
diff --git a/src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs b/src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs
index a75d4003b3ed7c..9e8e39f7d35efc 100644
--- a/src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs
+++ b/src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs
@@ -2349,6 +2349,14 @@ public static IEnumerable<object[]> SystemTimeZonesTestData()
             "Zulu"
         };
 
+        // On Android GMT, GMT+0, and GMT-0 are values
+        private static readonly string[] s_GMTAliases = new [] {
+            "GMT",
+            "GMT0",
+            "GMT+0",
+            "GMT-0"
+        };
+
         [Theory]
         [MemberData(nameof(SystemTimeZonesTestData))]
         [PlatformSpecific(TestPlatforms.AnyUnix)]
@@ -2401,7 +2409,12 @@ public static void TimeZoneDisplayNames_Unix(TimeZoneInfo timeZone)
                 // All we can really say generically here is that they aren't empty.
                 Assert.False(string.IsNullOrWhiteSpace(timeZone.DisplayName), $"Id: \"{timeZone.Id}\", DisplayName should not have been empty.");
                 Assert.False(string.IsNullOrWhiteSpace(timeZone.StandardName), $"Id: \"{timeZone.Id}\", StandardName should not have been empty.");
-                Assert.False(string.IsNullOrWhiteSpace(timeZone.DaylightName), $"Id: \"{timeZone.Id}\", DaylightName should not have been empty.");
+
+                // GMT* on Android does sets daylight savings time to false, so there will be no DaylightName
+                if (!PlatformDetection.IsAndroid || (PlatformDetection.IsAndroid && !timeZone.Id.StartsWith("GMT")))
+                {
+                    Assert.False(string.IsNullOrWhiteSpace(timeZone.DaylightName), $"Id: \"{timeZone.Id}\", DaylightName should not have been empty.");
+                }
             }
         }
 
@@ -2586,6 +2599,10 @@ public static void TimeZoneInfo_DisplayNameStartsWithOffset(TimeZoneInfo tzi)
                 // UTC and all of its aliases (Etc/UTC, and others) start with just "(UTC) "
                 Assert.StartsWith("(UTC) ", tzi.DisplayName);
             }
+            else if (s_GMTAliases.Contains(tzi.Id, StringComparer.OrdinalIgnoreCase))
+            {
+                Assert.StartsWith("GMT", tzi.DisplayName);
+            }
             else
             {
                 Assert.False(string.IsNullOrWhiteSpace(tzi.StandardName));
@@ -2701,6 +2718,7 @@ public static void IsIanaIdTest()
         }
 
         [ConditionalFact(nameof(DoesNotSupportIanaNamesConversion))]
+        [PlatformSpecific(~TestPlatforms.Android)]
         public static void UnsupportedImplicitConversionTest()
         {
             string nonNativeTzName = s_isWindows ? "America/Los_Angeles" : "Pacific Standard Time";
diff --git a/src/libraries/System.Text.RegularExpressions/tests/RegexCultureTests.cs b/src/libraries/System.Text.RegularExpressions/tests/RegexCultureTests.cs
index 86dc23b0fe35c8..ac0bc82bff7a79 100644
--- a/src/libraries/System.Text.RegularExpressions/tests/RegexCultureTests.cs
+++ b/src/libraries/System.Text.RegularExpressions/tests/RegexCultureTests.cs
@@ -190,6 +190,7 @@ Regex[] Create(string input, CultureInfo info, RegexOptions additional)
 
         [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Doesn't support NonBacktracking")]
         [Fact]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/60568", TestPlatforms.Android)]
         public void TurkishI_Is_Differently_LowerUpperCased_In_Turkish_Culture_NonBacktracking()
         {
             var turkish = new CultureInfo("tr-TR");
@@ -275,11 +276,17 @@ public static IEnumerable<object[]> Match_In_Different_Cultures_TestData()
                 yield return new object[] { "(?i:iI+)", options, invariant, "abc\u0130\u0131Ixyz", "" };
 
                 // Expected answers in the Turkish culture
-                yield return new object[] { "(?i:I)", options, turkish, "xy\u0131ab", "\u0131" };
-                yield return new object[] { "(?i:iI+)", options, turkish, "abcIIIxyz", "" };
-                yield return new object[] { "(?i:iI+)", options, turkish, "abcIi\u0130xyz", "" };
-                yield return new object[] { "(?i:iI+)", options, turkish, "abcI\u0130ixyz", "" };
-                yield return new object[] { "(?i:[^IJKLM]I)", options, turkish, "ii\u0130i\u0131ab", "i\u0131" };
+                //
+                // Android produces unexpected results for tr-TR
+                // https://github.com/dotnet/runtime/issues/60568
+                if (!PlatformDetection.IsAndroid)
+                {
+                    yield return new object[] { "(?i:I)", options, turkish, "xy\u0131ab", "\u0131" };
+                    yield return new object[] { "(?i:iI+)", options, turkish, "abcIIIxyz", "" };
+                    yield return new object[] { "(?i:iI+)", options, turkish, "abcIi\u0130xyz", "" };
+                    yield return new object[] { "(?i:iI+)", options, turkish, "abcI\u0130ixyz", "" };
+                    yield return new object[] { "(?i:[^IJKLM]I)", options, turkish, "ii\u0130i\u0131ab", "i\u0131" };
+                }
 
                 // None and Compiled are separated into the Match_In_Different_Cultures_CriticalCases test
                 if (options == RegexHelpers.RegexOptionNonBacktracking)
@@ -305,9 +312,14 @@ public static IEnumerable<object[]> Match_In_Different_Cultures_CriticalCases_Te
             yield return new object[] { "(?i:[^IJKLM]I)", options, invariant, "ii\u0130i\u0131ab", "\u0130i" }; // <-- failing for None, Compiled
 
             // Expected answers in the Turkish culture
-            yield return new object[] { "(?i:iI+)", options, turkish, "abc\u0130IIxyz", "\u0130II" };           // <-- failing for None, Compiled
-            yield return new object[] { "(?i:iI+)", options, turkish, "abc\u0130\u0131Ixyz", "\u0130\u0131I" }; // <-- failing for None, Compiled
-            yield return new object[] { "(?i:iI+)", options, turkish, "abc\u0130Iixyz", "\u0130I" };            // <-- failing for None, Compiled
+            // Android produces unexpected results for tr-TR
+            // https://github.com/dotnet/runtime/issues/60568
+            if (!PlatformDetection.IsAndroid)
+            {
+                yield return new object[] { "(?i:iI+)", options, turkish, "abc\u0130IIxyz", "\u0130II" };           // <-- failing for None, Compiled
+                yield return new object[] { "(?i:iI+)", options, turkish, "abc\u0130\u0131Ixyz", "\u0130\u0131I" }; // <-- failing for None, Compiled
+                yield return new object[] { "(?i:iI+)", options, turkish, "abc\u0130Iixyz", "\u0130I" };            // <-- failing for None, Compiled
+            }
         }
 
         public static IEnumerable<object[]> Match_In_Different_Cultures_CriticalCases_TestData() =>
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index 5e8478e3258817..8306ba65778b10 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -75,9 +75,6 @@
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Threading.Thread\tests\System.Threading.Thread.Tests.csproj" />
 
     <!-- Actual test failures -->
-    <!-- https://github.com/dotnet/runtime/issues/37088 -->
-    <!--<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Runtime.Tests.csproj" />-->
-
     <!-- https://github.com/dotnet/runtime/issues/50871 -->
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyInjection\tests\DI.Tests\Microsoft.Extensions.DependencyInjection.Tests.csproj" />
 
diff --git a/src/mono/wasm/build/WasmApp.Native.targets b/src/mono/wasm/build/WasmApp.Native.targets
index e42c22e4464c17..69facc5d7204a3 100644
--- a/src/mono/wasm/build/WasmApp.Native.targets
+++ b/src/mono/wasm/build/WasmApp.Native.targets
@@ -161,6 +161,7 @@
       <_EmccOptimizationFlagDefault Condition="'$(_EmccOptimizationFlagDefault)' == ''">-Oz</_EmccOptimizationFlagDefault>
 
       <EmccCompileOptimizationFlag Condition="'$(EmccCompileOptimizationFlag)' == ''">$(_EmccOptimizationFlagDefault)</EmccCompileOptimizationFlag>
+      <EmccLinkOptimizationFlag    Condition="'$(EmccLinkOptimizationFlag)' == '' and '$(Configuration)' == 'Release'">-O2</EmccLinkOptimizationFlag>
       <EmccLinkOptimizationFlag    Condition="'$(EmccLinkOptimizationFlag)' == ''"   >$(EmccCompileOptimizationFlag)</EmccLinkOptimizationFlag>
 
       <_EmccCompileRsp>$(_WasmIntermediateOutputPath)emcc-compile.rsp</_EmccCompileRsp>
diff --git a/src/mono/wasm/runtime/CMakeLists.txt b/src/mono/wasm/runtime/CMakeLists.txt
index d2c59089a49c22..450d8df3918b8b 100644
--- a/src/mono/wasm/runtime/CMakeLists.txt
+++ b/src/mono/wasm/runtime/CMakeLists.txt
@@ -25,7 +25,7 @@ target_link_libraries(dotnet
 
 set_target_properties(dotnet PROPERTIES
     LINK_DEPENDS "${NATIVE_BIN_DIR}/src/emcc-default.rsp;${NATIVE_BIN_DIR}/src/runtime.iffe.js;${SOURCE_DIR}/library-dotnet.js;${SYSTEM_NATIVE_DIR}/pal_random.js"
-    LINK_FLAGS "@${NATIVE_BIN_DIR}/src/emcc-default.rsp ${CONFIGURATION_EMCC_FLAGS} -DENABLE_NETCORE=1 --pre-js ${NATIVE_BIN_DIR}/src/runtime.iffe.js --js-library ${SOURCE_DIR}/library-dotnet.js --js-library ${SYSTEM_NATIVE_DIR}/pal_random.js"
+    LINK_FLAGS "@${NATIVE_BIN_DIR}/src/emcc-default.rsp ${CONFIGURATION_LINK_FLAGS} -DENABLE_NETCORE=1 --pre-js ${NATIVE_BIN_DIR}/src/runtime.iffe.js --js-library ${SOURCE_DIR}/library-dotnet.js --js-library ${SYSTEM_NATIVE_DIR}/pal_random.js"
     RUNTIME_OUTPUT_DIRECTORY "${NATIVE_BIN_DIR}")
 
 if(CMAKE_BUILD_TYPE STREQUAL "Release")
diff --git a/src/mono/wasm/wasm.proj b/src/mono/wasm/wasm.proj
index 53b1fe1fd7c756..1f85febd2f9dd6 100644
--- a/src/mono/wasm/wasm.proj
+++ b/src/mono/wasm/wasm.proj
@@ -149,8 +149,10 @@
       <PInvokeTableFile>$(ArtifactsObjDir)wasm/pinvoke-table.h</PInvokeTableFile>
       <CMakeConfigurationEmccFlags Condition="'$(Configuration)' == 'Debug'">-g -Os -s -DDEBUG=1</CMakeConfigurationEmccFlags>
       <CMakeConfigurationEmccFlags Condition="'$(Configuration)' == 'Release'">-Oz</CMakeConfigurationEmccFlags>
+      <CMakeConfigurationLinkFlags Condition="'$(Configuration)' == 'Debug'">$(CMakeConfigurationEmccFlags)</CMakeConfigurationLinkFlags>
+      <CMakeConfigurationLinkFlags Condition="'$(Configuration)' == 'Release'">-O2</CMakeConfigurationLinkFlags>
       <CMakeConfigurationEmsdkPath Condition="'$(Configuration)' == 'Release'"> -DEMSDK_PATH=&quot;$(EMSDK_PATH.TrimEnd('\/'))&quot;</CMakeConfigurationEmsdkPath>
-      <CMakeBuildRuntimeConfigureCmd>emcmake cmake $(MSBuildThisFileDirectory)runtime -DCMAKE_BUILD_TYPE=$(Configuration) -DCONFIGURATION_EMCC_FLAGS=&quot;$(CMakeConfigurationEmccFlags)&quot; -DMONO_INCLUDES=&quot;$(MonoArtifactsPath)include/mono-2.0&quot; -DMONO_OBJ_INCLUDES=&quot;$(MonoObjDir.TrimEnd('\/'))&quot; -DICU_LIB_DIR=&quot;$(ICULibDir.TrimEnd('\/'))&quot; -DMONO_ARTIFACTS_DIR=&quot;$(MonoArtifactsPath.TrimEnd('\/'))&quot; -DNATIVE_BIN_DIR=&quot;$(NativeBinDir.TrimEnd('\/'))&quot; -DSYSTEM_NATIVE_DIR=&quot;$(RepoRoot)src/libraries/Native/Unix/System.Native&quot; -DSOURCE_DIR=&quot;$(MSBuildThisFileDirectory.TrimEnd('\/'))/runtime&quot;$(CMakeConfigurationEmsdkPath)</CMakeBuildRuntimeConfigureCmd>
+      <CMakeBuildRuntimeConfigureCmd>emcmake cmake $(MSBuildThisFileDirectory)runtime -DCMAKE_BUILD_TYPE=$(Configuration) -DCONFIGURATION_EMCC_FLAGS=&quot;$(CMakeConfigurationEmccFlags)&quot; -DCONFIGURATION_LINK_FLAGS=&quot;$(CMakeConfigurationLinkFlags)&quot; -DMONO_INCLUDES=&quot;$(MonoArtifactsPath)include/mono-2.0&quot; -DMONO_OBJ_INCLUDES=&quot;$(MonoObjDir.TrimEnd('\/'))&quot; -DICU_LIB_DIR=&quot;$(ICULibDir.TrimEnd('\/'))&quot; -DMONO_ARTIFACTS_DIR=&quot;$(MonoArtifactsPath.TrimEnd('\/'))&quot; -DNATIVE_BIN_DIR=&quot;$(NativeBinDir.TrimEnd('\/'))&quot; -DSYSTEM_NATIVE_DIR=&quot;$(RepoRoot)src/libraries/Native/Unix/System.Native&quot; -DSOURCE_DIR=&quot;$(MSBuildThisFileDirectory.TrimEnd('\/'))/runtime&quot;$(CMakeConfigurationEmsdkPath)</CMakeBuildRuntimeConfigureCmd>
       <CMakeBuildRuntimeConfigureCmd Condition="'$(OS)' == 'Windows_NT'">call &quot;$(RepositoryEngineeringDir)native\init-vs-env.cmd&quot; &amp;&amp; call &quot;$([MSBuild]::NormalizePath('$(EMSDK_PATH)', 'emsdk_env.bat'))&quot; &amp;&amp; $(CMakeBuildRuntimeConfigureCmd)</CMakeBuildRuntimeConfigureCmd>
       <CMakeBuildRuntimeConfigureCmd Condition="'$(OS)' != 'Windows_NT'">bash -c 'source $(EMSDK_PATH)/emsdk_env.sh 2>&amp;1 &amp;&amp; $(CMakeBuildRuntimeConfigureCmd)'</CMakeBuildRuntimeConfigureCmd>
 
diff --git a/src/tests/Common/Coreclr.TestWrapper/MobileAppHandler.cs b/src/tests/Common/Coreclr.TestWrapper/MobileAppHandler.cs
index 324edcce76fa13..834bf24e451708 100644
--- a/src/tests/Common/Coreclr.TestWrapper/MobileAppHandler.cs
+++ b/src/tests/Common/Coreclr.TestWrapper/MobileAppHandler.cs
@@ -22,6 +22,12 @@ private static int HandleMobileApp(string action, string platform, string catego
         {
             //install or uninstall mobile app
             int exitCode = -100;
+
+            if (action == "install" && (File.Exists($"{testBinaryBase}/.retry") || File.Exists($"{testBinaryBase}/.reboot")))
+            {
+                return exitCode;
+            }
+
             string outputFile = Path.Combine(reportBase, action, $"{category}_{action}.output.txt");
             string errorFile = Path.Combine(reportBase, action, $"{category}_{action}.error.txt");
             bool platformValueFlag = true;
@@ -81,6 +87,11 @@ private static int HandleMobileApp(string action, string platform, string catego
                         }
                     }
 
+                    if (action == "install")
+                    {
+                        cmdStr += " --timeout 00:05:00";
+                    }
+
                     using (Process process = new Process())
                     {
                         if (OperatingSystem.IsWindows())
@@ -108,6 +119,19 @@ private static int HandleMobileApp(string action, string platform, string catego
                         {
                             // Process completed.
                             exitCode = process.ExitCode;
+
+                            // See https://github.com/dotnet/xharness/blob/main/src/Microsoft.DotNet.XHarness.Common/CLI/ExitCode.cs
+                            // 78 - PACKAGE_INSTALLATION_FAILURE
+                            // 81 - DEVICE_NOT_FOUND
+                            // 85 - ADB_DEVICE_ENUMERATION_FAILURE
+                            // 86 - PACKAGE_INSTALLATION_TIMEOUT
+                            if (action == "install" && (exitCode == 78 || exitCode == 81|| exitCode == 85|| exitCode == 86))
+                            {
+                                CreateRetryFile($"{testBinaryBase}/.retry", exitCode, category);
+                                CreateRetryFile($"{testBinaryBase}/.reboot", exitCode, category);
+                                return exitCode;
+                            }
+
                             Task.WaitAll(copyOutput, copyError);
                         }
                         else
@@ -155,5 +179,13 @@ private static string ConvertCmd2Arg(string cmd)
 
             return $"{cmdPrefix} \"{cmd}\"";
         }
+
+        private static void CreateRetryFile(string fileName, int exitCode, string appName)
+        {
+            using (StreamWriter writer = new StreamWriter(fileName))  
+            {
+                writer.WriteLine($"appName: {appName}; exitCode: {exitCode}"); 
+            }
+        }
     }
 }
diff --git a/src/tests/Interop/CMakeLists.txt b/src/tests/Interop/CMakeLists.txt
index 30a1e9ea0a879a..1914910027eb47 100644
--- a/src/tests/Interop/CMakeLists.txt
+++ b/src/tests/Interop/CMakeLists.txt
@@ -14,8 +14,6 @@ SET(CLR_INTEROP_TEST_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(common)
 add_subdirectory(PInvoke/Decimal)
 add_subdirectory(PInvoke/ArrayWithOffset)
-add_subdirectory(PInvoke/BestFitMapping/Char)
-add_subdirectory(PInvoke/BestFitMapping/LPStr)
 add_subdirectory(PInvoke/Delegate)
 add_subdirectory(PInvoke/Primitives/Int)
 add_subdirectory(PInvoke/Primitives/RuntimeHandles)
@@ -55,16 +53,18 @@ add_subdirectory(StringMarshalling/BSTR)
 add_subdirectory(StringMarshalling/AnsiBSTR)
 add_subdirectory(StringMarshalling/VBByRefStr)
 add_subdirectory(MarshalAPI/FunctionPointer)
-add_subdirectory(MarshalAPI/IUnknown)
 add_subdirectory(NativeLibrary/NativeLibraryToLoad)
 add_subdirectory(DllImportAttribute/DllImportPath)
 add_subdirectory(DllImportAttribute/ExactSpelling)
-add_subdirectory(ExecInDefAppDom)
 add_subdirectory(ICustomMarshaler/ConflictingNames)
 add_subdirectory(LayoutClass)
 add_subdirectory(PInvoke/DateTime)
 if(CLR_CMAKE_TARGET_WIN32)
+    add_subdirectory(ExecInDefAppDom)
+    add_subdirectory(MarshalAPI/IUnknown)
     add_subdirectory(PInvoke/Attributes/LCID)
+    add_subdirectory(PInvoke/BestFitMapping/Char)
+    add_subdirectory(PInvoke/BestFitMapping/LPStr)
     add_subdirectory(PInvoke/Variant)
     add_subdirectory(PInvoke/Varargs)
     add_subdirectory(PInvoke/NativeCallManagedComVisible)
diff --git a/src/tests/Interop/ExecInDefAppDom/ExecInDefAppDom.csproj b/src/tests/Interop/ExecInDefAppDom/ExecInDefAppDom.csproj
index 0a0137d6f3fd52..1e10117bc3dbf6 100644
--- a/src/tests/Interop/ExecInDefAppDom/ExecInDefAppDom.csproj
+++ b/src/tests/Interop/ExecInDefAppDom/ExecInDefAppDom.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
+    <CLRTestTargetUnsupported Condition="'$(TargetsWindows)' != 'true'">true</CLRTestTargetUnsupported>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/tests/issues.targets b/src/tests/issues.targets
index 37f4d2615cd851..4b51bdad3d9b1f 100644
--- a/src/tests/issues.targets
+++ b/src/tests/issues.targets
@@ -73,9 +73,6 @@
          <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/arglist/vararg_TargetUnix/*">
             <Issue>https://github.com/dotnet/runtime/issues/10478 </Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/Interop/ExecInDefAppDom/ExecInDefAppDom/*">
-            <Issue>Issue building native components for the test.</Issue>
-        </ExcludeList>
     </ItemGroup>
 
     <!-- All Unix targets  on CoreCLR Runtime -->
diff --git a/src/tests/profiler/native/CMakeLists.txt b/src/tests/profiler/native/CMakeLists.txt
index b7357a678b15a9..b9a1f47e5ab803 100644
--- a/src/tests/profiler/native/CMakeLists.txt
+++ b/src/tests/profiler/native/CMakeLists.txt
@@ -11,6 +11,7 @@ set(SOURCES
     gcbasicprofiler/gcbasicprofiler.cpp
     gcprofiler/gcprofiler.cpp
     getappdomainstaticaddress/getappdomainstaticaddress.cpp
+    inlining/inlining.cpp
     metadatagetdispenser/metadatagetdispenser.cpp
     multiple/multiple.cpp
     nullprofiler/nullprofiler.cpp
diff --git a/src/tests/profiler/native/classfactory.cpp b/src/tests/profiler/native/classfactory.cpp
index d09cb4c4e3bb02..de0a07ce08937d 100644
--- a/src/tests/profiler/native/classfactory.cpp
+++ b/src/tests/profiler/native/classfactory.cpp
@@ -15,6 +15,7 @@
 #include "releaseondetach/releaseondetach.h"
 #include "transitions/transitions.h"
 #include "multiple/multiple.h"
+#include "inlining/inlining.h"
 
 ClassFactory::ClassFactory(REFCLSID clsid) : refCount(0), clsid(clsid)
 {
@@ -114,6 +115,10 @@ HRESULT STDMETHODCALLTYPE ClassFactory::CreateInstance(IUnknown *pUnkOuter, REFI
     {
         profiler = new MultiplyLoaded();
     }
+    else if (clsid == InliningProfiler::GetClsid())
+    {
+        profiler = new InliningProfiler();
+    }
     else
     {
         printf("No profiler found in ClassFactory::CreateInstance. Did you add your profiler to the list?\n");
diff --git a/src/tests/profiler/native/eltprofiler/slowpatheltprofiler.cpp b/src/tests/profiler/native/eltprofiler/slowpatheltprofiler.cpp
index 17b114dd68b4c8..032dd3a82fa9ca 100644
--- a/src/tests/profiler/native/eltprofiler/slowpatheltprofiler.cpp
+++ b/src/tests/profiler/native/eltprofiler/slowpatheltprofiler.cpp
@@ -21,10 +21,10 @@ shared_ptr<SlowPathELTProfiler> SlowPathELTProfiler::s_profiler;
 
 #ifndef WIN32
 #define UINT_PTR_FORMAT "lx"
-#define PROFILER_STUB EXTERN_C __attribute__((visibility("hidden"))) void STDMETHODCALLTYPE
+#define PROFILER_STUB __attribute__((visibility("hidden"))) static void STDMETHODCALLTYPE
 #else // WIN32
 #define UINT_PTR_FORMAT "llx"
-#define PROFILER_STUB EXTERN_C void STDMETHODCALLTYPE
+#define PROFILER_STUB static void STDMETHODCALLTYPE
 #endif // WIN32
 
 PROFILER_STUB EnterStub(FunctionIDOrClientID functionId, COR_PRF_ELT_INFO eltInfo)
diff --git a/src/tests/profiler/native/inlining/inlining.cpp b/src/tests/profiler/native/inlining/inlining.cpp
new file mode 100644
index 00000000000000..0cd436833efd05
--- /dev/null
+++ b/src/tests/profiler/native/inlining/inlining.cpp
@@ -0,0 +1,172 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#define NOMINMAX
+
+#include "inlining.h"
+#include <iostream>
+
+using std::shared_ptr;
+using std::wcout;
+using std::endl;
+using std::atomic;
+
+shared_ptr<InliningProfiler> InliningProfiler::s_profiler;
+
+#ifndef WIN32
+#define UINT_PTR_FORMAT "lx"
+#define PROFILER_STUB __attribute__((visibility("hidden"))) static void STDMETHODCALLTYPE
+#else // WIN32
+#define UINT_PTR_FORMAT "llx"
+#define PROFILER_STUB static void STDMETHODCALLTYPE
+#endif // WIN32
+
+PROFILER_STUB EnterStub(FunctionIDOrClientID functionId, COR_PRF_ELT_INFO eltInfo)
+{
+    SHUTDOWNGUARD_RETVOID();
+
+    InliningProfiler::s_profiler->EnterCallback(functionId, eltInfo);
+}
+
+PROFILER_STUB LeaveStub(FunctionIDOrClientID functionId, COR_PRF_ELT_INFO eltInfo)
+{
+    SHUTDOWNGUARD_RETVOID();
+
+    InliningProfiler::s_profiler->LeaveCallback(functionId, eltInfo);
+}
+
+PROFILER_STUB TailcallStub(FunctionIDOrClientID functionId, COR_PRF_ELT_INFO eltInfo)
+{
+    SHUTDOWNGUARD_RETVOID();
+
+    InliningProfiler::s_profiler->TailcallCallback(functionId, eltInfo);
+}
+
+GUID InliningProfiler::GetClsid()
+{
+    // {DDADC0CB-21C8-4E53-9A6C-7C65EE5800CE}
+    GUID clsid = { 0xDDADC0CB, 0x21C8, 0x4E53, { 0x9A, 0x6C, 0x7C, 0x65, 0xEE, 0x58, 0x00, 0xCE } };
+    return clsid;
+}
+
+HRESULT InliningProfiler::Initialize(IUnknown* pICorProfilerInfoUnk)
+{
+    Profiler::Initialize(pICorProfilerInfoUnk);
+
+    HRESULT hr = S_OK;
+    InliningProfiler::s_profiler = shared_ptr<InliningProfiler>(this);
+
+    if (FAILED(hr = pCorProfilerInfo->SetEventMask2(COR_PRF_MONITOR_ENTERLEAVE
+                                                    | COR_PRF_ENABLE_FUNCTION_ARGS
+                                                    | COR_PRF_ENABLE_FUNCTION_RETVAL
+                                                    | COR_PRF_ENABLE_FRAME_INFO
+                                                    | COR_PRF_MONITOR_JIT_COMPILATION,
+                                                    0)))
+    {
+        wcout << L"FAIL: IpCorProfilerInfo::SetEventMask2() failed hr=0x" << std::hex << hr << endl;
+        _failures++;
+        return hr;
+    }
+
+    hr = this->pCorProfilerInfo->SetEnterLeaveFunctionHooks3WithInfo(EnterStub, LeaveStub, TailcallStub);
+    if (hr != S_OK)
+    {
+        wcout << L"SetEnterLeaveFunctionHooks3WithInfo failed with hr=0x" << std::hex << hr << endl;
+        _failures++;
+        return hr;
+    }
+
+    return S_OK;
+}
+
+HRESULT InliningProfiler::Shutdown()
+{
+    Profiler::Shutdown();
+
+    if (_failures == 0 && _sawInlineeCall)
+    {
+        wcout << L"PROFILER TEST PASSES" << endl;
+    }
+    else
+    {
+        wcout << L"TEST FAILED _failures=" << _failures.load() 
+              << L"_sawInlineeCall=" << _sawInlineeCall << endl;
+    }
+
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE InliningProfiler::EnterCallback(FunctionIDOrClientID functionIdOrClientID, COR_PRF_ELT_INFO eltInfo)
+{
+    String functionName = GetFunctionIDName(functionIdOrClientID.functionID);
+    if (functionName == WCHAR("Inlining"))
+    {
+        _inInlining = true;
+    }
+    else if (functionName == WCHAR("BlockInlining"))
+    {
+        _inBlockInlining = true;
+    }
+    else if (functionName == WCHAR("NoResponse"))
+    {
+        _inNoResponse = true;
+    }
+    else if (functionName == WCHAR("Inlinee"))
+    {
+        if (_inInlining || _inNoResponse)
+        {
+            _failures++;
+            wcout << L"Saw Inlinee as a real method call instead of inlined." << endl;
+        }
+
+        if (_inBlockInlining)
+        {
+            _sawInlineeCall = true;
+        }
+    }
+
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE InliningProfiler::LeaveCallback(FunctionIDOrClientID functionIdOrClientID, COR_PRF_ELT_INFO eltInfo)
+{
+    String functionName = GetFunctionIDName(functionIdOrClientID.functionID);
+    if (functionName == WCHAR("Inlining"))
+    {
+        _inInlining = false;
+    }
+    else if (functionName == WCHAR("BlockInlining"))
+    {
+        _inBlockInlining = false;
+    }
+    else if (functionName == WCHAR("NoResponse"))
+    {
+        _inNoResponse = false;
+    }
+
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE InliningProfiler::TailcallCallback(FunctionIDOrClientID functionIdOrClientID, COR_PRF_ELT_INFO eltInfo)
+{
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE InliningProfiler::JITInlining(FunctionID callerId, FunctionID calleeId, BOOL* pfShouldInline)
+{
+    String inlineeName = GetFunctionIDName(calleeId);
+    if (inlineeName == WCHAR("Inlinee"))
+    {
+        String inlinerName = GetFunctionIDName(callerId);
+        if (inlinerName == WCHAR("Inlining"))
+        {
+            *pfShouldInline = TRUE;
+        }
+        else if (inlinerName == WCHAR("BlockInlining"))
+        {
+            *pfShouldInline = FALSE;
+        }
+    }
+
+    return S_OK;
+}
diff --git a/src/tests/profiler/native/inlining/inlining.h b/src/tests/profiler/native/inlining/inlining.h
new file mode 100644
index 00000000000000..4b1b8752e3ec56
--- /dev/null
+++ b/src/tests/profiler/native/inlining/inlining.h
@@ -0,0 +1,38 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#pragma once
+
+#include "../profiler.h"
+#include <memory>
+
+class InliningProfiler : public Profiler
+{
+public:
+    static std::shared_ptr<InliningProfiler> s_profiler;
+
+    InliningProfiler() : 
+    	Profiler(),
+    	_failures(0),
+    	_inInlining(false),
+    	_inBlockInlining(false),
+    	_inNoResponse(false)
+    {
+    }
+
+    static GUID GetClsid();
+    virtual HRESULT STDMETHODCALLTYPE Initialize(IUnknown* pICorProfilerInfoUnk);
+    virtual HRESULT STDMETHODCALLTYPE Shutdown();
+    virtual HRESULT STDMETHODCALLTYPE JITInlining(FunctionID callerId, FunctionID calleeId, BOOL* pfShouldInline);
+
+    HRESULT STDMETHODCALLTYPE EnterCallback(FunctionIDOrClientID functionId, COR_PRF_ELT_INFO eltInfo);
+    HRESULT STDMETHODCALLTYPE LeaveCallback(FunctionIDOrClientID functionId, COR_PRF_ELT_INFO eltInfo);
+    HRESULT STDMETHODCALLTYPE TailcallCallback(FunctionIDOrClientID functionId, COR_PRF_ELT_INFO eltInfo);
+
+private:
+    std::atomic<int> _failures;
+    bool _inInlining;
+    bool _inBlockInlining;
+    bool _inNoResponse;
+    bool _sawInlineeCall;
+};
diff --git a/src/tests/profiler/unittest/inlining.cs b/src/tests/profiler/unittest/inlining.cs
new file mode 100644
index 00000000000000..84b9cdb85f5e45
--- /dev/null
+++ b/src/tests/profiler/unittest/inlining.cs
@@ -0,0 +1,66 @@
+// 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 System.IO;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Threading;
+
+namespace Profiler.Tests
+{
+    class InliningTest
+    {
+        private static readonly Guid InliningGuid = new Guid("DDADC0CB-21C8-4E53-9A6C-7C65EE5800CE");
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static int Inlinee()
+        {
+            Random rand = new Random();
+            return rand.Next();
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public static void Inlining()
+        {
+            int x = Inlinee();
+            Console.WriteLine($"Inlining, x={x}");
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public static void BlockInlining()
+        {
+            int x = Inlinee();
+            Console.WriteLine($"BlockInlining, x={x}");
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public static void NoResponse()
+        {
+            int x = Inlinee();
+            Console.WriteLine($"NoResponse, x={x}");
+        }
+
+        public static int RunTest(string[] args)
+        {
+            Inlining();
+            BlockInlining();
+            NoResponse();
+
+            return 100;
+        }
+
+        public static int Main(string[] args)
+        {
+            if (args.Length > 0 && args[0].Equals("RunTest", StringComparison.OrdinalIgnoreCase))
+            {
+                return RunTest(args);
+            }
+
+            return ProfilerTestRunner.Run(profileePath: System.Reflection.Assembly.GetExecutingAssembly().Location,
+                                          testName: "UnitTestInlining",
+                                          profilerClsid: InliningGuid,
+                                          profileeOptions: ProfileeOptions.OptimizationSensitive);
+        }
+    }
+}
diff --git a/src/tests/profiler/unittest/inlining.csproj b/src/tests/profiler/unittest/inlining.csproj
new file mode 100644
index 00000000000000..b2fbdc913b04a2
--- /dev/null
+++ b/src/tests/profiler/unittest/inlining.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
+    <OutputType>exe</OutputType>
+    <CLRTestKind>BuildAndRun</CLRTestKind>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CLRTestPriority>0</CLRTestPriority>
+    <Optimize>true</Optimize>
+    <!-- This test provides no interesting scenarios for GCStress -->
+    <GCStressIncompatible>true</GCStressIncompatible>
+    <!-- The test launches a secondary process and process launch creates
+    an infinite event loop in the SocketAsyncEngine on Linux. Since 
+    runincontext loads even framework assemblies into the unloadable
+    context, locals in this loop prevent unloading -->
+    <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildProjectName).cs" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="../common/profiler_common.csproj" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)/../native/CMakeLists.txt" />
+  </ItemGroup>
+</Project>
diff --git a/src/workloads/workloads.csproj b/src/workloads/workloads.csproj
index c1f6b4bb419ff2..f64d641604674d 100644
--- a/src/workloads/workloads.csproj
+++ b/src/workloads/workloads.csproj
@@ -48,7 +48,7 @@
 
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
 
-  <Target Name="Build" DependsOnTargets="GenerateVersions">
+  <Target Name="Build" DependsOnTargets="GetAssemblyVersion;_GetVersionProps;_GenerateMsiVersionString">
     <ItemGroup>
       <!-- Overrides for Visual Studio setup generation. If the workload definition IDs change,
            these must be updated. -->
@@ -106,14 +106,6 @@
       <ManifestPackages Include="$(PackageSource)Microsoft.NET.Workload.Mono.ToolChain.Manifest-*.nupkg" />
     </ItemGroup>
 
-    <GenerateMsiVersion
-        Major="$([System.Version]::Parse('$(SDKBundleVersion)').Major)"
-        Minor="$([System.Version]::Parse('$(SDKBundleVersion)').Minor)"
-        Patch="$([System.Version]::Parse('$(SDKBundleVersion)').Build)"
-        BuildNumber="$([System.Version]::Parse('$(SDKBundleVersion)').Revision)" >
-      <Output TaskParameter="MsiVersion" PropertyName="MsiVersion" />
-    </GenerateMsiVersion>
-
     <GenerateManifestMsi
         IntermediateBaseOutputPath="$(IntermediateOutputPath)"
         OutputPath="$(OutputPath)"
@@ -195,28 +187,38 @@
     <MSBuild Projects="@(VisualStudioManifestProjects)" BuildInParallel="true" Properties="SwixBuildTargets=$(SwixBuildTargets);ManifestOutputPath=$(VersionedVisualStudioSetupInsertionPath);OutputPath=$(VersionedVisualStudioSetupInsertionPath)" />
   </Target>
 
-  <Target Name="GenerateVersions" DependsOnTargets="GetAssemblyVersion">
-    <Exec Command="git rev-list --count HEAD"
-          ConsoleToMSBuild="true"
-          Condition=" '$(GitCommitCount)' == '' ">
-      <Output TaskParameter="ConsoleOutput" PropertyName="GitCommitCount" />
-    </Exec>
-
-    <Error Condition=" '$(OfficialBuild)' == 'true' And '$(_PatchNumber)' == '' "
-           Text="_PatchNumber should not be empty in an official build. Check if there were changes in Arcade." />
+  <Target Name="_GetVersionProps">
+    <PropertyGroup>
+      <_MajorVersion>$([System.Version]::Parse('$(AssemblyVersion)').Major)</_MajorVersion>
+      <_MinorVersion>$([System.Version]::Parse('$(AssemblyVersion)').Minor)</_MinorVersion>
+      <_PatchVersion>$([System.Version]::Parse('$(AssemblyVersion)').Build)</_PatchVersion>
+      <_BuildNumber>$([System.Version]::Parse('$(AssemblyVersion)').Revision)</_BuildNumber>
+    </PropertyGroup>
+  </Target>
 
+  <Target Name="_GenerateMsiVersionString">
     <PropertyGroup>
-      <GitCommitCount>$(GitCommitCount.PadLeft(6,'0'))</GitCommitCount>
+      <VersionPadding Condition="'$(VersionPadding)'==''">5</VersionPadding>
+      <!-- Using the following default comparison date will produce versions that align with our internal build system. -->
+      <VersionComparisonDate Condition="'$(VersionComparisonDate)'==''">1996-04-01</VersionComparisonDate>
+    </PropertyGroup>
 
-      <!-- This number comes from arcade and combines the date based build number id and the revision (incremental number per day) -->
-      <CombinedBuildNumberAndRevision>$(_PatchNumber)</CombinedBuildNumberAndRevision>
-      <!-- Fallback to commit count when patch number is not set. This happens only during CI. -->
-      <CombinedBuildNumberAndRevision Condition=" '$(CombinedBuildNumberAndRevision)' == '' ">$(GitCommitCount)</CombinedBuildNumberAndRevision>
+    <GenerateCurrentVersion
+      SeedDate="$([System.DateTime]::Now.ToString(yyyy-MM-dd))"
+      OfficialBuildId="$(OfficialBuildId)"
+      ComparisonDate="$(VersionComparisonDate)"
+      Padding="$(VersionPadding)">
+      <Output PropertyName="BuildNumberMajor" TaskParameter="GeneratedVersion" />
+      <Output PropertyName="BuildNumberMinor" TaskParameter="GeneratedRevision" />
+    </GenerateCurrentVersion>
 
-      <!-- This number comes from arcade and combines the date based build number id and the revision (incremental number per day) -->
-      <SDKBundleVersion>$(FileVersion)</SDKBundleVersion>
-      <!-- Fallback to commit count when patch number is not set. This happens only during CI. -->
-      <SDKBundleVersion Condition=" '$(SDKBundleVersion)' == '' ">$(VersionPrefix).$(CombinedBuildNumberAndRevision)</SDKBundleVersion>
-    </PropertyGroup>
+    <GenerateMsiVersion
+      Major="$(_MajorVersion)"
+      Minor="$(_MinorVersion)"
+      Patch="$(_PatchVersion)"
+      BuildNumberMajor="$(BuildNumberMajor)"
+      BuildNumberMinor="$(BuildNumberMinor)">
+      <Output TaskParameter="MsiVersion" PropertyName="MsiVersion" />
+    </GenerateMsiVersion>
   </Target>
 </Project>