From 4a6578b3606e08f4b6f763ea54a12f8ad3da03ba Mon Sep 17 00:00:00 2001 From: Jacob Viau Date: Tue, 15 Jul 2025 10:39:43 -0700 Subject: [PATCH 1/2] Migrate src projects to common packages Update tests to common packaging. Address style issues Revert global.json change Remove package source mapping Add packages.props to tools Simplify some recursive imports Fix test break Update tooling package.props issues Revert NugGet.config Add newline and eof Update assert message Add delay in InitializationLogs_AreEmitted Revert style changes Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- Directory.Packages.props | 108 ++++++++++++++++++ eng/build/Engineering.props | 27 ++--- eng/build/Workers.Dotnet.props | 2 +- eng/build/Workers.Java.props | 2 +- eng/build/Workers.Node.props | 2 +- eng/build/Workers.Powershell.props | 6 +- eng/build/Workers.Python.props | 2 +- ...oft.Azure.WebJobs.Script.Benchmarks.csproj | 12 +- src/Directory.Build.props | 3 +- .../WebJobs.Script.Abstractions.csproj | 10 +- .../WebJobs.Script.Grpc.csproj | 17 +-- .../WebJobs.Script.WebHost.csproj | 46 ++------ src/WebJobs.Script/WebJobs.Script.csproj | 76 ++++-------- test/Directory.Build.targets | 3 +- test/Directory.Packages.props | 25 ++++ test/Resources/Directory.Packages.props | 16 +++ .../WebJobs.Script.Tests.Abstractions.csproj | 6 +- .../StandbyInitializationTests.cs | 1 - .../WebHostEndToEnd/EndToEndTestsBase.cs | 38 ------ .../SamplesEndToEndTests_CSharp.cs | 28 ++--- .../WebHostEndToEnd/SpecializationE2ETests.cs | 2 +- .../WebJobs.Script.Tests.Integration.csproj | 31 +++-- .../WebJobs.Script.Tests.csproj | 29 ++--- .../Directory.Build.props | 3 +- .../Directory.Packages.props | 37 ++++++ ...ExtensionsMetadataGenerator.Console.csproj | 3 +- .../ExtensionsMetadataGenerator.csproj | 7 +- .../ExtensionsMetadataGeneratorTests.csproj | 10 +- .../TestProject_Core21.csproj | 2 +- .../TestProject_Core22.csproj | 2 +- .../TestProject_Razor.csproj | 4 +- 31 files changed, 317 insertions(+), 243 deletions(-) create mode 100644 Directory.Packages.props create mode 100644 test/Directory.Packages.props create mode 100644 test/Resources/Directory.Packages.props create mode 100644 tools/ExtensionsMetadataGenerator/Directory.Packages.props diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000000..54379ca515 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,108 @@ + + + + true + true + 6.35.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/build/Engineering.props b/eng/build/Engineering.props index 796658a032..2b494ebd6b 100644 --- a/eng/build/Engineering.props +++ b/eng/build/Engineering.props @@ -5,21 +5,12 @@ $(EngBuildRoot)Workers.props - - - - $(WarningsNotAsErrors)NU1901;NU1902;NU1903; - $(WarningsNotAsErrors)NU1904; - $(WarningsAsErrors)NU1904; - moderate - all - - latest $(EngResourceRoot)key.snk $(RepoRoot)src.ruleset - $(NoWarn);NU1701;NU5104 + + $(NoWarn);NU1701;NU5104;NU1507 embedded true true @@ -30,12 +21,22 @@ - - + + + + + + + $(WarningsNotAsErrors)NU1901;NU1902;NU1903; + $(WarningsNotAsErrors)NU1904; + $(WarningsAsErrors)NU1904; + moderate + all + diff --git a/eng/build/Workers.Dotnet.props b/eng/build/Workers.Dotnet.props index 38a5e98c4b..1844529bea 100644 --- a/eng/build/Workers.Dotnet.props +++ b/eng/build/Workers.Dotnet.props @@ -1,7 +1,7 @@ - + diff --git a/eng/build/Workers.Java.props b/eng/build/Workers.Java.props index f77083a15a..b7faf724ea 100644 --- a/eng/build/Workers.Java.props +++ b/eng/build/Workers.Java.props @@ -1,7 +1,7 @@ - + diff --git a/eng/build/Workers.Node.props b/eng/build/Workers.Node.props index 7804fc3cfe..d132ebc698 100644 --- a/eng/build/Workers.Node.props +++ b/eng/build/Workers.Node.props @@ -1,7 +1,7 @@ - + diff --git a/eng/build/Workers.Powershell.props b/eng/build/Workers.Powershell.props index 7399e83741..53761a222e 100644 --- a/eng/build/Workers.Powershell.props +++ b/eng/build/Workers.Powershell.props @@ -1,9 +1,9 @@ - - - + + + diff --git a/eng/build/Workers.Python.props b/eng/build/Workers.Python.props index 039fad3970..dbd96495ca 100644 --- a/eng/build/Workers.Python.props +++ b/eng/build/Workers.Python.props @@ -2,7 +2,7 @@ - + diff --git a/perf/WebJobs.Script.Benchmarks/Microsoft.Azure.WebJobs.Script.Benchmarks.csproj b/perf/WebJobs.Script.Benchmarks/Microsoft.Azure.WebJobs.Script.Benchmarks.csproj index 8aba112cd7..40426327b9 100644 --- a/perf/WebJobs.Script.Benchmarks/Microsoft.Azure.WebJobs.Script.Benchmarks.csproj +++ b/perf/WebJobs.Script.Benchmarks/Microsoft.Azure.WebJobs.Script.Benchmarks.csproj @@ -9,9 +9,17 @@ - + + + + - \ No newline at end of file + + + + + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 3fb289897c..11c84639e4 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,6 +1,5 @@ - + diff --git a/src/WebJobs.Script.Abstractions/WebJobs.Script.Abstractions.csproj b/src/WebJobs.Script.Abstractions/WebJobs.Script.Abstractions.csproj index ba7aa18983..cf48bb6c8f 100644 --- a/src/WebJobs.Script.Abstractions/WebJobs.Script.Abstractions.csproj +++ b/src/WebJobs.Script.Abstractions/WebJobs.Script.Abstractions.csproj @@ -7,14 +7,8 @@ - - - - - - - - + + diff --git a/src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj b/src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj index cb059eea7b..ac96bb3cd3 100644 --- a/src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj +++ b/src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj @@ -8,16 +8,8 @@ - - - - - - - - - - + + @@ -25,7 +17,10 @@ - + diff --git a/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj b/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj index ffbed14b57..6c913603b9 100644 --- a/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj +++ b/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj @@ -9,7 +9,6 @@ Microsoft.Azure.WebJobs.Script.WebHost InProcess false - 6.35.0 dc316708-c8c1-4ef1-90b3-19eb512d96f3 @@ -50,40 +49,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/WebJobs.Script/WebJobs.Script.csproj b/src/WebJobs.Script/WebJobs.Script.csproj index 8509e1f631..a457fc9fb8 100644 --- a/src/WebJobs.Script/WebJobs.Script.csproj +++ b/src/WebJobs.Script/WebJobs.Script.csproj @@ -25,58 +25,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets index 5a51d9d45b..5bfdf89157 100644 --- a/test/Directory.Build.targets +++ b/test/Directory.Build.targets @@ -1,7 +1,6 @@ - + diff --git a/test/Directory.Packages.props b/test/Directory.Packages.props new file mode 100644 index 0000000000..c9fe719c6b --- /dev/null +++ b/test/Directory.Packages.props @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/Resources/Directory.Packages.props b/test/Resources/Directory.Packages.props new file mode 100644 index 0000000000..6314c05d1b --- /dev/null +++ b/test/Resources/Directory.Packages.props @@ -0,0 +1,16 @@ + + + + false + + + + \ No newline at end of file diff --git a/test/WebJobs.Script.Abstractions/WebJobs.Script.Tests.Abstractions.csproj b/test/WebJobs.Script.Abstractions/WebJobs.Script.Tests.Abstractions.csproj index e3651327a5..dd15d1d90f 100644 --- a/test/WebJobs.Script.Abstractions/WebJobs.Script.Tests.Abstractions.csproj +++ b/test/WebJobs.Script.Abstractions/WebJobs.Script.Tests.Abstractions.csproj @@ -12,9 +12,9 @@ - - - + + + diff --git a/test/WebJobs.Script.Tests.Integration/Host/StandbyManager/StandbyInitializationTests.cs b/test/WebJobs.Script.Tests.Integration/Host/StandbyManager/StandbyInitializationTests.cs index f6d4599077..bd4f92ea1a 100644 --- a/test/WebJobs.Script.Tests.Integration/Host/StandbyManager/StandbyInitializationTests.cs +++ b/test/WebJobs.Script.Tests.Integration/Host/StandbyManager/StandbyInitializationTests.cs @@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.TestHost; using Microsoft.Azure.WebJobs.Script.Configuration; -using Microsoft.Azure.WebJobs.Script.WebHost; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; diff --git a/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/EndToEndTestsBase.cs b/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/EndToEndTestsBase.cs index 37f0868ac2..a3be885428 100644 --- a/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/EndToEndTestsBase.cs +++ b/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/EndToEndTestsBase.cs @@ -17,7 +17,6 @@ using Microsoft.Azure.WebJobs.Script.Config; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; -using Microsoft.WindowsAzure.MobileServices; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Xunit; @@ -280,43 +279,6 @@ protected async Task GetEmptyContainer(string containerName) return container; } - protected async Task WaitForMobileTableRecordAsync(string tableName, string itemId, string textToMatch = null) - { - // We know the tests are using the default INameResolver and this setting. - var mobileAppUri = _nameResolver.Resolve("AzureWebJobs_TestMobileUri"); - var client = new MobileServiceClient(new Uri(mobileAppUri)); - JToken item = null; - var table = client.GetTable(tableName); - await TestHelpers.Await(() => - { - bool result = false; - try - { - item = Task.Run(() => table.LookupAsync(itemId)).Result; - if (textToMatch != null) - { - result = item["Text"].ToString() == textToMatch; - } - else - { - result = true; - } - } - catch (AggregateException aggEx) - { - var ex = (MobileServiceInvalidOperationException)aggEx.InnerException; - if (ex.Response.StatusCode != HttpStatusCode.NotFound) - { - throw; - } - } - - return result; - }); - - return item; - } - protected async Task WaitForDocumentAsync(string itemId, string textToMatch = null) { var docUri = UriFactory.CreateDocumentUri("ItemDb", "ItemCollection", itemId); diff --git a/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/SamplesEndToEndTests_CSharp.cs b/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/SamplesEndToEndTests_CSharp.cs index e763fc33bd..38129cf8a0 100644 --- a/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/SamplesEndToEndTests_CSharp.cs +++ b/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/SamplesEndToEndTests_CSharp.cs @@ -835,7 +835,7 @@ public async Task ManualTrigger_Invoke_Succeeds() { var vars = new Dictionary { - { EnvironmentSettingNames.FunctionWorkerRuntime, RpcWorkerConstants.DotNetLanguageWorkerName} + { EnvironmentSettingNames.FunctionWorkerRuntime, RpcWorkerConstants.DotNetLanguageWorkerName } }; using (_fixture.Host.WebHostServices.CreateScopedEnvironment(vars)) { @@ -866,7 +866,7 @@ public async Task HttpTrigger_Poco_Post_Succeeds() { var vars = new Dictionary { - { EnvironmentSettingNames.FunctionWorkerRuntime, RpcWorkerConstants.DotNetLanguageWorkerName} + { EnvironmentSettingNames.FunctionWorkerRuntime, RpcWorkerConstants.DotNetLanguageWorkerName } }; using (_fixture.Host.WebHostServices.CreateScopedEnvironment(vars)) { @@ -975,7 +975,7 @@ public async Task Legacy_RequestTypes_Succeed() { var vars = new Dictionary { - { EnvironmentSettingNames.FunctionWorkerRuntime, RpcWorkerConstants.DotNetLanguageWorkerName} + { EnvironmentSettingNames.FunctionWorkerRuntime, RpcWorkerConstants.DotNetLanguageWorkerName } }; using (_fixture.Host.WebHostServices.CreateScopedEnvironment(vars)) { @@ -997,7 +997,7 @@ public async Task HttpTrigger_Poco_Get_Succeeds() { var vars = new Dictionary { - { EnvironmentSettingNames.FunctionWorkerRuntime, RpcWorkerConstants.DotNetLanguageWorkerName} + { EnvironmentSettingNames.FunctionWorkerRuntime, RpcWorkerConstants.DotNetLanguageWorkerName } }; using (_fixture.Host.WebHostServices.CreateScopedEnvironment(vars)) { @@ -1068,7 +1068,7 @@ public async Task HttpTrigger_AdminLevel_AdminIsolationEnabled_Succeeds() var vars = new Dictionary { - { EnvironmentSettingNames.FunctionWorkerRuntime, RpcWorkerConstants.DotNetLanguageWorkerName}, + { EnvironmentSettingNames.FunctionWorkerRuntime, RpcWorkerConstants.DotNetLanguageWorkerName }, { EnvironmentSettingNames.FunctionsAdminIsolationEnabled, "1" } }; using (_fixture.Host.WebHostServices.CreateScopedEnvironment(vars)) @@ -1106,7 +1106,7 @@ public async Task HttpTrigger_DuplicateQueryParams_Succeeds() { var vars = new Dictionary { - { EnvironmentSettingNames.FunctionWorkerRuntime, RpcWorkerConstants.DotNetLanguageWorkerName} + { EnvironmentSettingNames.FunctionWorkerRuntime, RpcWorkerConstants.DotNetLanguageWorkerName } }; using (_fixture.Host.WebHostServices.CreateScopedEnvironment(vars)) { @@ -1129,7 +1129,7 @@ public async Task HttpTrigger_CustomRoute_ReturnsExpectedResponse() { var vars = new Dictionary { - { EnvironmentSettingNames.FunctionWorkerRuntime, RpcWorkerConstants.DotNetLanguageWorkerName} + { EnvironmentSettingNames.FunctionWorkerRuntime, RpcWorkerConstants.DotNetLanguageWorkerName } }; using (_fixture.Host.WebHostServices.CreateScopedEnvironment(vars)) { @@ -1194,7 +1194,7 @@ public async Task HttpTriggerWithObject_Post_Succeeds() { var vars = new Dictionary { - { EnvironmentSettingNames.FunctionWorkerRuntime, RpcWorkerConstants.DotNetLanguageWorkerName} + { EnvironmentSettingNames.FunctionWorkerRuntime, RpcWorkerConstants.DotNetLanguageWorkerName } }; using (_fixture.Host.WebHostServices.CreateScopedEnvironment(vars)) { @@ -1220,8 +1220,8 @@ public async Task HttpTrigger_Identities_Succeeds() { var vars = new Dictionary { - { EnvironmentSettingNames.FunctionWorkerRuntime, RpcWorkerConstants.DotNetLanguageWorkerName}, - { "WEBSITE_AUTH_ENABLED", "TRUE"} + { EnvironmentSettingNames.FunctionWorkerRuntime, RpcWorkerConstants.DotNetLanguageWorkerName }, + { "WEBSITE_AUTH_ENABLED", "TRUE" } }; using (_fixture.Host.WebHostServices.CreateScopedEnvironment(vars)) { @@ -1245,8 +1245,8 @@ public async Task HttpTrigger_Identities_AnonymousAccessSucceeds() { var vars = new Dictionary { - { EnvironmentSettingNames.FunctionWorkerRuntime, RpcWorkerConstants.DotNetLanguageWorkerName}, - { "WEBSITE_AUTH_ENABLED", "TRUE"} + { EnvironmentSettingNames.FunctionWorkerRuntime, RpcWorkerConstants.DotNetLanguageWorkerName }, + { "WEBSITE_AUTH_ENABLED", "TRUE" } }; using (_fixture.Host.WebHostServices.CreateScopedEnvironment(vars)) { @@ -1268,8 +1268,8 @@ public async Task HttpTrigger_Identities_BlocksSpoofedEasyAuthIdentity() { var vars = new Dictionary { - { EnvironmentSettingNames.FunctionWorkerRuntime, RpcWorkerConstants.DotNetLanguageWorkerName}, - { "WEBSITE_AUTH_ENABLED", "FALSE"} + { EnvironmentSettingNames.FunctionWorkerRuntime, RpcWorkerConstants.DotNetLanguageWorkerName }, + { "WEBSITE_AUTH_ENABLED", "FALSE" } }; using (_fixture.Host.WebHostServices.CreateScopedEnvironment(vars)) { diff --git a/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/SpecializationE2ETests.cs b/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/SpecializationE2ETests.cs index ec19b94dbe..af763ba312 100644 --- a/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/SpecializationE2ETests.cs +++ b/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/SpecializationE2ETests.cs @@ -917,7 +917,7 @@ public async Task ResponseCompressionWorksAfterSpecialization(string acceptEncod _environment.SetEnvironmentVariable(EnvironmentSettingNames.AzureWebsiteContainerReady, "1"); _environment.SetEnvironmentVariable(EnvironmentSettingNames.AzureWebsitePlaceholderMode, "0"); - _environment.SetEnvironmentVariable(EnvironmentSettingNames.AzureWebJobsFeatureFlags, ScriptConstants.FeatureFlagEnableResponseCompression); + _environment.SetEnvironmentVariable(EnvironmentSettingNames.AzureWebJobsFeatureFlags , ScriptConstants.FeatureFlagEnableResponseCompression); response = await client.GetAsync("api/HttpRequestDataFunction"); response.EnsureSuccessStatusCode(); diff --git a/test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj b/test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj index 1a7f9be3d5..466fdcb7e5 100644 --- a/test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj +++ b/test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj @@ -11,24 +11,14 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + @@ -61,4 +51,9 @@ + + + + + diff --git a/test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj b/test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj index 03c6f2e8b2..3dc6251451 100644 --- a/test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj +++ b/test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj @@ -16,25 +16,16 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/tools/ExtensionsMetadataGenerator/Directory.Build.props b/tools/ExtensionsMetadataGenerator/Directory.Build.props index de78e9f418..a657d92f99 100644 --- a/tools/ExtensionsMetadataGenerator/Directory.Build.props +++ b/tools/ExtensionsMetadataGenerator/Directory.Build.props @@ -1,7 +1,6 @@ - + Azure Functions extensions metadata generator diff --git a/tools/ExtensionsMetadataGenerator/Directory.Packages.props b/tools/ExtensionsMetadataGenerator/Directory.Packages.props new file mode 100644 index 0000000000..db603cfc7d --- /dev/null +++ b/tools/ExtensionsMetadataGenerator/Directory.Packages.props @@ -0,0 +1,37 @@ + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/ExtensionsMetadataGenerator/src/ExtensionsMetadataGenerator.Console/ExtensionsMetadataGenerator.Console.csproj b/tools/ExtensionsMetadataGenerator/src/ExtensionsMetadataGenerator.Console/ExtensionsMetadataGenerator.Console.csproj index 93eaa4b67e..381b79fd56 100644 --- a/tools/ExtensionsMetadataGenerator/src/ExtensionsMetadataGenerator.Console/ExtensionsMetadataGenerator.Console.csproj +++ b/tools/ExtensionsMetadataGenerator/src/ExtensionsMetadataGenerator.Console/ExtensionsMetadataGenerator.Console.csproj @@ -13,8 +13,7 @@ - - + diff --git a/tools/ExtensionsMetadataGenerator/src/ExtensionsMetadataGenerator/ExtensionsMetadataGenerator.csproj b/tools/ExtensionsMetadataGenerator/src/ExtensionsMetadataGenerator/ExtensionsMetadataGenerator.csproj index c6b11bbc31..b1bb30a4c5 100644 --- a/tools/ExtensionsMetadataGenerator/src/ExtensionsMetadataGenerator/ExtensionsMetadataGenerator.csproj +++ b/tools/ExtensionsMetadataGenerator/src/ExtensionsMetadataGenerator/ExtensionsMetadataGenerator.csproj @@ -77,13 +77,12 @@ - - - + + - + diff --git a/tools/ExtensionsMetadataGenerator/test/ExtensionsMetadataGeneratorTests/ExtensionsMetadataGeneratorTests.csproj b/tools/ExtensionsMetadataGenerator/test/ExtensionsMetadataGeneratorTests/ExtensionsMetadataGeneratorTests.csproj index c6fb984c5f..44ecbbc9a5 100644 --- a/tools/ExtensionsMetadataGenerator/test/ExtensionsMetadataGeneratorTests/ExtensionsMetadataGeneratorTests.csproj +++ b/tools/ExtensionsMetadataGenerator/test/ExtensionsMetadataGeneratorTests/ExtensionsMetadataGeneratorTests.csproj @@ -11,11 +11,11 @@ - - - - - + + + + + diff --git a/tools/ExtensionsMetadataGenerator/test/TestProject_Core21/TestProject_Core21.csproj b/tools/ExtensionsMetadataGenerator/test/TestProject_Core21/TestProject_Core21.csproj index cd547e23f0..2cfaa8c929 100644 --- a/tools/ExtensionsMetadataGenerator/test/TestProject_Core21/TestProject_Core21.csproj +++ b/tools/ExtensionsMetadataGenerator/test/TestProject_Core21/TestProject_Core21.csproj @@ -9,7 +9,7 @@ - + diff --git a/tools/ExtensionsMetadataGenerator/test/TestProject_Core22/TestProject_Core22.csproj b/tools/ExtensionsMetadataGenerator/test/TestProject_Core22/TestProject_Core22.csproj index 00d106ba0e..3d62e1d4c9 100644 --- a/tools/ExtensionsMetadataGenerator/test/TestProject_Core22/TestProject_Core22.csproj +++ b/tools/ExtensionsMetadataGenerator/test/TestProject_Core22/TestProject_Core22.csproj @@ -9,7 +9,7 @@ - + \ No newline at end of file diff --git a/tools/ExtensionsMetadataGenerator/test/TestProject_Razor/TestProject_Razor.csproj b/tools/ExtensionsMetadataGenerator/test/TestProject_Razor/TestProject_Razor.csproj index 2cf7b0842f..c69e4a095a 100644 --- a/tools/ExtensionsMetadataGenerator/test/TestProject_Razor/TestProject_Razor.csproj +++ b/tools/ExtensionsMetadataGenerator/test/TestProject_Razor/TestProject_Razor.csproj @@ -5,8 +5,8 @@ - - + + From e295d6da983793b03d07c8c56b0bf32b2d7a3540 Mon Sep 17 00:00:00 2001 From: Jacob Viau Date: Thu, 2 Oct 2025 15:16:06 -0700 Subject: [PATCH 2/2] Update packages to current from dev --- Directory.Packages.props | 29 ++++++++++--------- .../WebJobs.Script.WebHost.csproj | 1 + src/WebJobs.Script/WebJobs.Script.csproj | 6 +++- test/Directory.Packages.props | 3 +- .../StandbyInitializationTests.cs | 5 ++-- .../TestTelemetryChannel.cs | 4 +-- .../WebJobs.Script.Tests.Shared.csproj | 6 ++-- .../WebJobs.Script.Tests.csproj | 3 +- 8 files changed, 34 insertions(+), 23 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 54379ca515..e43f23d474 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -8,18 +8,17 @@ - + - - + - + - + @@ -35,7 +34,9 @@ - + + + @@ -45,7 +46,7 @@ - + @@ -57,22 +58,24 @@ + + - - - - + + + + - + - + diff --git a/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj b/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj index 6c913603b9..cb2048576e 100644 --- a/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj +++ b/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj @@ -49,6 +49,7 @@ + diff --git a/src/WebJobs.Script/WebJobs.Script.csproj b/src/WebJobs.Script/WebJobs.Script.csproj index a457fc9fb8..ff790fdd1c 100644 --- a/src/WebJobs.Script/WebJobs.Script.csproj +++ b/src/WebJobs.Script/WebJobs.Script.csproj @@ -26,7 +26,7 @@ - + @@ -40,9 +40,13 @@ + + + + diff --git a/test/Directory.Packages.props b/test/Directory.Packages.props index c9fe719c6b..5149ee9c78 100644 --- a/test/Directory.Packages.props +++ b/test/Directory.Packages.props @@ -4,7 +4,8 @@ - + + diff --git a/test/WebJobs.Script.Tests.Integration/Host/StandbyManager/StandbyInitializationTests.cs b/test/WebJobs.Script.Tests.Integration/Host/StandbyManager/StandbyInitializationTests.cs index bd4f92ea1a..5f82b393e6 100644 --- a/test/WebJobs.Script.Tests.Integration/Host/StandbyManager/StandbyInitializationTests.cs +++ b/test/WebJobs.Script.Tests.Integration/Host/StandbyManager/StandbyInitializationTests.cs @@ -1,5 +1,5 @@ -//// Copyright (c) .NET Foundation. All rights reserved. -//// Licensed under the MIT License. See License.txt in the project root for license information. +// 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; @@ -10,6 +10,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.TestHost; using Microsoft.Azure.WebJobs.Script.Configuration; +using Microsoft.Azure.WebJobs.Script.WebHost; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; diff --git a/test/WebJobs.Script.Tests.Shared/TestTelemetryChannel.cs b/test/WebJobs.Script.Tests.Shared/TestTelemetryChannel.cs index 0997d63c93..33626706fc 100644 --- a/test/WebJobs.Script.Tests.Shared/TestTelemetryChannel.cs +++ b/test/WebJobs.Script.Tests.Shared/TestTelemetryChannel.cs @@ -1,5 +1,5 @@ -//// Copyright (c) .NET Foundation. All rights reserved. -//// Licensed under the MIT License. See License.txt in the project root for license information. +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. using System.Collections.Concurrent; using Microsoft.ApplicationInsights.Channel; diff --git a/test/WebJobs.Script.Tests.Shared/WebJobs.Script.Tests.Shared.csproj b/test/WebJobs.Script.Tests.Shared/WebJobs.Script.Tests.Shared.csproj index 408ffb0d76..47e6e96cde 100644 --- a/test/WebJobs.Script.Tests.Shared/WebJobs.Script.Tests.Shared.csproj +++ b/test/WebJobs.Script.Tests.Shared/WebJobs.Script.Tests.Shared.csproj @@ -6,9 +6,9 @@ - - - + + + diff --git a/test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj b/test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj index 3dc6251451..bcc8a9e793 100644 --- a/test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj +++ b/test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj @@ -16,7 +16,8 @@ - + +