Fix Linux PGO optdata consumption + PGO count update (#12239)

* Update PGO package version to 20170612-1411

* Fix PGO optdata path issue on Linux

diff --git a/dir.props b/dir.props
index 62bf267..498fa5c 100644 (file)
--- a/dir.props
+++ b/dir.props
@@ -23,7 +23,7 @@
 
   <!-- Profile-based optimization data package versions -->
   <PropertyGroup>
-    <PgoDataPackageVersion>99.99.99-master-20170609-1125</PgoDataPackageVersion>
+    <PgoDataPackageVersion>99.99.99-master-20170612-1411</PgoDataPackageVersion>
     <!--<IbcDataPackageVersion></IbcDataPackageVersion>-->
   </PropertyGroup>
 

diff --git a/pgosupport.cmake b/pgosupport.cmake
index 1f8ee9c..f3d00b7 100644 (file)
--- a/pgosupport.cmake
+++ b/pgosupport.cmake
@@ -15,12 +15,14 @@ function(add_pgo TargetName)
     endif(WIN32)
 
     set(CLR_CMAKE_OPTDATA_PACKAGEWITHRID "optimization.${CLR_CMAKE_TARGET_OS}-${CLR_CMAKE_TARGET_ARCH}.PGO.CoreCLR")
+
+    # On case-sensitive file systems, NuGet packages are restored to lowercase paths
+    string(TOLOWER "${CLR_CMAKE_OPTDATA_PACKAGEWITHRID}/${CLR_CMAKE_OPTDATA_VERSION}" OptDataVersionedSubPath)
+
     file(TO_NATIVE_PATH
-        "${CLR_CMAKE_PACKAGES_DIR}/${CLR_CMAKE_OPTDATA_PACKAGEWITHRID}/${CLR_CMAKE_OPTDATA_VERSION}/data/${ProfileFileName}"
+        "${CLR_CMAKE_PACKAGES_DIR}/${OptDataVersionedSubPath}/data/${ProfileFileName}"
         ProfilePath
     )
-    # NuGet packages are restored to lowercase paths
-    string(TOLOWER "${ProfilePath}" ProfilePath)
 
     if(CLR_CMAKE_PGO_INSTRUMENT)
         if(WIN32)