microsoft
diff --git a/‎.ado/android-pr.yml‎
Lines changed: 18 additions & 4 deletions b/‎.ado/android-pr.yml‎
Lines changed: 18 additions & 4 deletions
diff --git a/‎.ado/templates/android-build-office.yml‎
Lines changed: 19 additions & 2 deletions b/‎.ado/templates/android-build-office.yml‎
Lines changed: 19 additions & 2 deletions
diff --git a/‎.ado/templates/apple-droid-node-patching.yml‎
Lines changed: 1 addition & 1 deletion b/‎.ado/templates/apple-droid-node-patching.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.circleci/config.yml‎
Lines changed: 10 additions & 8 deletions b/‎.circleci/config.yml‎
Lines changed: 10 additions & 8 deletions
diff --git a/‎.editorconfig‎
Lines changed: 4 additions & 0 deletions b/‎.editorconfig‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎.gitattributes‎
Lines changed: 3 additions & 0 deletions b/‎.gitattributes‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎.gitignore‎
Lines changed: 2 additions & 4 deletions b/‎.gitignore‎
Lines changed: 2 additions & 4 deletions
diff --git a/‎Libraries/ActionSheetIOS/ActionSheetIOS.js‎
Lines changed: 2 additions & 0 deletions b/‎Libraries/ActionSheetIOS/ActionSheetIOS.js‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎Libraries/ActionSheetIOS/NativeActionSheetManager.js‎
Lines changed: 1 addition & 0 deletions b/‎Libraries/ActionSheetIOS/NativeActionSheetManager.js‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎Libraries/Components/Keyboard/KeyboardAvoidingView.js‎
Lines changed: 4 additions & 1 deletion b/‎Libraries/Components/Keyboard/KeyboardAvoidingView.js‎
Lines changed: 4 additions & 1 deletion
@@ -74,10 +74,24 @@ jobs:
           SYSTEM_ACCESSTOKEN: $(System.AccessToken)
           githubApiToken: $(githubApiToken)
 
-      - task: CmdLine@2
-        displayName: gradlew clean
-        inputs:
-          script: ./gradlew clean
+#     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
+#     :packages:rn-tester:android:app:generateCodegenArtifactsFromSchema SKIPPED
+#     :ReactAndroid:extractAARHeaders SKIPPED
+#     :ReactAndroid:extractJNIFiles SKIPPED
+#     :ReactAndroid:generateCodegenSchemaFromJavaScript SKIPPED
+#     :ReactAndroid:generateCodegenArtifactsFromSchema SKIPPED
+#     :ReactAndroid:prepareBoost SKIPPED
+#     :ReactAndroid:createNativeDepsDirectories SKIPPED
+#     ..
+#      - task: CmdLine@2
+#        displayName: gradlew clean
+#        inputs:
+#          script: ./gradlew clean
 
       - task: PublishBuildArtifacts@1
         displayName: 'Publish final artifacts'
 
@@ -30,12 +30,29 @@ steps:
     inputs:
       script: yarn install --frozen-lockfile
 
+  # scripts/bump-oss-version.js
+  #
+  # update the following files to the commit id.
+  # package.json (-> npm package version)
+  # gradle.properties (-> aar version)
+  # gradle.properties (-> aar version)
+  #
+  # The following files are updated for runtime version checking.
+  # ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
+  # React/Base/RCTVersion.m
+  # ReactCommon/cxxreact/ReactNativeVersion.h
+  # Libraries/Core/ReactNativeVersion.js
+  #
+  # --nightly => version = `0.0.0-${currentCommit.slice(0, 9)}`;
+  # When on master branch or non-stable branch.
   - task: CmdLine@2
     displayName: Bump canary package version
     inputs:
       script: node scripts/bump-oss-version.js --nightly
-    condition: eq(variables['Build.SourceBranchName'], 'master')
-  
+    condition: or(eq(variables['Build.SourceBranchName'], 'master'), not(contains(variables['Build.SourceBranchName'], '-stable')))
+
+  # TODO: We don't seem to be running bump-oss-version.js for stable branches, hence we would end up publishing using the values in the repository.
+
   - task: CmdLine@2
     displayName: nuget restore
     inputs:
 
@@ -5,4 +5,4 @@ steps:
   - task: CmdLine@2
     displayName: Apply Android specific patches for Office consumption
     inputs:
