Auto stash before rebase of "origin/master"

update versioning tasks
dprevato · Dec 21, 2019 · 29363b5 · 29363b5
1 parent 42ffc8b
commit 29363b5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Source/build/jobs/sandbox-android.yml b/Source/build/jobs/sandbox-android.yml
@@ -4,7 +4,6 @@ parameters:
 jobs:
 - job: sandboxAndroid
   displayName: Sandbox Android App
-  condition: succeeded()
   pool:
     vmImage: $(MacImage)
     demands:
@@ -15,11 +14,14 @@ jobs:
   workspace:
     clean: all
   steps:
-  - task: vs-publisher-473885.motz-mobile-buildtasks.android-manifest-version.android-manifest-version@0
+  - task: android-manifest-version@1
     displayName: 'Bump Android Versions in AndroidManifest.xml'
     inputs:
       sourcePath: Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.Android/Properties/AndroidManifest.xml
+      versionCodeOption: 'buildid'
+      versionCode: '$(Build.BuildId)'
       versionName: '7.2.$(Build.BuildId)'
+      printFile: true
 
   - template: ../steps/set-runtime.yml
 

diff --git a/Source/build/jobs/sandbox-ios.yml b/Source/build/jobs/sandbox-ios.yml
@@ -4,7 +4,6 @@ parameters:
 jobs:
 - job: sandboxIOS
   displayName: Sandbox iOS App
-  condition: succeeded()
   pool:
     vmImage: $(MacImage)
     demands:
@@ -23,11 +22,14 @@ jobs:
     inputs:
       provProfileSecureFile: Prism.mobileprovision
 
-  - task: vs-publisher-473885.motz-mobile-buildtasks.ios-bundle-version.ios-bundle-version@0
+  - task: ios-bundle-version@1
     displayName: 'Bump iOS Versions in Info.plist'
     inputs:
       sourcePath: Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.iOS/Info.plist
+      versionCodeOption: 'buildid'
+      versionCode: '$(Build.BuildId)'
       versionName: '7.2.$(Build.BuildId)'
+      printFile: true
 
   - template: ../steps/set-runtime.yml