зеркало из https://github.com/microsoft/BuildXL.git
Merged PR 780158: Changes to upgrade MSVC version and resolve c-style casts errors
Need to update MSVC version to 14.39.33519 to ensure that the runtime binaries are compiled with the /ZH:SHA256 flag. If this is not done, it will keep picking up the old version which 14.29.30133 Before: https://dev.azure.com/mseng/Domino/_build/results?buildId=27818778&view=logs&j=ac0a85a6-02a9-5058-229a-2b15404be380&t=795dfba3-3fa9-52fc-ce81-dba976734c4e&l=65 After: https://dev.azure.com/mseng/Domino/_build/results?buildId=27824324&view=logs&j=ac0a85a6-02a9-5058-229a-2b15404be380&t=795dfba3-3fa9-52fc-ce81-dba976734c4e&l=65 This PR also includes some of the changes to resolve c-style casts errors, which have been caused due to the upgrade Related work items: #2169518
This commit is contained in:
Родитель
3e82f17e7c
Коммит
8051b1f861
|
@ -93,7 +93,7 @@ function getMsvcPackage() : StaticDirectory {
|
|||
}
|
||||
else {
|
||||
let msvcVersions = [
|
||||
"14.29.30133"
|
||||
"14.39.33519"
|
||||
];
|
||||
|
||||
// ADO will set this variable if the version above is not installed
|
||||
|
|
|
@ -172,7 +172,7 @@ int GetFileAttributesExWLogging(void)
|
|||
{
|
||||
GetFileAttributesExW(
|
||||
L"GetFileAttributesALoggingTest.txt",
|
||||
(GET_FILEEX_INFO_LEVELS)GetFileExInfoStandard,
|
||||
static_cast<GET_FILEEX_INFO_LEVELS>(GetFileExInfoStandard),
|
||||
NULL
|
||||
);
|
||||
|
||||
|
@ -183,7 +183,7 @@ int GetFileAttributesExALogging(void)
|
|||
{
|
||||
GetFileAttributesExA(
|
||||
"GetFileAttributesALoggingTest.txt",
|
||||
(GET_FILEEX_INFO_LEVELS)GetFileExInfoStandard,
|
||||
static_cast<GET_FILEEX_INFO_LEVELS>(GetFileExInfoStandard),
|
||||
NULL
|
||||
);
|
||||
|
||||
|
@ -412,9 +412,9 @@ int FindFirstFileExWLogging(void)
|
|||
{
|
||||
FindFirstFileExW(
|
||||
L"FindFirstFileExWLoggingTest.txt",
|
||||
(FINDEX_INFO_LEVELS)FindExInfoStandard,
|
||||
static_cast<FINDEX_INFO_LEVELS>(FindExInfoStandard),
|
||||
NULL,
|
||||
(FINDEX_SEARCH_OPS)FindExSearchNameMatch,
|
||||
static_cast<FINDEX_SEARCH_OPS>(FindExSearchNameMatch),
|
||||
NULL,
|
||||
0
|
||||
);
|
||||
|
@ -426,9 +426,9 @@ int FindFirstFileExALogging(void)
|
|||
{
|
||||
FindFirstFileExA(
|
||||
"FindFirstFileExALoggingTest.txt",
|
||||
(FINDEX_INFO_LEVELS)FindExInfoStandard,
|
||||
static_cast<FINDEX_INFO_LEVELS>(FindExInfoStandard),
|
||||
NULL,
|
||||
(FINDEX_SEARCH_OPS)FindExSearchNameMatch,
|
||||
static_cast<FINDEX_SEARCH_OPS>(FindExSearchNameMatch),
|
||||
NULL,
|
||||
0
|
||||
);
|
||||
|
@ -441,7 +441,7 @@ int GetFileInformationByHandleExLogging(void)
|
|||
HANDLE hFile = NULL;
|
||||
GetFileInformationByHandleEx(
|
||||
hFile,
|
||||
(FILE_INFO_BY_HANDLE_CLASS)FileBasicInfo,
|
||||
static_cast<FILE_INFO_BY_HANDLE_CLASS>(FileBasicInfo),
|
||||
NULL,
|
||||
100
|
||||
);
|
||||
|
@ -454,7 +454,7 @@ int SetFileInformationByHandleLogging(void)
|
|||
HANDLE hFile = NULL;
|
||||
SetFileInformationByHandle(
|
||||
hFile,
|
||||
(FILE_INFO_BY_HANDLE_CLASS)FileBasicInfo,
|
||||
static_cast<FILE_INFO_BY_HANDLE_CLASS>(FileBasicInfo),
|
||||
NULL,
|
||||
100
|
||||
);
|
||||
|
|
|
@ -408,7 +408,7 @@ int CallDetouredFileCreateOnSymlink(bool openWithReparsePoint)
|
|||
FILE_SHARE_READ,
|
||||
0,
|
||||
OPEN_EXISTING,
|
||||
(DWORD)(openWithReparsePoint ? FILE_FLAG_OPEN_REPARSE_POINT : FILE_ATTRIBUTE_NORMAL),
|
||||
static_cast<DWORD>(openWithReparsePoint ? FILE_FLAG_OPEN_REPARSE_POINT : FILE_ATTRIBUTE_NORMAL),
|
||||
NULL);
|
||||
|
||||
if (hFile == INVALID_HANDLE_VALUE)
|
||||
|
@ -446,9 +446,9 @@ int CallDetouredCopyFileNotFollowingChainOfSymlinks()
|
|||
CopyFileExW(
|
||||
L"SourceOfSymLink.link",
|
||||
L"CopiedFile.txt",
|
||||
(LPPROGRESS_ROUTINE)NULL,
|
||||
(LPVOID)NULL,
|
||||
(LPBOOL)NULL,
|
||||
static_cast<LPPROGRESS_ROUTINE>(NULL),
|
||||
static_cast<LPVOID>(NULL),
|
||||
static_cast<LPBOOL>(NULL),
|
||||
COPY_FILE_COPY_SYMLINK);
|
||||
|
||||
return static_cast<int>(GetLastError());
|
||||
|
@ -464,9 +464,9 @@ int CallDetouredCopyFileToExistingSymlink(bool copySymlink)
|
|||
CopyFileExW(
|
||||
L"LinkToSource.link",
|
||||
L"LinkToDestination.link",
|
||||
(LPPROGRESS_ROUTINE)NULL,
|
||||
(LPVOID)NULL,
|
||||
(LPBOOL)NULL,
|
||||
static_cast<LPPROGRESS_ROUTINE>(NULL),
|
||||
static_cast<LPVOID>(NULL),
|
||||
static_cast<LPBOOL>(NULL),
|
||||
copySymlink ? COPY_FILE_COPY_SYMLINK : (DWORD)0x0);
|
||||
|
||||
return static_cast<int>(GetLastError());
|
||||
|
@ -636,7 +636,7 @@ int CallDetouredNtCreateFileOnSymlink(bool withReparsePointFlag)
|
|||
FILE_ATTRIBUTE_NORMAL,
|
||||
FILE_SHARE_READ,
|
||||
FILE_OPEN,
|
||||
FILE_NON_DIRECTORY_FILE | (DWORD)(withReparsePointFlag ? FILE_OPEN_REPARSE_POINT : 0),
|
||||
FILE_NON_DIRECTORY_FILE | static_cast<DWORD>(withReparsePointFlag ? FILE_OPEN_REPARSE_POINT : 0),
|
||||
NULL,
|
||||
NULL);
|
||||
|
||||
|
|
|
@ -211,8 +211,8 @@ NTSTATUS ZwSetFileDispositionByHandle(HANDLE hFile, FILE_INFORMATION_CLASS_EXTRA
|
|||
hFile,
|
||||
&ioStatusBlock,
|
||||
fileInfo,
|
||||
(ULONG)bufferSize,
|
||||
(FILE_INFORMATION_CLASS)fileInfoClass);
|
||||
static_cast<ULONG>(bufferSize),
|
||||
static_cast<FILE_INFORMATION_CLASS>(fileInfoClass));
|
||||
}
|
||||
|
||||
NTSTATUS OpenFileWithNtCreateFile(
|
||||
|
|
Загрузка…
Ссылка в новой задаче