Change official build to use 1ES templates (dotnet#7048)

With any luck this doesn't break our builds (official build tests have been done from a branch)
ericstj · Mar 13, 2024 · 3e3768c · 3e3768c
1 parent 4ae582b
commit 3e3768c
Show file tree

Hide file tree

Showing 8 changed files with 347 additions and 302 deletions.
diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml
diff --git a/src/Native/CpuMathNative/CMakeLists.txt b/src/Native/CpuMathNative/CMakeLists.txt
@@ -13,4 +13,9 @@ endif()
 
 add_library(CpuMathNative SHARED ${SOURCES} ${RESOURCES})
 
+if (MSVC AND NOT MSVC_VERSION LESS 1900)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /guard:cf")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qspectre")
+endif()
+
 install_library_and_symbols (CpuMathNative)
diff --git a/src/Native/FastTreeNative/CMakeLists.txt b/src/Native/FastTreeNative/CMakeLists.txt
@@ -17,4 +17,9 @@ endif()
 
 add_library(FastTreeNative SHARED ${SOURCES} ${RESOURCES})
 
+if (MSVC AND NOT MSVC_VERSION LESS 1900)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /guard:cf")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qspectre")
+endif()
+
 install_library_and_symbols (FastTreeNative)
diff --git a/src/Native/LdaNative/CMakeLists.txt b/src/Native/LdaNative/CMakeLists.txt
@@ -16,6 +16,11 @@ set(SOURCES
 
 add_library(LdaNative SHARED ${SOURCES} ${RESOURCES})
 
+if (MSVC AND NOT MSVC_VERSION LESS 1900)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /guard:cf")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qspectre")
+endif()
+
 if (${ARCHITECTURE} STREQUAL "arm")
     if (WIN32)
         target_link_libraries(LdaNative shell32.lib)

diff --git a/src/Native/MatrixFactorizationNative/CMakeLists.txt b/src/Native/MatrixFactorizationNative/CMakeLists.txt
@@ -43,6 +43,11 @@ endif()
 
 add_library(MatrixFactorizationNative SHARED ${SOURCES} ${RESOURCES})
 
+if (MSVC AND NOT MSVC_VERSION LESS 1900)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /guard:cf")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qspectre")
+endif()
+
 if (${ARCHITECTURE} STREQUAL "arm")
     if (WIN32)
         target_link_libraries(MatrixFactorizationNative shell32.lib)

diff --git a/src/Native/MklProxyNative/CMakeLists.txt b/src/Native/MklProxyNative/CMakeLists.txt
@@ -18,6 +18,11 @@ endif()
 add_library(MklProxyNative SHARED ${SOURCES} ${RESOURCES})
 target_link_libraries(MklProxyNative PUBLIC ${MKL_LIBRARY})
 
+if (MSVC AND NOT MSVC_VERSION LESS 1900)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /guard:cf")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qspectre")
+endif()
+
 if(APPLE)
     set_target_properties(MklProxyNative PROPERTIES INSTALL_RPATH "@loader_path")
 endif()

diff --git a/src/Native/OneDalNative/CMakeLists.txt b/src/Native/OneDalNative/CMakeLists.txt
@@ -24,5 +24,9 @@ endif()
 
 set(SOURCES OneDalAlgorithms.cpp)
 add_library(OneDalNative SHARED ${SOURCES} ${RESOURCES})
+if (MSVC AND NOT MSVC_VERSION LESS 1900)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /guard:cf")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qspectre")
+endif()
 target_link_libraries(OneDalNative PUBLIC ${WRAPPER_LINK_OPTIONS})
 install_library_and_symbols(OneDalNative)
diff --git a/src/Native/SymSgdNative/CMakeLists.txt b/src/Native/SymSgdNative/CMakeLists.txt
@@ -39,6 +39,10 @@ endif()
 
 add_definitions(-DUSE_OMP)
 add_library(SymSgdNative SHARED ${SOURCES} ${RESOURCES})
+if (MSVC AND NOT MSVC_VERSION LESS 1900)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /guard:cf")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qspectre")
+endif()
 target_link_libraries(SymSgdNative PUBLIC ${MKL_LIBRARY} PUBLIC ${OPENMP_LIBRARY})
 
 if(APPLE)