From 736eb890d70debf5c74d89daefa402f7a581d109 Mon Sep 17 00:00:00 2001
From: Wei Hu <huwe@microsoft.com>
Date: Tue, 21 Oct 2025 12:05:30 +0800
Subject: [PATCH 1/3] Skip shared/arm files during scaffolding, it has been
 handled in central place

---
 eng/Directory.Build.Common.targets            |  2 +-
 .../NewManagementProjectScaffolding.cs        | 19 +------------------
 .../Azure.Generator.MgmtTypeSpec.Tests.csproj |  4 ----
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/eng/Directory.Build.Common.targets b/eng/Directory.Build.Common.targets
index 24e88160c10e..2188d0207e57 100644
--- a/eng/Directory.Build.Common.targets
+++ b/eng/Directory.Build.Common.targets
@@ -220,7 +220,7 @@
     <ExcludeMgmtCoreShared Condition="'$(ExcludeMgmtCoreShared)' == ''">false</ExcludeMgmtCoreShared>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(IsMgmtSubLibrary)' == 'true' and '$(IsMgmtLibrary)' == 'true' and '$(IsTestProject)' != 'true' and '$(ExcludeMgmtCoreShared)' == 'false'">
+  <ItemGroup Condition="('$(IsGeneratorLibraryGenerationTest)' == 'true' or ('$(IsMgmtSubLibrary)' == 'true' and '$(IsMgmtLibrary)' == 'true' and '$(IsTestProject)' != 'true')) and '$(ExcludeMgmtCoreShared)' == 'false'">
     <Compile Include="$(MgmtCoreShared)/**/*.cs"
                  LinkBase="Shared/Management" />
   </ItemGroup>
diff --git a/eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/Primitives/NewManagementProjectScaffolding.cs b/eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/Primitives/NewManagementProjectScaffolding.cs
index cc407e7326c5..b69af4f4b977 100644
--- a/eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/Primitives/NewManagementProjectScaffolding.cs
+++ b/eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/Primitives/NewManagementProjectScaffolding.cs
@@ -9,24 +9,7 @@ namespace Azure.Generator.Management.Primitives
 {
     internal class NewManagementProjectScaffolding : NewAzureProjectScaffolding
     {
-        private const string SharedArmLinkBase = "Shared/Arm";
-
-        private const string RelativeArmSegment = "sdk/resourcemanager/Azure.ResourceManager/src/Shared/";
-
         protected override IReadOnlyList<CSharpProjectCompileInclude> BuildCompileIncludes()
-        {
-            var compileIncludes = new List<CSharpProjectCompileInclude>();
-            foreach (var armShareFile in armSharedFiles)
-            {
-                compileIncludes.Add(new CSharpProjectCompileInclude(GetCompileInclude(armShareFile, RelativeArmSegment), SharedArmLinkBase));
-            }
-
-            return compileIncludes;
-        }
-
-        private static IReadOnlyList<string> armSharedFiles = new List<string>
-        {
-            "SharedExtensions.cs"
-        };
+            => new List<CSharpProjectCompileInclude>();
     }
 }
diff --git a/eng/packages/http-client-csharp-mgmt/generator/TestProjects/Local/Mgmt-TypeSpec/src/Azure.Generator.MgmtTypeSpec.Tests.csproj b/eng/packages/http-client-csharp-mgmt/generator/TestProjects/Local/Mgmt-TypeSpec/src/Azure.Generator.MgmtTypeSpec.Tests.csproj
index acecf6cbf1fa..86a1f03d5636 100644
--- a/eng/packages/http-client-csharp-mgmt/generator/TestProjects/Local/Mgmt-TypeSpec/src/Azure.Generator.MgmtTypeSpec.Tests.csproj
+++ b/eng/packages/http-client-csharp-mgmt/generator/TestProjects/Local/Mgmt-TypeSpec/src/Azure.Generator.MgmtTypeSpec.Tests.csproj
@@ -6,8 +6,4 @@
     <PackageTags>Azure.Generator.MgmtTypeSpec.Tests</PackageTags>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)../../../../../../../../sdk/resourcemanager/Azure.ResourceManager/src/Shared/SharedExtensions.cs" LinkBase="Shared/Arm" />
-  </ItemGroup>
 </Project>

From 034d8ed90bf41e7360772b27f8fb159de4bdd62e Mon Sep 17 00:00:00 2001
From: Wei Hu <live1206@gmail.com>
Date: Tue, 21 Oct 2025 12:07:06 +0800
Subject: [PATCH 2/3] Update
 eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/Primitives/NewManagementProjectScaffolding.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .../src/Primitives/NewManagementProjectScaffolding.cs           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/Primitives/NewManagementProjectScaffolding.cs b/eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/Primitives/NewManagementProjectScaffolding.cs
index b69af4f4b977..5003d8c4de55 100644
--- a/eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/Primitives/NewManagementProjectScaffolding.cs
+++ b/eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/Primitives/NewManagementProjectScaffolding.cs
@@ -10,6 +10,6 @@ namespace Azure.Generator.Management.Primitives
     internal class NewManagementProjectScaffolding : NewAzureProjectScaffolding
     {
         protected override IReadOnlyList<CSharpProjectCompileInclude> BuildCompileIncludes()
-            => new List<CSharpProjectCompileInclude>();
+            => Array.Empty<CSharpProjectCompileInclude>();
     }
 }

From acc9cc717bd31236ad4012e35b338227f55ec4a1 Mon Sep 17 00:00:00 2001
From: Wei Hu <huwe@microsoft.com>
Date: Tue, 21 Oct 2025 12:08:21 +0800
Subject: [PATCH 3/3] fix build

---
 .../src/Primitives/NewManagementProjectScaffolding.cs            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/Primitives/NewManagementProjectScaffolding.cs b/eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/Primitives/NewManagementProjectScaffolding.cs
index 5003d8c4de55..17dc1ea163ac 100644
--- a/eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/Primitives/NewManagementProjectScaffolding.cs
+++ b/eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/Primitives/NewManagementProjectScaffolding.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+using System;
 using System.Collections.Generic;
 using Azure.Generator.Primitives;
 using Microsoft.TypeSpec.Generator.Primitives;