From e1539a7ca8aeaa9197623fbdfb3c5b398dfde320 Mon Sep 17 00:00:00 2001 From: Lilian Kasem Date: Wed, 30 Aug 2023 09:31:39 -0700 Subject: [PATCH 1/4] Update extension versions --- .../FunctionMetadataGeneratorTests.cs | 14 +++++++------- test/SdkE2ETests/PublishTests.cs | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/FunctionMetadataGeneratorTests/FunctionMetadataGeneratorTests.cs b/test/FunctionMetadataGeneratorTests/FunctionMetadataGeneratorTests.cs index 63a9dd4eb..95c8cc09e 100644 --- a/test/FunctionMetadataGeneratorTests/FunctionMetadataGeneratorTests.cs +++ b/test/FunctionMetadataGeneratorTests/FunctionMetadataGeneratorTests.cs @@ -176,7 +176,7 @@ public void StorageFunctions() AssertDictionary(extensions, new Dictionary { { "Microsoft.Azure.WebJobs.Extensions.Storage.Queues", "5.1.3" }, - { "Microsoft.Azure.WebJobs.Extensions.Storage.Blobs", "5.1.3" }, + { "Microsoft.Azure.WebJobs.Extensions.Storage.Blobs", "5.2.0" }, }); void ValidateQueueTrigger(ExpandoObject b) @@ -267,7 +267,7 @@ public void BlobStorageFunctions_SDKTypeBindings() AssertDictionary(extensions, new Dictionary { - { "Microsoft.Azure.WebJobs.Extensions.Storage.Blobs", "5.1.3" }, + { "Microsoft.Azure.WebJobs.Extensions.Storage.Blobs", "5.2.0" }, }); var blobClientToBlobStringFunction = functions.Single(p => p.Name == "BlobClientToBlobStringFunction"); @@ -353,7 +353,7 @@ public void BlobCollectionFunctions_SDKTypeBindings() AssertDictionary(extensions, new Dictionary { - { "Microsoft.Azure.WebJobs.Extensions.Storage.Blobs", "5.1.3" }, + { "Microsoft.Azure.WebJobs.Extensions.Storage.Blobs", "5.2.0" }, }); var blobStringToBlobClientEnumerable = functions.Single(p => p.Name == "BlobStringToBlobClientEnumerable"); @@ -605,7 +605,7 @@ public void MultiOutput_OnReturnType() AssertDictionary(extensions, new Dictionary { { "Microsoft.Azure.WebJobs.Extensions.Storage.Queues", "5.1.3" }, - { "Microsoft.Azure.WebJobs.Extensions.Storage.Blobs", "5.1.3" }, + { "Microsoft.Azure.WebJobs.Extensions.Storage.Blobs", "5.2.0" }, }); void ValidateQueueTrigger(ExpandoObject b) @@ -806,7 +806,7 @@ public void CardinalityManyFunctions(string functionName, string entryPoint, boo b => ValidateTrigger(b, cardinalityMany)); AssertDictionary(extensions, new Dictionary(){ - { "Microsoft.Azure.WebJobs.Extensions.EventHubs", "5.4.0" } + { "Microsoft.Azure.WebJobs.Extensions.EventHubs", "5.5.0" } }); void ValidateTrigger(ExpandoObject b, bool many) @@ -978,7 +978,7 @@ public void ServiceBus_SDKTypeBindings() AssertDictionary(extensions, new Dictionary { - { "Microsoft.Azure.WebJobs.Extensions.ServiceBus", "5.11.0" }, + { "Microsoft.Azure.WebJobs.Extensions.ServiceBus", "5.12.0" }, }); var serviceBusTriggerFunction = functions.Single(p => p.Name == nameof(SDKTypeBindings_ServiceBus.ServiceBusTriggerFunction)); @@ -1031,7 +1031,7 @@ public void EventHubs_SDKTypeBindings() AssertDictionary(extensions, new Dictionary { - { "Microsoft.Azure.WebJobs.Extensions.EventHubs", "5.4.0" }, + { "Microsoft.Azure.WebJobs.Extensions.EventHubs", "5.5.0" }, }); var eventHubTriggerFunction = functions.Single(p => p.Name == nameof(SDKTypeBindings_EventHubs.EventHubTriggerFunction)); diff --git a/test/SdkE2ETests/PublishTests.cs b/test/SdkE2ETests/PublishTests.cs index 6423968ea..c038865a9 100644 --- a/test/SdkE2ETests/PublishTests.cs +++ b/test/SdkE2ETests/PublishTests.cs @@ -64,7 +64,7 @@ private async Task RunPublishTest(string outputDir, string additionalParams = nu "Microsoft.Azure.WebJobs.Extensions.FunctionMetadataLoader.Startup, Microsoft.Azure.WebJobs.Extensions.FunctionMetadataLoader, Version=1.0.0.0, Culture=neutral, PublicKeyToken=551316b6919f366c", @"./.azurefunctions/Microsoft.Azure.WebJobs.Extensions.FunctionMetadataLoader.dll"), new Extension("AzureStorageBlobs", - "Microsoft.Azure.WebJobs.Extensions.Storage.AzureStorageBlobsWebJobsStartup, Microsoft.Azure.WebJobs.Extensions.Storage.Blobs, Version=5.1.3.0, Culture=neutral, PublicKeyToken=92742159e12e44c8", + "Microsoft.Azure.WebJobs.Extensions.Storage.AzureStorageBlobsWebJobsStartup, Microsoft.Azure.WebJobs.Extensions.Storage.Blobs, Version=5.2.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8", @"./.azurefunctions/Microsoft.Azure.WebJobs.Extensions.Storage.Blobs.dll"), new Extension("AzureStorageQueues", "Microsoft.Azure.WebJobs.Extensions.Storage.AzureStorageQueuesWebJobsStartup, Microsoft.Azure.WebJobs.Extensions.Storage.Queues, Version=5.1.3.0, Culture=neutral, PublicKeyToken=92742159e12e44c8", From 4a62291c460afa07eb07d103a811619d1da18675 Mon Sep 17 00:00:00 2001 From: Lilian Kasem Date: Wed, 30 Aug 2023 14:42:58 -0700 Subject: [PATCH 2/4] exclude the ext rpc test proj from linux e2e --- src/ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ci.yml b/src/ci.yml index ca88023ae..1fea00026 100644 --- a/src/ci.yml +++ b/src/ci.yml @@ -227,7 +227,7 @@ jobs: - publish: $(System.DefaultWorkingDirectory)/packages artifact: drop -- job: "E2ETests_Ubuntu" +- job: "E2ETests_Ubuntu" pool: name: '1ES-Hosted-AzFunc' demands: @@ -255,10 +255,12 @@ jobs: displayName: "Setup E2E tests" env: CORE_TOOLS_URL: $(CORE_TOOLS_URL) - + - task: DotNetCoreCLI@2 displayName: 'Run E2E tests' inputs: command: 'test' arguments: '--no-build -c Release --filter "FullyQualifiedName~HttpTrigger"' #only run http tests to avoid emulators on Linux - projects: 'test/**/*Tests.csproj' + projects: | + !test/Worker.Extensions.Rpc.Tests/** + test/**/*Tests.csproj From 637670e9040ad1191771f26b8ef81048b2541cc0 Mon Sep 17 00:00:00 2001 From: Lilian Kasem Date: Wed, 30 Aug 2023 15:01:09 -0700 Subject: [PATCH 3/4] update --- src/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci.yml b/src/ci.yml index 1fea00026..9e52a8342 100644 --- a/src/ci.yml +++ b/src/ci.yml @@ -262,5 +262,5 @@ jobs: command: 'test' arguments: '--no-build -c Release --filter "FullyQualifiedName~HttpTrigger"' #only run http tests to avoid emulators on Linux projects: | - !test/Worker.Extensions.Rpc.Tests/** + !test/Worker.Extensions.Rpc.Tests/Worker.Extensions.Rpc.Tests.csproj test/**/*Tests.csproj From 2979482add5227c6dc6b682037ee75b57d749175 Mon Sep 17 00:00:00 2001 From: Lilian Kasem Date: Wed, 30 Aug 2023 15:30:38 -0700 Subject: [PATCH 4/4] update --- src/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci.yml b/src/ci.yml index 9e52a8342..c34079f75 100644 --- a/src/ci.yml +++ b/src/ci.yml @@ -262,5 +262,5 @@ jobs: command: 'test' arguments: '--no-build -c Release --filter "FullyQualifiedName~HttpTrigger"' #only run http tests to avoid emulators on Linux projects: | - !test/Worker.Extensions.Rpc.Tests/Worker.Extensions.Rpc.Tests.csproj test/**/*Tests.csproj + !test/**/Worker.Extensions.Rpc.Tests.csproj