From 6f3cb7c8a23dce9e998f399ed2e26d79f4570a8a Mon Sep 17 00:00:00 2001 From: Fabio Cavalcante Date: Mon, 9 Sep 2024 16:19:51 -0700 Subject: [PATCH 1/2] Fixing project structure for ASP.NET Core Analyzers --- DotNetWorker.sln | 14 +++++++------- ...odeFixForRegistrationInASPNetCoreIntegration.cs | 0 .../{ => src}/DiagnosticDescriptors.cs | 0 .../RegistrationExpectedInASPNetIntegration.cs | 0 ...ker.Extensions.Http.AspNetCore.Analyzers.csproj | 2 +- .../src/Worker.Extensions.Http.AspNetCore.csproj | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename extensions/Worker.Extensions.Http.AspNetCore.Analyzers/{ => src}/CodeFixForRegistrationInASPNetCoreIntegration.cs (100%) rename extensions/Worker.Extensions.Http.AspNetCore.Analyzers/{ => src}/DiagnosticDescriptors.cs (100%) rename extensions/Worker.Extensions.Http.AspNetCore.Analyzers/{ => src}/RegistrationExpectedInASPNetIntegration.cs (100%) rename extensions/Worker.Extensions.Http.AspNetCore.Analyzers/{ => src}/Worker.Extensions.Http.AspNetCore.Analyzers.csproj (97%) diff --git a/DotNetWorker.sln b/DotNetWorker.sln index 640a483f0..f9615a07d 100644 --- a/DotNetWorker.sln +++ b/DotNetWorker.sln @@ -138,8 +138,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Worker.Extensions.Http.AspN EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Worker.Extensions.Shared.Tests", "test\Worker.Extensions.Shared.Tests\Worker.Extensions.Shared.Tests.csproj", "{B6342174-5436-4846-B43C-39D8E34AE5CF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Worker.Extensions.Http.AspNetCore.Analyzers", "extensions\Worker.Extensions.Http.AspNetCore.Analyzers\Worker.Extensions.Http.AspNetCore.Analyzers.csproj", "{7B6C2920-7A02-43B2-8DA0-7B76B9FAFC6B}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Net7Worker", "samples\Net7Worker\Net7Worker.csproj", "{BE1F79C3-24FA-4BC8-BAB2-C1AD321B13FF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DependentAssemblyWithFunctions.NetStandard", "test\DependentAssemblyWithFunctions.NetStandard\DependentAssemblyWithFunctions.NetStandard.csproj", "{198DA072-F94F-4585-A744-97B3DAC21686}" @@ -150,6 +148,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetWorker.OpenTelemetry. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Worker.Extensions.Timer.Tests", "test\extensions\Worker.Extensions.Timer.Tests\Worker.Extensions.Timer.Tests.csproj", "{6947034E-C97F-4F78-940F-B6A398E23C9C}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Worker.Extensions.Http.AspNetCore.Analyzers", "extensions\Worker.Extensions.Http.AspNetCore.Analyzers\src\Worker.Extensions.Http.AspNetCore.Analyzers.csproj", "{63C70590-7F4A-4D54-9157-7FEDE0F8650D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -356,10 +356,6 @@ Global {B6342174-5436-4846-B43C-39D8E34AE5CF}.Debug|Any CPU.Build.0 = Debug|Any CPU {B6342174-5436-4846-B43C-39D8E34AE5CF}.Release|Any CPU.ActiveCfg = Release|Any CPU {B6342174-5436-4846-B43C-39D8E34AE5CF}.Release|Any CPU.Build.0 = Release|Any CPU - {7B6C2920-7A02-43B2-8DA0-7B76B9FAFC6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B6C2920-7A02-43B2-8DA0-7B76B9FAFC6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B6C2920-7A02-43B2-8DA0-7B76B9FAFC6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B6C2920-7A02-43B2-8DA0-7B76B9FAFC6B}.Release|Any CPU.Build.0 = Release|Any CPU {BE1F79C3-24FA-4BC8-BAB2-C1AD321B13FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BE1F79C3-24FA-4BC8-BAB2-C1AD321B13FF}.Debug|Any CPU.Build.0 = Debug|Any CPU {BE1F79C3-24FA-4BC8-BAB2-C1AD321B13FF}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -380,6 +376,10 @@ Global {6947034E-C97F-4F78-940F-B6A398E23C9C}.Debug|Any CPU.Build.0 = Debug|Any CPU {6947034E-C97F-4F78-940F-B6A398E23C9C}.Release|Any CPU.ActiveCfg = Release|Any CPU {6947034E-C97F-4F78-940F-B6A398E23C9C}.Release|Any CPU.Build.0 = Release|Any CPU + {63C70590-7F4A-4D54-9157-7FEDE0F8650D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {63C70590-7F4A-4D54-9157-7FEDE0F8650D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {63C70590-7F4A-4D54-9157-7FEDE0F8650D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {63C70590-7F4A-4D54-9157-7FEDE0F8650D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -440,12 +440,12 @@ Global {AB6E1E7A-0D2C-4086-9487-566887C1E753} = {B5821230-6E0A-4535-88A9-ED31B6F07596} {D8E79B53-9A44-46CC-9D7A-E9494FC8CAF4} = {AA4D318D-101B-49E7-A4EC-B34165AEDB33} {B6342174-5436-4846-B43C-39D8E34AE5CF} = {FD7243E4-BF18-43F8-8744-BA1D17ACF378} - {7B6C2920-7A02-43B2-8DA0-7B76B9FAFC6B} = {A7B4FF1E-3DF7-4F28-9333-D0961CDDF702} {BE1F79C3-24FA-4BC8-BAB2-C1AD321B13FF} = {9D6603BD-7EA2-4D11-A69C-0D9E01317FD6} {198DA072-F94F-4585-A744-97B3DAC21686} = {B5821230-6E0A-4535-88A9-ED31B6F07596} {82157559-DF60-496D-817F-84B34CFF76FD} = {083592CA-7DAB-44CE-8979-44FAFA46AEC3} {9AE6E00C-5E6F-4615-9C69-464E9B208E8C} = {FD7243E4-BF18-43F8-8744-BA1D17ACF378} {6947034E-C97F-4F78-940F-B6A398E23C9C} = {AA4D318D-101B-49E7-A4EC-B34165AEDB33} + {63C70590-7F4A-4D54-9157-7FEDE0F8650D} = {A7B4FF1E-3DF7-4F28-9333-D0961CDDF702} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {497D2ED4-A13E-4BCA-8D29-F30CA7D0EA4A} diff --git a/extensions/Worker.Extensions.Http.AspNetCore.Analyzers/CodeFixForRegistrationInASPNetCoreIntegration.cs b/extensions/Worker.Extensions.Http.AspNetCore.Analyzers/src/CodeFixForRegistrationInASPNetCoreIntegration.cs similarity index 100% rename from extensions/Worker.Extensions.Http.AspNetCore.Analyzers/CodeFixForRegistrationInASPNetCoreIntegration.cs rename to extensions/Worker.Extensions.Http.AspNetCore.Analyzers/src/CodeFixForRegistrationInASPNetCoreIntegration.cs diff --git a/extensions/Worker.Extensions.Http.AspNetCore.Analyzers/DiagnosticDescriptors.cs b/extensions/Worker.Extensions.Http.AspNetCore.Analyzers/src/DiagnosticDescriptors.cs similarity index 100% rename from extensions/Worker.Extensions.Http.AspNetCore.Analyzers/DiagnosticDescriptors.cs rename to extensions/Worker.Extensions.Http.AspNetCore.Analyzers/src/DiagnosticDescriptors.cs diff --git a/extensions/Worker.Extensions.Http.AspNetCore.Analyzers/RegistrationExpectedInASPNetIntegration.cs b/extensions/Worker.Extensions.Http.AspNetCore.Analyzers/src/RegistrationExpectedInASPNetIntegration.cs similarity index 100% rename from extensions/Worker.Extensions.Http.AspNetCore.Analyzers/RegistrationExpectedInASPNetIntegration.cs rename to extensions/Worker.Extensions.Http.AspNetCore.Analyzers/src/RegistrationExpectedInASPNetIntegration.cs diff --git a/extensions/Worker.Extensions.Http.AspNetCore.Analyzers/Worker.Extensions.Http.AspNetCore.Analyzers.csproj b/extensions/Worker.Extensions.Http.AspNetCore.Analyzers/src/Worker.Extensions.Http.AspNetCore.Analyzers.csproj similarity index 97% rename from extensions/Worker.Extensions.Http.AspNetCore.Analyzers/Worker.Extensions.Http.AspNetCore.Analyzers.csproj rename to extensions/Worker.Extensions.Http.AspNetCore.Analyzers/src/Worker.Extensions.Http.AspNetCore.Analyzers.csproj index 332c3228a..022514d9a 100644 --- a/extensions/Worker.Extensions.Http.AspNetCore.Analyzers/Worker.Extensions.Http.AspNetCore.Analyzers.csproj +++ b/extensions/Worker.Extensions.Http.AspNetCore.Analyzers/src/Worker.Extensions.Http.AspNetCore.Analyzers.csproj @@ -15,7 +15,7 @@ true - + diff --git a/extensions/Worker.Extensions.Http.AspNetCore/src/Worker.Extensions.Http.AspNetCore.csproj b/extensions/Worker.Extensions.Http.AspNetCore/src/Worker.Extensions.Http.AspNetCore.csproj index 6ecd2aef6..23d89d2b3 100644 --- a/extensions/Worker.Extensions.Http.AspNetCore/src/Worker.Extensions.Http.AspNetCore.csproj +++ b/extensions/Worker.Extensions.Http.AspNetCore/src/Worker.Extensions.Http.AspNetCore.csproj @@ -19,7 +19,7 @@ - + From 24da90fbd158a23c51aa9028d567a24e972bd9c6 Mon Sep 17 00:00:00 2001 From: Fabio Cavalcante Date: Mon, 9 Sep 2024 16:30:22 -0700 Subject: [PATCH 2/2] Adding project name to task display names --- eng/ci/templates/steps/build-extension-project.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/ci/templates/steps/build-extension-project.yml b/eng/ci/templates/steps/build-extension-project.yml index 95c86f5fc..91d5530ac 100644 --- a/eng/ci/templates/steps/build-extension-project.yml +++ b/eng/ci/templates/steps/build-extension-project.yml @@ -5,7 +5,7 @@ parameters: steps: - task: DotNetCoreCLI@2 - displayName: Build project + displayName: Build project '${{ parameters.ExtensionProjectName }}' inputs: command: custom custom: build @@ -15,7 +15,7 @@ steps: - template: ci/sign-files.yml@eng parameters: - displayName: Sign assemblies + displayName: Sign assemblies for '${{ parameters.ExtensionProjectName }}' folderPath: extensions/${{ parameters.ExtensionProjectName }}/src/bin/ pattern: Microsoft.Azure.Functions.Worker.Extensions*.dll signType: dll @@ -27,7 +27,7 @@ steps: contents: '**/CodeSignSummary-*.md' - task: DotNetCoreCLI@2 - displayName: Pack extension + displayName: Pack extension '${{ parameters.ExtensionProjectName }}' inputs: command: custom custom: pack @@ -37,7 +37,7 @@ steps: - template: ci/sign-files.yml@eng parameters: - displayName: Sign nuget packages + displayName: Sign nuget packages for '${{ parameters.ExtensionProjectName }}' folderPath: $(Build.ArtifactStagingDirectory)/NugetPackages pattern: Microsoft.Azure.Functions.Worker.Extensions*.nupkg signType: nuget