Skip to content

Commit f4073d3

Browse files
DefaultRyanCopilot
andcommitted
Fix CI failures
Co-authored-by: Copilot <copilot@github.com>
1 parent ccfee65 commit f4073d3

2 files changed

Lines changed: 13 additions & 0 deletions

File tree

.github/workflows/ci.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,15 @@ jobs:
379379
$target_platform = "${{ matrix.arch }}"
380380
& "_build\$target_platform\$target_configuration\cppwinrt.exe" -in local -out _build\$target_platform\$target_configuration -verbose
381381
382+
- name: Remove module test projects on v143
383+
if: matrix.toolchain.platform_toolset == 'v143'
384+
run: |
385+
# Module test projects require v145 toolset
386+
mv test\nuget\NugetTest.sln test\nuget\NugetTest.sln.orig
387+
Get-Content test\nuget\NugetTest.sln.orig |
388+
Where-Object { -not ($_ -match 'TestModule') } |
389+
Set-Content test\nuget\NugetTest.sln
390+
382391
- name: Run nuget test
383392
run: |
384393
cmd /c "$env:VSDevCmd" "&" msbuild /m /clp:ForceConsoleColor "$env:msbuild_config_props" test\nuget\NugetTest.sln

strings/base_fast_forward.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ static_assert(WINRT_FAST_ABI_SIZE >= %);
3030

3131
#pragma detect_mismatch("WINRT_FAST_ABI_SIZE", WINRT_IMPL_STRING(WINRT_FAST_ABI_SIZE))
3232

33+
#ifndef WINRT_EXPORT
34+
#define WINRT_EXPORT
35+
#endif
36+
3337
WINRT_EXPORT namespace winrt::impl
3438
{
3539
// Thunk definitions are in arch-specific assembly sources

0 commit comments

Comments
 (0)