Skip to content

Binplace dab.draft.schema.json #996

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 5 commits into from
Nov 25, 2022
Merged

Binplace dab.draft.schema.json #996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5852ec4
Binplace schema file with build version
Aniruddh25 Nov 23, 2022
8d8e3e1
Include schema json in build output
Aniruddh25 Nov 24, 2022
807b19f
Fix the url for schema path
Aniruddh25 Nov 24, 2022
216902a
Merge branch 'main' into dev/anmunde/binplaceJsonSchema
abhishekkumams Nov 24, 2022
5f973cc
Merge branch 'main' into dev/anmunde/binplaceJsonSchema
ayush3797 Nov 24, 2022
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
10 changes: 9 additions & 1 deletion .pipelines/build-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ variables:
# The counter is reset when the minor version is updated.
patch: $[counter(format('{0}_{1}', variables['build.reason'], variables['minor']), 0)]
isReleaseBuild: $(isNugetRelease)
additionalProperties.version: 'urn:dab:config:schema:draft-$(major).$(minor).$(patch)'
additionalProperties.version: 'https://dataapibuilder.azureedge.net/schemas/v$(major).$(minor).$(patch)-alpha/dab.draft.schema.json'

steps:
- task: NuGetAuthenticate@1
Expand Down Expand Up @@ -47,6 +47,13 @@ steps:
folderPath: '$(System.DefaultWorkingDirectory)'
fileType: 'json'
targetFiles: 'schemas/dab.draft.schema.json'

- task: CopyFiles@2
displayName: 'Copy dab.draft.schema.json'
inputs:
sourceFolder: '$(Build.SourcesDirectory)/schemas'
contents: 'dab.draft.schema.json'
targetFolder: '$(Build.ArtifactStagingDirectory)'

- task: UseDotNet@2
displayName: Setup .NET SDK v6.0.x
Expand Down Expand Up @@ -191,6 +198,7 @@ steps:
$(Build.ArtifactStagingDirectory)/**/*.nupkg
$(Build.ArtifactStagingDirectory)/**/*.zip
$(Build.ArtifactStagingDirectory)/**/dab-manifest.json
$(Build.ArtifactStagingDirectory)/**/dab.draft.schema.json
isDraft: true
isPreRelease: true
addChangeLog: false
Expand Down
2 changes: 1 addition & 1 deletion schemas/dab.draft.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"title": "Data API Builder",
"description": "Schema for Data API Builder engine",
"additionalProperties": {
"version": "urn:dab:config:schema:draft-major.minor.patch"
"version": "https://dataapibuilder.azureedge.net/schemas/vmajor.minor.patch-alpha/dab.draft.schema.json"
},
"type": "object",
"properties": {
Expand Down
14 changes: 12 additions & 2 deletions src/Cli/src/Cli.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,20 @@
<ConfigFiles Include="..\..\Service\dab-config*.json" />
</ItemGroup>

<ItemGroup>
<None Remove="dab.draft.schema.json" />
</ItemGroup>

<ItemGroup>
<Content Include="..\..\..\schemas\dab.draft.schema.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>

<Target Name="GenerateConfigFiles" AfterTargets="PostBuildEvent">
<Exec Command="powershell.exe -command ..\..\..\ConfigGenerators\configGenerator.ps1 " Condition=" '$(OS)' == 'Windows_NT' And '$(generateConfigFiles)' == 'true' "/>
<Exec Command="powershell.exe -command ..\..\..\ConfigGenerators\configGenerator.ps1 " Condition=" '$(OS)' == 'Windows_NT' And '$(generateConfigFiles)' == 'true' " />
<Exec Command="bash ../../../ConfigGenerators/configGenerator.sh" Condition=" '$(OS)' != 'Windows_NT' And '$(generateConfigFiles)' == 'true' " />
<Copy SourceFiles="@(ConfigFiles)" DestinationFolder="..\..\out\tests\$(TargetFramework)" />
<Copy SourceFiles="@(ConfigFiles)" DestinationFolder="..\..\out\tests\$(TargetFramework)" />
</Target>

</Project>