reverting version prefix change for Functions build (#9865)

Author: brettsam

azure-pipelines.yml

@@ -6,7 +6,7 @@ variables:
   ${{ elseif contains(variables['Build.SourceBranch'], 'release/inproc8/') }}:
     minorVersionPrefix: "8"
   ${{ else }}:
-    minorVersionPrefix: "10"
+    minorVersionPrefix: ""
   DOTNET_NOLOGO: 1
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
   DOTNET_CLI_TELEMETRY_OPTOUT: 1

build/build-extensions.ps1

@@ -1,7 +1,7 @@
 param (
   [string]$buildNumber = "0",    
   [string]$suffix = "",
-  [ValidateSet("6", "8", "10")][string]$minorVersionPrefix = "10",
+  [ValidateSet("6", "8", "")][string]$minorVersionPrefix = "",
   [string]$hashesForHardlinksFile = "hashesForHardlinks.txt"
 )
 
@@ -240,7 +240,7 @@ function CreateSiteExtensions() {
     $zipOutput = "$buildOutput\SiteExtension"
     $hashesForHardLinksPath = "$siteExtensionPath\$extensionVersion\$hashesForHardlinksFile"
     New-Item -Itemtype directory -path $zipOutput -Force > $null
-    if ($minorVersionPrefix -eq "10") {
+    if ($minorVersionPrefix -eq "") {
         ZipContent $siteExtensionPath "$zipOutput\Functions.$extensionVersion$runtimeSuffix.zip"
     } elseif ($minorVersionPrefix -eq "8") {
         # Only the "Functions" site extension supports hard links

build/common.props

@@ -3,8 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <LangVersion>latest</LangVersion>
-    <MajorVersion>4</MajorVersion>
-    <MinorVersionPrefix Condition="'$(MinorVersionPrefix)' == ''">10</MinorVersionPrefix>
+    <MajorVersion>4</MajorVersion>    
     <MinorVersion>$(MinorVersionPrefix)31</MinorVersion>
     <PatchVersion>0</PatchVersion>
     <BuildNumber Condition="'$(BuildNumber)' == '' ">0</BuildNumber>