Update package version to 0.0.0-<commit>-microsoft.0 for nightly ms b…

…uilds (microsoft#807)
HeyImChris · Sep 2, 2021 · c3af414 · c3af414
1 parent 64f103c
commit c3af414
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.ado/templates/android-build-office.yml b/.ado/templates/android-build-office.yml
@@ -29,6 +29,12 @@ steps:
     displayName: npm install
     inputs:
       script: npm install
+
+  - task: CmdLine@2
+    displayName: Bump canary package version
+    inputs:
+      script: node scripts/bump-oss-version.js --nightly
+    condition: eq(variables['Build.SourceBranchName'], 'master')
 
   - task: CmdLine@2
     displayName: nuget restore

diff --git a/android-patches/patches/Build/ReactAndroid/ReactAndroid.nuspec b/android-patches/patches/Build/ReactAndroid/ReactAndroid.nuspec
@@ -1,6 +1,6 @@
 --- "E:\\github\\rnm-63-fresh\\ReactAndroid\\ReactAndroid.nuspec"	1969-12-31 16:00:00.000000000 -0800
 +++ "E:\\github\\rnm-63\\ReactAndroid\\ReactAndroid.nuspec"	2020-10-27 20:20:54.071789900 -0700
-@@ -0,0 +1,140 @@
+@@ -0,0 +1,135 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 +  <metadata>
@@ -65,11 +65,6 @@
 +    <file src="build\react-ndk\all\x86\libyoga.so" target="lib\droidx86"/>
 +    <file src="build\react-ndk\all\arm64-v8a\libyoga.so" target="lib\droidarm64"/>
 +
-+    <file src="build\react-ndk\all\x86_64\libyoga.so" target="lib\droidx64"/>
-+    <file src="build\react-ndk\all\armeabi-v7a\libyoga.so" target="lib\droidarm"/>
-+    <file src="build\react-ndk\all\x86\libyoga.so" target="lib\droidx86"/>
-+    <file src="build\react-ndk\all\arm64-v8a\libyoga.so" target="lib\droidarm64"/>
-+
 +    <!-- Unstripped binaries -->
 +    <file src="build\tmp\buildReactNdkLib\local\x86_64\libfb.so" target="lib\droidx64\unstripped"/>
 +    <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libfb.so" target="lib\droidarm\unstripped"/>