From 374e6c3bae0264b8be6393a8ebd5a3a6d44f95a5 Mon Sep 17 00:00:00 2001
From: Kenny Guo <kennyguo@microsoft.com>
Date: Tue, 27 Jul 2021 12:50:29 +0800
Subject: [PATCH] Bump internal package build number

---
 .../azure-pipelines.ci-internal.yaml          |  8 ++++++++
 build/pipelines/azure-pipelines.release.yaml  | 20 +++----------------
 .../templates/build-app-internal.yaml         |  6 +++++-
 .../prepare-release-internalonly.yaml         |  2 +-
 4 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/build/pipelines/azure-pipelines.ci-internal.yaml b/build/pipelines/azure-pipelines.ci-internal.yaml
index 6014b53b..a3f3847a 100644
--- a/build/pipelines/azure-pipelines.ci-internal.yaml
+++ b/build/pipelines/azure-pipelines.ci-internal.yaml
@@ -20,16 +20,24 @@ jobs:
 - template: ./templates/build-app-internal.yaml
   parameters:
     platform: x86
+    condition: not(eq(variables['Build.Reason'], 'PullRequest'))
 
 - template: ./templates/build-app-internal.yaml
   parameters:
     platform: ARM
+    condition: not(eq(variables['Build.Reason'], 'PullRequest'))
 
 - template: ./templates/run-ui-tests.yaml
   parameters:
     platform: x64
     runsettingsFileName: CalculatorUITests.release.runsettings
 
+- template: ./templates/run-ui-tests.yaml
+  parameters:
+    platform: x86
+    runsettingsFileName: CalculatorUITests.release.runsettings
+    condition: not(eq(variables['Build.Reason'], 'PullRequest'))
+
 - template: ./templates/run-unit-tests.yaml
   parameters:
     platform: x64
diff --git a/build/pipelines/azure-pipelines.release.yaml b/build/pipelines/azure-pipelines.release.yaml
index ba9de01c..05eec0b3 100644
--- a/build/pipelines/azure-pipelines.release.yaml
+++ b/build/pipelines/azure-pipelines.release.yaml
@@ -4,13 +4,6 @@
 # Store and the Windows image. This pipeline relies on Microsoft-internal resources to run.
 #
 
-schedules:
-- cron: "0 7 * * *"
-  displayName: Daily midnight build
-  branches:
-    include:
-    - master
-
 trigger: none
 pr: none
 
@@ -26,27 +19,20 @@ jobs:
 - template: ./templates/build-app-internal.yaml
   parameters:
     platform: x64
+    isPublicRelease: true
 
 - template: ./templates/build-app-internal.yaml
   parameters:
     platform: x86
+    isPublicRelease: true
     condition: not(eq(variables['Build.Reason'], 'PullRequest'))
 
 - template: ./templates/build-app-internal.yaml
   parameters:
     platform: ARM
+    isPublicRelease: true
     condition: not(eq(variables['Build.Reason'], 'PullRequest'))
 
-- template: ./templates/run-ui-tests.yaml
-  parameters:
-    platform: x64
-    runsettingsFileName: CalculatorUITests.release.runsettings
-
-- template: ./templates/run-ui-tests.yaml
-  parameters:
-    platform: x86
-    runsettingsFileName: CalculatorUITests.release.runsettings
-
 - template: ./templates/run-unit-tests.yaml
   parameters:
     platform: x64
diff --git a/build/pipelines/templates/build-app-internal.yaml b/build/pipelines/templates/build-app-internal.yaml
index 48a63b5d..f09e2cdb 100644
--- a/build/pipelines/templates/build-app-internal.yaml
+++ b/build/pipelines/templates/build-app-internal.yaml
@@ -6,6 +6,7 @@
 parameters:
   platform: ''
   condition: ''
+  isPublicRelease: false
 
 jobs:
 - job: Build${{ parameters.platform }}
@@ -27,7 +28,10 @@ jobs:
       downloadDirectory: $(Build.SourcesDirectory)
       vstsFeed: WindowsInboxApps
       vstsFeedPackage: calculator-internals
-      vstsPackageVersion: 0.0.65
+      ${{ if eq(parameters.isPublicRelease, true) }}:
+        vstsPackageVersion: 0.0.66
+      ${{ if eq(parameters.isPublicRelease, false) }}:
+        vstsPackageVersion: 0.0.65
 
   - template: ./build-single-architecture.yaml
     parameters:
diff --git a/build/pipelines/templates/prepare-release-internalonly.yaml b/build/pipelines/templates/prepare-release-internalonly.yaml
index e4bb1932..d5551408 100644
--- a/build/pipelines/templates/prepare-release-internalonly.yaml
+++ b/build/pipelines/templates/prepare-release-internalonly.yaml
@@ -81,7 +81,7 @@ jobs:
       downloadDirectory: $(Build.SourcesDirectory)
       vstsFeed: WindowsInboxApps
       vstsFeedPackage: calculator-internals
-      vstsPackageVersion: 0.0.65
+      vstsPackageVersion: 0.0.66
 
   - powershell: |
       # Just modify this line to indicate where your en-us PDP file is. Leave the other lines alone.