create more variables and bump versions

.ado/android-pr.yml

@@ -16,7 +16,7 @@ jobs:
   - job: AndroidRNPR
     displayName: Android React Native PR
     pool:
-      vmImage: ubuntu-18.04
+      vmImage: $(VmImageUbuntu)
     timeoutInMinutes: 90 # how long to run the job before automatically cancelling
     cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them
     steps:
@@ -76,7 +76,7 @@ jobs:
 
 #     In RN64 "clean" task tries to run the build again. It is reproing in 0.64-stable branch but fixed in 0.65-stable.
 #     I can't zero on the exact cause .. but turns out the issue is with rntester clean task.
-#     
+#
 #     mganandraj@RNDroid:~/github/rnm-64$ ./gradlew :packages:rn-tester:android:app:clean --dry-run
 #     :packages:react-native-codegen:android:buildCodegenCLI SKIPPED
 #     :packages:rn-tester:android:app:generateCodegenSchemaFromJavaScript SKIPPED
@@ -97,4 +97,4 @@ jobs:
         displayName: 'Publish final artifacts'
         inputs:
           PathtoPublish: '$(Build.StagingDirectory)/final'
-          ArtifactName: 'ReactNative-Final' 
+          ArtifactName: 'ReactNative-Final'

.ado/apple-integration.yml

@@ -1,6 +1,6 @@
 name: Integrate $(Date:yyyyMMdd).$(Rev:.r)
 variables:
-  - template: variables/mac.yml
+  - template: variables/vars.yml
 trigger:
   branches:
     include:
@@ -23,7 +23,7 @@ jobs:
   - job: react_native_test_app
     displayName: react-native-test-app
     pool:
-      vmImage: $(VmImage)
+      vmImage: $(VmImageApple)
       demands: ['npm', 'sh', 'xcode']
     workspace:
       clean: all

.ado/apple-pr.yml

@@ -2,7 +2,7 @@
 name: $(Date:yyyyMMdd).$(Rev:.r)
 
 variables:
-  - template: variables/mac.yml
+  - template: variables/vars.yml
 
 trigger: none # will disable CI builds entirely
 
@@ -25,7 +25,7 @@ jobs:
         public:
           apply_office_patches: 'false'
     pool:
-      vmImage: $(VmImage)
+      vmImage: $(VmImageApple)
       demands: ['xcode', 'sh', 'npm']
     steps:
       - template: templates/apple-job-javascript.yml
@@ -71,7 +71,7 @@ jobs:
           xcode_actions_release: 'build'
           apply_office_patches: 'true'
     pool:
-      vmImage: $(VmImage)
+      vmImage: $(VmImageApple)
       demands: ['xcode', 'sh', 'npm']
     timeoutInMinutes: 60 # how long to run the job before automatically cancelling
     cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them
@@ -96,7 +96,7 @@ jobs:
         MacDebug:
           configuration: Debug
     pool:
-      vmImage: $(VmImage)
+      vmImage: $(VmImageApple)
       demands: ['xcode', 'sh', 'npm']
     steps:
       - template: templates/react-native-macos-init.yml

.ado/publish.yml

@@ -4,7 +4,7 @@
 # This file defines the build steps to publish a release
 name: $(Date:yyyyMMdd).$(Rev:.r)
 
-trigger: 
+trigger:
   batch: true
   branches:
     include:
@@ -17,13 +17,13 @@ trigger:
 pr: none
 
 variables:
-  - template: variables/mac.yml
+  - template: variables/vars.yml
 
 jobs:
   - job: RNGithubNpmJSPublish
     displayName: React-Native GitHub Publish to npmjs.org
     pool:
-      vmImage: $(VmImage)
+      vmImage: $(VmImageApple)
     timeoutInMinutes: 90 # how long to run the job before automatically cancelling
     cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them
     steps:
@@ -107,7 +107,7 @@ jobs:
   - job: RNMacOSInitNpmJSPublish
     displayName: react-native-macos-init Publish to npmjs.org
     pool:
-      vmImage: vs2017-win2016
+      vmImage: $(VmImageWindows)
     timeoutInMinutes: 90 # how long to run the job before automatically cancelling
     cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them
     condition: eq(variables['Build.SourceBranchName'], 'main')
@@ -144,7 +144,7 @@ jobs:
   - job: RNGithubOfficePublish
     displayName: React-Native GitHub Publish to Office
     pool:
-      vmImage: ubuntu-18.04
+      vmImage: $(VmImageUbuntu)
     timeoutInMinutes: 90 # how long to run the job before automatically cancelling
     cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them
     steps:
@@ -203,4 +203,4 @@ jobs:
         displayName: 'Publish final artifacts'
         inputs:
           PathtoPublish: '$(Build.StagingDirectory)/final'
-          ArtifactName: 'ReactNative-Final' 
+          ArtifactName: 'ReactNative-Final'

.ado/variables/vars.yml

@@ -0,0 +1,6 @@
+variables:
+  VmImageApple: macOS-11
+  VmImageWindows: windows-2019
+  VmImageUbuntu: ubuntu-20.04
+  slice_name: 'Xcode_13_1'
+  xcode_version: '/Applications/Xcode_13.1.app'