From c31b416530dc1dbd14c3e0039ec291239541b688 Mon Sep 17 00:00:00 2001 From: Leonard Hecker Date: Thu, 28 Jul 2022 03:50:33 +0200 Subject: [PATCH 1/2] Disable C26493 due to issues in MSVC 14.33.31629 --- scratch/ScratchIslandApp/Package/Package.wapproj | 4 ---- src/cascadia/CascadiaPackage/CascadiaPackage.wapproj | 4 ---- src/common.build.pre.props | 9 ++++++--- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/scratch/ScratchIslandApp/Package/Package.wapproj b/scratch/ScratchIslandApp/Package/Package.wapproj index b99e588aaca..12b3b7d768e 100644 --- a/scratch/ScratchIslandApp/Package/Package.wapproj +++ b/scratch/ScratchIslandApp/Package/Package.wapproj @@ -87,10 +87,6 @@ Since PRI file generation is _before_ manifest generation (for possibly obvious or important reasons), that doesn't work for us. --> - - - <_GenerateProjectPriFileDependsOn Condition="$(MSBuildVersion) < '16.3.0'">OpenConsoleLiftDesktopBridgePriFiles;$(_GenerateProjectPriFileDependsOn) - <_PriFile Include="@(_NonWapProjProjectOutput)" Condition="'%(Extension)' == '.pri'" /> diff --git a/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj b/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj index a00aaecd33c..4c93cde0c40 100644 --- a/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj +++ b/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj @@ -109,10 +109,6 @@ Since PRI file generation is _before_ manifest generation (for possibly obvious or important reasons), that doesn't work for us. --> - - - <_GenerateProjectPriFileDependsOn Condition="$(MSBuildVersion) < '16.3.0'">OpenConsoleLiftDesktopBridgePriFiles;$(_GenerateProjectPriFileDependsOn) - <_PriFile Include="@(_NonWapProjProjectOutput)" Condition="'%(Extension)' == '.pri'" /> diff --git a/src/common.build.pre.props b/src/common.build.pre.props index 21065253edb..e328298795a 100644 --- a/src/common.build.pre.props +++ b/src/common.build.pre.props @@ -83,8 +83,7 @@ - v142 - v143 + v143 Unicode false x64 @@ -110,8 +109,12 @@ C26813: Use 'bitwise and' to check if a flag is set. The MSVC v19.31 toolset has a bug where a pointer to an enum is incorrectly flagged with C26813. It's supposed to be fixed with VS 17.2.1 and 17.3.0 and later respectively. + C26493: Don't use C-style casts (type.4). + The MSVC 14.33.31629 toolset (VS 17.3 Preview 5) has a bug + where brace initializations are treated as C-style casts. --> - 4201;4312;4467;5105;26445;26813;%(DisableSpecificWarnings) + 4201;4312;4467;5105;26445;26813;%(DisableSpecificWarnings) + 4201;4312;4467;5105;26445;26813;26493;%(DisableSpecificWarnings) _WINDOWS;EXTERNAL_BUILD;%(PreprocessorDefinitions) true precomp.h From 0616d8148eb773d4f84d00756784ad0acf8f29c3 Mon Sep 17 00:00:00 2001 From: Leonard Hecker Date: Thu, 28 Jul 2022 14:25:38 +0200 Subject: [PATCH 2/2] Revert C26493 suppression --- src/common.build.pre.props | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/common.build.pre.props b/src/common.build.pre.props index e328298795a..bcd9eb51fe5 100644 --- a/src/common.build.pre.props +++ b/src/common.build.pre.props @@ -109,12 +109,8 @@ C26813: Use 'bitwise and' to check if a flag is set. The MSVC v19.31 toolset has a bug where a pointer to an enum is incorrectly flagged with C26813. It's supposed to be fixed with VS 17.2.1 and 17.3.0 and later respectively. - C26493: Don't use C-style casts (type.4). - The MSVC 14.33.31629 toolset (VS 17.3 Preview 5) has a bug - where brace initializations are treated as C-style casts. --> - 4201;4312;4467;5105;26445;26813;%(DisableSpecificWarnings) - 4201;4312;4467;5105;26445;26813;26493;%(DisableSpecificWarnings) + 4201;4312;4467;5105;26445;26813;%(DisableSpecificWarnings) _WINDOWS;EXTERNAL_BUILD;%(PreprocessorDefinitions) true precomp.h