Merge upstream into fork

.ado/android-pr.yml

@@ -16,7 +16,7 @@ jobs:
   - job: AndroidRNPR
     displayName: Android React Native PR
     pool:
-      vmImage: vs2017-win2016
+      vmImage: ubuntu-18.04
     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:
@@ -27,18 +27,27 @@ jobs:
         submodules: recursive # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules
         persistCredentials: false # set to 'true' to leave the OAuth token in the Git config after the initial fetch
 
+      - task: UseNode@1
+        inputs:
+          version: '12.x'
+
       - template: templates/apple-droid-node-patching.yml
         parameters:
           apply_office_patches: true
 
-      - task: UseNode@1
+      # Install NuGet
+      - task: CmdLine@2
         inputs:
-          version: '10.x'
+          script: mkdir $(System.DefaultWorkingDirectory)/nuget-bin/ && curl -o $(System.DefaultWorkingDirectory)/nuget-bin/nuget.exe https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
+
 
-      # Install NuGet v4.6.4+
-      - task: NuGetToolInstaller@1
+      # This is currently required as the command task (strangely) always runs elevated .. 
+      # which makes all the files touched by the above patching step unreadable by following non-command tasks without sudo. 
+      # This makes all the files readable.
+      - task: CmdLine@2
+        displayName: chmod
         inputs:
-          versionSpec: '>=4.6.4'
+          script: chmod -R +r .
 
       - task: CmdLine@2
         displayName: "Rename package to react-native"
@@ -50,119 +59,41 @@ jobs:
         inputs:
           script: npm install
 
-      - task: NuGetCommand@2
-        displayName: NuGet restore
-        inputs:
-          command: restore
-          restoreSolution: ReactAndroid/packages.config
-          feedsToUse: config
-          #vstsFeed: # Required when feedsToUse == Select
-          #includeNuGetOrg: true # Required when feedsToUse == Select
-          nugetConfigPath: ReactAndroid/NuGet.Config
-          #externalFeedCredentials: # Optional
-          #noCache: false
-          #disableParallelProcessing: false
-          restoreDirectory: packages/
-          verbosityRestore: Detailed # Options: quiet, normal, detailed
-          #packagesToPush: '$(Build.ArtifactStagingDirectory)/**/*.nupkg;!$(Build.ArtifactStagingDirectory)/**/*.symbols.nupkg' # Required when command == Push
-          #nuGetFeedType: 'internal' # Required when command == Push# Options: internal, external
-          #publishVstsFeed: # Required when command == Push && NuGetFeedType == Internal
-          #publishPackageMetadata: true # Optional
-          #allowPackageConflicts: # Optional
-          #publishFeedCredentials: # Required when command == Push && NuGetFeedType == External
-          #verbosityPush: 'Detailed' # Options: quiet, normal, detailed
-          #packagesToPack: '**/*.csproj' # Required when command == Pack
-          #configuration: '$(BuildConfiguration)' # Optional
-          #packDestination: '$(Build.ArtifactStagingDirectory)' # Optional
-          #versioningScheme: 'off' # Options: off, byPrereleaseNumber, byEnvVar, byBuildNumber
-          #includeReferencedProjects: false # Optional
-          #versionEnvVar: # Required when versioningScheme == ByEnvVar
-          #majorVersion: '1' # Required when versioningScheme == ByPrereleaseNumber
-          #minorVersion: '0' # Required when versioningScheme == ByPrereleaseNumber
-          #patchVersion: '0' # Required when versioningScheme == ByPrereleaseNumber
-          #packTimezone: 'utc' # Required when versioningScheme == ByPrereleaseNumber# Options: utc, local
-          #includeSymbols: false # Optional
-          #toolPackage: # Optional
-          #buildProperties: # Optional
-          #basePath: # Optional
-          #verbosityPack: 'Detailed' # Options: quiet, normal, detailed
-          #arguments: # Required when command == Custom
-
-#      - task: CmdLine@2
-#        displayName: Setup Build Dependencies
-#        inputs:
-#          script: .ado\setup_droid_deps.bat
-
       - task: CmdLine@2
         displayName: Remove RNTesterApp.android.bundle
         inputs:
