Skip to content

Commit 85592b0

Browse files
fix: move ConfigurationSchema.json under src/Generated instead of roo… (#10316)
…t Generated The ConfigurationSchema.json was being written to a new Generated folder at the project root level, but it should go under the existing src/Generated folder where all other generated artifacts reside. - ScmCodeModelGenerator.cs: output path changed to src/Generated/schema/ - NewProjectScaffolding.cs: csproj pack include updated to Generated\schema\ (relative to src/ where csproj lives) - All 72 test projects regenerated with corrected paths --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 75c3b35 commit 85592b0

146 files changed

Lines changed: 74 additions & 74 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmCodeModelGenerator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public override async Task WriteAdditionalFiles(string outputPath)
6868
ConfigurationSchema.OptionsRef);
6969
if (schemaContent != null)
7070
{
71-
var schemaPath = Path.Combine(outputPath, "Generated", "schema", "ConfigurationSchema.json");
71+
var schemaPath = Path.Combine(outputPath, "src", "Generated", "schema", "ConfigurationSchema.json");
7272
var schemaDir = Path.GetDirectoryName(schemaPath);
7373
if (schemaDir != null)
7474
{

packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ protected virtual string GetSourceProjectFileContent()
9090
var customSchemaPath = Path.Combine(CodeModelGenerator.Instance.Configuration.OutputDirectory, "schema", "ConfigurationSchema.json");
9191
if (!File.Exists(customSchemaPath))
9292
{
93-
builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem(@"..\Generated\schema\ConfigurationSchema.json", @"\"));
93+
builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem(@"Generated\schema\ConfigurationSchema.json", @"\"));
9494
builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem($@"..\{packageName}.NuGet.targets", @"buildTransitive\netstandard2.0\" + $"{packageName}.targets"));
9595
}
9696

packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/Generated/schema/ConfigurationSchema.json renamed to packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/schema/ConfigurationSchema.json

File renamed without changes.

packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/SampleTypeSpec.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
17+
<None Include="Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
1818
<None Include="..\SampleTypeSpec.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\SampleTypeSpec.targets" />
1919
</ItemGroup>
2020
</Project>

packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Authentication.ApiKey.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
17+
<None Include="Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
1818
<None Include="..\Authentication.ApiKey.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Authentication.ApiKey.targets" />
1919
</ItemGroup>
2020
</Project>

packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/Generated/schema/ConfigurationSchema.json renamed to packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Generated/schema/ConfigurationSchema.json

File renamed without changes.

packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Authentication.Http.Custom.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
17+
<None Include="Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
1818
<None Include="..\Authentication.Http.Custom.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Authentication.Http.Custom.targets" />
1919
</ItemGroup>
2020
</Project>

packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/Generated/schema/ConfigurationSchema.json renamed to packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Generated/schema/ConfigurationSchema.json

File renamed without changes.

packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Authentication.OAuth2.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
17+
<None Include="Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
1818
<None Include="..\Authentication.OAuth2.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Authentication.OAuth2.targets" />
1919
</ItemGroup>
2020
</Project>

packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/Generated/schema/ConfigurationSchema.json renamed to packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Generated/schema/ConfigurationSchema.json

File renamed without changes.

0 commit comments

Comments
 (0)