Merge remote-tracking branch 'ms/master'

.ado/publish.yml

@@ -64,23 +64,25 @@ jobs:
         persistCredentials: true # set to 'true' to leave the OAuth token in the Git config after the initial fetch
 
       - task: CmdLine@2
-        displayName: npm install
+        displayName: yarn install
         inputs:
           script: |
             cd packages/react-native-macos-init
-            npm install
+            yarn install
 
       - task: CmdLine@2
-        displayName: Bump package version
+        displayName: yarn build
         inputs:
-          script: node .ado/bumpFileVersions.js
+          script: |
+            cd packages/react-native-macos-init
+            yarn build
 
-      - task: Npm@1
+      - task: CmdLine@2
         displayName: "Publish react-native-macos-init to npmjs.org"
         inputs:
-          command: 'publish'
-          workingDir: 'packages/react-native-macos-init'
-          publishEndpoint: 'npmjs'
+          script: |
+            cd packages/react-native-macos-init
+            npx --no-install beachball publish --branch origin/$(Build.SourceBranchName) -n $(npmAuthToken) -yes -m "applying package updates ***NO_CI***" --access public
 
   - job: RNGithubOfficePublish
     displayName: React-Native GitHub Publish to Office

.ado/versionUtils.js

@@ -51,8 +51,11 @@ function updateVersionsInFiles() {
     pkgJson.version = releaseVersion;
     fs.writeFileSync(pkgJsonPath, JSON.stringify(pkgJson, null, 2));
     console.log(`Updating package.json to version ${releaseVersion}`);
+<<<<<<< HEAD
 
     updateReactNativeMacOSInitVersionInFile();
+=======
+>>>>>>> ms/master
 
     return {releaseVersion, branchVersionSuffix};
 }

packages/react-native-macos-init/package.json

@@ -7,8 +7,11 @@
   "license": "MIT",
   "private": false,
   "scripts": {
-    "build": "just-scripts build",
+    "change": "beachball change",
+    "check": "beachball check",
     "clean": "just-scripts clean",
+    "beachball:publish": "beachball publish",
+    "build": "just-scripts build",
     "lint": "just-scripts lint",
     "lint:fix": "just-scripts lint:fix",
     "prepublishOnly": "npm run build"
@@ -18,9 +21,9 @@
   },
   "dependencies": {
     "chalk": "^3",
+    "find-up": "^4.1.0",
     "npm-registry": "^0.1.13",
     "prompts": "^2.3.0",
-    "find-up": "^4.1.0",
     "semver": "^7.1.3",
     "valid-url": "^1.0.9",
     "yargs": "^15.1.0"
@@ -31,6 +34,7 @@
     "@types/semver": "^7.1.0",
     "@types/valid-url": "^1.0.2",
     "@types/yargs": "^15.0.3",
+    "beachball": "^1.27.0",
     "just-scripts": "^0.36.1",
     "typescript": "3.5.3"
   },
@@ -39,4 +43,4 @@
     "lib-commonjs",
     "README.md"
   ]
-}
+}