From 475cfaf6d518c50d51e3d88fb7f0f39bbcce5ce2 Mon Sep 17 00:00:00 2001
From: Shyju Krishnankutty <connectshyju@gmail.com>
Date: Mon, 25 Sep 2023 08:30:59 -0700
Subject: [PATCH 1/4] Using root namespace for generated types.

---
 sdk/Sdk.Generators/Constants.cs               |  1 +
 .../ExtensionStartupRunnerGenerator.cs        | 10 +--
 .../FunctionExecutorGenerator.Emitter.cs      |  7 +-
 .../FunctionExecutorGenerator.cs              |  2 +-
 ...nctionMetadataProviderGenerator.Emitter.cs |  8 ++-
 .../FunctionMetadataProviderGenerator.cs      | 11 ++-
 sdk/Sdk.Generators/FunctionsUtil.cs           | 18 ++++-
 ...Microsoft.Azure.Functions.Worker.Sdk.props |  1 +
 .../ExtensionStartupRunnerGeneratorTests.cs   | 68 ++++---------------
 .../FunctionExecutorGeneratorTests.cs         | 21 ++++--
 .../AutoConfigureStartupTypeTests.cs          |  3 +-
 .../DependentAssemblyTest.cs                  |  3 +-
 .../EventHubsBindingsTests.cs                 | 18 +++--
 .../HttpTriggerTests.cs                       | 18 +++--
 .../IntegratedTriggersAndBindingsTests.cs     | 18 +++--
 .../NestedTypesTest.cs                        |  6 +-
 .../RetryOptionsTests.cs                      |  6 +-
 .../StorageBindingTests.cs                    |  6 +-
 18 files changed, 121 insertions(+), 104 deletions(-)

diff --git a/sdk/Sdk.Generators/Constants.cs b/sdk/Sdk.Generators/Constants.cs
index 95ad3ddea..18e84c3b7 100644
--- a/sdk/Sdk.Generators/Constants.cs
+++ b/sdk/Sdk.Generators/Constants.cs
@@ -12,6 +12,7 @@ internal static class Languages
 
         internal static class BuildProperties
         {
+            internal const string GeneratedCodeNamespace = "build_property.FunctionsGeneratedCodeNamespace";
             internal const string EnableSourceGen = "build_property.FunctionsEnableMetadataSourceGen";
             internal const string EnablePlaceholder = "build_property.FunctionsEnableExecutorSourceGen";
             internal const string AutoRegisterGeneratedFunctionsExecutor = "build_property.FunctionsAutoRegisterGeneratedFunctionsExecutor";
diff --git a/sdk/Sdk.Generators/ExtensionStartupRunnerGenerator.cs b/sdk/Sdk.Generators/ExtensionStartupRunnerGenerator.cs
index 48b20d456..700f46299 100644
--- a/sdk/Sdk.Generators/ExtensionStartupRunnerGenerator.cs
+++ b/sdk/Sdk.Generators/ExtensionStartupRunnerGenerator.cs
@@ -69,7 +69,7 @@ public void Execute(GeneratorExecutionContext context)
                 return;
             }
 
-            var source = GenerateExtensionStartupRunner(extensionStartupTypeNames);
+            var source = GenerateExtensionStartupRunner(context, extensionStartupTypeNames);
             var sourceText = SourceText.From(source, encoding: Encoding.UTF8);
 
             // Add the source code to the compilation
@@ -81,18 +81,20 @@ public void Execute(GeneratorExecutionContext context)
         /// </summary>
         /// <param name="extensionStartupTypeNames">The types to add to the configuration/bootstrapping process.</param>
         /// <returns>The generated source code.</returns>
