From 65a083a81259d3564c0c3d4dd0aeba081463b640 Mon Sep 17 00:00:00 2001
From: Mamta Dhaka <mamtadhaka@microsoft.com>
Date: Tue, 3 Mar 2026 15:27:26 +0530
Subject: [PATCH 1/2] compiling and linking icu4c with CFG Enabled

---
 .../source/allinone/Build.Windows.ProjectConfiguration.props   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/icu/icu4c/source/allinone/Build.Windows.ProjectConfiguration.props b/icu/icu4c/source/allinone/Build.Windows.ProjectConfiguration.props
index 14e9a6d48f..e967b62d0f 100644
--- a/icu/icu4c/source/allinone/Build.Windows.ProjectConfiguration.props
+++ b/icu/icu4c/source/allinone/Build.Windows.ProjectConfiguration.props
@@ -116,6 +116,7 @@
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <AdditionalOptions>/Zi %(AdditionalOptions)</AdditionalOptions>
+      <ControlFlowGuard>Guard</ControlFlowGuard>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -123,7 +124,7 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <AdditionalOptions>/profile /opt:ref /opt:icf %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/guard:cf /profile /opt:ref /opt:icf %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <!-- Options that are common to all 'Debug' configurations for *all* projects. -->

From af2466a940f9cd0b34f264082562f39c56da6e0a Mon Sep 17 00:00:00 2001
From: Mamta Dhaka <mamtadhaka@microsoft.com>
Date: Tue, 3 Mar 2026 16:42:54 +0530
Subject: [PATCH 2/2] fix

---
 build/azure-nuget-1es-pt.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/build/azure-nuget-1es-pt.yml b/build/azure-nuget-1es-pt.yml
index 17b8c3ea4f..8005bb7bfe 100644
--- a/build/azure-nuget-1es-pt.yml
+++ b/build/azure-nuget-1es-pt.yml
@@ -494,13 +494,9 @@ extends:
             Write-Host "$(BUILD.ArtifactStagingDirectory)"
             Tree /F /A $(BUILD.ArtifactStagingDirectory)
           displayName: 'DIAG: dir'
-        
-        - powershell: |
-            Write-Host "SigningPattern is: '$(signingPattern)'" 
-          displayName: 'DIAG: show signing pattern'
 
         - task: EsrpCodeSigning@5
-          displayName: 'ESRP CodeSigning - CodeSign DLLs'
+          displayName: 'ESRP CodeSigning - CodeSign NuGet'
           inputs:
             ConnectedServiceName: 'ESRP Code Signing for MS-ICU (2026)'
             UseMSIAuthentication: true