-      script: node $(System.DefaultWorkingDirectory)/android-patches/bundle/bundle.js patch $(System.DefaultWorkingDirectory) Build OfficeRNHost V8 Focus --patch-store $(System.DefaultWorkingDirectory)/android-patches/patches --log-folder $(System.DefaultWorkingDirectory)/android-patches/logs --confirm ${{ parameters.apply_office_patches }}
+      script: node $(System.DefaultWorkingDirectory)/android-patches/bundle/bundle.js patch $(System.DefaultWorkingDirectory) Build OfficeRNHost V8 Focus MAC ImageColor --patch-store $(System.DefaultWorkingDirectory)/android-patches/patches --log-folder $(System.DefaultWorkingDirectory)/android-patches/logs --confirm ${{ parameters.apply_office_patches }}
@@ -423,7 +423,7 @@ jobs:
           steps:
             - run:
                 name: Generate RNTesterPods Workspace
-                command: cd packages/rn-tester && bundle exec pod install --verbose
+                command: cd packages/rn-tester && USE_FABRIC=1 bundle exec pod install --verbose
 
       # -------------------------
       # Runs iOS unit tests
@@ -790,13 +790,15 @@ workflows:
           run_unit_tests: true
           requires:
             - setup_ios
-      - test_ios:
-          name: test_ios_unit_frameworks_hermes
-          use_hermes: true
-          use_frameworks: true
-          run_unit_tests: true
-          requires:
-            - setup_ios
+      # Hermes doesn't support dynamic frameworks right now.
+      # The following configuration will fail.
+      # - test_ios:
+      #     name: test_ios_unit_frameworks_hermes
+      #     use_hermes: true
+      #     use_frameworks: true
+      #     run_unit_tests: true
+      #     requires:
+      #       - setup_ios
       # - test_ios:
       #     name: test_ios_detox
       #     run_detox_tests: true
 
@@ -15,3 +15,7 @@ indent_size = 4
 
 [BUCK]
 indent_size = 4
+
+# Windows files
+[*.bat]
+end_of_line = crlf
@@ -0,0 +1,3 @@
+# Windows files should use crlf line endings
+# https://help.github.com/articles/dealing-with-line-endings/
+*.bat text eol=crlf
@@ -94,9 +94,9 @@ package-lock.json
 
 # Libs that shouldn't have Xcode project
 /Libraries/FBLazyVector/**/*.xcodeproj
-/Libraries/FBReactNativeSpec/**/*.xcodeproj
 /Libraries/RCTRequired/**/*.xcodeproj
 /React/CoreModules/**/*.xcodeproj
+/React/FBReactNativeSpec/**/*.xcodeproj
 /packages/react-native-codegen/**/*.xcodeproj
 
 # CocoaPods
@@ -109,10 +109,8 @@ package-lock.json
 !/packages/rn-tester/Pods/__offline_mirrors__
 
 # react-native-codegen
-/Libraries/FBReactNativeSpec/FBReactNativeSpec
 /packages/react-native-codegen/lib
-/ReactCommon/fabric/components/rncore/
-/schema-rncore.json
+/ReactCommon/react/renderer/components/rncore/
 
 # Visual studio
 .vscode
 
@@ -33,6 +33,7 @@ const ActionSheetIOS = {
    * - `destructiveButtonIndex` (int or array of ints) - index or indices of destructive buttons in `options`
    * - `title` (string) - a title to show above the action sheet
    * - `message` (string) - a message to show below the title
+   * - `disabledButtonIndices` (array of numbers) - a list of button indices which should be disabled
    *
    * The 'callback' function takes one parameter, the zero-based index
    * of the selected item.
@@ -49,6 +50,7 @@ const ActionSheetIOS = {
       +anchor?: ?number,
       +tintColor?: ColorValue | ProcessedColorValue,
       +userInterfaceStyle?: string,
+      +disabledButtonIndices?: Array<number>,
     |},
     callback: (buttonIndex: number) => void,
   ) {
 
@@ -25,6 +25,7 @@ export interface Spec extends TurboModule {
       +anchor?: ?number,
       +tintColor?: ?number,
       +userInterfaceStyle?: ?string,
+      +disabledButtonIndices?: Array<number>,
     |},
     callback: (buttonIndex: number) => void,
   ) => void;
 
@@ -97,13 +97,16 @@ class KeyboardAvoidingView extends React.Component<Props, State> {
   };
 
   _onLayout = (event: ViewLayoutEvent) => {
+    const wasFrameNull = this._frame == null;
     this._frame = event.nativeEvent.layout;
     if (!this._initialFrameHeight) {
       // save the initial frame height, before the keyboard is visible
       this._initialFrameHeight = this._frame.height;
     }
 
-    this._updateBottomIfNecesarry();
+    if (wasFrameNull) {
+      this._updateBottomIfNecesarry();
+    }
   };
 
   _updateBottomIfNecesarry = () => {
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# Windows files should use crlf line endings`
	`2`	`+# https://help.github.com/articles/dealing-with-line-endings/`
	`3`	`+*.bat text eol=crlf`