Merge branch 'main' into integrate_oct28

Author: NickGerleman

.ado/publish.yml

@@ -79,10 +79,6 @@ jobs:
         displayName: Beachball Publish (Stable Branch)
         condition: and(succeeded(), ne(variables['Build.SourceBranchName'], 'main'))
 
-      # Beachball reverts to local state after publish, but we want the updates it added
-      - script: git pull origin ${{ variables['Build.SourceBranchName'] }}
-        displayName: git pull
-
       - script: npx --yes @rnw-scripts/create-github-releases@latest --yes --authToken $(githubAuthToken)
         displayName: Create GitHub Releases for New Tags (Stable Branch)
         condition: and(succeeded(), ${{ not(parameters.skipGitPush) }}, ${{ ne(variables['Build.SourceBranchName'], 'main') }} )

.ado/templates/react-native-init.yml

@@ -55,10 +55,6 @@ steps:
   - script: npx beachball publish --branch origin/$(BeachBallBranchName) --no-push --registry http://localhost:4873 --yes --verbose --access public --changehint "Run `yarn change` from root of repo to generate a change file."
     displayName: Publish packages to verdaccio
 
-    # Beachball reverts to local state after publish, but we need to know the new version it pushed.
-  - script: npx beachball bump --branch origin/$(BeachBallBranchName) --yes --verbose
-    displayName: beachball bump
-
   - template: set-version-vars.yml
     parameters:
       buildEnvironment: ${{ parameters.buildEnvironment }}

beachball.config.js

@@ -16,21 +16,11 @@ module.exports = {
 
   hooks: {
     // Stamp versions when we publish a new package
-    prepublish: (_packagePath, name, version) => {
+    postbump: (_packagePath, name, version) => {
       if (name === 'react-native-windows') {
         console.log(`Stamping RNW Version ${version}`);
-
-        // prepublish is run before bumping or commiting. Append an additional
-        // commit to check-in stamped versions when we push.
-        
-        execSilent(`yarn stamp-version ${version}`);
-        execSilent('git add --all');
-        execSilent(`git commit --message "Stamp RNW ${version}"`);
+        execSync(`yarn stamp-version ${version}`);
       }
     }
   }
 }
-
-function execSilent(command) {
-  execSync(command, {stdio: 'pipe'});
-}

change/react-native-windows-d76f4c73-02fd-48c6-84ef-ed292bceefb1.json

@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Force version bump",
+  "packageName": "react-native-windows",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

package.json

@@ -32,7 +32,7 @@
     ]
   },
   "devDependencies": {
-    "beachball": "^2.16.0",
+    "beachball": "^2.20.0",
     "husky": "^4.2.5",
     "unbroken": "1.0.27",
     "lage": "^0.29.3",

yarn.lock

@@ -3186,10 +3186,10 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-beachball@^2.16.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/beachball/-/beachball-2.19.0.tgz#00a8305c5ce2a29c81f1ed6fa6024546a87b9334"
-  integrity sha512-o4BfIbsrkUK0tKONjqf+YtGEYBf3m4UDcK08vMHb+1BH3L6uTd6Uq/DhKAuhaUndlwfE4m4TqKYZl/o29ybIBA==
+beachball@^2.20.0:
+  version "2.20.0"
+  resolved "https://registry.yarnpkg.com/beachball/-/beachball-2.20.0.tgz#7fe55e7d86c9c890de15474c84f6a32653bdb6ca"
+  integrity sha512-vVdF6qDDurO66GZigUtqKuXzQM8ImlG7MgN5iTj9rvZ4RM6vy+nklu0EmqaQtqS5K6hZ4WrHDwgcR/kLa0VHpA==
   dependencies:
     cosmiconfig "^6.0.0"
     execa "^4.0.3"