Merge pull request #1126 from JetBrains/rabdrakhmanov/improve-azure-project-detection

Improve Azure Function project detection

Author: rafaelldi

PluginsAndFeatures/azure-toolkit-for-rider/CHANGELOG.md

@@ -6,6 +6,12 @@
 
 ### Changed
 
+- Unify logic to detect Azure Function projects by using `AzureFunctionsVersion` MSBuild property ([RIDER-131333](https://youtrack.jetbrains.com/issue/RIDER-131333))
+
+## [4.6.0] - 2025-10-21
+
+### Changed
+
 - Support for Rider 2025.3 EAP 6
 
 ## [4.5.5] - 2025-10-09
@@ -365,7 +371,8 @@
 - Reimplement Azure Functions Core Tools integration
 - Reimplement Azure Functions templates
 
-[Unreleased]: https://github.com/JetBrains/azure-tools-for-intellij/compare/4.5.5...HEAD
+[Unreleased]: https://github.com/JetBrains/azure-tools-for-intellij/compare/4.6.0...HEAD
+[4.6.0]: https://github.com/JetBrains/azure-tools-for-intellij/compare/4.5.5...4.6.0
 [4.5.5]: https://github.com/JetBrains/azure-tools-for-intellij/compare/4.5.4...4.5.5
 [4.5.4]: https://github.com/JetBrains/azure-tools-for-intellij/compare/4.5.3...4.5.4
 [4.5.3]: https://github.com/JetBrains/azure-tools-for-intellij/compare/v4.5.2...v4.5.3

PluginsAndFeatures/azure-toolkit-for-rider/gradle.properties

@@ -4,7 +4,7 @@ pluginGroup = com.jetbrains
 pluginName = Azure Toolkit for Rider
 pluginRepositoryUrl = https://github.com/JetBrains/azure-tools-for-intellij
 # SemVer format -> https://semver.org
-pluginVersion = 4.6.0
+pluginVersion = 4.6.1
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 253

PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Daemon/RunMarkers/FunctionAppRunMarkerProvider.cs

@@ -1,7 +1,7 @@
 // Copyright 2018-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the MIT license.
 
 using JetBrains.Application.Settings;
-using JetBrains.ReSharper.Azure.Project.FunctionApp;
+using JetBrains.ProjectModel;
 using JetBrains.ReSharper.Azure.Psi.FunctionApp;
 using JetBrains.ReSharper.Feature.Services.Daemon;
 using JetBrains.ReSharper.Psi;
@@ -26,7 +26,7 @@ public void CollectRunMarkers(IFile file, IContextBoundSettingsStore settings, I
 
         var project = file.GetProject();
         if (project == null || !project.IsValid()) return;
-        if (!project.IsAzureFunctionsProject()) return;
+        if (!project.IsAzureFunctionProject()) return;
 
         foreach (var declaration in CachedDeclarationsCollector.Run<IMethodDeclaration>(csharpFile))
         {

PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Intellisense/FunctionApp/LiveTemplates/Scope/AzureProjectScopeProvider.cs

@@ -39,7 +39,7 @@ public AzureProjectScopeProvider()
     public override IEnumerable<ITemplateScopePoint> ProvideScopePoints(TemplateAcceptanceContext context)
     {
         var project = context.GetProject();
-        if (project == null || !project.IsAzureFunctionsProject()) yield break;
+        if (project == null || !project.IsAzureFunctionProject()) yield break;
 
         yield return new InAzureFunctionsProject();
 

PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Project/Dockerfile/AzureFunctionsProjectDockerfileContentGenerator.cs

@@ -19,7 +19,7 @@ public class AzureFunctionsProjectDockerfileContentGenerator(ILogger logger) : I
 {
     public int Priority => 10;
 
-    public bool IsApplicable(IProject project) => project.IsAzureFunctionsProject();
+    public bool IsApplicable(IProject project) => project.IsAzureFunctionProject();
 
     public string Generate(
         IProject project,

PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Project/FunctionApp/FunctionAppProjectDetector.cs

@@ -12,7 +12,7 @@ public class FunctionAppProjectTechnologyProvider : IProjectTechnologyAnalyticsP
 {
     public IEnumerable<string> GetProjectTechnology(IProject project)
     {
-        if (project.IsAzureFunctionsProject())
+        if (project.IsAzureFunctionProject())
         {
             yield return "Azure Function";
         }

PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Project/FunctionApp/FunctionAppProjectTechnologyProvider.cs

@@ -0,0 +1,54 @@
+// Copyright 2018-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the MIT license.
+
+using JetBrains.ProjectModel;
+using JetBrains.ProjectModel.Assemblies.Interfaces;
+using JetBrains.ProjectModel.NuGet.Packaging;
+
+namespace JetBrains.ReSharper.Azure.Project.FunctionApp;
+
+/// <summary>
+/// Provides methods for detecting the worker model associated with an Azure Functions project
+/// based on installed NuGet package references.
+/// </summary>
+public static class FunctionProjectWorkerModelDetector
+{
+    private static readonly NugetId DefaultWorkerNuGetId = new("Microsoft.NET.Sdk.Functions");
+    private static readonly NugetId IsolatedWorkerNuGetId = new("Microsoft.Azure.Functions.Worker.Sdk");
+
+    /// <summary>
+    /// Determines if the given project has a default worker NuGet package reference installed.
+    /// </summary>
+    /// <param name="project">The project to check for the default worker NuGet package reference.</param>
+    /// <returns>True if the default worker NuGet package reference is installed; otherwise, false.</returns>
+    public static bool HasDefaultWorkerPackageReference(this IProject project)
+    {
+        var checker = project.GetComponent<NuGetInstalledPackageChecker>();
+        return checker.IsPackageInstalled(project, DefaultWorkerNuGetId.ID);
+    }
+
+    /// <summary>
+    /// Determines if the given project has an isolated worker NuGet package reference installed.
+    /// </summary>
+    /// <param name="project">The project to check for the isolated worker NuGet package reference.</param>
+    /// <returns>True if the isolated worker NuGet package reference is installed; otherwise, false.</returns>
+    public static bool HasIsolatedWorkerPackageReference(this IProject project)
+    {
+        var checker = project.GetComponent<NuGetInstalledPackageChecker>();
+        return checker.IsPackageInstalled(project, IsolatedWorkerNuGetId.ID);
+    }
+
+    /// <summary>
+    /// Determines the worker model for the specified Azure Functions project based on the installed NuGet package references.
+    /// </summary>
+    /// <param name="project">The Azure Functions project to analyse for worker model detection.</param>
+    /// <returns>The detected <see cref="FunctionProjectWorkerModel"/> indicating the worker model of the project.</returns>
+    public static FunctionProjectWorkerModel GetFunctionProjectWorkerModel(this IProject project)
+    {
+        if (HasIsolatedWorkerPackageReference(project))
+            return FunctionProjectWorkerModel.Isolated;
+        else if (HasDefaultWorkerPackageReference(project))
+            return FunctionProjectWorkerModel.Default;
+        else
+            return FunctionProjectWorkerModel.Unknown;
+    }
+}

PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Project/FunctionApp/FunctionProjectWorkerModelDetector.cs

@@ -2,8 +2,10 @@
 
 using System.Collections.Generic;
 using JetBrains.Application.Parts;
+using JetBrains.Application.Threading;
 using JetBrains.ProjectModel;
-using JetBrains.ReSharper.Azure.Project.FunctionApp;
+using JetBrains.ProjectModel.Properties;
+using JetBrains.ProjectModel.Properties.Managed;
 using JetBrains.ReSharper.Features.Running;
 using JetBrains.Rider.Model;
 using JetBrains.Util;
@@ -22,15 +24,43 @@ public class AzureFunctionsRunnableProjectProvider(ILogger logger) : IRunnablePr
             return null;
         }
 
-        var projectOutputs = project.GetAzureFunctionsCompatibleProjectOutputs(out var problems, logger);
-
-        if (projectOutputs.IsEmpty())
+        if (!project.IsAzureFunctionProject())
         {
-            logger.Trace("No project output was found, return null");
+            logger.Trace("Project is not an Azure Function project, return null");
             return null;
         }
 
-        logger.Trace($"AzureFunctionsRunnableProjectProvider returned RunnableProject {fullName}");
+        var projectOutputs = new List<ProjectOutput>();
+        string? problems = null;
+
+        foreach (var tfm in project.TargetFrameworkIds)
+        {
+            var configuration = project.ProjectProperties.TryGetConfiguration<IManagedProjectConfiguration>(tfm);
+            if (configuration == null || (configuration.OutputType != ProjectOutputType.LIBRARY &&
+                                          configuration.OutputType != ProjectOutputType.CONSOLE_EXE))
+            {
+                logger.Trace($"Project OutputType = {configuration?.OutputType}, skip configuration");
+                continue;
+            }
+
+            var projectOutputPath = project.GetOutputFilePath(tfm);
+            // Azure Functions host needs the tfm folder, not the bin folder
+            var workingDirectoryPath = projectOutputPath.Directory
+                .NormalizeSeparators(FileSystemPathEx.SeparatorStyle.Unix)
+                .TrimFromEnd("/bin");
+
+            var projectOutput = new ProjectOutput(
+                tfm.ToRdTargetFrameworkInfo(),
+                projectOutputPath.NormalizeSeparators(FileSystemPathEx.SeparatorStyle.Unix),
+                ["host", "start", "--pause-on-error"],
+                workingDirectoryPath,
+                string.Empty,
+                null,
+                []
+            );
+
+            projectOutputs.Add(projectOutput);
+        }
 
         return new Rider.Model.RunnableProject(
             name,