resolve conflicts.

haiyuazhang · haiyuazhang · commit b8b7301d0eaf · 2025-06-30T16:41:32.000+08:00
diff --git a/eng/packages/http-client-csharp/generator/Azure.Generator/src/Primitives/NewAzureProjectScaffolding.cs b/eng/packages/http-client-csharp/generator/Azure.Generator/src/Primitives/NewAzureProjectScaffolding.cs
@@ -37,7 +37,7 @@ protected override string GetSourceProjectFileContent()
                 builder.PackageReferences.Add(packages);
             }
 
-            foreach (var compileInclude in BuildCompileIncludes())
+            foreach (var compileInclude in CompileIncludes)
             {
                 builder.CompileIncludes.Add(compileInclude);
             }

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ protected override string GetSourceProjectFileContent()`
`37`	`37`	`builder.PackageReferences.Add(packages);`
`38`	`38`	`}`
`39`	`39`
`40`		`- foreach (var compileInclude in BuildCompileIncludes())`
	`40`	`+ foreach (var compileInclude in CompileIncludes)`
`41`	`41`	`{`
`42`	`42`	`builder.CompileIncludes.Add(compileInclude);`
`43`	`43`	`}`