From 6c2e1ad7a4a29d6818c99f53b9656ac6d3e77d15 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Mon, 2 Dec 2024 11:46:56 -0800
Subject: [PATCH 1/2] Update to final version of .net 6

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index e2bbecba9995..5fe013cae677 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -26,7 +26,7 @@
     <VersionFeature21>30</VersionFeature21>
     <VersionFeature31>32</VersionFeature31>
     <VersionFeature50>17</VersionFeature50>
-    <VersionFeature60>$([MSBuild]::Add($(VersionFeature), 25))</VersionFeature60>
+    <VersionFeature60>36</VersionFeature60>
     <VersionFeature70>20</VersionFeature70>
     <!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
          referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->

From 3919a70a242c9475bb3aa3e6e92083278d8fab66 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Tue, 3 Dec 2024 14:27:39 -0800
Subject: [PATCH 2/2] Patch for Clang 19 support (#20259)

---
 ...d-support-for-building-with-Clang-19.patch | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 src/SourceBuild/patches/runtime/0001-Add-support-for-building-with-Clang-19.patch

diff --git a/src/SourceBuild/patches/runtime/0001-Add-support-for-building-with-Clang-19.patch b/src/SourceBuild/patches/runtime/0001-Add-support-for-building-with-Clang-19.patch
new file mode 100644
index 000000000000..b774da92e348
--- /dev/null
+++ b/src/SourceBuild/patches/runtime/0001-Add-support-for-building-with-Clang-19.patch
@@ -0,0 +1,64 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nikola Milosavljevic <nikolam@microsoft.com>
+Date: Tue, 3 Dec 2024 19:24:39 +0000
+Subject: [PATCH] Add support for building with Clang 19
+
+Backport: https://github.com/dotnet/runtime/pull/109198
+---
+ src/coreclr/vm/comreflectioncache.hpp | 4 ++++
+ src/native/libs/CMakeLists.txt        | 6 ++++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/src/coreclr/vm/comreflectioncache.hpp b/src/coreclr/vm/comreflectioncache.hpp
+index 08d173e6164..12db55251d8 100644
+--- a/src/coreclr/vm/comreflectioncache.hpp
++++ b/src/coreclr/vm/comreflectioncache.hpp
+@@ -26,6 +26,7 @@ public:
+ 
+     void Init();
+ 
++#ifndef DACCESS_COMPILE
+     BOOL GetFromCache(Element *pElement, CacheType& rv)
+     {
+         CONTRACTL
+@@ -102,6 +103,7 @@ public:
+         AdjustStamp(TRUE);
+         this->LeaveWrite();
+     }
++#endif // !DACCESS_COMPILE
+ 
+ private:
+     // Lock must have been taken before calling this.
+@@ -141,6 +143,7 @@ private:
+         return CacheSize;
+     }
+ 
++#ifndef DACCESS_COMPILE
+     void AdjustStamp(BOOL hasWriterLock)
+     {
+         CONTRACTL
+@@ -170,6 +173,7 @@ private:
+         if (!hasWriterLock)
+             this->LeaveWrite();
+     }
++#endif // !DACCESS_COMPILE
+ 
+     void UpdateHashTable(SIZE_T hash, int slot)
+     {
+diff --git a/src/native/libs/CMakeLists.txt b/src/native/libs/CMakeLists.txt
+index b8ec2cf654c..67f2858647e 100644
+--- a/src/native/libs/CMakeLists.txt
++++ b/src/native/libs/CMakeLists.txt
+@@ -128,6 +128,12 @@ if (CLR_CMAKE_TARGET_UNIX OR CLR_CMAKE_TARGET_BROWSER OR CLR_CMAKE_TARGET_WASI)
+         add_compile_options(-Wno-cast-align)
+         add_compile_options(-Wno-typedef-redefinition)
+         add_compile_options(-Wno-c11-extensions)
++
++        check_c_compiler_flag(-Wpre-c11-compat COMPILER_SUPPORTS_W_PRE_C11_COMPAT)
++        if (COMPILER_SUPPORTS_W_PRE_C11_COMPAT)
++            add_compile_options(-Wno-pre-c11-compat)
++        endif()
++
+         add_compile_options(-Wno-thread-safety-analysis)
+         if (CLR_CMAKE_TARGET_BROWSER)
+             add_compile_options(-Wno-unsafe-buffer-usage)