From 276dbf15a3ed575d0ccfd53bfaa62d628677a36a Mon Sep 17 00:00:00 2001 From: Dillon Skaggs Date: Wed, 13 Aug 2025 22:15:10 -0500 Subject: [PATCH] tweak(premake): up win11 sdk to `10.0.22621.0` 10.0.22000.0 was removed in the latest version VS Version `16.11.50`, this swaps the win11 sdk to be recommended --- code/client/launcher/BackdropBrush.winmd | Bin 2560 -> 2560 bytes .../launcher/CitiLaunch/BackdropBrush.g.h | 16 +++++++-------- code/client/launcher/build_winmd.cmd | 2 +- code/client/launcher/winrt/CitiLaunch.h | 13 +++++++----- .../winrt/Microsoft.Graphics.Canvas.Effects.h | 9 ++++++--- code/client/launcher/winrt/fast_forward.h | 3 ++- .../client/launcher/winrt/impl/CitiLaunch.0.h | 19 +++++++++--------- .../client/launcher/winrt/impl/CitiLaunch.1.h | 7 ++++--- .../client/launcher/winrt/impl/CitiLaunch.2.h | 11 +++++----- .../Microsoft.Graphics.Canvas.Effects.0.h | 7 ++++--- .../Microsoft.Graphics.Canvas.Effects.1.h | 3 ++- .../Microsoft.Graphics.Canvas.Effects.2.h | 3 ++- code/premake5.lua | 2 +- docs/building.md | 2 +- 14 files changed, 55 insertions(+), 42 deletions(-) diff --git a/code/client/launcher/BackdropBrush.winmd b/code/client/launcher/BackdropBrush.winmd index 0f44f3dc71084f9a10fd37fc29289847163b4c79..b0b5d7df2879f251076748e7d0e0f49f53289d0d 100644 GIT binary patch delta 37 tcmZn=X%Ly~6m;flb5UBtF diff --git a/code/client/launcher/CitiLaunch/BackdropBrush.g.h b/code/client/launcher/CitiLaunch/BackdropBrush.g.h index 510b837f53..adb70bf5a1 100644 --- a/code/client/launcher/CitiLaunch/BackdropBrush.g.h +++ b/code/client/launcher/CitiLaunch/BackdropBrush.g.h @@ -1,4 +1,4 @@ -// WARNING: Please don't edit this file. It was generated by C++/WinRT v2.0.201201.7 +// WARNING: Please don't edit this file. It was generated by C++/WinRT v2.0.220110.5 #pragma once #include "winrt/CitiLaunch.h" @@ -8,30 +8,30 @@ namespace winrt::CitiLaunch::implementation { template - struct __declspec(empty_bases) BackdropBrush_base : implements, - impl::require, - impl::base, - Windows::UI::Xaml::Media::IXamlCompositionBrushBaseOverridesT, Windows::UI::Xaml::Media::IBrushOverrides2T + struct __declspec(empty_bases) BackdropBrush_base : implements, + impl::require, + impl::base, + winrt::Windows::UI::Xaml::Media::IXamlCompositionBrushBaseOverridesT, winrt::Windows::UI::Xaml::Media::IBrushOverrides2T { using base_type = BackdropBrush_base; using class_type = CitiLaunch::BackdropBrush; using implements_type = typename BackdropBrush_base::implements_type; using implements_type::implements_type; - using composable_base = Windows::UI::Xaml::Media::XamlCompositionBrushBase; + using composable_base = winrt::Windows::UI::Xaml::Media::XamlCompositionBrushBase; hstring GetRuntimeClassName() const { return L"CitiLaunch.BackdropBrush"; } BackdropBrush_base() { - impl::call_factory([&](Windows::UI::Xaml::Media::IXamlCompositionBrushBaseFactory const& f) { [[maybe_unused]] auto winrt_impl_discarded = f.CreateInstance(*this, this->m_inner); }); + impl::call_factory([&](winrt::Windows::UI::Xaml::Media::IXamlCompositionBrushBaseFactory const& f) { [[maybe_unused]] auto winrt_impl_discarded = f.CreateInstance(*this, this->m_inner); }); } }; } namespace winrt::CitiLaunch::factory_implementation { template - struct __declspec(empty_bases) BackdropBrushT : implements + struct __declspec(empty_bases) BackdropBrushT : implements { using instance_type = CitiLaunch::BackdropBrush; diff --git a/code/client/launcher/build_winmd.cmd b/code/client/launcher/build_winmd.cmd index 1d0c4b3cee..a6da1195c4 100644 --- a/code/client/launcher/build_winmd.cmd +++ b/code/client/launcher/build_winmd.cmd @@ -1,5 +1,5 @@ @echo off -midl /winrt /metadata_dir "%WindowsSdkDir%References\10.0.22000.0\windows.foundation.foundationcontract\4.0.0.0" /h "nul" /nomidl /reference "%WindowsSdkDir%References\10.0.22000.0\Windows.Foundation.FoundationContract\4.0.0.0\Windows.Foundation.FoundationContract.winmd" /reference "%WindowsSdkDir%References\10.0.22000.0\Windows.Foundation.UniversalApiContract\13.0.0.0\Windows.Foundation.UniversalApiContract.winmd" BackdropBrush.idl +midl /winrt /metadata_dir "%WindowsSdkDir%References\10.0.22621.0\windows.foundation.foundationcontract\4.0.0.0" /h "nul" /nomidl /reference "%WindowsSdkDir%References\10.0.22621.0\Windows.Foundation.FoundationContract\4.0.0.0\Windows.Foundation.FoundationContract.winmd" /reference "%WindowsSdkDir%References\10.0.22621.0\Windows.Foundation.UniversalApiContract\15.0.0.0\Windows.Foundation.UniversalApiContract.winmd" BackdropBrush.idl cppwinrt -in BackdropBrush.winmd -c -r sdk -o . diff --git a/code/client/launcher/winrt/CitiLaunch.h b/code/client/launcher/winrt/CitiLaunch.h index 2bb37e4b9d..5cdedfae50 100644 --- a/code/client/launcher/winrt/CitiLaunch.h +++ b/code/client/launcher/winrt/CitiLaunch.h @@ -1,10 +1,11 @@ -// WARNING: Please don't edit this file. It was generated by C++/WinRT v2.0.201201.7 +// WARNING: Please don't edit this file. It was generated by C++/WinRT v2.0.220110.5 +#pragma once #ifndef WINRT_CitiLaunch_H #define WINRT_CitiLaunch_H #include "winrt/base.h" -static_assert(winrt::check_version(CPPWINRT_VERSION, "2.0.201201.7"), "Mismatched C++/WinRT headers."); -#define CPPWINRT_VERSION "2.0.201201.7" +static_assert(winrt::check_version(CPPWINRT_VERSION, "2.0.220110.5"), "Mismatched C++/WinRT headers."); +#define CPPWINRT_VERSION "2.0.220110.5" #include "winrt/impl/Windows.UI.Composition.2.h" #include "winrt/impl/Windows.UI.Xaml.2.h" #include "winrt/impl/Windows.UI.Xaml.Media.2.h" @@ -12,14 +13,14 @@ static_assert(winrt::check_version(CPPWINRT_VERSION, "2.0.201201.7"), "Mismatche namespace winrt::impl { template - struct produce : produce_base + struct produce : produce_base { }; } WINRT_EXPORT namespace winrt::CitiLaunch { inline BackdropBrush::BackdropBrush() : - BackdropBrush(impl::call_factory_cast([](Windows::Foundation::IActivationFactory const& f) { return f.template ActivateInstance(); })) + BackdropBrush(impl::call_factory_cast([](winrt::Windows::Foundation::IActivationFactory const& f) { return f.template ActivateInstance(); })) { } } @@ -29,5 +30,7 @@ namespace std template<> struct hash : winrt::impl::hash_base {}; template<> struct hash : winrt::impl::hash_base {}; #endif +#ifdef __cpp_lib_format +#endif } #endif diff --git a/code/client/launcher/winrt/Microsoft.Graphics.Canvas.Effects.h b/code/client/launcher/winrt/Microsoft.Graphics.Canvas.Effects.h index 1b081d8f61..6090b50383 100644 --- a/code/client/launcher/winrt/Microsoft.Graphics.Canvas.Effects.h +++ b/code/client/launcher/winrt/Microsoft.Graphics.Canvas.Effects.h @@ -1,10 +1,11 @@ -// WARNING: Please don't edit this file. It was generated by C++/WinRT v2.0.201201.7 +// WARNING: Please don't edit this file. It was generated by C++/WinRT v2.0.220110.5 +#pragma once #ifndef WINRT_Microsoft_Graphics_Canvas_Effects_H #define WINRT_Microsoft_Graphics_Canvas_Effects_H #include "winrt/base.h" -static_assert(winrt::check_version(CPPWINRT_VERSION, "2.0.201201.7"), "Mismatched C++/WinRT headers."); -#define CPPWINRT_VERSION "2.0.201201.7" +static_assert(winrt::check_version(CPPWINRT_VERSION, "2.0.220110.5"), "Mismatched C++/WinRT headers."); +#define CPPWINRT_VERSION "2.0.220110.5" #include "winrt/impl/Microsoft.Graphics.Canvas.Effects.2.h" namespace winrt::impl { @@ -16,5 +17,7 @@ namespace std { #ifndef WINRT_LEAN_AND_MEAN #endif +#ifdef __cpp_lib_format +#endif } #endif diff --git a/code/client/launcher/winrt/fast_forward.h b/code/client/launcher/winrt/fast_forward.h index 4d22b3f122..4e0bda64f1 100644 --- a/code/client/launcher/winrt/fast_forward.h +++ b/code/client/launcher/winrt/fast_forward.h @@ -1,5 +1,6 @@ -// WARNING: Please don't edit this file. It was generated by C++/WinRT v2.0.201201.7 +// WARNING: Please don't edit this file. It was generated by C++/WinRT v2.0.220110.5 +#pragma once #ifndef WINRT_FAST_FORWARD_H #define WINRT_FAST_FORWARD_H #include diff --git a/code/client/launcher/winrt/impl/CitiLaunch.0.h b/code/client/launcher/winrt/impl/CitiLaunch.0.h index ec5c87f8f0..b7e5469d94 100644 --- a/code/client/launcher/winrt/impl/CitiLaunch.0.h +++ b/code/client/launcher/winrt/impl/CitiLaunch.0.h @@ -1,5 +1,6 @@ -// WARNING: Please don't edit this file. It was generated by C++/WinRT v2.0.201201.7 +// WARNING: Please don't edit this file. It was generated by C++/WinRT v2.0.220110.5 +#pragma once #ifndef WINRT_CitiLaunch_0_H #define WINRT_CitiLaunch_0_H WINRT_EXPORT namespace winrt::CitiLaunch @@ -9,13 +10,13 @@ WINRT_EXPORT namespace winrt::CitiLaunch } namespace winrt::impl { - template <> struct category{ using type = interface_category; }; - template <> struct category{ using type = class_category; }; - template <> inline constexpr auto& name_v = L"CitiLaunch.BackdropBrush"; - template <> inline constexpr auto& name_v = L"CitiLaunch.IBackdropBrush"; - template <> inline constexpr guid guid_v{ 0xB3CC91C9,0xD1CB,0x5350,{ 0xBC,0x5C,0xA0,0x76,0xF5,0xC5,0x0B,0xF7 } }; // B3CC91C9-D1CB-5350-BC5C-A076F5C50BF7 - template <> struct default_interface{ using type = CitiLaunch::IBackdropBrush; }; - template <> struct abi + template <> struct category{ using type = interface_category; }; + template <> struct category{ using type = class_category; }; + template <> inline constexpr auto& name_v = L"CitiLaunch.BackdropBrush"; + template <> inline constexpr auto& name_v = L"CitiLaunch.IBackdropBrush"; + template <> inline constexpr guid guid_v{ 0xB3CC91C9,0xD1CB,0x5350,{ 0xBC,0x5C,0xA0,0x76,0xF5,0xC5,0x0B,0xF7 } }; // B3CC91C9-D1CB-5350-BC5C-A076F5C50BF7 + template <> struct default_interface{ using type = winrt::CitiLaunch::IBackdropBrush; }; + template <> struct abi { struct __declspec(novtable) type : inspectable_abi { @@ -25,7 +26,7 @@ namespace winrt::impl struct consume_CitiLaunch_IBackdropBrush { }; - template <> struct consume + template <> struct consume { template using type = consume_CitiLaunch_IBackdropBrush; }; diff --git a/code/client/launcher/winrt/impl/CitiLaunch.1.h b/code/client/launcher/winrt/impl/CitiLaunch.1.h index 9a03981846..f9e5e5635d 100644 --- a/code/client/launcher/winrt/impl/CitiLaunch.1.h +++ b/code/client/launcher/winrt/impl/CitiLaunch.1.h @@ -1,16 +1,17 @@ -// WARNING: Please don't edit this file. It was generated by C++/WinRT v2.0.201201.7 +// WARNING: Please don't edit this file. It was generated by C++/WinRT v2.0.220110.5 +#pragma once #ifndef WINRT_CitiLaunch_1_H #define WINRT_CitiLaunch_1_H #include "winrt/impl/CitiLaunch.0.h" WINRT_EXPORT namespace winrt::CitiLaunch { struct __declspec(empty_bases) IBackdropBrush : - Windows::Foundation::IInspectable, + winrt::Windows::Foundation::IInspectable, impl::consume_t { IBackdropBrush(std::nullptr_t = nullptr) noexcept {} - IBackdropBrush(void* ptr, take_ownership_from_abi_t) noexcept : Windows::Foundation::IInspectable(ptr, take_ownership_from_abi) {} + IBackdropBrush(void* ptr, take_ownership_from_abi_t) noexcept : winrt::Windows::Foundation::IInspectable(ptr, take_ownership_from_abi) {} }; } #endif diff --git a/code/client/launcher/winrt/impl/CitiLaunch.2.h b/code/client/launcher/winrt/impl/CitiLaunch.2.h index 94a9b4dd1f..d927635aec 100644 --- a/code/client/launcher/winrt/impl/CitiLaunch.2.h +++ b/code/client/launcher/winrt/impl/CitiLaunch.2.h @@ -1,5 +1,6 @@ -// WARNING: Please don't edit this file. It was generated by C++/WinRT v2.0.201201.7 +// WARNING: Please don't edit this file. It was generated by C++/WinRT v2.0.220110.5 +#pragma once #ifndef WINRT_CitiLaunch_2_H #define WINRT_CitiLaunch_2_H #include "winrt/impl/Windows.UI.Composition.1.h" @@ -8,12 +9,12 @@ #include "winrt/impl/CitiLaunch.1.h" WINRT_EXPORT namespace winrt::CitiLaunch { - struct __declspec(empty_bases) BackdropBrush : CitiLaunch::IBackdropBrush, - impl::base, - impl::require + struct __declspec(empty_bases) BackdropBrush : winrt::CitiLaunch::IBackdropBrush, + impl::base, + impl::require { BackdropBrush(std::nullptr_t) noexcept {} - BackdropBrush(void* ptr, take_ownership_from_abi_t) noexcept : CitiLaunch::IBackdropBrush(ptr, take_ownership_from_abi) {} + BackdropBrush(void* ptr, take_ownership_from_abi_t) noexcept : winrt::CitiLaunch::IBackdropBrush(ptr, take_ownership_from_abi) {} BackdropBrush(); }; } diff --git a/code/client/launcher/winrt/impl/Microsoft.Graphics.Canvas.Effects.0.h b/code/client/launcher/winrt/impl/Microsoft.Graphics.Canvas.Effects.0.h index 011d74c527..65ed49948a 100644 --- a/code/client/launcher/winrt/impl/Microsoft.Graphics.Canvas.Effects.0.h +++ b/code/client/launcher/winrt/impl/Microsoft.Graphics.Canvas.Effects.0.h @@ -1,5 +1,6 @@ -// WARNING: Please don't edit this file. It was generated by C++/WinRT v2.0.201201.7 +// WARNING: Please don't edit this file. It was generated by C++/WinRT v2.0.220110.5 +#pragma once #ifndef WINRT_Microsoft_Graphics_Canvas_Effects_0_H #define WINRT_Microsoft_Graphics_Canvas_Effects_0_H WINRT_EXPORT namespace winrt::Microsoft::Graphics::Canvas::Effects @@ -8,8 +9,8 @@ WINRT_EXPORT namespace winrt::Microsoft::Graphics::Canvas::Effects } namespace winrt::impl { - template <> struct category{ using type = struct_category; }; - template <> inline constexpr auto& name_v = L"Microsoft.Graphics.Canvas.Effects.Matrix5x4"; + template <> struct category{ using type = struct_category; }; + template <> inline constexpr auto& name_v = L"Microsoft.Graphics.Canvas.Effects.Matrix5x4"; struct struct_Microsoft_Graphics_Canvas_Effects_Matrix5x4 { float M11; diff --git a/code/client/launcher/winrt/impl/Microsoft.Graphics.Canvas.Effects.1.h b/code/client/launcher/winrt/impl/Microsoft.Graphics.Canvas.Effects.1.h index e4c50010b8..2fc0605626 100644 --- a/code/client/launcher/winrt/impl/Microsoft.Graphics.Canvas.Effects.1.h +++ b/code/client/launcher/winrt/impl/Microsoft.Graphics.Canvas.Effects.1.h @@ -1,5 +1,6 @@ -// WARNING: Please don't edit this file. It was generated by C++/WinRT v2.0.201201.7 +// WARNING: Please don't edit this file. It was generated by C++/WinRT v2.0.220110.5 +#pragma once #ifndef WINRT_Microsoft_Graphics_Canvas_Effects_1_H #define WINRT_Microsoft_Graphics_Canvas_Effects_1_H #include "winrt/impl/Microsoft.Graphics.Canvas.Effects.0.h" diff --git a/code/client/launcher/winrt/impl/Microsoft.Graphics.Canvas.Effects.2.h b/code/client/launcher/winrt/impl/Microsoft.Graphics.Canvas.Effects.2.h index 064fea509f..b303b5fbdd 100644 --- a/code/client/launcher/winrt/impl/Microsoft.Graphics.Canvas.Effects.2.h +++ b/code/client/launcher/winrt/impl/Microsoft.Graphics.Canvas.Effects.2.h @@ -1,5 +1,6 @@ -// WARNING: Please don't edit this file. It was generated by C++/WinRT v2.0.201201.7 +// WARNING: Please don't edit this file. It was generated by C++/WinRT v2.0.220110.5 +#pragma once #ifndef WINRT_Microsoft_Graphics_Canvas_Effects_2_H #define WINRT_Microsoft_Graphics_Canvas_Effects_2_H #include "winrt/impl/Microsoft.Graphics.Canvas.Effects.1.h" diff --git a/code/premake5.lua b/code/premake5.lua index 14c9cc9142..8038f34f6a 100644 --- a/code/premake5.lua +++ b/code/premake5.lua @@ -176,7 +176,7 @@ workspace "CitizenMP" buildoptions { '/Zc:preprocessor' } - systemversion '10.0.22000.0' + systemversion '10.0.22621.0' else vectorextensions 'SSSE3' end diff --git a/docs/building.md b/docs/building.md index fd432846e7..99f6a399c5 100644 --- a/docs/building.md +++ b/docs/building.md @@ -11,7 +11,7 @@ To build FiveM, RedM or FXServer on Windows you need the following dependencies: - Windows application development - Individual components - .NET Framework 4.6 targeting pack - - Windows 11 SDK (10.0.22000.0) + - Windows 11 SDK (10.0.22621.0) You can install these workloads by going to "Tools" -> "Get Tools and Features..." -> Check the checkboxes -> Click "Modify" in the bottom right corner.