Merge remote-tracking branch 'origin/main' into feature/llm

Author: Console Service Bot

src/buffer/out/Row.cpp

@@ -350,7 +350,7 @@ void ROW::_init() noexcept
     std::iota(_charOffsets.begin(), _charOffsets.end(), uint16_t{ 0 });
 #endif
 
-#pragma warning(push)
+#pragma warning(pop)
 }
 
 void ROW::CopyFrom(const ROW& source)

src/host/ft_host/API_FontTests.cpp

@@ -67,7 +67,7 @@ void FontTests::TestCurrentFontAPIsInvalid()
     }
     else
     {
-        hConsoleOutput = (HANDLE)dwConsoleOutput;
+        hConsoleOutput = ULongToHandle(dwConsoleOutput);
     }
 
     if (strOperation == L"Get")
@@ -107,7 +107,7 @@ void FontTests::TestGetFontSizeInvalid()
     // Need to make sure that last error is cleared so that we can verify that lasterror was set by GetConsoleFontSize
     SetLastError(0);
 
-    auto coordFontSize = OneCoreDelay::GetConsoleFontSize((HANDLE)dwConsoleOutput, 0);
+    auto coordFontSize = OneCoreDelay::GetConsoleFontSize(ULongToHandle(dwConsoleOutput), 0);
     VERIFY_ARE_EQUAL(coordFontSize, c_coordZero, L"Ensure (0,0) coord returned to indicate failure");
     VERIFY_ARE_EQUAL(GetLastError(), (DWORD)ERROR_INVALID_HANDLE, L"Ensure last error was set appropriately");
 }

src/interactivity/onecore/lib/sources

@@ -6,8 +6,3 @@
 
 TARGETNAME              = ConInteractivityOneCoreLib
 TARGETTYPE              = LIBRARY
-
-# VSTS 14847240: Locally suppress individual -Wv:17 compiler warnings.
-# For more information, visit https://osgwiki.com/wiki/Windows_C%2B%2B_Toolset_Status.
-USER_C_FLAGS=$(USER_C_FLAGS) /wd4302 # 'conversion': truncation from 'type1' to 'type2'
-USER_C_FLAGS=$(USER_C_FLAGS) /wd4311 # 'variable': pointer truncation from 'type 1' to 'type 2'