Multi-target WebJobs.Script (#11385)

jviau · web-flow · commit 98e62976131b · 2025-10-01T10:35:21.000-07:00
* Multi-target WebJobs.Script

* Remove unused extension methods. Port logic from dev for GetDefaultWorkersDirectory

* Port dev logic for MemoryMappedFileAccessorWindows.TryOpen
diff --git a/eng/build/Engineering.props b/eng/build/Engineering.props
@@ -23,6 +23,7 @@
     <DebugType>embedded</DebugType>
     <GenerateRuntimeConfigDevFile>true</GenerateRuntimeConfigDevFile><!-- https://github.com/dotnet/runtime/issues/54684 -->
     <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
+    <CheckEolTargetFramework>false</CheckEolTargetFramework> <!-- We are building net6 until OOP is end of life. -->
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/WebJobs.Script/Description/Compilation/CompilationServiceException.cs b/src/WebJobs.Script/Description/Compilation/CompilationServiceException.cs
@@ -26,7 +26,11 @@ public CompilationServiceException(string message, Exception innerException) : b
         {
         }
 
-        private CompilationServiceException(SerializationInfo info, StreamingContext context) : base(info, context)
+#if NET8_0_OR_GREATER
+        [Obsolete]
+#endif
+        private CompilationServiceException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
         {
         }
     }
diff --git a/src/WebJobs.Script/Description/DotNet/RuntimeAssembliesInfo.cs b/src/WebJobs.Script/Description/DotNet/RuntimeAssembliesInfo.cs
@@ -3,16 +3,15 @@
 
 using System;
 using System.Collections.Generic;
-using System.Runtime.InteropServices;
 using Microsoft.Azure.WebJobs.Script.Config;
 
 namespace Microsoft.Azure.WebJobs.Script.Description
 {
     internal class RuntimeAssembliesInfo
     {
+        private readonly object _loadSyncRoot = new();
         private readonly IEnvironment _environment;
         private Lazy<Dictionary<string, ScriptRuntimeAssembly>> _runtimeAssemblies;
-        private object _loadSyncRoot = new object();
         private bool? _relaxedUnification;
 
         public RuntimeAssembliesInfo()
@@ -35,10 +34,9 @@ private Dictionary<string, ScriptRuntimeAssembly> GetRuntimeAssemblies()
             lock (_loadSyncRoot)
             {
                 _relaxedUnification = FeatureFlags.IsEnabled(ScriptConstants.FeatureFlagRelaxedAssemblyUnification, _environment);
-                var tfmversion = typeof(string).Assembly.GetName().Version.Major;
                 var manifestName = _relaxedUnification.Value
                     ? "runtimeassemblies-relaxed.json"
-                    : $"runtimeassemblies-net{tfmversion}.json";
+                    : $"runtimeassemblies.json";
 
                 return DependencyHelper.GetRuntimeAssemblies(manifestName);
             }
diff --git a/src/WebJobs.Script/Extensions/AssemblyExtensions.cs b/src/WebJobs.Script/Extensions/AssemblyExtensions.cs
diff --git a/src/WebJobs.Script/ExternalStartupException.cs b/src/WebJobs.Script/ExternalStartupException.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 using System;
+using System.Runtime.Serialization;
 
 namespace Microsoft.Azure.WebJobs.Script
 {
@@ -18,8 +19,10 @@ public ExternalStartupException(string message) : base(message) { }
 
         public ExternalStartupException(string message, Exception inner) : base(message, inner) { }
 
-        protected ExternalStartupException(
-          System.Runtime.Serialization.SerializationInfo info,
-          System.Runtime.Serialization.StreamingContext context) : base(info, context) { }
+#if NET8_0_OR_GREATER
+        [Obsolete]
+#endif
+        protected ExternalStartupException(SerializationInfo info, StreamingContext context)
+            : base(info, context) { }
     }
 }
diff --git a/src/WebJobs.Script/FunctionConfigurationException.cs b/src/WebJobs.Script/FunctionConfigurationException.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 using System;
+using System.Runtime.Serialization;
 
 namespace Microsoft.Azure.WebJobs.Script
 {
@@ -18,8 +19,10 @@ public FunctionConfigurationException(string message) : base(message) { }
 
         public FunctionConfigurationException(string message, Exception inner) : base(message, inner) { }
 
-        protected FunctionConfigurationException(
-          System.Runtime.Serialization.SerializationInfo info,
-          System.Runtime.Serialization.StreamingContext context) : base(info, context) { }
+#if NET8_0_OR_GREATER
+        [Obsolete]
+#endif
+        protected FunctionConfigurationException(SerializationInfo info, StreamingContext context)
+            : base(info, context) { }
     }
 }
