Skip to content

Skip shared/arm files during scaffolding, handle it centrally #53381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 22, 2025
Merged

Skip shared/arm files during scaffolding, handle it centrally #53381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
736eb89
Skip shared/arm files during scaffolding, it has been handled in cent…
live1206 Oct 21, 2025
034d8ed
Update eng/packages/http-client-csharp-mgmt/generator/Azure.Generator…
live1206 Oct 21, 2025
acc9cc7
fix build
live1206 Oct 21, 2025
ac2f3bf
Merge remote-tracking branch 'origin/main' into scaffolding-shared-arm
live1206 Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/Directory.Build.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
20 changes: 2 additions & 18 deletions ...mt/generator/Azure.Generator.Management/src/Primitives/NewManagementProjectScaffolding.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -9,24 +10,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"
};
=> Array.Empty<CSharpProjectCompileInclude>();
}
}
4 changes: 0 additions & 4 deletions .../generator/TestProjects/Local/Mgmt-TypeSpec/src/Azure.Generator.MgmtTypeSpec.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Loading