Fix IBC data directory path

dotnet · Feb 14, 2019 · 9d4358f · 9d4358f
1 parent b8bbc16
commit 9d4358f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
@@ -70,7 +70,6 @@ jobs:
               /p:PublishToSymbolServer=true
               /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
               /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
-              /p:IbcOptimizationDataDir=$(Build.SourcesDirectory)\.o\\
     displayName: Build
     condition: succeeded()
 

diff --git a/eng/build.ps1 b/eng/build.ps1
@@ -197,6 +197,9 @@ function BuildSolution() {
     $suppressExtensionDeployment = if (!$deployExtensions) { "/p:DeployExtension=false" } else { "" } 
     $suppressPartialNgenOptimization = if (!$applyOptimizationData) { "/p:ApplyPartialNgenOptimization=false" } else { "" }
 
+    # Workaround for some machines in the AzDO pool not allowing long paths (%5c is msbuild escaped backslash)
+    $ibcDir = Join-Path $RepoRoot ".o%5c"
+
     # Setting /p:TreatWarningsAsErrors=true is a workaround for https://github.com/Microsoft/msbuild/issues/3062.
     # We don't pass /warnaserror to msbuild ($warnAsError is set to $false by default above), but set 
     # /p:TreatWarningsAsErrors=true so that compiler reported warnings, other than IDE0055 are treated as errors. 
@@ -221,6 +224,7 @@ function BuildSolution() {
         /p:QuietRestoreBinaryLog=$binaryLog `
         /p:TestTargetFrameworks=$testTargetFrameworks `
         /p:TreatWarningsAsErrors=true `
+        /p:IbcOptimizationDataDir=$ibcDir `
         $suppressPartialNgenOptimization `
         $suppressExtensionDeployment `
         @properties