-          script: del RNTesterApp.android.bundle
+          script: rm -f RNTesterApp.android.bundle
 
       - task: CmdLine@2
         displayName: Create RNTester bundle
         inputs:
-          script: node cli.js bundle --entry-file .\RNTester\js\RNTesterApp.android.js --bundle-output RNTesterApp.android.bundle --platform android
+          script: node cli.js bundle --entry-file ./RNTester/js/RNTesterApp.android.js --bundle-output RNTesterApp.android.bundle --platform android
 
-      - task: Gradle@1
+      - task: CmdLine@2
         displayName: gradlew installArchives
-#        env:
-#          REACT_NATIVE_DEPENDENCIES: $(System.DefaultWorkingDirectory)\build_deps
         inputs:
-          gradleWrapperFile: gradlew
-          # workingDirectory: src\react-native\
-          options: -Pparam="excludeLibs"
-          tasks: installArchives
-          publishJUnitResults: false
-          #testResultsFiles: '**/TEST-*.xml' # Required when publishJUnitResults == True
-          #testRunTitle: # Optional
-          #codeCoverageToolOption: 'None' # Optional. Options: none, cobertura, jaCoCo
-          #codeCoverageClassFilesDirectories: 'build/classes/main/' # Required when codeCoverageToolOption == False
-          #codeCoverageClassFilter: # Optional
-          #codeCoverageFailIfEmpty: false # Optional
-          #javaHomeOption: 'JDKVersion' # Options: jDKVersion, path
-          #jdkVersionOption: 'default' # Optional. Options: default, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6
-          #jdkDirectory: # Required when javaHomeOption == Path
-          #jdkArchitectureOption: 'x64' # Optional. Options: x86, x64
-          #gradleOptions: '-Xmx1024m' # Optional
-          #sonarQubeRunAnalysis: false
-          #sqGradlePluginVersionChoice: 'specify' # Required when sonarQubeRunAnalysis == True# Options: specify, build
-          #sonarQubeGradlePluginVersion: '2.6.1' # Required when sonarQubeRunAnalysis == True && SqGradlePluginVersionChoice == Specify
-          #checkStyleRunAnalysis: false # Optional
-          #findBugsRunAnalysis: false # Optional
-          #pmdRunAnalysis: false # Optional
+          script: ./gradlew installArchives -Pparam="excludeLibs"
 
       - template: templates\prep-android-nuget.yml
 
-      - task: NuGetCommand@2
+      # Very similar to the default pack task .. but appends 'ndk21' to the nuget pack version
+      - task: CmdLine@2
         displayName: 'Verify NuGet can be packed'
         inputs:
-          command: pack
-          packagesToPack: 'ReactAndroid/ReactAndroid.nuspec'
-          packDestination: '$(System.DefaultWorkingDirectory)'
-          buildProperties: buildNumber=$(buildNumber);commitId=$(Build.SourceVersion)
+          script: NDK=ndk`cat ${ANDROID_SDK_ROOT}/ndk-bundle/source.properties 2>&1 | grep Pkg.Revision | awk '{ print $3}' | awk -F. '{ print $1 }'`; mono $(System.DefaultWorkingDirectory)/nuget-bin/nuget.exe pack $(System.DefaultWorkingDirectory)/ReactAndroid/ReactAndroid.nuspec -OutputDirectory $(System.DefaultWorkingDirectory) -Properties buildNumber=$(buildNumber)-$NDK;commitId=$(Build.SourceVersion)
 
-      - task: Gradle@1
+      - task: CmdLine@2
+        displayName: 'Npm pack'
+        inputs:
+          script: node .ado/npmOfficePack.js --fake
+        env:
+          BUILD_STAGINGDIRECTORY: $(Build.StagingDirectory)
+          BUILD_SOURCESDIRECTORY: $(Build.SourcesDirectory)
+          BUILD_SOURCEBRANCH: $(Build.SourceBranch)
+          SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+          githubApiToken: $(githubApiToken)
+
+      - task: CmdLine@2
         displayName: gradlew clean
         inputs:
