From 5fd8374c40b8d6dd1b1f6e07f8c1710f6bb95b7e Mon Sep 17 00:00:00 2001
From: David Federman <dfederm@microsoft.com>
Date: Thu, 10 Jul 2025 04:08:28 -0700
Subject: [PATCH] Re-enable MSBuildCache (#40261)

Re-enable MSBuildCache
---
 .pipelines/v2/ci-test-with-canary-webview2.yml           | 5 +++--
 .pipelines/v2/ci-using-the-latest-winappsdk.yml          | 5 +++--
 .pipelines/v2/ci.yml                                     | 5 +++--
 .pipelines/v2/templates/pipeline-ci-build.yml            | 3 ---
 .pipelines/v2/templates/pipeline-ui-tests-automation.yml | 3 ---
 packages.config                                          | 6 +++---
 6 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/.pipelines/v2/ci-test-with-canary-webview2.yml b/.pipelines/v2/ci-test-with-canary-webview2.yml
index 01f0454186..1efb4d4abf 100644
--- a/.pipelines/v2/ci-test-with-canary-webview2.yml
+++ b/.pipelines/v2/ci-test-with-canary-webview2.yml
@@ -19,7 +19,7 @@ parameters:
   - name: enableMsBuildCaching
     type: boolean
     displayName: "Enable MSBuild Caching"
-    default: false
+    default: true
   - name: runTests
     type: boolean
     displayName: "Run Tests"
@@ -36,7 +36,8 @@ extends:
   template: templates/pipeline-ci-build.yml
   parameters:
     buildPlatforms: ${{ parameters.buildPlatforms }}
-    enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
+    ${{ if eq(variables['System.PullRequest.IsFork'], 'False') }}:
+      enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
     runTests: ${{ parameters.runTests }}
     useVSPreview: ${{ parameters.useVSPreview }}
     useLatestWebView2: ${{ parameters.useLatestWebView2 }}
diff --git a/.pipelines/v2/ci-using-the-latest-winappsdk.yml b/.pipelines/v2/ci-using-the-latest-winappsdk.yml
index 3d628b13a9..4e642ddfd6 100644
--- a/.pipelines/v2/ci-using-the-latest-winappsdk.yml
+++ b/.pipelines/v2/ci-using-the-latest-winappsdk.yml
@@ -19,7 +19,7 @@ parameters:
   - name: enableMsBuildCaching
     type: boolean
     displayName: "Enable MSBuild Caching"
-    default: false
+    default: true
   - name: runTests
     type: boolean
     displayName: "Run Tests"
@@ -42,7 +42,8 @@ extends:
   template: templates/pipeline-ci-build.yml
   parameters:
     buildPlatforms: ${{ parameters.buildPlatforms }}
-    enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
+    ${{ if eq(variables['System.PullRequest.IsFork'], 'False') }}:
+      enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
     runTests: ${{ parameters.runTests }}
     useVSPreview: ${{ parameters.useVSPreview }}
     useLatestWinAppSDK: ${{ parameters.useLatestWinAppSDK }}
diff --git a/.pipelines/v2/ci.yml b/.pipelines/v2/ci.yml
index 0b8daa76d6..6b0105a38a 100644
--- a/.pipelines/v2/ci.yml
+++ b/.pipelines/v2/ci.yml
@@ -32,7 +32,7 @@ parameters:
   - name: enableMsBuildCaching
     type: boolean
     displayName: "Enable MSBuild Caching"
-    default: false
+    default: true
   - name: runTests
     type: boolean
     displayName: "Run Tests"
@@ -46,6 +46,7 @@ extends:
   template: templates/pipeline-ci-build.yml
   parameters:
     buildPlatforms: ${{ parameters.buildPlatforms }}
-    enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
+    ${{ if eq(variables['System.PullRequest.IsFork'], 'False') }}:
+      enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
     runTests: ${{ parameters.runTests }}
     useVSPreview: ${{ parameters.useVSPreview }}
diff --git a/.pipelines/v2/templates/pipeline-ci-build.yml b/.pipelines/v2/templates/pipeline-ci-build.yml
index cc7a67e613..e94ef92913 100644
--- a/.pipelines/v2/templates/pipeline-ci-build.yml
+++ b/.pipelines/v2/templates/pipeline-ci-build.yml
@@ -3,9 +3,6 @@ variables:
     value: false
   - name: EnablePipelineCache
     value: true
-  - ${{ if eq(parameters.enableMsBuildCaching, true) }}:
-    - name: EnablePipelineCache
-      value: true
 
 parameters:
   - name: buildPlatforms
diff --git a/.pipelines/v2/templates/pipeline-ui-tests-automation.yml b/.pipelines/v2/templates/pipeline-ui-tests-automation.yml
index 628a691fed..8db82aceac 100644
--- a/.pipelines/v2/templates/pipeline-ui-tests-automation.yml
+++ b/.pipelines/v2/templates/pipeline-ui-tests-automation.yml
@@ -3,9 +3,6 @@ variables:
     value: false
   - name: EnablePipelineCache
     value: true
-  - ${{ if eq(parameters.enableMsBuildCaching, true) }}:
-    - name: EnablePipelineCache
-      value: true
 
 parameters:
   - name: buildPlatforms
diff --git a/packages.config b/packages.config
index 65d836456e..0ae124b7c1 100644
--- a/packages.config
+++ b/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.MSBuildCache.AzurePipelines" version="0.1.283-preview" />
-  <package id="Microsoft.MSBuildCache.Local" version="0.1.283-preview" />
-  <package id="Microsoft.MSBuildCache.SharedCompilation" version="0.1.283-preview" />
+  <package id="Microsoft.MSBuildCache.AzurePipelines" version="0.1.318-preview" />
+  <package id="Microsoft.MSBuildCache.Local" version="0.1.318-preview" />
+  <package id="Microsoft.MSBuildCache.SharedCompilation" version="0.1.318-preview" />
 </packages>
\ No newline at end of file