diff --git a/src/WebJobs.Script/Host/ProxyFunctionProvider.cs b/src/WebJobs.Script/Host/ProxyFunctionProvider.cs
@@ -94,7 +94,7 @@ private ImmutableArray<FunctionMetadata> LoadFunctionMetadata()
             var functionErrors = new Dictionary<string, ICollection<string>>();
             Collection<ProxyFunctionMetadata> proxies = ReadProxyMetadata(_scriptOptions.Value.RootScriptPath, _logger, functionErrors);
 
-            ImmutableArray<FunctionMetadata> metadata;
+            ImmutableArray<FunctionMetadata> metadata = default;
             if (proxies != null && proxies.Any())
             {
                 metadata = proxies.ToImmutableArray<FunctionMetadata>();
diff --git a/src/WebJobs.Script/HostConfigurationException.cs b/src/WebJobs.Script/HostConfigurationException.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 using System;
+using System.Runtime.Serialization;
 
 namespace Microsoft.Azure.WebJobs.Script
 {
@@ -18,8 +19,10 @@ public HostConfigurationException(string message) : base(message) { }
 
         public HostConfigurationException(string message, Exception inner) : base(message, inner) { }
 
-        protected HostConfigurationException(
-          System.Runtime.Serialization.SerializationInfo info,
-          System.Runtime.Serialization.StreamingContext context) : base(info, context) { }
+#if NET8_0_OR_GREATER
+        [Obsolete]
+#endif
+        protected HostConfigurationException(SerializationInfo info, StreamingContext context)
+            : base(info, context) { }
     }
 }
diff --git a/src/WebJobs.Script/HostDisposedException.cs b/src/WebJobs.Script/HostDisposedException.cs
@@ -24,14 +24,13 @@ public HostDisposedException(string disposedObjectName, Exception inner)
             _stackTraceString = GetStackTraceString();
         }
 
+#if NET8_0_OR_GREATER
+        [Obsolete]
+#endif
         protected HostDisposedException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
-            if (info == null)
-            {
-                throw new ArgumentNullException(nameof(info));
-            }
-
+            ArgumentNullException.ThrowIfNull(info);
             _stackTraceString = info.GetString("FullStackTraceString");
         }
 
@@ -42,10 +41,12 @@ public string GetStackTraceString()
             return new StackTrace(true).ToString();
         }
 
+#if NET8_0_OR_GREATER
+        [Obsolete]
+#endif
         public override void GetObjectData(SerializationInfo info, StreamingContext context)
         {
             base.GetObjectData(info, context);
-
             info.AddValue("FullStackTraceString", _stackTraceString);
         }
 
diff --git a/src/WebJobs.Script/HostInitializationException.cs b/src/WebJobs.Script/HostInitializationException.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 using System;
+using System.Runtime.Serialization;
 
 namespace Microsoft.Azure.WebJobs.Script
 {
@@ -17,8 +18,10 @@ public HostInitializationException(string message) : base(message) { }
 
         public HostInitializationException(string message, Exception inner) : base(message, inner) { }
 
-        protected HostInitializationException(
-          System.Runtime.Serialization.SerializationInfo info,
-          System.Runtime.Serialization.StreamingContext context) : base(info, context) { }
+#if NET8_0_OR_GREATER
+        [Obsolete]
+#endif
+        protected HostInitializationException(SerializationInfo info, StreamingContext context)
+            : base(info, context) { }
     }
 }
diff --git a/src/WebJobs.Script/InvalidHostServicesException.cs b/src/WebJobs.Script/InvalidHostServicesException.cs
@@ -7,7 +7,7 @@
 namespace Microsoft.Azure.WebJobs.Script
 {
     /// <summary>
-    /// An exception that indicates an issue with the registerd services for a ScriptHost. This will
+    /// An exception that indicates an issue with the registered services for a ScriptHost. This will
     /// prevent the host from starting.
     /// </summary>
     [Serializable]
@@ -19,6 +19,9 @@ public InvalidHostServicesException(string message) : base(message) { }
 
         public InvalidHostServicesException(string message, Exception inner) : base(message, inner) { }
 
+#if NET8_0_OR_GREATER
+        [Obsolete]
+#endif
         protected InvalidHostServicesException(SerializationInfo info, StreamingContext context)
             : base(info, context) { }
     }
