From 2a03f67ffe563ba4ce63ea85a75184243187421b Mon Sep 17 00:00:00 2001
From: Jacob Viau <javia@microsoft.com>
Date: Thu, 31 Jul 2025 13:10:21 -0700
Subject: [PATCH 1/3] Incorporate MinorVersionPrefix with multi-TFM

---
 eng/build/Version.props                           | 15 ++++++++-------
 eng/build/Version.targets                         |  6 ++++++
 .../WebJobs.Script.Grpc.csproj                    |  3 +--
 .../WebJobs.Script.WebHost.csproj                 |  3 +--
 src/WebJobs.Script/WebJobs.Script.csproj          |  3 +--
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/eng/build/Version.props b/eng/build/Version.props
index 62205c0180..c6559d3ba2 100644
--- a/eng/build/Version.props
+++ b/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>
diff --git a/eng/build/Version.targets b/eng/build/Version.targets
index bafd0b00df..da829fba8c 100644
--- a/eng/build/Version.targets
+++ b/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">
diff --git a/src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj b/src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj
index ba7e481a0d..cb41ba06f0 100644
--- a/src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj
+++ b/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>
diff --git a/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj b/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj
index 6fbf2aa568..b8f1a4c1b7 100644
--- a/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj
+++ b/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>
diff --git a/src/WebJobs.Script/WebJobs.Script.csproj b/src/WebJobs.Script/WebJobs.Script.csproj
index 8518f586ef..a667b6f5cc 100644
--- a/src/WebJobs.Script/WebJobs.Script.csproj
+++ b/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>

From d99c504fd7d2cf5d9d85f39deee76a9317e03a42 Mon Sep 17 00:00:00 2001
From: Jacob Viau <javia@microsoft.com>
Date: Fri, 3 Oct 2025 09:09:55 -0700
Subject: [PATCH 2/3] Disable package warning

---
 eng/build/Engineering.props | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/build/Engineering.props b/eng/build/Engineering.props
index bc36e72bda..ac7da3cd6b 100644
--- a/eng/build/Engineering.props
+++ b/eng/build/Engineering.props
@@ -13,6 +13,7 @@
     <WarningsAsErrors Condition="'$(CI)' == 'true'">$(WarningsAsErrors)NU1904;</WarningsAsErrors>
     <NuGetAuditLevel>moderate</NuGetAuditLevel> <!-- warn on moderate severity only. -->
     <NuGetAuditMode>all</NuGetAuditMode> <!-- audit transitive dependencies. -->
+    <WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
   </PropertyGroup>
 
   <PropertyGroup>

From c4a1fa28500d6e2194762b49df5c319eff747da3 Mon Sep 17 00:00:00 2001
From: Jacob Viau <javia@microsoft.com>
Date: Fri, 3 Oct 2025 10:17:08 -0700
Subject: [PATCH 3/3] Do not change package name

---
 src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj | 1 -
 src/WebJobs.Script/WebJobs.Script.csproj           | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj b/src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj
index cb41ba06f0..a8b108f806 100644
--- a/src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj
+++ b/src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
     <AssemblyName>Microsoft.Azure.WebJobs.Script.Grpc</AssemblyName>
-    <PackageId>$(AssemblyName).InProc</PackageId>
     <Ext Condition="'$(OS)' == 'Windows_NT'">bat</Ext>
     <Ext Condition="'$(OS)' != 'Windows_NT'">sh</Ext>
   </PropertyGroup>
diff --git a/src/WebJobs.Script/WebJobs.Script.csproj b/src/WebJobs.Script/WebJobs.Script.csproj
index a667b6f5cc..892f2fd35b 100644
--- a/src/WebJobs.Script/WebJobs.Script.csproj
+++ b/src/WebJobs.Script/WebJobs.Script.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <AssemblyName>Microsoft.Azure.WebJobs.Script</AssemblyName>
-    <PackageId>$(AssemblyName).InProc</PackageId>
     <NoWarn>NU5104</NoWarn>
   </PropertyGroup>
   <ItemGroup>