From 8a02f815f5c2330fa3255377576ea7b2cd8c8fb6 Mon Sep 17 00:00:00 2001
From: Kenny Guo <kennyguo@microsoft.com>
Date: Tue, 27 Jul 2021 12:19:33 +0800
Subject: [PATCH] Revert some change of build scripts

---
 .../pipelines/templates/build-app-internal.yaml  |  6 ++++--
 .../templates/build-single-architecture.yaml     |  8 ++------
 .../templates/prepare-release-internalonly.yaml  |  2 +-
 build/scripts/UpdateAppxManifestVersion.ps1      | 16 +---------------
 4 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/build/pipelines/templates/build-app-internal.yaml b/build/pipelines/templates/build-app-internal.yaml
index 4c9dcd35..f09e2cdb 100644
--- a/build/pipelines/templates/build-app-internal.yaml
+++ b/build/pipelines/templates/build-app-internal.yaml
@@ -28,12 +28,14 @@ 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:
       extraMsBuildArgs: '/p:IsStoreBuild=true'
-      isPublicRelease: ${{ parameters.isPublicRelease }}
 
   - task: PublishSymbols@2
     displayName: Publish symbols
diff --git a/build/pipelines/templates/build-single-architecture.yaml b/build/pipelines/templates/build-single-architecture.yaml
index 09d29a05..349ffcbd 100644
--- a/build/pipelines/templates/build-single-architecture.yaml
+++ b/build/pipelines/templates/build-single-architecture.yaml
@@ -3,7 +3,6 @@
 
 parameters:
   extraMsBuildArgs: ''
-  isPublicRelease: false
 
 steps:
   - task: NuGetToolInstaller@1
@@ -23,10 +22,7 @@ steps:
     displayName: Set version number in AppxManifest
     inputs:
       filePath: $(Build.SourcesDirectory)\build\scripts\UpdateAppxManifestVersion.ps1
-      ${{ if eq(parameters.isPublicRelease, true) }}:
-        arguments: '-AppxManifest $(Build.SourcesDirectory)\src\Calculator\Package.appxmanifest -Version $(Build.BuildNumber) -MinVersion 10.0.22000.0'
-      ${{ if eq(parameters.isPublicRelease, false) }}:
-        arguments: '-AppxManifest $(Build.SourcesDirectory)\src\Calculator\Package.appxmanifest -Version $(Build.BuildNumber)'
+      arguments: '-AppxManifest $(Build.SourcesDirectory)\src\Calculator\Package.appxmanifest -Version $(Build.BuildNumber)'
 
   - task: VSBuild@1
     displayName: 'Build solution src/Calculator.sln'
@@ -43,4 +39,4 @@ steps:
     inputs:
       artifactName: drop
       pathToPublish: $(Build.BinariesDirectory)
-      parallel: true
+      parallel: true
\ No newline at end of file
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.
diff --git a/build/scripts/UpdateAppxManifestVersion.ps1 b/build/scripts/UpdateAppxManifestVersion.ps1
index 64ced98c..1c6bc5dd 100644
--- a/build/scripts/UpdateAppxManifestVersion.ps1
+++ b/build/scripts/UpdateAppxManifestVersion.ps1
@@ -11,9 +11,6 @@
 .PARAMETER Version
     The version number to write into the file.
 
-.PARAMETER MinVersion
-    The MinVersion to write to TargetDeviceFamily element in the file.
-
 .EXAMPLE
     Update-AppxManifestVersion -AppxManifest "C:\App\Package.appxmanifest" -Version "3.2.1.0"
 #>
@@ -26,20 +23,9 @@ param(
     [ValidateScript({[version]$_})]
     [Parameter(Mandatory)]
     [string]
-    $Version,
-
-    [ValidateScript({[version]$_})]
-    [Parameter(Mandatory=$false)]
-    [string]
-    $MinVersion
+    $Version
 )
 
 $xmlDoc = [XML](Get-Content $AppxManifest)
 $xmlDoc.Package.Identity.setAttribute("Version", $Version);
-
-if($MinVersion)
-{
-    $xmlDoc.Package.Dependencies.TargetDeviceFamily.setAttribute("MinVersion", $MinVersion);
-}
-
 $xmlDoc.Save($AppxManifest)
\ No newline at end of file