-        internal string GenerateExtensionStartupRunner(IList<string> extensionStartupTypeNames)
+        internal string GenerateExtensionStartupRunner(GeneratorExecutionContext context, IList<string> extensionStartupTypeNames)
         {
             string startupCodeExecutor = GenerateStartupCodeExecutorClass(extensionStartupTypeNames);
+            var ns = FunctionsUtil.GetNamespaceForGeneratedCode(context);
 
             return $$"""
                    // <auto-generated/>
                    using System;
+                   using Microsoft.Azure.Functions.Worker;
                    using Microsoft.Azure.Functions.Worker.Core;
        
-                   [assembly: WorkerExtensionStartupCodeExecutorInfo(typeof(Microsoft.Azure.Functions.Worker.WorkerExtensionStartupCodeExecutor))]
+                   [assembly: WorkerExtensionStartupCodeExecutorInfo(typeof({{ns}}.WorkerExtensionStartupCodeExecutor))]
        
-                   namespace Microsoft.Azure.Functions.Worker
+                   namespace {{ns}}
                    {
                        internal class WorkerExtensionStartupCodeExecutor : WorkerExtensionStartup
                        {
diff --git a/sdk/Sdk.Generators/FunctionExecutor/FunctionExecutorGenerator.Emitter.cs b/sdk/Sdk.Generators/FunctionExecutor/FunctionExecutorGenerator.Emitter.cs
index 7dc051d6e..abf0e51bf 100644
--- a/sdk/Sdk.Generators/FunctionExecutor/FunctionExecutorGenerator.Emitter.cs
+++ b/sdk/Sdk.Generators/FunctionExecutor/FunctionExecutorGenerator.Emitter.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading;
+using Microsoft.CodeAnalysis;
 
 namespace Microsoft.Azure.Functions.Worker.Sdk.Generators
 {
@@ -13,7 +13,7 @@ public partial class FunctionExecutorGenerator
     {
         internal static class Emitter
         {
-            internal static string Emit(IEnumerable<ExecutableFunction> functions, bool includeAutoRegistrationCode, CancellationToken cancellationToken)
+            internal static string Emit(GeneratorExecutionContext context, IEnumerable<ExecutableFunction> functions, bool includeAutoRegistrationCode)
             {
 
                 string result = $$"""
@@ -23,9 +23,10 @@ internal static string Emit(IEnumerable<ExecutableFunction> functions, bool incl
                          using System.Collections.Generic;
                          using Microsoft.Extensions.Hosting;
                          using Microsoft.Extensions.DependencyInjection;
+                         using Microsoft.Azure.Functions.Worker;
                          using Microsoft.Azure.Functions.Worker.Context.Features;
                          using Microsoft.Azure.Functions.Worker.Invocation;
-                         namespace Microsoft.Azure.Functions.Worker
+                         namespace {{FunctionsUtil.GetNamespaceForGeneratedCode(context)}}
                          {
                              internal class DirectFunctionExecutor : IFunctionExecutor
                              {
diff --git a/sdk/Sdk.Generators/FunctionExecutor/FunctionExecutorGenerator.cs b/sdk/Sdk.Generators/FunctionExecutor/FunctionExecutorGenerator.cs
index b886b96ec..4bbea665f 100644
--- a/sdk/Sdk.Generators/FunctionExecutor/FunctionExecutorGenerator.cs
+++ b/sdk/Sdk.Generators/FunctionExecutor/FunctionExecutorGenerator.cs
@@ -38,7 +38,7 @@ public void Execute(GeneratorExecutionContext context)
 
             var shouldIncludeAutoGeneratedAttributes = ShouldIncludeAutoGeneratedAttributes(context);
 
-            var text = Emitter.Emit(functions, shouldIncludeAutoGeneratedAttributes, context.CancellationToken);
+            var text = Emitter.Emit(context, functions, shouldIncludeAutoGeneratedAttributes);
             context.AddSource(Constants.FileNames.GeneratedFunctionExecutor, SourceText.From(text, Encoding.UTF8));
         }
 
diff --git a/sdk/Sdk.Generators/FunctionMetadataProviderGenerator/FunctionMetadataProviderGenerator.Emitter.cs b/sdk/Sdk.Generators/FunctionMetadataProviderGenerator/FunctionMetadataProviderGenerator.Emitter.cs
index 193a4e870..63016583a 100644
--- a/sdk/Sdk.Generators/FunctionMetadataProviderGenerator/FunctionMetadataProviderGenerator.Emitter.cs
+++ b/sdk/Sdk.Generators/FunctionMetadataProviderGenerator/FunctionMetadataProviderGenerator.Emitter.cs
@@ -5,6 +5,7 @@
 using System.Text;
 using System.Text.Json;
 using System.Threading;
+using Microsoft.CodeAnalysis;
 
 namespace Microsoft.Azure.Functions.Worker.Sdk.Generators
 {
@@ -18,9 +19,9 @@ internal sealed class Emitter
                 DictionaryKeyPolicy = JsonNamingPolicy.CamelCase
             };
 
-            public string Emit(IReadOnlyList<GeneratorFunctionMetadata> funcMetadata, bool includeAutoRegistrationCode, CancellationToken cancellationToken)
+            public string Emit(GeneratorExecutionContext context, IReadOnlyList<GeneratorFunctionMetadata> funcMetadata, bool includeAutoRegistrationCode)
             {
-                string functionMetadataInfo = AddFunctionMetadataInfo(funcMetadata, cancellationToken);
+                string functionMetadataInfo = AddFunctionMetadataInfo(funcMetadata, context.CancellationToken);
 
                 return $$"""
                          // <auto-generated/>
@@ -29,11 +30,12 @@ public string Emit(IReadOnlyList<GeneratorFunctionMetadata> funcMetadata, bool i
                          using System.Collections.Immutable;
                          using System.Text.Json;
                          using System.Threading.Tasks;
+                         using Microsoft.Azure.Functions.Worker;
                          using Microsoft.Azure.Functions.Worker.Core.FunctionMetadata;
                          using Microsoft.Extensions.DependencyInjection;
                          using Microsoft.Extensions.Hosting;
                      
-                         namespace Microsoft.Azure.Functions.Worker
+                         namespace {{FunctionsUtil.GetNamespaceForGeneratedCode(context)}}
                          {
                              public class GeneratedFunctionMetadataProvider : IFunctionMetadataProvider
                              {
diff --git a/sdk/Sdk.Generators/FunctionMetadataProviderGenerator/FunctionMetadataProviderGenerator.cs b/sdk/Sdk.Generators/FunctionMetadataProviderGenerator/FunctionMetadataProviderGenerator.cs
index 96b722e20..665bf2f44 100644
--- a/sdk/Sdk.Generators/FunctionMetadataProviderGenerator/FunctionMetadataProviderGenerator.cs
+++ b/sdk/Sdk.Generators/FunctionMetadataProviderGenerator/FunctionMetadataProviderGenerator.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Linq;
 using System.Text;
 using Microsoft.CodeAnalysis;
@@ -49,7 +48,7 @@ public void Execute(GeneratorExecutionContext context)
                 Emitter e = new();
                 var shouldIncludeAutoGeneratedAttributes = ShouldIncludeAutoGeneratedAttributes(context);
 
-                string result = e.Emit(functionMetadataInfo, shouldIncludeAutoGeneratedAttributes, context.CancellationToken);
+                string result = e.Emit(context, functionMetadataInfo, shouldIncludeAutoGeneratedAttributes);
 
                 context.AddSource(Constants.FileNames.GeneratedFunctionMetadata, SourceText.From(result, Encoding.UTF8));
             }
@@ -63,7 +62,7 @@ public void Initialize(GeneratorInitializationContext context)
         {
             context.RegisterForSyntaxNotifications(() => new FunctionMethodSyntaxReceiver());
         }
-        
+
         private static bool ShouldIncludeAutoGeneratedAttributes(GeneratorExecutionContext context)
         {
             if (!context.AnalyzerConfigOptions.GlobalOptions.TryGetValue(
@@ -77,15 +76,13 @@ private static bool ShouldIncludeAutoGeneratedAttributes(GeneratorExecutionConte
 
         private IEnumerable<IMethodSymbol> GetEntryAssemblyFunctions(List<MethodDeclarationSyntax> candidateMethods, GeneratorExecutionContext context)
         {
-            IList<IMethodSymbol>? entryAssemblyFuncs = new List<IMethodSymbol>();
-
             foreach (MethodDeclarationSyntax method in candidateMethods)
             {
                 var model = context.Compilation.GetSemanticModel(method.SyntaxTree);
 
-                if (FunctionsUtil.IsValidFunctionMethod(context, context.Compilation, model,  method))
+                if (FunctionsUtil.IsValidFunctionMethod(context, context.Compilation, model, method))
                 {
-                    IMethodSymbol? methodSymbol = (IMethodSymbol) model.GetDeclaredSymbol(method)!;
+                    IMethodSymbol? methodSymbol = (IMethodSymbol)model.GetDeclaredSymbol(method)!;
                     yield return methodSymbol;
                 }
             }
diff --git a/sdk/Sdk.Generators/FunctionsUtil.cs b/sdk/Sdk.Generators/FunctionsUtil.cs
index 429400f27..7d82af381 100644
--- a/sdk/Sdk.Generators/FunctionsUtil.cs
+++ b/sdk/Sdk.Generators/FunctionsUtil.cs
@@ -4,9 +4,6 @@
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis;
 using System.Linq;
-using System.Reflection.Metadata.Ecma335;
-using System.Data;
-using System;
 
 namespace Microsoft.Azure.Functions.Worker.Sdk.Generators
 {
@@ -77,5 +74,20 @@ internal static string GetFullyQualifiedMethodName(IMethodSymbol method)
             var fullyQualifiedClassName = method.ContainingSymbol.ToDisplayString();
             return $"{fullyQualifiedClassName}.{method.Name}";
         }
+
+        /// <summary>
+        /// Gets the namespace value to be used for the auto generated types.
+        /// </summary>
+        internal static string GetNamespaceForGeneratedCode(GeneratorExecutionContext context)
+        {
+            // If csproj has the msbuild property specified, use it's value.
+            if (context.AnalyzerConfigOptions.GlobalOptions.TryGetValue(Constants.BuildProperties.GeneratedCodeNamespace, out var namespaceValue))
+            {
+                return namespaceValue;
+            }
+
+            // Use root namespace.
+            return context.Compilation.Assembly.Name;
+        }
     }
 }
diff --git a/sdk/Sdk/Targets/Microsoft.Azure.Functions.Worker.Sdk.props b/sdk/Sdk/Targets/Microsoft.Azure.Functions.Worker.Sdk.props
index bac53404a..d24ff04fb 100644
--- a/sdk/Sdk/Targets/Microsoft.Azure.Functions.Worker.Sdk.props
+++ b/sdk/Sdk/Targets/Microsoft.Azure.Functions.Worker.Sdk.props
@@ -25,6 +25,7 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
     <CompilerVisibleProperty Include="FunctionsEnableExecutorSourceGen" />
     <CompilerVisibleProperty Include="FunctionsAutoRegisterGeneratedFunctionsExecutor" />
     <CompilerVisibleProperty Include="FunctionsAutoRegisterGeneratedMetadataProvider" />
+    <CompilerVisibleProperty Include="FunctionsGeneratedCodeNamespace" />
   </ItemGroup>
 <!--
   ***********************************************************************************************
diff --git a/test/Sdk.Generator.Tests/ExtensionStartupRunnerGeneratorTests.cs b/test/Sdk.Generator.Tests/ExtensionStartupRunnerGeneratorTests.cs
index 1b9306831..2c0d1dd98 100644
--- a/test/Sdk.Generator.Tests/ExtensionStartupRunnerGeneratorTests.cs
+++ b/test/Sdk.Generator.Tests/ExtensionStartupRunnerGeneratorTests.cs
@@ -32,11 +32,12 @@ public async Task StartupExecutorCodeGetsGenerated()
             string expectedOutput = """
                                     // <auto-generated/>
                                     using System;
+                                    using Microsoft.Azure.Functions.Worker;
                                     using Microsoft.Azure.Functions.Worker.Core;
 
-                                    [assembly: WorkerExtensionStartupCodeExecutorInfo(typeof(Microsoft.Azure.Functions.Worker.WorkerExtensionStartupCodeExecutor))]
+                                    [assembly: WorkerExtensionStartupCodeExecutorInfo(typeof(TestProject.WorkerExtensionStartupCodeExecutor))]
 
-                                    namespace Microsoft.Azure.Functions.Worker
+                                    namespace TestProject
                                     {
                                         internal class WorkerExtensionStartupCodeExecutor : WorkerExtensionStartup
                                         {
@@ -62,55 +63,6 @@ await TestHelpers.RunTestAsync<ExtensionStartupRunnerGenerator>(
                 expectedOutput);
         }
 
-        [Fact]
-        public void StartupExecutorCodeWithMultipleStartupsGetsGenerated()
-        {
-            // Source generation is based on referenced assembly.
-            var typeNames = new[]
-            {
-                "Microsoft.Azure.Functions.Tests.WorkerExtensionsSample.SampleExtensionStartup",
-                "Microsoft.Azure.Functions.Tests.WorkerExtensionsSample.SampleExtensionStartup2",
-            };
-
-            string expectedOutput = """
-                                    // <auto-generated/>
-                                    using System;
-                                    using Microsoft.Azure.Functions.Worker.Core;
-
-                                    [assembly: WorkerExtensionStartupCodeExecutorInfo(typeof(Microsoft.Azure.Functions.Worker.WorkerExtensionStartupCodeExecutor))]
-
-                                    namespace Microsoft.Azure.Functions.Worker
-                                    {
-                                        internal class WorkerExtensionStartupCodeExecutor : WorkerExtensionStartup
-                                        {
-                                            public override void Configure(IFunctionsWorkerApplicationBuilder applicationBuilder)
-                                            {
-                                                try
-                                                {
-                                                    new Microsoft.Azure.Functions.Tests.WorkerExtensionsSample.SampleExtensionStartup().Configure(applicationBuilder);
-                                                }
-                                                catch (Exception ex)
-                                                {
-                                                    Console.Error.WriteLine("Error calling Configure on Microsoft.Azure.Functions.Tests.WorkerExtensionsSample.SampleExtensionStartup instance."+ex.ToString());
-                                                }
-                                                try
-                                                {
-                                                    new Microsoft.Azure.Functions.Tests.WorkerExtensionsSample.SampleExtensionStartup2().Configure(applicationBuilder);
-                                                }
-                                                catch (Exception ex)
-                                                {
-                                                    Console.Error.WriteLine("Error calling Configure on Microsoft.Azure.Functions.Tests.WorkerExtensionsSample.SampleExtensionStartup2 instance."+ex.ToString());
-                                                }
-                                            }
-                                        }
-                                    }
-                                    """;
-
-            var source = new ExtensionStartupRunnerGenerator().GenerateExtensionStartupRunner(typeNames);
-
-            Assert.Equal(expectedOutput, source);
-        }
-
         [Fact]
         public async Task StartupExecutorCodeDoesNotGetsGeneratedWheNoExtensionAssembliesAreReferenced()
         {
@@ -144,11 +96,12 @@ public async Task DiagnosticErrorsAreReportedWhenStartupTypeIsInvalid()
             string expectedOutput = """
                                     // <auto-generated/>
                                     using System;
+                                    using Microsoft.Azure.Functions.Worker;
                                     using Microsoft.Azure.Functions.Worker.Core;
 
-                                    [assembly: WorkerExtensionStartupCodeExecutorInfo(typeof(Microsoft.Azure.Functions.Worker.WorkerExtensionStartupCodeExecutor))]
+                                    [assembly: WorkerExtensionStartupCodeExecutorInfo(typeof(MyCompany.MyProject.MyApp.WorkerExtensionStartupCodeExecutor))]
 
-                                    namespace Microsoft.Azure.Functions.Worker
+                                    namespace MyCompany.MyProject.MyApp
                                     {
                                         internal class WorkerExtensionStartupCodeExecutor : WorkerExtensionStartup
                                         {
@@ -177,12 +130,19 @@ public override void Configure(IFunctionsWorkerApplicationBuilder applicationBui
                 .WithArguments("Worker.Extensions.Sample_IncorrectImplementation.SampleIncorrectExtensionStartup")
             };
 
+            // override the namespace value for generated types using msbuild property.
+            var buildPropertiesDict = new Dictionary<string, string>()
+            {
+                {  Constants.BuildProperties.GeneratedCodeNamespace, "MyCompany.MyProject.MyApp"}
+            };
+
             await TestHelpers.RunTestAsync<ExtensionStartupRunnerGenerator>(
                 referencedExtensionAssemblies,
                 InputCode,
                 expectedGeneratedFileName,
                 expectedOutput,
-                expectedDiagnosticResults);
+                expectedDiagnosticResults,
+                buildPropertiesDict);
         }
     }
 }
diff --git a/test/Sdk.Generator.Tests/FunctionExecutor/FunctionExecutorGeneratorTests.cs b/test/Sdk.Generator.Tests/FunctionExecutor/FunctionExecutorGeneratorTests.cs
index d4cd271d9..1d71aeb85 100644
--- a/test/Sdk.Generator.Tests/FunctionExecutor/FunctionExecutorGeneratorTests.cs
+++ b/test/Sdk.Generator.Tests/FunctionExecutor/FunctionExecutorGeneratorTests.cs
@@ -105,9 +105,10 @@ public void Run2([QueueTrigger(""myqueue-items"")] string message)
 using System.Collections.Generic;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Context.Features;
 using Microsoft.Azure.Functions.Worker.Invocation;
-namespace Microsoft.Azure.Functions.Worker
+namespace TestProject
 {{
     internal class DirectFunctionExecutor : IFunctionExecutor
     {{
@@ -211,9 +212,10 @@ public HttpResponseData Run2([HttpTrigger(AuthorizationLevel.User, ""get"")] Htt
 using System.Collections.Generic;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Context.Features;
 using Microsoft.Azure.Functions.Worker.Invocation;
-namespace Microsoft.Azure.Functions.Worker
+namespace MyCompany.MyProject.MyApp
 {{
     internal class DirectFunctionExecutor : IFunctionExecutor
     {{
@@ -251,11 +253,18 @@ public async ValueTask ExecuteAsync(FunctionContext context)
 {GetExpectedExtensionMethodCode()}
 }}".Replace("'", "\"");
 
+            // override the namespace value for generated types using msbuild property.
+            var buildPropertiesDict = new Dictionary<string, string>()
+            {
+                {  Constants.BuildProperties.GeneratedCodeNamespace, "MyCompany.MyProject.MyApp"}
+            };
+
             await TestHelpers.RunTestAsync<FunctionExecutorGenerator>(
                 _referencedAssemblies,
                 inputSourceCode,
                 Constants.FileNames.GeneratedFunctionExecutor,
-                expectedOutput);
+                expectedOutput,
+                buildPropertiesDictionary: buildPropertiesDict);
         }
 
         [Fact]
@@ -338,9 +347,10 @@ public static Task RunAsync1([EventHubTrigger(""items"", Connection = ""Con"")]
 using System.Collections.Generic;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Context.Features;
 using Microsoft.Azure.Functions.Worker.Invocation;
-namespace Microsoft.Azure.Functions.Worker
+namespace TestProject
 {{
     internal class DirectFunctionExecutor : IFunctionExecutor
     {{
@@ -444,9 +454,10 @@ public HttpResponseData Run1([HttpTrigger(AuthorizationLevel.User, ""get"")] Htt
 using System.Collections.Generic;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Context.Features;
 using Microsoft.Azure.Functions.Worker.Invocation;
-namespace Microsoft.Azure.Functions.Worker
+namespace TestProject
 {{
     internal class DirectFunctionExecutor : IFunctionExecutor
     {{
diff --git a/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/AutoConfigureStartupTypeTests.cs b/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/AutoConfigureStartupTypeTests.cs
index a4fc97dea..d88a710c5 100644
--- a/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/AutoConfigureStartupTypeTests.cs
+++ b/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/AutoConfigureStartupTypeTests.cs
@@ -67,11 +67,12 @@ public static void HttpTrigger([HttpTrigger(AuthorizationLevel.Admin, "get", "po
 using System.Collections.Immutable;
 using System.Text.Json;
 using System.Threading.Tasks;
+using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Core.FunctionMetadata;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
-namespace Microsoft.Azure.Functions.Worker
+namespace TestProject
 {{
     public class GeneratedFunctionMetadataProvider : IFunctionMetadataProvider
     {{
diff --git a/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/DependentAssemblyTest.cs b/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/DependentAssemblyTest.cs
index 621a7232d..f5cdd7ff4 100644
--- a/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/DependentAssemblyTest.cs
+++ b/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/DependentAssemblyTest.cs
@@ -67,11 +67,12 @@ public static HttpResponseData Run([HttpTrigger(AuthorizationLevel.Anonymous, "g
                 using System.Collections.Immutable;
                 using System.Text.Json;
                 using System.Threading.Tasks;
+                using Microsoft.Azure.Functions.Worker;
                 using Microsoft.Azure.Functions.Worker.Core.FunctionMetadata;
                 using Microsoft.Extensions.DependencyInjection;
                 using Microsoft.Extensions.Hosting;
 
-                namespace Microsoft.Azure.Functions.Worker
+                namespace TestProject
                 {
                     public class GeneratedFunctionMetadataProvider : IFunctionMetadataProvider
                     {
diff --git a/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/EventHubsBindingsTests.cs b/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/EventHubsBindingsTests.cs
index b09544bec..9423010c3 100644
--- a/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/EventHubsBindingsTests.cs
+++ b/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/EventHubsBindingsTests.cs
@@ -87,11 +87,12 @@ public class EventHubsInput
                 using System.Collections.Immutable;
                 using System.Text.Json;
                 using System.Threading.Tasks;
+                using Microsoft.Azure.Functions.Worker;
                 using Microsoft.Azure.Functions.Worker.Core.FunctionMetadata;
                 using Microsoft.Extensions.DependencyInjection;
                 using Microsoft.Extensions.Hosting;
 
-                namespace Microsoft.Azure.Functions.Worker
+                namespace TestProject
                 {
                     public class GeneratedFunctionMetadataProvider : IFunctionMetadataProvider
                     {
@@ -211,11 +212,12 @@ IEnumerator<int> IEnumerable<int>.GetEnumerator()
                 using System.Collections.Immutable;
                 using System.Text.Json;
                 using System.Threading.Tasks;
+                using Microsoft.Azure.Functions.Worker;
                 using Microsoft.Azure.Functions.Worker.Core.FunctionMetadata;
                 using Microsoft.Extensions.DependencyInjection;
                 using Microsoft.Extensions.Hosting;
 
-                namespace Microsoft.Azure.Functions.Worker
+                namespace TestProject
                 {
                     public class GeneratedFunctionMetadataProvider : IFunctionMetadataProvider
                     {
@@ -302,11 +304,12 @@ public static void EnumerableBinaryInputFunction<T>([EventHubTrigger("test", Con
                 using System.Collections.Immutable;
                 using System.Text.Json;
                 using System.Threading.Tasks;
+                using Microsoft.Azure.Functions.Worker;
                 using Microsoft.Azure.Functions.Worker.Core.FunctionMetadata;
                 using Microsoft.Extensions.DependencyInjection;
                 using Microsoft.Extensions.Hosting;
 
-                namespace Microsoft.Azure.Functions.Worker
+                namespace TestProject
                 {
                     public class GeneratedFunctionMetadataProvider : IFunctionMetadataProvider
                     {
@@ -440,11 +443,12 @@ public class EnumerableStringNestedGenericTestClass<TK> : EnumerableStringTestCl
                 using System.Collections.Immutable;
                 using System.Text.Json;
                 using System.Threading.Tasks;
+                using Microsoft.Azure.Functions.Worker;
                 using Microsoft.Azure.Functions.Worker.Core.FunctionMetadata;
                 using Microsoft.Extensions.DependencyInjection;
                 using Microsoft.Extensions.Hosting;
 
-                namespace Microsoft.Azure.Functions.Worker
+                namespace TestProject
                 {
                     public class GeneratedFunctionMetadataProvider : IFunctionMetadataProvider
                     {
@@ -588,11 +592,12 @@ public class EnumerableBinaryNestedTestClass : EnumerableBinaryTestClass
                 using System.Collections.Immutable;
                 using System.Text.Json;
                 using System.Threading.Tasks;
+                using Microsoft.Azure.Functions.Worker;
                 using Microsoft.Azure.Functions.Worker.Core.FunctionMetadata;
                 using Microsoft.Extensions.DependencyInjection;
                 using Microsoft.Extensions.Hosting;
 
-                namespace Microsoft.Azure.Functions.Worker
+                namespace TestProject
                 {
                     public class GeneratedFunctionMetadataProvider : IFunctionMetadataProvider
                     {
@@ -699,11 +704,12 @@ public class Poco
                 using System.Collections.Immutable;
                 using System.Text.Json;
                 using System.Threading.Tasks;
+                using Microsoft.Azure.Functions.Worker;
                 using Microsoft.Azure.Functions.Worker.Core.FunctionMetadata;
                 using Microsoft.Extensions.DependencyInjection;
                 using Microsoft.Extensions.Hosting;
 
-                namespace Microsoft.Azure.Functions.Worker
+                namespace TestProject
                 {
                     public class GeneratedFunctionMetadataProvider : IFunctionMetadataProvider
                     {
diff --git a/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/HttpTriggerTests.cs b/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/HttpTriggerTests.cs
index 5fdbf0a4e..b49afe09b 100644
--- a/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/HttpTriggerTests.cs
+++ b/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/HttpTriggerTests.cs
@@ -1,6 +1,7 @@
 // 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.Generic;
 using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.Azure.Functions.Worker.Sdk.Generators;
@@ -65,11 +66,12 @@ public static HttpResponseData Run([HttpTrigger(AuthorizationLevel.Anonymous, "g
                 using System.Collections.Immutable;
                 using System.Text.Json;
                 using System.Threading.Tasks;
+                using Microsoft.Azure.Functions.Worker;
                 using Microsoft.Azure.Functions.Worker.Core.FunctionMetadata;
                 using Microsoft.Extensions.DependencyInjection;
                 using Microsoft.Extensions.Hosting;
 
-                namespace Microsoft.Azure.Functions.Worker
+                namespace TestProject
                 {
                     public class GeneratedFunctionMetadataProvider : IFunctionMetadataProvider
                     {
@@ -150,11 +152,12 @@ public static void HttpTrigger([HttpTrigger(AuthorizationLevel.Admin, "get", "po
                 using System.Collections.Immutable;
                 using System.Text.Json;
                 using System.Threading.Tasks;
+                using Microsoft.Azure.Functions.Worker;
                 using Microsoft.Azure.Functions.Worker.Core.FunctionMetadata;
                 using Microsoft.Extensions.DependencyInjection;
                 using Microsoft.Extensions.Hosting;
 
-                namespace Microsoft.Azure.Functions.Worker
+                namespace TestProject
                 {
                     public class GeneratedFunctionMetadataProvider : IFunctionMetadataProvider
                     {
@@ -239,11 +242,12 @@ public class JustHttp
                 using System.Collections.Immutable;
                 using System.Text.Json;
                 using System.Threading.Tasks;
+                using Microsoft.Azure.Functions.Worker;
                 using Microsoft.Azure.Functions.Worker.Core.FunctionMetadata;
                 using Microsoft.Extensions.DependencyInjection;
                 using Microsoft.Extensions.Hosting;
 
-                namespace Microsoft.Azure.Functions.Worker
+                namespace MyCompany.MyProject.MyApp
                 {
                     public class GeneratedFunctionMetadataProvider : IFunctionMetadataProvider
                     {
@@ -285,12 +289,18 @@ public static IHostBuilder ConfigureGeneratedFunctionMetadataProvider(this IHost
                     }
                 }
                 """;
+                // override the namespace value for generated types using msbuild property.
+                var buildPropertiesDict = new Dictionary<string, string>()
+                {
+                    {  Constants.BuildProperties.GeneratedCodeNamespace, "MyCompany.MyProject.MyApp"}
+                };
 
                 await TestHelpers.RunTestAsync<FunctionMetadataProviderGenerator>(
                     _referencedExtensionAssemblies,
                     inputCode,
                     expectedGeneratedFileName,
-                    expectedOutput);
+                    expectedOutput,
+                    buildPropertiesDictionary: buildPropertiesDict);
             }
         }
     }
diff --git a/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/IntegratedTriggersAndBindingsTests.cs b/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/IntegratedTriggersAndBindingsTests.cs
index 0171928c8..39c337fc4 100644
--- a/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/IntegratedTriggersAndBindingsTests.cs
+++ b/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/IntegratedTriggersAndBindingsTests.cs
@@ -88,11 +88,12 @@ public class MyOutputType
                 using System.Collections.Immutable;
                 using System.Text.Json;
                 using System.Threading.Tasks;
+                using Microsoft.Azure.Functions.Worker;
                 using Microsoft.Azure.Functions.Worker.Core.FunctionMetadata;
                 using Microsoft.Extensions.DependencyInjection;
                 using Microsoft.Extensions.Hosting;
 
-                namespace Microsoft.Azure.Functions.Worker
+                namespace TestProject
                 {
                     public class GeneratedFunctionMetadataProvider : IFunctionMetadataProvider
                     {
@@ -201,11 +202,12 @@ public class Book
                 using System.Collections.Immutable;
                 using System.Text.Json;
                 using System.Threading.Tasks;
+                using Microsoft.Azure.Functions.Worker;
                 using Microsoft.Azure.Functions.Worker.Core.FunctionMetadata;
                 using Microsoft.Extensions.DependencyInjection;
                 using Microsoft.Extensions.Hosting;
 
-                namespace Microsoft.Azure.Functions.Worker
+                namespace TestProject
                 {
                     public class GeneratedFunctionMetadataProvider : IFunctionMetadataProvider
                     {
@@ -302,11 +304,12 @@ public FakeAttribute(string name)
                 using System.Collections.Immutable;
                 using System.Text.Json;
                 using System.Threading.Tasks;
+                using Microsoft.Azure.Functions.Worker;
                 using Microsoft.Azure.Functions.Worker.Core.FunctionMetadata;
                 using Microsoft.Extensions.DependencyInjection;
                 using Microsoft.Extensions.Hosting;
 
-                namespace Microsoft.Azure.Functions.Worker
+                namespace TestProject
                 {
                     public class GeneratedFunctionMetadataProvider : IFunctionMetadataProvider
                     {
@@ -388,11 +391,12 @@ public Task RunTimer([TimerTrigger("0 0 0 * * *", RunOnStartup = false)] object
                 using System.Collections.Immutable;
                 using System.Text.Json;
                 using System.Threading.Tasks;
+                using Microsoft.Azure.Functions.Worker;
                 using Microsoft.Azure.Functions.Worker.Core.FunctionMetadata;
                 using Microsoft.Extensions.DependencyInjection;
                 using Microsoft.Extensions.Hosting;
 
-                namespace Microsoft.Azure.Functions.Worker
+                namespace TestProject
                 {
                     public class GeneratedFunctionMetadataProvider : IFunctionMetadataProvider
                     {
@@ -473,11 +477,12 @@ public Task<HttpResponseData> Http([HttpTrigger(AuthorizationLevel.Admin, "get",
                 using System.Collections.Immutable;
                 using System.Text.Json;
                 using System.Threading.Tasks;
+                using Microsoft.Azure.Functions.Worker;
                 using Microsoft.Azure.Functions.Worker.Core.FunctionMetadata;
                 using Microsoft.Extensions.DependencyInjection;
                 using Microsoft.Extensions.Hosting;
 
-                namespace Microsoft.Azure.Functions.Worker
+                namespace TestProject
                 {
                     public class GeneratedFunctionMetadataProvider : IFunctionMetadataProvider
                     {
@@ -568,11 +573,12 @@ public async Task<HttpResponseData> RunAsync2([HttpTrigger(AuthorizationLevel.An
                 using System.Collections.Immutable;
                 using System.Text.Json;
                 using System.Threading.Tasks;
+                using Microsoft.Azure.Functions.Worker;
                 using Microsoft.Azure.Functions.Worker.Core.FunctionMetadata;
                 using Microsoft.Extensions.DependencyInjection;
                 using Microsoft.Extensions.Hosting;
 
-                namespace Microsoft.Azure.Functions.Worker
+                namespace TestProject
                 {
                     public class GeneratedFunctionMetadataProvider : IFunctionMetadataProvider
                     {
diff --git a/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/NestedTypesTest.cs b/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/NestedTypesTest.cs
index a087cb087..c85e0928a 100644
--- a/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/NestedTypesTest.cs
+++ b/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/NestedTypesTest.cs
@@ -71,11 +71,12 @@ public static HttpResponseData Run(HttpRequestData req)
                 using System.Collections.Immutable;
                 using System.Text.Json;
                 using System.Threading.Tasks;
+                using Microsoft.Azure.Functions.Worker;
                 using Microsoft.Azure.Functions.Worker.Core.FunctionMetadata;
                 using Microsoft.Extensions.DependencyInjection;
                 using Microsoft.Extensions.Hosting;
 
-                namespace Microsoft.Azure.Functions.Worker
+                namespace TestProject
                 {
                     public class GeneratedFunctionMetadataProvider : IFunctionMetadataProvider
                     {
@@ -157,11 +158,12 @@ public static HttpResponseData Run([HttpTrigger(AuthorizationLevel.User, "get")]
                 using System.Collections.Immutable;
                 using System.Text.Json;
                 using System.Threading.Tasks;
+                using Microsoft.Azure.Functions.Worker;
                 using Microsoft.Azure.Functions.Worker.Core.FunctionMetadata;
                 using Microsoft.Extensions.DependencyInjection;
                 using Microsoft.Extensions.Hosting;
 
-                namespace Microsoft.Azure.Functions.Worker
+                namespace TestProject
                 {
                     public class GeneratedFunctionMetadataProvider : IFunctionMetadataProvider
                     {
diff --git a/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/RetryOptionsTests.cs b/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/RetryOptionsTests.cs
index e105f64f8..f8b122c85 100644
--- a/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/RetryOptionsTests.cs
+++ b/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/RetryOptionsTests.cs
@@ -72,11 +72,12 @@ public static void Run([TimerTrigger("0 */5 * * * *")] TimerInfo timerInfo,
                 using System.Collections.Immutable;
                 using System.Text.Json;
                 using System.Threading.Tasks;
+                using Microsoft.Azure.Functions.Worker;
                 using Microsoft.Azure.Functions.Worker.Core.FunctionMetadata;
                 using Microsoft.Extensions.DependencyInjection;
                 using Microsoft.Extensions.Hosting;
                 
-                namespace Microsoft.Azure.Functions.Worker
+                namespace TestProject
                 {
                     public class GeneratedFunctionMetadataProvider : IFunctionMetadataProvider
                     {
@@ -161,11 +162,12 @@ public static void Run([TimerTrigger("0 */5 * * * *")] TimerInfo timerInfo,
                 using System.Collections.Immutable;
                 using System.Text.Json;
                 using System.Threading.Tasks;
+                using Microsoft.Azure.Functions.Worker;
                 using Microsoft.Azure.Functions.Worker.Core.FunctionMetadata;
                 using Microsoft.Extensions.DependencyInjection;
                 using Microsoft.Extensions.Hosting;
                 
-                namespace Microsoft.Azure.Functions.Worker
+                namespace TestProject
                 {
                     public class GeneratedFunctionMetadataProvider : IFunctionMetadataProvider
                     {
diff --git a/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/StorageBindingTests.cs b/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/StorageBindingTests.cs
index 14524c18b..e5028230b 100644
--- a/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/StorageBindingTests.cs
+++ b/test/Sdk.Generator.Tests/FunctionMetadataProviderGeneratorTests/StorageBindingTests.cs
@@ -75,11 +75,12 @@ public string QueueTriggerAndOutputFunction([QueueTrigger("test-input-dotnet-iso
                 using System.Collections.Immutable;
                 using System.Text.Json;
                 using System.Threading.Tasks;
+                using Microsoft.Azure.Functions.Worker;
                 using Microsoft.Azure.Functions.Worker.Core.FunctionMetadata;
                 using Microsoft.Extensions.DependencyInjection;
                 using Microsoft.Extensions.Hosting;
 
-                namespace Microsoft.Azure.Functions.Worker
+                namespace TestProject
                 {
                     public class GeneratedFunctionMetadataProvider : IFunctionMetadataProvider
                     {
@@ -180,11 +181,12 @@ public object BlobsToQueue(
                 using System.Collections.Immutable;
                 using System.Text.Json;
                 using System.Threading.Tasks;
+                using Microsoft.Azure.Functions.Worker;
                 using Microsoft.Azure.Functions.Worker.Core.FunctionMetadata;
                 using Microsoft.Extensions.DependencyInjection;
                 using Microsoft.Extensions.Hosting;
 
-                namespace Microsoft.Azure.Functions.Worker
+                namespace TestProject
                 {
                     public class GeneratedFunctionMetadataProvider : IFunctionMetadataProvider
                     {

From 512d1316999e4c555e04d1a3ba637f0e87c07a7c Mon Sep 17 00:00:00 2001
From: Shyju Krishnankutty <connectshyju@gmail.com>
Date: Mon, 25 Sep 2023 08:32:59 -0700
Subject: [PATCH 2/4] release notes

---
 sdk/release_notes.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sdk/release_notes.md b/sdk/release_notes.md
index fcc474fc2..bb5272629 100644
--- a/sdk/release_notes.md
+++ b/sdk/release_notes.md
@@ -17,3 +17,5 @@
 - Parse named arguments by type (#1877)
 - Refactor source gen to walk dependent assemblies (#1896)
 - Add diagnostic descriptor logs for parsing binding arguments in source gen (#1882)
+- Use project root namespace for generated types (#1158)
+

From b98531b18a9a84ac35c0517161ae0cf4100dc985 Mon Sep 17 00:00:00 2001
From: Shyju Krishnankutty <connectshyju@gmail.com>
Date: Tue, 26 Sep 2023 07:48:49 -0700
Subject: [PATCH 3/4] Using "RootNamespace" msbuild property and adding null
 check

---
 sdk/Sdk.Generators/Constants.cs                   |  1 +
 .../ExtensionStartupRunnerGenerator.cs            |  6 +++---
 sdk/Sdk.Generators/FunctionsUtil.cs               | 15 +++++++++------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/sdk/Sdk.Generators/Constants.cs b/sdk/Sdk.Generators/Constants.cs
index 18e84c3b7..c64b01633 100644
--- a/sdk/Sdk.Generators/Constants.cs
+++ b/sdk/Sdk.Generators/Constants.cs
@@ -12,6 +12,7 @@ internal static class Languages
 
         internal static class BuildProperties
         {
+            internal const string MSBuildRootNamespace = "build_property.RootNamespace";
             internal const string GeneratedCodeNamespace = "build_property.FunctionsGeneratedCodeNamespace";
             internal const string EnableSourceGen = "build_property.FunctionsEnableMetadataSourceGen";
             internal const string EnablePlaceholder = "build_property.FunctionsEnableExecutorSourceGen";
diff --git a/sdk/Sdk.Generators/ExtensionStartupRunnerGenerator.cs b/sdk/Sdk.Generators/ExtensionStartupRunnerGenerator.cs
index 700f46299..48754e943 100644
--- a/sdk/Sdk.Generators/ExtensionStartupRunnerGenerator.cs
+++ b/sdk/Sdk.Generators/ExtensionStartupRunnerGenerator.cs
@@ -84,7 +84,7 @@ public void Execute(GeneratorExecutionContext context)
         internal string GenerateExtensionStartupRunner(GeneratorExecutionContext context, IList<string> extensionStartupTypeNames)
         {
             string startupCodeExecutor = GenerateStartupCodeExecutorClass(extensionStartupTypeNames);
-            var ns = FunctionsUtil.GetNamespaceForGeneratedCode(context);
+            var namespaceValue = FunctionsUtil.GetNamespaceForGeneratedCode(context);
 
             return $$"""
                    // <auto-generated/>
@@ -92,9 +92,9 @@ internal string GenerateExtensionStartupRunner(GeneratorExecutionContext context
                    using Microsoft.Azure.Functions.Worker;
                    using Microsoft.Azure.Functions.Worker.Core;
        
-                   [assembly: WorkerExtensionStartupCodeExecutorInfo(typeof({{ns}}.WorkerExtensionStartupCodeExecutor))]
+                   [assembly: WorkerExtensionStartupCodeExecutorInfo(typeof({{namespaceValue}}.WorkerExtensionStartupCodeExecutor))]
        
-                   namespace {{ns}}
+                   namespace {{namespaceValue}}
                    {
                        internal class WorkerExtensionStartupCodeExecutor : WorkerExtensionStartup
                        {
diff --git a/sdk/Sdk.Generators/FunctionsUtil.cs b/sdk/Sdk.Generators/FunctionsUtil.cs
index 7d82af381..7f5046aed 100644
--- a/sdk/Sdk.Generators/FunctionsUtil.cs
+++ b/sdk/Sdk.Generators/FunctionsUtil.cs
@@ -15,7 +15,7 @@ internal static class FunctionsUtil
         internal static bool IsValidFunctionMethod(
             GeneratorExecutionContext context,
             Compilation compilation,
-            SemanticModel model, 
+            SemanticModel model,
             MethodDeclarationSyntax method)
         {
             var methodSymbol = model.GetDeclaredSymbol(method);
@@ -48,7 +48,7 @@ internal static bool IsFunctionSymbol(ISymbol symbol, Compilation compilation)
             return false;
         }
 
-        internal static bool TryGetFunctionName(ISymbol symbol, Compilation compilation, out string? functionName) 
+        internal static bool TryGetFunctionName(ISymbol symbol, Compilation compilation, out string? functionName)
         {
             functionName = null;
 
@@ -57,7 +57,7 @@ internal static bool TryGetFunctionName(ISymbol symbol, Compilation compilation,
 
             if (functionAttribute is not null)
             {
-                functionName = (string) functionAttribute.ConstructorArguments.First().Value!;
+                functionName = (string)functionAttribute.ConstructorArguments.First().Value!;
                 return true;
             }
 
@@ -81,13 +81,16 @@ internal static string GetFullyQualifiedMethodName(IMethodSymbol method)
         internal static string GetNamespaceForGeneratedCode(GeneratorExecutionContext context)
         {
             // If csproj has the msbuild property specified, use it's value.
-            if (context.AnalyzerConfigOptions.GlobalOptions.TryGetValue(Constants.BuildProperties.GeneratedCodeNamespace, out var namespaceValue))
+            if (context.AnalyzerConfigOptions.GlobalOptions.TryGetValue(Constants.BuildProperties.GeneratedCodeNamespace, out var namespaceValue)
+                && !string.IsNullOrWhiteSpace(namespaceValue))
             {
                 return namespaceValue;
             }
 
-            // Use root namespace.
-            return context.Compilation.Assembly.Name;
+            // Get the "RootNamespace" msbuild property value.(This gets populated in Microsoft.NET.Sdk.props and can be overridden by user in their function app)
+            context.AnalyzerConfigOptions.GlobalOptions.TryGetValue(Constants.BuildProperties.MSBuildRootNamespace, out var rootNamespaceValue);
+
+            return rootNamespaceValue!;
         }
     }
 }

From 5d457215832cfe1ae66117fe2b134cd6d2efb867 Mon Sep 17 00:00:00 2001
From: Shyju Krishnankutty <connectshyju@gmail.com>
Date: Tue, 26 Sep 2023 08:10:21 -0700
Subject: [PATCH 4/4] Adding "RootNamespace" to global configs in the tests

---
 test/Sdk.Generator.Tests/TestHelpers.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/Sdk.Generator.Tests/TestHelpers.cs b/test/Sdk.Generator.Tests/TestHelpers.cs
index 2a6e3ef4a..c1d015ebc 100644
--- a/test/Sdk.Generator.Tests/TestHelpers.cs
+++ b/test/Sdk.Generator.Tests/TestHelpers.cs
@@ -48,7 +48,8 @@ public static Task RunTestAsync<TSourceGenerator>(
             // Enable SourceGen & Placeholder MSBuild Properties for testing
             var config = $@"is_global = true
                             build_property.FunctionsEnableExecutorSourceGen = {true}
-                            build_property.FunctionsEnableMetadataSourceGen = {true}";
+                            build_property.FunctionsEnableMetadataSourceGen = {true}
+                            build_property.RootNamespace = TestProject";
 
             // Add test specific MSBuild properties.
             if (buildPropertiesDictionary is not null)