diff --git a/AdvLoggerPkg/AdvLoggerPkg.dsc b/AdvLoggerPkg/AdvLoggerPkg.dsc index 0c30761f78..1500cef7c7 100644 --- a/AdvLoggerPkg/AdvLoggerPkg.dsc +++ b/AdvLoggerPkg/AdvLoggerPkg.dsc @@ -71,15 +71,6 @@ FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf [LibraryClasses.X64] - RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf -!if $(TOOL_CHAIN_TAG) == VS2019 or $(TOOL_CHAIN_TAG) == VS2022 - # Provide StackCookie support lib so that we can link to /GS exports for VS builds - NULL|MdePkg/Library/BaseBinSecurityLibRng/BaseBinSecurityLibRng.inf - BaseBinSecurityLib|MdePkg/Library/BaseBinSecurityLibRng/BaseBinSecurityLibRng.inf -!else - BaseBinSecurityLib|MdePkg/Library/BaseBinSecurityLibNull/BaseBinSecurityLibNull.inf -!endif - SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf AdvancedLoggerAccessLib|AdvLoggerPkg/Library/AdvancedLoggerAccessLib/AdvancedLoggerAccessLib.inf AdvancedLoggerLib|AdvLoggerPkg/Library/AdvancedLoggerLib/Dxe/AdvancedLoggerLib.inf diff --git a/HidPkg/HidPkg.dsc b/HidPkg/HidPkg.dsc index 55947da95b..bb0a4bf3e2 100644 --- a/HidPkg/HidPkg.dsc +++ b/HidPkg/HidPkg.dsc @@ -40,16 +40,6 @@ UefiHiiServicesLib |MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf SafeIntLib |MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf # MU_CHANGE - CodeQL change -[LibraryClasses.X64] - RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf -!if $(TOOL_CHAIN_TAG) == VS2019 or $(TOOL_CHAIN_TAG) == VS2022 - # Provide StackCookie support lib so that we can link to /GS exports for VS builds - NULL|MdePkg/Library/BaseBinSecurityLibRng/BaseBinSecurityLibRng.inf - BaseBinSecurityLib|MdePkg/Library/BaseBinSecurityLibRng/BaseBinSecurityLibRng.inf -!else - BaseBinSecurityLib|MdePkg/Library/BaseBinSecurityLibNull/BaseBinSecurityLibNull.inf -!endif - [Components.X64] HidPkg/HidKeyboardDxe/HidKeyboardDxe.inf HidPkg/HidMouseAbsolutePointerDxe/HidMouseAbsolutePointerDxe.inf diff --git a/MfciPkg/MfciPkg.dsc b/MfciPkg/MfciPkg.dsc index 7bbe5656bc..cbed620efd 100644 --- a/MfciPkg/MfciPkg.dsc +++ b/MfciPkg/MfciPkg.dsc @@ -57,14 +57,6 @@ PlatformPKProtectionLib|SecurityPkg/Library/PlatformPKProtectionLibVarPolicy/PlatformPKProtectionLibVarPolicy.inf MfciRetrievePolicyLib|MfciPkg/Library/MfciRetrievePolicyLibNull/MfciRetrievePolicyLibNull.inf -!if $(TOOL_CHAIN_TAG) == VS2019 or $(TOOL_CHAIN_TAG) == VS2022 - # Provide StackCookie support lib so that we can link to /GS exports for VS builds - NULL|MdePkg/Library/BaseBinSecurityLibRng/BaseBinSecurityLibRng.inf - BaseBinSecurityLib|MdePkg/Library/BaseBinSecurityLibRng/BaseBinSecurityLibRng.inf -!else - BaseBinSecurityLib|MdePkg/Library/BaseBinSecurityLibNull/BaseBinSecurityLibNull.inf -!endif - [LibraryClasses] MfciPolicyParsingLib|MfciPkg/Private/Library/MfciPolicyParsingLibNull/MfciPolicyParsingLibNull.inf MfciDeviceIdSupportLib|MfciPkg/Library/MfciDeviceIdSupportLibNull/MfciDeviceIdSupportLibNull.inf diff --git a/MfciPkg/UnitTests/MfciPkgHostTest.dsc b/MfciPkg/UnitTests/MfciPkgHostTest.dsc index cb0d813a94..79dad3acba 100644 --- a/MfciPkg/UnitTests/MfciPkgHostTest.dsc +++ b/MfciPkg/UnitTests/MfciPkgHostTest.dsc @@ -34,7 +34,11 @@ # Library Class section - list of all Library Classes needed by this Platform. # ################################################################################ -!include MdePkg/MdeLibs.dsc.inc +[LibraryClasses] + ArmTrngLib|MdePkg/Library/BaseArmTrngLibNull/BaseArmTrngLibNull.inf + RegisterFilterLib|MdePkg/Library/RegisterFilterLibNull/RegisterFilterLibNull.inf + CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf + SmmCpuRendezvousLib|MdePkg/Library/SmmCpuRendezvousLibNull/SmmCpuRendezvousLibNull.inf [LibraryClasses.X64] TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf diff --git a/MsApplicationPkg/MsApplicationPkg.dsc b/MsApplicationPkg/MsApplicationPkg.dsc index 4ce9cc8385..00d4b89016 100644 --- a/MsApplicationPkg/MsApplicationPkg.dsc +++ b/MsApplicationPkg/MsApplicationPkg.dsc @@ -31,16 +31,6 @@ UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf -[LibraryClasses.X64] - -!if $(TOOL_CHAIN_TAG) == VS2019 or $(TOOL_CHAIN_TAG) == VS2022 - # Provide StackCookie support lib so that we can link to /GS exports for VS builds - NULL|MdePkg/Library/BaseBinSecurityLibRng/BaseBinSecurityLibRng.inf - BaseBinSecurityLib|MdePkg/Library/BaseBinSecurityLibRng/BaseBinSecurityLibRng.inf -!else - BaseBinSecurityLib|MdePkg/Library/BaseBinSecurityLibNull/BaseBinSecurityLibNull.inf -!endif - [LibraryClasses.AARCH64] # Add support for GCC stack protector NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf diff --git a/MsCorePkg/MsCorePkg.dsc b/MsCorePkg/MsCorePkg.dsc index 3c327203f9..ae7aa2792b 100644 --- a/MsCorePkg/MsCorePkg.dsc +++ b/MsCorePkg/MsCorePkg.dsc @@ -103,15 +103,6 @@ [LibraryClasses.common.SEC] CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf -[LibraryClasses.X64] -!if $(TOOL_CHAIN_TAG) == VS2019 or $(TOOL_CHAIN_TAG) == VS2022 - # Provide StackCookie support lib so that we can link to /GS exports for VS builds - NULL|MdePkg/Library/BaseBinSecurityLibRng/BaseBinSecurityLibRng.inf - BaseBinSecurityLib|MdePkg/Library/BaseBinSecurityLibRng/BaseBinSecurityLibRng.inf -!else - BaseBinSecurityLib|MdePkg/Library/BaseBinSecurityLibNull/BaseBinSecurityLibNull.inf -!endif - [LibraryClasses.common.PEIM] PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf diff --git a/MsCorePkg/UnitTests/MsCorePkgHostTest.dsc b/MsCorePkg/UnitTests/MsCorePkgHostTest.dsc index 3b9f7f3fa1..037e4d86c1 100644 --- a/MsCorePkg/UnitTests/MsCorePkgHostTest.dsc +++ b/MsCorePkg/UnitTests/MsCorePkgHostTest.dsc @@ -28,9 +28,11 @@ # Library Class section - list of all Library Classes needed by this Platform. # ################################################################################ -!include MdePkg/MdeLibs.dsc.inc - [LibraryClasses] + ArmTrngLib|MdePkg/Library/BaseArmTrngLibNull/BaseArmTrngLibNull.inf + RegisterFilterLib|MdePkg/Library/RegisterFilterLibNull/RegisterFilterLibNull.inf + CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf + SmmCpuRendezvousLib|MdePkg/Library/SmmCpuRendezvousLibNull/SmmCpuRendezvousLibNull.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf UefiRuntimeServicesTableLib|MfciPkg/UnitTests/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf diff --git a/MsGraphicsPkg/MsGraphicsPkg.dsc b/MsGraphicsPkg/MsGraphicsPkg.dsc index b7b629f1bd..f693dc4513 100644 --- a/MsGraphicsPkg/MsGraphicsPkg.dsc +++ b/MsGraphicsPkg/MsGraphicsPkg.dsc @@ -27,16 +27,6 @@ BaseLib|MdePkg/Library/BaseLib/BaseLib.inf BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf -[LibraryClasses.X64] - RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf -!if $(TOOL_CHAIN_TAG) == VS2019 or $(TOOL_CHAIN_TAG) == VS2022 - # Provide StackCookie support lib so that we can link to /GS exports for VS builds - NULL|MdePkg/Library/BaseBinSecurityLibRng/BaseBinSecurityLibRng.inf - BaseBinSecurityLib|MdePkg/Library/BaseBinSecurityLibRng/BaseBinSecurityLibRng.inf -!else - BaseBinSecurityLib|MdePkg/Library/BaseBinSecurityLibNull/BaseBinSecurityLibNull.inf -!endif - [LibraryClasses.common] UefiLib|MdePkg/Library/UefiLib/UefiLib.inf diff --git a/MsWheaPkg/MsWheaPkg.dsc b/MsWheaPkg/MsWheaPkg.dsc index 5344e298a7..a94b363390 100644 --- a/MsWheaPkg/MsWheaPkg.dsc +++ b/MsWheaPkg/MsWheaPkg.dsc @@ -35,16 +35,6 @@ BaseLib|MdePkg/Library/BaseLib/BaseLib.inf BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf -[LibraryClasses.X64] - RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf -!if $(TOOL_CHAIN_TAG) == VS2019 or $(TOOL_CHAIN_TAG) == VS2022 - # Provide StackCookie support lib so that we can link to /GS exports for VS builds - NULL|MdePkg/Library/BaseBinSecurityLibRng/BaseBinSecurityLibRng.inf - BaseBinSecurityLib|MdePkg/Library/BaseBinSecurityLibRng/BaseBinSecurityLibRng.inf -!else - BaseBinSecurityLib|MdePkg/Library/BaseBinSecurityLibNull/BaseBinSecurityLibNull.inf -!endif - [LibraryClasses] UefiLib|MdePkg/Library/UefiLib/UefiLib.inf PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf diff --git a/PcBdsPkg/PcBdsPkg.dsc b/PcBdsPkg/PcBdsPkg.dsc index 970b5462fa..2cbf9fc103 100644 --- a/PcBdsPkg/PcBdsPkg.dsc +++ b/PcBdsPkg/PcBdsPkg.dsc @@ -77,15 +77,6 @@ RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf [LibraryClasses.X64] - -!if $(TOOL_CHAIN_TAG) == VS2019 or $(TOOL_CHAIN_TAG) == VS2022 - # Provide StackCookie support lib so that we can link to /GS exports for VS builds - NULL|MdePkg/Library/BaseBinSecurityLibRng/BaseBinSecurityLibRng.inf - BaseBinSecurityLib|MdePkg/Library/BaseBinSecurityLibRng/BaseBinSecurityLibRng.inf -!else - BaseBinSecurityLib|MdePkg/Library/BaseBinSecurityLibNull/BaseBinSecurityLibNull.inf -!endif - HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf MsUiThemeLib|MsGraphicsPkg/Library/MsUiThemeLib/Dxe/MsUiThemeLib.inf diff --git a/TpmTestingPkg/TpmTestingPkg.dsc b/TpmTestingPkg/TpmTestingPkg.dsc index 93665553e1..6f75d2136b 100644 --- a/TpmTestingPkg/TpmTestingPkg.dsc +++ b/TpmTestingPkg/TpmTestingPkg.dsc @@ -75,14 +75,10 @@ # # Stack cookie related libraries # -!if $(TOOL_CHAIN_TAG) == VS2019 or $(TOOL_CHAIN_TAG) == VS2022 -[LibraryClasses.X64, LibraryClasses.IA32] - # Link to /GS exports on MSVC - RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf [LibraryClasses.X64] - BaseBinSecurityLib|MdePkg/Library/BaseBinSecurityLibRng/BaseBinSecurityLibRng.inf - NULL|MdePkg/Library/BaseBinSecurityLibRng/BaseBinSecurityLibRng.inf -!endif + RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf + NULL|MdePkg/Library/StackCheckLib/StackCheckLib.inf + StackCheckFailureLib|MdePkg/Library/StackCheckFailureLibNull/StackCheckFailureLibNull.inf [Components] TpmTestingPkg/Library/BaseFvMeasurementExclusionLibNull/BaseFvMeasurementExclusionLibNull.inf diff --git a/UefiTestingPkg/UefiTestingPkg.dsc b/UefiTestingPkg/UefiTestingPkg.dsc index 3e79ee6523..2b5d0c70a7 100644 --- a/UefiTestingPkg/UefiTestingPkg.dsc +++ b/UefiTestingPkg/UefiTestingPkg.dsc @@ -105,16 +105,6 @@ PciCf8Lib|MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf -[LibraryClasses.X64] - RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf -!if $(TOOL_CHAIN_TAG) == VS2019 or $(TOOL_CHAIN_TAG) == VS2022 - # Provide StackCookie support lib so that we can link to /GS exports for VS builds - NULL|MdePkg/Library/BaseBinSecurityLibRng/BaseBinSecurityLibRng.inf - BaseBinSecurityLib|MdePkg/Library/BaseBinSecurityLibRng/BaseBinSecurityLibRng.inf -!else - BaseBinSecurityLib|MdePkg/Library/BaseBinSecurityLibNull/BaseBinSecurityLibNull.inf -!endif - ############################################################### # # Components Section - list of the modules and components that will be processed by compilation diff --git a/XmlSupportPkg/XmlSupportPkg.dsc b/XmlSupportPkg/XmlSupportPkg.dsc index fe2e515aa8..f32b5e0356 100644 --- a/XmlSupportPkg/XmlSupportPkg.dsc +++ b/XmlSupportPkg/XmlSupportPkg.dsc @@ -30,16 +30,6 @@ XmlTreeLib|XmlSupportPkg/Library/XmlTreeLib/XmlTreeLib.inf XmlTreeQueryLib|XmlSupportPkg/Library/XmlTreeQueryLib/XmlTreeQueryLib.inf -[LibraryClasses.X64] - RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf -!if $(TOOL_CHAIN_TAG) == VS2019 or $(TOOL_CHAIN_TAG) == VS2022 - # Provide StackCookie support lib so that we can link to /GS exports for VS builds - NULL|MdePkg/Library/BaseBinSecurityLibRng/BaseBinSecurityLibRng.inf - BaseBinSecurityLib|MdePkg/Library/BaseBinSecurityLibRng/BaseBinSecurityLibRng.inf -!else - BaseBinSecurityLib|MdePkg/Library/BaseBinSecurityLibNull/BaseBinSecurityLibNull.inf -!endif - [Components] XmlSupportPkg/Library/XmlTreeLib/XmlTreeLib.inf XmlSupportPkg/Library/XmlTreeQueryLib/XmlTreeQueryLib.inf