From 912aa47ff43e0379e89d10dcb0d470bd360d17e3 Mon Sep 17 00:00:00 2001
From: Jon Wiswall <jonwis@microsoft.com>
Date: Sat, 25 Nov 2023 21:48:38 -0800
Subject: [PATCH] Update GitHub action LLVM version to 17.0.5 (#1373)

* Maybe update tools version

* LLVM & Clang v17.0.5 now support source_location properly
---
 .github/actions/setup-llvm-msvc/action.yml | 2 +-
 Directory.Build.Props                      | 4 ++++
 test/test_cpp20/custom_error.cpp           | 7 +------
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/actions/setup-llvm-msvc/action.yml b/.github/actions/setup-llvm-msvc/action.yml
index 5017f7dc..d6a2a5fa 100644
--- a/.github/actions/setup-llvm-msvc/action.yml
+++ b/.github/actions/setup-llvm-msvc/action.yml
@@ -4,7 +4,7 @@ inputs:
   llvm-version:
     description: 'LLVM version'
     required: true
-    default: '15.0.5'
+    default: '17.0.5'
 outputs:
   llvm-path:
     description: "The path in which LLVM is installed to"
diff --git a/Directory.Build.Props b/Directory.Build.Props
index 38ad0835..95286d28 100644
--- a/Directory.Build.Props
+++ b/Directory.Build.Props
@@ -22,6 +22,10 @@
     Optionally add /t:<project> to only build a given a solution project:
 
         msbuild /m /p:Configuration=Debug,Platform=x64,Clang=1 cppwinrt.sln /t:cppwinrt
+
+    If you have deployed the LLVM toolset elsewhere, add its path to the configuration:
+
+        msbuild /m /p:Configuration=Debug,Platform=x64,Clang=1,LLVMToolsVersion=17.0.5,LLVMInstallDir=C:\llvm cppwinrt.sln
   -->
 
   <PropertyGroup Condition="'$(Clang)'=='1'">
diff --git a/test/test_cpp20/custom_error.cpp b/test/test_cpp20/custom_error.cpp
index 34a0ea38..97bfd8dc 100644
--- a/test/test_cpp20/custom_error.cpp
+++ b/test/test_cpp20/custom_error.cpp
@@ -35,12 +35,7 @@ namespace
     }
 }
 
-#if defined(__clang__) && defined(_MSC_VER)
-// FIXME: Blocked on __cpp_consteval, see:
-// * https://github.com/microsoft/cppwinrt/pull/1203#issuecomment-1279764927
-// * https://github.com/llvm/llvm-project/issues/57094
-TEST_CASE("custom_error_logger", "[!shouldfail]")
-#elif defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 160000
+#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 170000
 // <source_location> not available in libc++ before LLVM 16
 TEST_CASE("custom_error_logger", "[!shouldfail]")
 #else