Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public override async Task WriteAdditionalFiles(string outputPath)
ConfigurationSchema.OptionsRef);
if (schemaContent != null)
{
var schemaPath = Path.Combine(outputPath, "schema", "ConfigurationSchema.json");
var schemaPath = Path.Combine(outputPath, "Generated", "schema", "ConfigurationSchema.json");
var schemaDir = Path.GetDirectoryName(schemaPath);
if (schemaDir != null)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ protected virtual string GetSourceProjectFileContent()

// Add pack items for ConfigurationSchema.json and .targets file
var packageName = CodeModelGenerator.Instance.Configuration.PackageName;
var schemaPath = Path.Combine(CodeModelGenerator.Instance.Configuration.OutputDirectory, "schema", "ConfigurationSchema.json");
var schemaPath = Path.Combine(CodeModelGenerator.Instance.Configuration.OutputDirectory, "Generated", "schema", "ConfigurationSchema.json");
if (File.Exists(schemaPath))
{
builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem(@"..\schema\ConfigurationSchema.json", @"\"));
builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem(@"..\Generated\schema\ConfigurationSchema.json", @"\"));
builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem($@"..\{packageName}.NuGet.targets", @"buildTransitive\netstandard2.0\" + $"{packageName}.targets"));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\SampleTypeSpec.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\SampleTypeSpec.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Authentication.ApiKey.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Authentication.ApiKey.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Authentication.Http.Custom.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Authentication.Http.Custom.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Authentication.OAuth2.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Authentication.OAuth2.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Authentication.Union.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Authentication.Union.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Client.Structure.Service.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Client.Structure.Service.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Client.Structure.Service.Default.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Client.Structure.Service.Default.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Client.Structure.Service.Multi.Client.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Client.Structure.Service.Multi.Client.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Client.Structure.Service.Renamed.Operation.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Client.Structure.Service.Renamed.Operation.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Client.Structure.Service.TwoOperationGroup.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Client.Structure.Service.TwoOperationGroup.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Documentation.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Documentation.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Encode.Array.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Encode.Array.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Encode.Bytes.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Encode.Bytes.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Encode.Datetime.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Encode.Datetime.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Encode.Duration.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Encode.Duration.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Encode.Numeric.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Encode.Numeric.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Parameters.Basic.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Parameters.Basic.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Parameters.BodyOptionality.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Parameters.BodyOptionality.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Parameters.CollectionFormat.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Parameters.CollectionFormat.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Parameters.Path.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Parameters.Path.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Parameters.Query.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Parameters.Query.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Parameters.Spread.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Parameters.Spread.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Payload.ContentNegotiation.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Payload.ContentNegotiation.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Payload.JsonMergePatch.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Payload.JsonMergePatch.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Payload.MediaType.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Payload.MediaType.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Payload.MultiPart.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Payload.MultiPart.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Payload.Pageable.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Payload.Pageable.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Payload.Xml.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Payload.Xml.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Resiliency.SrvDriven.V1.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Resiliency.SrvDriven.V1.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Resiliency.SrvDriven.V2.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Resiliency.SrvDriven.V2.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Response.StatusCodeRange.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Response.StatusCodeRange.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Routes.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Routes.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Serialization.EncodedName.Json.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Serialization.EncodedName.Json.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Server.Endpoint.NotDefined.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Server.Endpoint.NotDefined.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Server.Path.Multiple.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Server.Path.Multiple.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Server.Path.Single.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Server.Path.Single.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Server.Versions.NotVersioned.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Server.Versions.NotVersioned.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Server.Versions.Versioned.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Server.Versions.Versioned.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\SpecialHeaders.ConditionalRequest.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\SpecialHeaders.ConditionalRequest.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\SpecialHeaders.Repeatability.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\SpecialHeaders.Repeatability.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\SpecialWords.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\SpecialWords.targets" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Generated\schema\ConfigurationSchema.json" Pack="true" PackagePath="\" />
<None Include="..\Type.Array.NuGet.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\Type.Array.targets" />
</ItemGroup>
</Project>
Loading
Loading