From 092a8ac1644b8f1e734c787e2de58f5ac9327ab1 Mon Sep 17 00:00:00 2001
From: Ian Clanton-Thuon <iclanton@users.noreply.github.com>
Date: Thu, 2 Dec 2021 18:16:58 -0800
Subject: [PATCH 1/3] Put publishOnlyDependencies back.

---
 apps/rush-lib/package.json | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/rush-lib/package.json b/apps/rush-lib/package.json
index 4b83fe2b265..c2da35de524 100644
--- a/apps/rush-lib/package.json
+++ b/apps/rush-lib/package.json
@@ -52,9 +52,7 @@
     "tapable": "2.2.1",
     "tar": "~5.0.5",
     "true-case-path": "~2.2.1",
-    "z-schema": "~3.18.3",
-    "@rushstack/rush-amazon-s3-build-cache-plugin": "5.57.0",
-    "@rushstack/rush-azure-storage-build-cache-plugin": "5.57.0"
+    "z-schema": "~3.18.3"
   },
   "devDependencies": {
     "@pnpm/logger": "4.0.0",
@@ -79,5 +77,9 @@
     "@types/z-schema": "3.16.31",
     "jest": "~25.4.0",
     "typescript": "~4.4.2"
+  },
+  "publishOnlyDependencies": {
+    "@rushstack/rush-amazon-s3-build-cache-plugin": "workspace:*",
+    "@rushstack/rush-azure-storage-build-cache-plugin": "workspace:*"
   }
 }

From 57d0dcc0d2130457a5fecc0a7c12599b6a0b5077 Mon Sep 17 00:00:00 2001
From: Ian Clanton-Thuon <iclanton@users.noreply.github.com>
Date: Thu, 2 Dec 2021 18:22:41 -0800
Subject: [PATCH 2/3] Move pre-publish workaround to directly before publish to
 avoid changing the master branch.

---
 common/config/azure-pipelines/npm-publish-rush.yaml  | 5 +++--
 common/config/azure-pipelines/templates/publish.yaml | 5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/common/config/azure-pipelines/npm-publish-rush.yaml b/common/config/azure-pipelines/npm-publish-rush.yaml
index 55e26de31a4..0b62c669649 100644
--- a/common/config/azure-pipelines/npm-publish-rush.yaml
+++ b/common/config/azure-pipelines/npm-publish-rush.yaml
@@ -7,11 +7,12 @@ steps:
   - checkout: self
     persistCredentials: true
   - template: templates/build.yaml
-  - script: 'node apps/rush-lib/scripts/plugins-prepublish.js'
-    displayName: 'Prepublish workaround'
   - template: templates/publish.yaml
     parameters:
       VersionPolicyName: noRush
   - template: templates/publish.yaml
     parameters:
       VersionPolicyName: rush
+      PrePublishSteps:
+        - script: 'node apps/rush-lib/scripts/plugins-prepublish.js'
+          displayName: 'Prepublish workaround'
diff --git a/common/config/azure-pipelines/templates/publish.yaml b/common/config/azure-pipelines/templates/publish.yaml
index 784938b40f3..2de4c0964fd 100644
--- a/common/config/azure-pipelines/templates/publish.yaml
+++ b/common/config/azure-pipelines/templates/publish.yaml
@@ -1,9 +1,14 @@
 parameters:
   - name: VersionPolicyName
     type: string
+  - name: PrePublishSteps
+    type: stepList
+    default: []
+
 steps:
   - script: 'node common/scripts/install-run-rush.js version --bump --version-policy ${{ parameters.VersionPolicyName }} --target-branch $(Build.SourceBranchName)'
     displayName: 'Rush Version (Policy: ${{ parameters.VersionPolicyName }})'
+  - ${{ parameters.PrePublishSteps }}
   - script: 'node common/scripts/install-run-rush.js publish --apply --publish --include-all --target-branch $(Build.SourceBranchName) --add-commit-details --set-access-level public'
     displayName: 'Rush Publish (Policy: ${{ parameters.VersionPolicyName }})'
     env:

From 78f869e9b3978c7a5c2839f9242606bd726f4d2b Mon Sep 17 00:00:00 2001
From: Ian Clanton-Thuon <iclanton@users.noreply.github.com>
Date: Thu, 2 Dec 2021 18:31:37 -0800
Subject: [PATCH 3/3] Rush change.

---
 ...publishOnlyDependencies-back_2021-12-03-02-31.json | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 common/changes/@microsoft/rush/put-publishOnlyDependencies-back_2021-12-03-02-31.json

diff --git a/common/changes/@microsoft/rush/put-publishOnlyDependencies-back_2021-12-03-02-31.json b/common/changes/@microsoft/rush/put-publishOnlyDependencies-back_2021-12-03-02-31.json
new file mode 100644
index 00000000000..efcd84c45fb
--- /dev/null
+++ b/common/changes/@microsoft/rush/put-publishOnlyDependencies-back_2021-12-03-02-31.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "",
+      "type": "none",
+      "packageName": "@microsoft/rush"
+    }
+  ],
+  "packageName": "@microsoft/rush",
+  "email": "iclanton@users.noreply.github.com"
+}
\ No newline at end of file