diff --git a/src/WebJobs.Script/WebJobs.Script.csproj b/src/WebJobs.Script/WebJobs.Script.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <PackageId>Microsoft.Azure.WebJobs.Script</PackageId>
     <AssemblyName>Microsoft.Azure.WebJobs.Script</AssemblyName>
     <RootNamespace>Microsoft.Azure.WebJobs.Script</RootNamespace>
@@ -9,26 +9,16 @@
   <ItemGroup>
     <None Remove="FileProvisioning\PowerShell\profile.ps1" />
     <None Remove="FileProvisioning\PowerShell\requirements.psd1" />
-    <None Remove="runtimeassemblies-net6.json" />
-    <None Remove="runtimeassemblies-net8.json" />
-    <None Remove="runtimeassemblies-relaxed.json" />
+    <None Remove="runtimeassemblies-*.json" />
     <None Remove="runtimes.json" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="extensionrequirements.json">
-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-    </EmbeddedResource>
+    <EmbeddedResource Include="extensionrequirements.json" />
     <EmbeddedResource Include="FileProvisioning\PowerShell\profile.ps1" />
     <EmbeddedResource Include="FileProvisioning\PowerShell\requirements.psd1" />
-    <EmbeddedResource Include="runtimeassemblies-relaxed.json">
-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-    </EmbeddedResource>
-    <EmbeddedResource Include="runtimeassemblies-net6.json">
-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-    </EmbeddedResource>
-    <EmbeddedResource Include="runtimeassemblies-net8.json">
-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-    </EmbeddedResource>
+    <EmbeddedResource Include="runtimeassemblies-relaxed.json" />
+    <EmbeddedResource Include="runtimeassemblies-net6.json" Link="runtimeassemblies.json" Condition="'$(TargetFramework)' == 'net6.0'" />
+    <EmbeddedResource Include="runtimeassemblies-net8.json" Link="runtimeassemblies.json" Condition="'$(TargetFramework)' == 'net8.0'" />
     <EmbeddedResource Include="runtimes.json" />
   </ItemGroup>
   <ItemGroup>
@@ -43,7 +33,7 @@
     <PackageReference Include="Microsoft.ApplicationInsights.WindowsServer" Version="2.21.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" Version="2.21.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.WebApiCompatShim" Version="2.2.0" NoWarn="NU1701" />
-	<PackageReference Include="Microsoft.Azure.AppService.Proxy.Client" Version="2.2.20220831.41" />
+    <PackageReference Include="Microsoft.Azure.AppService.Proxy.Client" Version="2.2.20220831.41" />
     <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.42" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Host.Storage" Version="5.0.1" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="5.2.0-12282" />
diff --git a/src/WebJobs.Script/Workers/Rpc/Configuration/RpcWorkerConfigFactory.cs b/src/WebJobs.Script/Workers/Rpc/Configuration/RpcWorkerConfigFactory.cs
@@ -64,13 +64,15 @@ public IList<RpcWorkerConfig> GetConfigs()
 
         internal static string GetDefaultWorkersDirectory(Func<string, bool> directoryExists)
         {
-            string assemblyLocalPath = Path.GetDirectoryName(new Uri(typeof(RpcWorkerConfigFactory).Assembly.CodeBase).LocalPath);
-            string workersDirPath = Path.Combine(assemblyLocalPath, RpcWorkerConstants.DefaultWorkersDirectoryName);
+            string assemblyDir = AppContext.BaseDirectory;
+            string workersDirPath = Path.Combine(assemblyDir, RpcWorkerConstants.DefaultWorkersDirectoryName);
             if (!directoryExists(workersDirPath))
             {
                 // Site Extension. Default to parent directory
-                workersDirPath = Path.Combine(Directory.GetParent(assemblyLocalPath).FullName, RpcWorkerConstants.DefaultWorkersDirectoryName);
+                string parentDir = Directory.GetParent(assemblyDir.TrimEnd(Path.DirectorySeparatorChar)).FullName;
+                workersDirPath = Path.Combine(parentDir, RpcWorkerConstants.DefaultWorkersDirectoryName);
             }
+
             return workersDirPath;
         }
 
