Incorporate MinorVersionPrefix with multi-TFM

Author: jviau

eng/build/Version.props

@@ -1,5 +1,10 @@
 <Project>
 
+  <PropertyGroup Condition="'$(MinorVersionPrefix)' == ''">
+    <MinorVersionPrefix Condition="'$(TargetFramework)' == 'net6.0'">6</MinorVersionPrefix>
+    <MinorVersionPrefix Condition="'$(TargetFramework)' == 'net8.0'">8</MinorVersionPrefix>
+  </PropertyGroup>
+
   <!--
     Import the first 'Directory.Version.props' seen from project being built up.
     This allows each directory cone to set its own versioning at the time this file needs it set.
@@ -24,13 +29,9 @@
     <AssemblyVersion>$(VersionPrefix.Substring(0, $(VersionPrefix.LastIndexOf('.')))).0.0</AssemblyVersion>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(CI)' != 'true'">
-    <!-- Constant file version for local dev. -->
-    <FileVersion>42.42.42.4242</FileVersion>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(CI)' == 'true'">
-    <FileVersion>$(VersionPrefix).$(BuildNumber)</FileVersion>
+  <PropertyGroup>
+    <FileVersion Condition="'$(CI)' != 'true'">42.42.42.4242</FileVersion> <!-- Constant file version for local dev. -->
+    <FileVersion Condition="'$(CI)' == 'true'">$(VersionPrefix).$(BuildNumber)</FileVersion>
   </PropertyGroup>
 
 </Project>

eng/build/Version.targets

@@ -14,6 +14,12 @@
     <Version>$(VersionPrefix)-$(VersionSuffix)</Version>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(MinorVersionPrefix)' != ''">
+    <!-- Removing MinorVersionPrefix from the package version. -->
+    <!-- NOTE: this relies on minor version being 1 digit. -->
+    <PackageVersion>$(Version.Remove(2, $(MinorVersionPrefix.Length)))</PackageVersion>
+  </PropertyGroup>
+
   <!-- When building in Azure pipelines, update the build number. -->
   <!-- Specifically use '$(TF_BUILD)' and not '$(CI)' to ensure we are in Azure pipelines. -->
   <Target Name="UpdateAzDoBuildNumber" Condition="'$(TF_BUILD)' == 'true' AND '$(UpdateBuildNumber)' == 'true'" BeforeTargets="BeforeBuild">

src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj

@@ -2,9 +2,8 @@
 
   <PropertyGroup>
     <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
-    <PackageId>Microsoft.Azure.WebJobs.Script.Grpc</PackageId>
     <AssemblyName>Microsoft.Azure.WebJobs.Script.Grpc</AssemblyName>
-    <RootNamespace>Microsoft.Azure.WebJobs.Script.Grpc</RootNamespace>
+    <PackageId>$(AssemblyName).InProc</PackageId>
     <Ext Condition="'$(OS)' == 'Windows_NT'">bat</Ext>
     <Ext Condition="'$(OS)' != 'Windows_NT'">sh</Ext>
   </PropertyGroup>

src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj

@@ -3,8 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
     <AssemblyName>Microsoft.Azure.WebJobs.Script.WebHost</AssemblyName>
-    <RootNamespace>Microsoft.Azure.WebJobs.Script.WebHost</RootNamespace>
-    <PackageId>Microsoft.Azure.WebJobs.Script.WebHost.InProc</PackageId>
+    <PackageId>$(AssemblyName).InProc</PackageId>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <TieredCompilation>false</TieredCompilation>
     <NoWarn>NU5104</NoWarn>

src/WebJobs.Script/WebJobs.Script.csproj

@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
-    <PackageId>Microsoft.Azure.WebJobs.Script</PackageId>
     <AssemblyName>Microsoft.Azure.WebJobs.Script</AssemblyName>
-    <RootNamespace>Microsoft.Azure.WebJobs.Script</RootNamespace>
+    <PackageId>$(AssemblyName).InProc</PackageId>
     <NoWarn>NU5104</NoWarn>
   </PropertyGroup>
   <ItemGroup>