Multi-targeting .NET 6 and .NET 8

fabiocav · fabiocav · commit 5d36a5507fc3 · 2024-05-08T10:13:35.000-07:00
diff --git a/benchmarks/WebJobs.Script.Benchmarks/Microsoft.Azure.WebJobs.Script.Benchmarks.csproj b/benchmarks/WebJobs.Script.Benchmarks/Microsoft.Azure.WebJobs.Script.Benchmarks.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <!-- BenchmarkDotNet looks for a matching Project, see https://github.com/dotnet/BenchmarkDotNet/issues/1019 -->
     <!--<AssemblyName>Microsoft.Azure.WebJobs.Script.Benchmarks</AssemblyName>-->
diff --git a/build/common.props b/build/common.props
@@ -1,7 +1,7 @@
 <Project>
   <Import Project=".\package.props" />
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFrameworks>netstandard2.1</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <MajorVersion>4</MajorVersion>    
     <MinorVersion>$(MinorVersionPrefix)34</MinorVersion>
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.419",
+    "version": "8.0.204",
     "rollForward": "latestFeature"
   },
   "msbuild-sdks": {
diff --git a/src/WebJobs.Script.Abstractions/WebJobs.Script.Abstractions.csproj b/src/WebJobs.Script.Abstractions/WebJobs.Script.Abstractions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\build\common.props" />
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <Version>1.0.4-preview</Version>
     <BuildNumber Condition=" '$(BuildNumber)' == '' ">1</BuildNumber>
     <MajorMinorProductVersion>1.0</MajorMinorProductVersion>
diff --git a/src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj b/src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj
@@ -2,7 +2,7 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <PackageId>Microsoft.Azure.WebJobs.Script.Grpc</PackageId>
     <AssemblyName>Microsoft.Azure.WebJobs.Script.Grpc</AssemblyName>
     <RootNamespace>Microsoft.Azure.WebJobs.Script.Grpc</RootNamespace>
diff --git a/src/WebJobs.Script.WebHost/Middleware/HttpThrottleMiddleware.cs b/src/WebJobs.Script.WebHost/Middleware/HttpThrottleMiddleware.cs
@@ -84,7 +84,7 @@ private void RejectRequest(HttpContext httpContext, IMetricsLogger metricsLogger
             metricsLogger.LogEvent(MetricEventNames.FunctionInvokeThrottled);
 
             httpContext.Response.StatusCode = 429;
-            httpContext.Response.Headers.Add(ScriptConstants.AntaresScaleOutHeaderName, "1");
+            httpContext.Response.Headers.Append(ScriptConstants.AntaresScaleOutHeaderName, "1");
         }
     }
 }
diff --git a/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj b/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj
@@ -2,7 +2,7 @@
   <Import Project="..\..\build\common.props" />
   <Import Project="..\..\build\python.props" />
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <AssemblyName>Microsoft.Azure.WebJobs.Script.WebHost</AssemblyName>
     <RootNamespace>Microsoft.Azure.WebJobs.Script.WebHost</RootNamespace>
     <PackageId>Microsoft.Azure.WebJobs.Script.WebHost</PackageId>
diff --git a/test/WebJobs.Script.Tests.Integration/Properties/Resources.Designer.cs b/test/WebJobs.Script.Tests.Integration/Properties/Resources.Designer.cs
diff --git a/test/WebJobs.Script.Tests.Integration/ScriptHostEndToEnd/DirectLoadEndToEndTests.cs b/test/WebJobs.Script.Tests.Integration/ScriptHostEndToEnd/DirectLoadEndToEndTests.cs
@@ -43,7 +43,7 @@ public async Task Invoke_Succeeds()
             {
                 { "req", request }
             };
-            request.Headers.Add("Accept", new StringValues("text/plain"));
+            request.Headers.Append("Accept", new StringValues("text/plain"));
 
             await Fixture.JobHost.CallAsync("Function1", arguments);
 