diff --git a/src/WebJobs.Script/Workers/SharedMemoryDataTransfer/MemoryMappedFileAccessorWindows.cs b/src/WebJobs.Script/Workers/SharedMemoryDataTransfer/MemoryMappedFileAccessorWindows.cs
@@ -60,8 +60,12 @@ public override bool TryCreate(string mapName, long size, out MemoryMappedFile m
 
         public override bool TryOpen(string mapName, out MemoryMappedFile mmf)
         {
-            mmf = null;
+            if (!OperatingSystem.IsWindows())
+            {
+                throw new PlatformNotSupportedException($"{nameof(TryOpen)} is not supported on the current platform.");
+            }
 
+            mmf = null;
             try
             {
                 mmf = MemoryMappedFile.OpenExisting(
diff --git a/test/WebJobs.Script.Tests/RuntimeAssembliesInfoTests.cs b/test/WebJobs.Script.Tests/RuntimeAssembliesInfoTests.cs
@@ -1,10 +1,6 @@
 ﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Microsoft.Azure.WebJobs.Script.Description;
 using Xunit;
 

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,11 @@ public CompilationServiceException(string message, Exception innerException) : b`
`26`	`26`	`{`
`27`	`27`	`}`
`28`	`28`
`29`		`- private CompilationServiceException(SerializationInfo info, StreamingContext context) : base(info, context)`
	`29`	`+#if NET8_0_OR_GREATER`
	`30`	`+ [Obsolete]`
	`31`	`+#endif`
	`32`	`+ private CompilationServiceException(SerializationInfo info, StreamingContext context)`
	`33`	`+ : base(info, context)`
`30`	`34`	`{`
`31`	`35`	`}`
`32`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`// Licensed under the MIT License. See License.txt in the project root for license information.`
`3`	`3`
`4`	`4`	`using System;`
	`5`	`+using System.Runtime.Serialization;`
`5`	`6`
`6`	`7`	`namespace Microsoft.Azure.WebJobs.Script`
`7`	`8`	`{`
`@@ -18,8 +19,10 @@ public ExternalStartupException(string message) : base(message) { }`
`18`	`19`
`19`	`20`	`public ExternalStartupException(string message, Exception inner) : base(message, inner) { }`
`20`	`21`
`21`		`- protected ExternalStartupException(`
`22`		`- System.Runtime.Serialization.SerializationInfo info,`
`23`		`- System.Runtime.Serialization.StreamingContext context) : base(info, context) { }`
	`22`	`+#if NET8_0_OR_GREATER`
	`23`	`+ [Obsolete]`
	`24`	`+#endif`
	`25`	`+ protected ExternalStartupException(SerializationInfo info, StreamingContext context)`
	`26`	`+ : base(info, context) { }`
`24`	`27`	`}`
`25`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ private ImmutableArray<FunctionMetadata> LoadFunctionMetadata()`
`94`	`94`	`var functionErrors = new Dictionary<string, ICollection<string>>();`
`95`	`95`	`Collection<ProxyFunctionMetadata> proxies = ReadProxyMetadata(_scriptOptions.Value.RootScriptPath, _logger, functionErrors);`
`96`	`96`
`97`		`- ImmutableArray<FunctionMetadata> metadata;`
	`97`	`+ ImmutableArray<FunctionMetadata> metadata = default;`
`98`	`98`	`if (proxies != null && proxies.Any())`
`99`	`99`	`{`
`100`	`100`	`metadata = proxies.ToImmutableArray<FunctionMetadata>();`
Original file line number	Diff line number	Diff line change
`@@ -24,14 +24,13 @@ public HostDisposedException(string disposedObjectName, Exception inner)`
`24`	`24`	`_stackTraceString = GetStackTraceString();`
`25`	`25`	`}`
`26`	`26`
	`27`	`+#if NET8_0_OR_GREATER`
	`28`	`+ [Obsolete]`
	`29`	`+#endif`
`27`	`30`	`protected HostDisposedException(SerializationInfo info, StreamingContext context)`
`28`	`31`	`: base(info, context)`
`29`	`32`	`{`
`30`		`- if (info == null)`
`31`		`- {`
`32`		`- throw new ArgumentNullException(nameof(info));`
`33`		`- }`
`34`		`-`
	`33`	`+ ArgumentNullException.ThrowIfNull(info);`
`35`	`34`	`_stackTraceString = info.GetString("FullStackTraceString");`
`36`	`35`	`}`
`37`	`36`
`@@ -42,10 +41,12 @@ public string GetStackTraceString()`
`42`	`41`	`return new StackTrace(true).ToString();`
`43`	`42`	`}`
`44`	`43`
	`44`	`+#if NET8_0_OR_GREATER`
	`45`	`+ [Obsolete]`
	`46`	`+#endif`
`45`	`47`	`public override void GetObjectData(SerializationInfo info, StreamingContext context)`
`46`	`48`	`{`
`47`	`49`	`base.GetObjectData(info, context);`
`48`		`-`
`49`	`50`	`info.AddValue("FullStackTraceString", _stackTraceString);`
`50`	`51`	`}`
`51`	`52`