-          gradleWrapperFile: gradlew
-          # workingDirectory: src\
-          #options: # Optional
-          tasks: clean
-          publishJUnitResults: false
-          #testResultsFiles: '**/build/test-results/TEST-*.xml'
-          #testRunTitle: # Optional
-          #codeCoverageToolOption: 'None' # Optional. Options: none, cobertura, jaCoCo
-          #codeCoverageClassFilesDirectories: 'build/classes/main/' # Required when codeCoverageToolOption == False
-          #codeCoverageClassFilter: # Optional
-          #codeCoverageFailIfEmpty: false # Optional
-          #javaHomeOption: 'JDKVersion' # Options: jDKVersion, path
-          #jdkVersionOption: 'default' # Optional. Options: default, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6
-          #jdkDirectory: # Required when javaHomeOption == Path
-          #jdkArchitectureOption: 'x64' # Optional. Options: x86, x64
-          #gradleOptions: '-Xmx1024m' # Optional
-          #sonarQubeRunAnalysis: false
-          #sqGradlePluginVersionChoice: 'specify' # Required when sonarQubeRunAnalysis == True# Options: specify, build
-          #sonarQubeGradlePluginVersion: '2.6.1' # Required when sonarQubeRunAnalysis == True && SqGradlePluginVersionChoice == Specify
-          #checkStyleRunAnalysis: false # Optional
-          #findBugsRunAnalysis: false # Optional
-          #pmdRunAnalysis: false # Optional
+          script: ./gradlew clean

.ado/android_symlink_ndk.bat

@@ -0,0 +1,28 @@
+REM @if "%DEBUG%" == "" @echo off
+
+REM Android tools doesn't support SDK/NDK paths containing space in it.
+REM This scrip creates a symlink to Android NDK to work around the limitation.
+REM We use the 
+
+set ANDROID_NDK_SYMLINK_PATH=c:\android_ndk_symlink__
+
+REM 1. Try ANDROID_NDK environment variable
+set ANDROID_NDK_PATH=%ANDROID_NDK%
+
+REM 2. May be SDK has ndk-bundle in it.
+IF "%ANDROID_NDK_PATH%"=="" set ANDROID_NDK_PATH=%ANDROID_home%\ndk-bundle
+
+echo %ANDROID_NDK_PATH%
+
+if exist %ANDROID_NDK_PATH% (
+    mklink /J %ANDROID_NDK_SYMLINK_PATH% "%ANDROID_NDK_PATH%"
+    goto :success
+) else (
+    goto :error
+)
+
+:success
+exit /b 0
+
+:error
+exit /b 1

.ado/npmOfficePack.js

@@ -19,15 +19,15 @@ function exec(command) {
   }
 }
 
-function doPublish() {
+function doPublish(fakeMode) {
   console.log(`Target branch to publish to: ${publishBranchName}`);
 
   const {releaseVersion, branchVersionSuffix} = gatherVersionInfo()
 
   const onlyTagSource = !!branchVersionSuffix;
   if (!onlyTagSource) {
     // -------- Generating Android Artifacts with JavaDoc
-    exec("gradlew installArchives");
+    exec(path.join(process.env.BUILD_SOURCESDIRECTORY, "gradlew") + " installArchives");
 
     // undo uncommenting javadoc setting
     exec("git checkout ReactAndroid/gradle.properties");
@@ -40,7 +40,19 @@ function doPublish() {
   const npmTarPath = path.resolve(__dirname, '..', npmTarFileName);
   const finalTarPath = path.join(process.env.BUILD_STAGINGDIRECTORY, 'final', npmTarFileName);
   console.log(`Copying tar file ${npmTarPath} to: ${finalTarPath}`)
-  fs.copyFileSync(npmTarPath, finalTarPath);
+
+  if(fakeMode) {
+    if (!fs.existsSync(npmTarPath))
+      throw "The final artefact to be published is missing.";
+  } else {
+    fs.copyFileSync(npmTarPath, finalTarPath);
+  }
 }
 
-doPublish();
+var args = process.argv.slice(2);
+
+let fakeMode = false;
+if (args.length > 0 && args[0] === '--fake')
+  fakeMode = true;
+
+doPublish(fakeMode);