diff --git a/test/WebJobs.Script.Tests.Integration/ScriptHostEndToEnd/NodeContentTests.cs b/test/WebJobs.Script.Tests.Integration/ScriptHostEndToEnd/NodeContentTests.cs
@@ -158,15 +158,15 @@ protected async Task<string> CreateTest<Req>(Req content, string contentType, bo
         {
             IHeaderDictionary headers = new HeaderDictionary();
 
-            headers.Add("accept", contentType);
-            headers.Add("type", contentType);
+            headers.Append("accept", contentType);
+            headers.Append("type", contentType);
 
             if (contentNegotiation)
             {
-                headers.Add("negotiation", "true");
+                headers.Append("negotiation", "true");
             }
 
-            headers.Add("scenario", "content");
+            headers.Append("scenario", "content");
 
             HttpRequest request = HttpTestHelpers.CreateHttpRequest("POST", "http://localhost/api/httptrigger", headers, content);
 
diff --git a/test/WebJobs.Script.Tests.Integration/ScriptHostEndToEnd/NodeScriptHostTests.cs b/test/WebJobs.Script.Tests.Integration/ScriptHostEndToEnd/NodeScriptHostTests.cs
@@ -95,7 +95,7 @@ public async Task HttpTrigger_Post_ByteArray(string contentType)
             TestHelpers.ClearFunctionLogs("HttpTriggerByteArray");
 
             IHeaderDictionary headers = new HeaderDictionary();
-            headers.Add("Content-Type", contentType);
+            headers.Append("Content-Type", contentType);
 
             byte[] inputBytes = new byte[] { 1, 2, 3, 4, 5 };
             var content = inputBytes;
diff --git a/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/HostDisposedExceptionTests.cs b/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/HostDisposedExceptionTests.cs
@@ -80,15 +80,16 @@ public void Serialization()
             HostDisposedException originalEx = new HostDisposedException("someObject", new ObjectDisposedException("someObject"));
             HostDisposedException deserializedEx;
 
+#pragma warning disable SYSLIB0011 // Type or member is obsolete
             BinaryFormatter bf = new BinaryFormatter();
             using (MemoryStream ms = new MemoryStream())
             {
-#pragma warning disable SYSLIB0011 // Type or member is obsolete
+
                 bf.Serialize(ms, originalEx);
                 ms.Seek(0, 0);
                 deserializedEx = (HostDisposedException)bf.Deserialize(ms);
-#pragma warning restore SYSLIB0011 // Type or member is obsolete
             }
+#pragma warning restore SYSLIB0011 // Type or member is obsolete
 
             Assert.Equal(originalEx.ToString(), deserializedEx.ToString());
         }
diff --git a/test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj b/test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj
@@ -2,7 +2,7 @@
   <Import Project="..\..\build\common.props" />
   <Import Project="..\..\build\python.props" />
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <AssemblyName>Microsoft.Azure.WebJobs.Script.Tests.Integration</AssemblyName>
     <RootNamespace>Microsoft.Azure.WebJobs.Script.Tests.Integration</RootNamespace>
diff --git a/test/WebJobs.Script.Tests.Shared/HttpTestHelpers.cs b/test/WebJobs.Script.Tests.Shared/HttpTestHelpers.cs
@@ -28,7 +28,7 @@ public static HttpRequest CreateHttpRequest(string method, string uriString, IHe
 
             if (!string.IsNullOrEmpty(uri.Host))
             {
-                headers.Add("Host", uri.Host);
+                headers.Append("Host", uri.Host);
             }
 
             if (body != null)
@@ -50,7 +50,7 @@ public static HttpRequest CreateHttpRequest(string method, string uriString, IHe
 
                 requestFeature.Body = new MemoryStream(bytes);
                 request.ContentLength = request.Body.Length;
-                headers.Add("Content-Length", request.Body.Length.ToString());
+                headers.Append("Content-Length", request.Body.Length.ToString());
             }
 
             requestFeature.Headers = headers;
diff --git a/test/WebJobs.Script.Tests/Binding/ActionResults/RawScriptResultTests.cs b/test/WebJobs.Script.Tests/Binding/ActionResults/RawScriptResultTests.cs
@@ -95,7 +95,7 @@ public async Task HandlesStringContent_WithHeader()
             var contentHeader = "application/json";
             var result = new RawScriptResult(null, obj) { Headers = new Dictionary<string, object>() };
             var context = new ActionContext() { HttpContext = new DefaultHttpContext() };
-            context.HttpContext.Response.Headers.Add("Content-Type", contentHeader);
+            context.HttpContext.Response.Headers.Append("Content-Type", contentHeader);
             context.HttpContext.Response.Body = new MemoryStream();
             await result.ExecuteResultAsync(context);
             var body = await TestHelpers.ReadStreamToEnd(context.HttpContext.Response.Body);
diff --git a/test/WebJobs.Script.Tests/Controllers/Admin/FunctionsControllerTests.cs b/test/WebJobs.Script.Tests/Controllers/Admin/FunctionsControllerTests.cs
@@ -141,7 +141,7 @@ public async Task Invoke_CallsFunctionSession()
             var mockRouter = new Mock<IWebJobsRouter>();
             var testController = new FunctionsController(functionsManagerMock.Object, mockRouter.Object, new LoggerFactory(), optionsWrapper);
             var httpContext = new DefaultHttpContext();
-            httpContext.Request.Headers.Add(ScriptConstants.LiveLogsSessionAIKey, sessionId);
+            httpContext.Request.Headers.Append(ScriptConstants.LiveLogsSessionAIKey, sessionId);
             testController.ControllerContext.HttpContext = httpContext;
 
             //Test Code
diff --git a/test/WebJobs.Script.Tests/Controllers/Admin/HostControllerTests.cs b/test/WebJobs.Script.Tests/Controllers/Admin/HostControllerTests.cs
@@ -218,7 +218,7 @@ public async Task Ping_ScalePing_ReturnsExpectedResult(string userAgent, string
             httpContext.Request.Host = new HostString("local");
             httpContext.Request.Method = "Post";
             httpContext.Request.Path = "/admin/host/ping";
-            httpContext.Request.Headers.Add("User-Agent", userAgent);
+            httpContext.Request.Headers.Append("User-Agent", userAgent);
             if (healthCheckQueryParam != null)
             {
                 httpContext.Request.QueryString = new QueryString($"?{ScriptConstants.HealthCheckQueryParam}={healthCheckQueryParam}");
diff --git a/test/WebJobs.Script.Tests/Description/Proxy/ProxyFunctionDescriptorProviderTests.cs b/test/WebJobs.Script.Tests/Description/Proxy/ProxyFunctionDescriptorProviderTests.cs
@@ -91,7 +91,7 @@ private ProxyClientExecutor GetMockProxyClient()
                     object requestObj = arguments != null && arguments.Length > 0 ? arguments[0] : null;
                     var request = requestObj as HttpRequest;
                     var response = new StatusCodeResult(StatusCodes.Status200OK);
-                    request.HttpContext.Response.Headers.Add("myversion", "123");
+                    request.HttpContext.Response.Headers.Append("myversion", "123");
                     request.HttpContext.Items[ScriptConstants.AzureFunctionsHttpResponseKey] = response;
                     return Task.CompletedTask;
                 });
diff --git a/test/WebJobs.Script.Tests/HostNameProviderTests.cs b/test/WebJobs.Script.Tests/HostNameProviderTests.cs
@@ -60,13 +60,13 @@ public void Synchronize_UpdatesValue()
 
             // empty header value
             request = new DefaultHttpContext().Request;
-            request.Headers.Add(ScriptConstants.AntaresDefaultHostNameHeader, string.Empty);
+            request.Headers.Append(ScriptConstants.AntaresDefaultHostNameHeader, string.Empty);
             _hostNameProvider.Synchronize(request, _logger);
             Assert.Equal(null, _hostNameProvider.Value);
 
             // host provided via header - expect update
             request = new DefaultHttpContext().Request;
-            request.Headers.Add(ScriptConstants.AntaresDefaultHostNameHeader, "test.azurewebsites.net");
+            request.Headers.Append(ScriptConstants.AntaresDefaultHostNameHeader, "test.azurewebsites.net");
             _hostNameProvider.Synchronize(request, _logger);
             Assert.Equal("test.azurewebsites.net", _hostNameProvider.Value);
             var logs = _loggerProvider.GetAllLogMessages();
@@ -83,7 +83,7 @@ public void Synchronize_UpdatesValue()
 
             // another change - expect update
             request = new DefaultHttpContext().Request;
-            request.Headers.Add(ScriptConstants.AntaresDefaultHostNameHeader, "test2.azurewebsites.net");
+            request.Headers.Append(ScriptConstants.AntaresDefaultHostNameHeader, "test2.azurewebsites.net");
             _hostNameProvider.Synchronize(request, _logger);
             Assert.Equal("test2.azurewebsites.net", _hostNameProvider.Value);
             logs = _loggerProvider.GetAllLogMessages();
diff --git a/test/WebJobs.Script.Tests/Managment/VirtualFileSystemFacts.cs b/test/WebJobs.Script.Tests/Managment/VirtualFileSystemFacts.cs
@@ -222,7 +222,7 @@ public async Task DeleteItemDeletesFileIfETagMatches(EntityTagHeaderValue etag)
 
             var controller = CreateVirtualFileSystem();
             var request = CreateRequest(path);
-            request.Headers.Add("If-Match", etag.Tag);
+            request.Headers.Append("If-Match", etag.Tag);
 
             // Act
             var response = await controller.DeleteItem(request);
diff --git a/test/WebJobs.Script.Tests/Middleware/AppServiceHeaderFixupMiddlewareTests.cs b/test/WebJobs.Script.Tests/Middleware/AppServiceHeaderFixupMiddlewareTests.cs
@@ -20,7 +20,7 @@ public class AppServiceHeaderFixupMiddlewareTests
         public async Task AppServiceFixupMiddleware_Handles_Multivalue_Header(string[] headerValues, string expectedScheme)
         {
             var ctx = new DefaultHttpContext();
-            ctx.Request.Headers.Add(AppServiceHeaderFixupMiddleware.ForwardedProtocolHeader, new StringValues(headerValues));
+            ctx.Request.Headers.Append(AppServiceHeaderFixupMiddleware.ForwardedProtocolHeader, new StringValues(headerValues));
 
             var middleware = new AppServiceHeaderFixupMiddleware(nextCtx =>
             {
diff --git a/test/WebJobs.Script.Tests/Middleware/HostWarmupMiddlewareTests.cs b/test/WebJobs.Script.Tests/Middleware/HostWarmupMiddlewareTests.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Azure.WebJobs.Script.Config;
 using Microsoft.Azure.WebJobs.Script.Eventing;
 using Microsoft.Azure.WebJobs.Script.Tests.Workers.Rpc;
@@ -105,7 +106,7 @@ public void IsWarmUpRequest_ReturnsExpectedValue()
             Assert.True(HostWarmupMiddleware.IsWarmUpRequest(request, hostEnvironment.InStandbyMode, environment));
 
             request = HttpTestHelpers.CreateHttpRequest("POST", "http://azure.com/api/warmup");
-            request.Headers.Add(ScriptConstants.AntaresLogIdHeaderName, "xyz123");
+            request.Headers.Append(ScriptConstants.AntaresLogIdHeaderName, "xyz123");
             Assert.False(HostWarmupMiddleware.IsWarmUpRequest(request, hostEnvironment.InStandbyMode, environment));
 
             request = HttpTestHelpers.CreateHttpRequest("POST", "http://azure.com/api/foo");
diff --git a/test/WebJobs.Script.Tests/Middleware/HostnameFixupMiddlewareTests.cs b/test/WebJobs.Script.Tests/Middleware/HostnameFixupMiddlewareTests.cs
@@ -49,7 +49,7 @@ public async Task SendAsync_HandlesHostnameChange()
 
             var context = CreateHttpContext();
             var requestFeature = context.Request.HttpContext.Features.Get<IHttpRequestFeature>();
-            requestFeature.Headers.Add(ScriptConstants.AntaresDefaultHostNameHeader, "test2.azurewebsites.net");
+            requestFeature.Headers.Append(ScriptConstants.AntaresDefaultHostNameHeader, "test2.azurewebsites.net");
 
             await _middleware.Invoke(context);
 
diff --git a/test/WebJobs.Script.Tests/Security/Authentication/ArmAuthenticationHandlerTests.cs b/test/WebJobs.Script.Tests/Security/Authentication/ArmAuthenticationHandlerTests.cs
@@ -66,7 +66,7 @@ public async Task AuthenticateAsync_WithToken_PerformsAuthentication_Using_WebSi
                 DefaultHttpContext context = GetContext();
 
                 string token = SimpleWebTokenHelper.CreateToken(DateTime.UtcNow.AddMinutes(2), websiteAuthEncryptionKeyBytes);
-                context.Request.Headers.Add(ScriptConstants.SiteRestrictedTokenHeaderName, token);
+                context.Request.Headers.Append(ScriptConstants.SiteRestrictedTokenHeaderName, token);
 
                 // Act
                 AuthenticateResult result = await context.AuthenticateAsync();
@@ -95,7 +95,7 @@ public async Task AuthenticateAsync_WithToken_PerformsAuthentication_Using_Conta
                 DefaultHttpContext context = GetContext();
 
                 string token = SimpleWebTokenHelper.CreateToken(DateTime.UtcNow.AddMinutes(2), containerEncryptionKeyBytes);
-                context.Request.Headers.Add(ScriptConstants.SiteRestrictedTokenHeaderName, token);
+                context.Request.Headers.Append(ScriptConstants.SiteRestrictedTokenHeaderName, token);
 
                 // Act
                 AuthenticateResult result = await context.AuthenticateAsync();
@@ -116,7 +116,7 @@ public async Task AuthenticateAsync_WithToken_PerformsAuthentication()
                 DefaultHttpContext context = GetContext();
 
                 string token = SimpleWebTokenHelper.CreateToken(DateTime.UtcNow.AddMinutes(2));
-                context.Request.Headers.Add(ScriptConstants.SiteRestrictedTokenHeaderName, token);
+                context.Request.Headers.Append(ScriptConstants.SiteRestrictedTokenHeaderName, token);
 
                 // Act
                 AuthenticateResult result = await context.AuthenticateAsync();
@@ -138,7 +138,7 @@ public async Task AuthenticateAsync_WithInvalidToken_FailsAuthentication()
 
                 string token = SimpleWebTokenHelper.CreateToken(DateTime.UtcNow.AddMinutes(2));
                 token = token.Substring(0, token.Length - 5);
-                context.Request.Headers.Add(ScriptConstants.SiteRestrictedTokenHeaderName, token);
+                context.Request.Headers.Append(ScriptConstants.SiteRestrictedTokenHeaderName, token);
 
                 // Act
                 AuthenticateResult result = await context.AuthenticateAsync();
@@ -158,7 +158,7 @@ public async Task AuthenticateAsync_WithExpiredToken_FailsAuthentication()
                 DefaultHttpContext context = GetContext();
 
                 string token = SimpleWebTokenHelper.CreateToken(DateTime.UtcNow.AddMinutes(-20));
-                context.Request.Headers.Add(ScriptConstants.SiteRestrictedTokenHeaderName, token);
+                context.Request.Headers.Append(ScriptConstants.SiteRestrictedTokenHeaderName, token);
 
                 // Act
                 AuthenticateResult result = await context.AuthenticateAsync();
diff --git a/test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj b/test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\build\common.props" />
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>
     <AssemblyName>Microsoft.Azure.WebJobs.Script.Tests</AssemblyName>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "6.0.419",`
	`3`	`+ "version": "8.0.204",`
`4`	`4`	`"rollForward": "latestFeature"`
`5`	`5`	`},`
`6`	`6`	`"msbuild-sdks": {`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ private void RejectRequest(HttpContext httpContext, IMetricsLogger metricsLogger`
`84`	`84`	`metricsLogger.LogEvent(MetricEventNames.FunctionInvokeThrottled);`
`85`	`85`
`86`	`86`	`httpContext.Response.StatusCode = 429;`
`87`		`- httpContext.Response.Headers.Add(ScriptConstants.AntaresScaleOutHeaderName, "1");`
	`87`	`+ httpContext.Response.Headers.Append(ScriptConstants.AntaresScaleOutHeaderName, "1");`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public async Task Invoke_Succeeds()`
`43`	`43`	`{`
`44`	`44`	`{ "req", request }`
`45`	`45`	`};`
`46`		`- request.Headers.Add("Accept", new StringValues("text/plain"));`
	`46`	`+ request.Headers.Append("Accept", new StringValues("text/plain"));`
`47`	`47`
`48`	`48`	`await Fixture.JobHost.CallAsync("Function1", arguments);`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -158,15 +158,15 @@ protected async Task<string> CreateTest<Req>(Req content, string contentType, bo`
`158`	`158`	`{`
`159`	`159`	`IHeaderDictionary headers = new HeaderDictionary();`
`160`	`160`
`161`		`- headers.Add("accept", contentType);`
`162`		`- headers.Add("type", contentType);`
	`161`	`+ headers.Append("accept", contentType);`
	`162`	`+ headers.Append("type", contentType);`
`163`	`163`
`164`	`164`	`if (contentNegotiation)`
`165`	`165`	`{`
`166`		`- headers.Add("negotiation", "true");`
	`166`	`+ headers.Append("negotiation", "true");`
`167`	`167`	`}`
`168`	`168`
`169`		`- headers.Add("scenario", "content");`
	`169`	`+ headers.Append("scenario", "content");`
`170`	`170`
`171`	`171`	`HttpRequest request = HttpTestHelpers.CreateHttpRequest("POST", "http://localhost/api/httptrigger", headers, content);`
`172`	`172`