Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
fdbee8f
Update input parameter description
MaggieKimani1 Jan 19, 2022
7f88a35
Add OData conversion libraries
MaggieKimani1 Jan 19, 2022
e0f0ed6
Add necessary usings
MaggieKimani1 Jan 19, 2022
c2ae2dd
Add method for CSDL to OpenAPI conversion
MaggieKimani1 Jan 19, 2022
07169a4
Check input file for .xml extension
MaggieKimani1 Jan 20, 2022
f23b0a9
Merge remote-tracking branch 'origin/vnext' into mk/feature/convert-c…
MaggieKimani1 Jan 24, 2022
581023c
Clean up code
MaggieKimani1 Jan 25, 2022
7606916
Refactor code
MaggieKimani1 Jan 25, 2022
cb8ef3a
Add check for .csdl files
MaggieKimani1 Jan 26, 2022
73339e1
Add a sample csdl file for testing and copy to output directory
MaggieKimani1 Jan 26, 2022
7ec682b
Add csdl conversion tests
MaggieKimani1 Jan 26, 2022
b13c3ad
Add xml documentation
MaggieKimani1 Jan 26, 2022
695eb05
Merge branch 'mk/align-hidi-params-with-kiota' into mk/feature/conver…
MaggieKimani1 Jan 27, 2022
66c06b6
Add --csdl input param for converting csdl files
MaggieKimani1 Jan 27, 2022
1b40298
Refactor code
MaggieKimani1 Jan 27, 2022
ef7640f
Rename test file
MaggieKimani1 Jan 27, 2022
51e85a7
Refactor param to be more implicit
MaggieKimani1 Jan 27, 2022
761088f
Merge branch 'vnext' into mk/feature/convert-csdl-to-openapi
MaggieKimani1 Feb 3, 2022
1d986d1
Resolve merge conflicts
MaggieKimani1 Feb 3, 2022
5550f01
Clean up code
MaggieKimani1 Feb 3, 2022
b8d0d2b
Default to V3 of OpenApi during document serialization
MaggieKimani1 Feb 4, 2022
385e5af
Clean up
MaggieKimani1 Feb 4, 2022
53c4e2c
Update package version
MaggieKimani1 Feb 7, 2022
be80647
Merge pull request #725 from microsoft/release/1.3.1-preview4
darrelmiller Feb 8, 2022
8683e37
Catch any OpenApiExceptions thrown during parsing and continue proces…
MaggieKimani1 Feb 8, 2022
40d0c97
Merge branch 'vnext' into mk/fix-parsing-errors
MaggieKimani1 Feb 8, 2022
528cee2
Merge remote-tracking branch 'origin/vnext' into mk/feature/convert-c…
MaggieKimani1 Feb 8, 2022
36a11bb
Add package icon and description
MaggieKimani1 Feb 8, 2022
707d7b7
Merge pull request #705 from microsoft/mk/feature/convert-csdl-to-ope…
darrelmiller Feb 10, 2022
4092472
Bump Verify from 15.2.1 to 16.1.1
dependabot[bot] Feb 10, 2022
76973e5
Merge pull request #723 from microsoft/dependabot/nuget/Verify-16.1.1
darrelmiller Feb 10, 2022
18abded
Bump System.Text.Json from 6.0.1 to 6.0.2
dependabot[bot] Feb 10, 2022
1b198dc
Merge pull request #728 from microsoft/dependabot/nuget/System.Text.J…
darrelmiller Feb 10, 2022
54bdbbe
Bump Verify.Xunit from 14.14.1 to 16.1.1
dependabot[bot] Feb 10, 2022
96f613a
Merge pull request #724 from microsoft/dependabot/nuget/Verify.Xunit-…
darrelmiller Feb 10, 2022
9f128dc
Fixed ValidateDocument method in hidi
darrelmiller Feb 12, 2022
e48338d
Merge remote-tracking branch 'origin/vnext' into issues/734
darrelmiller Feb 12, 2022
b274162
Fixed validate for Path Parameters so it does not fail for components
darrelmiller Feb 12, 2022
6adac99
Merge pull request #739 from microsoft/issues/733
darrelmiller Feb 15, 2022
34b56de
Merge branch 'vnext' into issues/734
darrelmiller Feb 15, 2022
5984798
Initialize a diagnostics object in the constructor and use it to appe…
MaggieKimani1 Feb 15, 2022
a7b1e1e
Pass the Diagnostic object to the class instances
MaggieKimani1 Feb 15, 2022
00eca6f
Upgrade packages
MaggieKimani1 Feb 15, 2022
4890e0e
Merge branch 'vnext' into mk/fix-parsing-errors
MaggieKimani1 Feb 15, 2022
ceb3ff4
Update TFMs in project and workflow files
MaggieKimani1 Feb 16, 2022
b977607
Update public api text file
MaggieKimani1 Feb 16, 2022
8e9e8cb
Migrate WPF project to .NET6 and delete obsolete App.config
MaggieKimani1 Feb 16, 2022
2937f02
Merge pull request #738 from microsoft/issues/734
darrelmiller Feb 16, 2022
c53bbe9
Merge branch 'vnext' into mk/fix/dependabot-updates
darrelmiller Feb 16, 2022
25b7357
Remove package and its reference
MaggieKimani1 Feb 16, 2022
4ac479a
Merge branch 'vnext' into mk/fix-migrate-to-net6
MaggieKimani1 Feb 16, 2022
7b2821e
Add enums to cater for multiple scheme and bearer formats
MaggieKimani1 Feb 16, 2022
8af1c19
Get the display name from the enum
MaggieKimani1 Feb 16, 2022
fc6f461
Refactor code
MaggieKimani1 Feb 16, 2022
5dc4d8a
Fix test
MaggieKimani1 Feb 16, 2022
80498c9
Bump Microsoft.NET.Test.Sdk from 17.0.0 to 17.1.0
dependabot[bot] Feb 16, 2022
a636ec2
Merge pull request #746 from microsoft/dependabot/nuget/Microsoft.NET…
darrelmiller Feb 17, 2022
6929114
Merge branch 'vnext' into mk/fix/dependabot-updates
darrelmiller Feb 17, 2022
4d84210
Merge branch 'vnext' into mk/feature/add-constants
MaggieKimani1 Feb 17, 2022
8e04fd1
Merge pull request #743 from microsoft/mk/fix/dependabot-updates
darrelmiller Feb 18, 2022
39ce0e9
Merge branch 'vnext' into mk/fix-parsing-errors
darrelmiller Feb 18, 2022
9720987
Add Jwt and Bearer constants and revert previous changes
MaggieKimani1 Feb 21, 2022
0390a81
Merge remote-tracking branch 'origin/mk/feature/add-constants' into m…
MaggieKimani1 Feb 21, 2022
15e7cc4
Merge branch 'vnext' into mk/feature/add-constants
MaggieKimani1 Feb 21, 2022
2b2bc25
Remove the OpenIdConnectUrl constant and replace it with the Bearer s…
MaggieKimani1 Feb 22, 2022
ad396b3
Merge remote-tracking branch 'origin/mk/feature/add-constants' into m…
MaggieKimani1 Feb 22, 2022
4fdfd70
Clean up solution file
MaggieKimani1 Feb 22, 2022
0f1350d
Revert
MaggieKimani1 Feb 22, 2022
9ef0a8e
Update target framework monikers
MaggieKimani1 Feb 22, 2022
b440e32
Revert change to the public API interface
MaggieKimani1 Feb 22, 2022
6ddb563
Merge branch 'vnext' into mk/fix-migrate-to-net6
MaggieKimani1 Feb 22, 2022
b1e745c
Address review feedback
MaggieKimani1 Feb 22, 2022
fd3dc26
Merge remote-tracking branch 'origin/mk/fix-migrate-to-net6' into mk/…
MaggieKimani1 Feb 22, 2022
ad36f92
Merge pull request #745 from microsoft/mk/feature/add-constants
darrelmiller Feb 22, 2022
b67be2a
Merge branch 'vnext' into mk/fix-migrate-to-net6
darrelmiller Feb 22, 2022
b98a4cb
removed support for net462
darrelmiller Feb 23, 2022
9551e33
Merge pull request #744 from microsoft/mk/fix-migrate-to-net6
darrelmiller Feb 23, 2022
1eeb31a
Update ci-build.yml for Azure Pipelines
MaggieKimani1 Feb 24, 2022
da6a4d1
Update ci-build.yml for Azure Pipelines
MaggieKimani1 Feb 27, 2022
fecd0fe
- upgrades odata conversion lib reference in hidi
baywet Feb 28, 2022
cd100d5
- fixes conversion tests and makes method async
baywet Feb 28, 2022
ee063b7
- fixes outdated unit test data
baywet Feb 28, 2022
de4ea22
Merge pull request #753 from microsoft/feature/conversion-lib-upgrade
baywet Feb 28, 2022
a79aae8
Merge remote-tracking branch 'origin/vnext' into mk/feature/publish-h…
MaggieKimani1 Feb 28, 2022
92a9eb1
- fixes an issue where hidi would not process async
baywet Feb 28, 2022
eca9137
- updates vs code configuration files to be able to debug hidi
baywet Feb 28, 2022
7bd8c36
Merge pull request #750 from microsoft/mk/feature/publish-hidi-as-exe
darrelmiller Feb 28, 2022
28ced82
Merge branch 'vnext' into bugfix/hidi-async
darrelmiller Feb 28, 2022
f9b8375
Merge pull request #756 from microsoft/bugfix/hidi-async
darrelmiller Feb 28, 2022
fa45d12
Merge branch 'vnext' into mk/fix-parsing-errors
darrelmiller Feb 28, 2022
d551f87
Merge pull request #727 from microsoft/mk/fix-parsing-errors
darrelmiller Feb 28, 2022
23e3b32
Updated versions to preview5
darrelmiller Mar 1, 2022
05bbf41
Merge pull request #760 from microsoft/release/1.3.1-preview5
darrelmiller Mar 1, 2022
8b2d347
Bump Moq from 4.16.1 to 4.17.1
dependabot[bot] Mar 1, 2022
1acfec6
Merge branch 'master' into release/1.3.1-preview5
baywet Mar 1, 2022
b48025e
Merge pull request #758 from microsoft/dependabot/nuget/Moq-4.17.1
baywet Mar 1, 2022
656697e
Bump actions/setup-dotnet from 1 to 2
dependabot[bot] Mar 1, 2022
be7861d
Bump Verify from 16.1.2 to 16.3.2
dependabot[bot] Mar 1, 2022
6d251f1
Merge pull request #757 from microsoft/dependabot/github_actions/acti…
baywet Mar 1, 2022
c8430ce
Merge pull request #755 from microsoft/dependabot/nuget/Verify-16.3.2
baywet Mar 1, 2022
93d7915
Bump Verify.Xunit from 16.1.2 to 16.3.2
dependabot[bot] Mar 1, 2022
fc83996
Merge pull request #754 from microsoft/dependabot/nuget/Verify.Xunit-…
baywet Mar 1, 2022
2ecd462
- ADO pipeline updates
baywet Feb 28, 2022
8a0ef11
- removes policheck on inexistant tool directory
baywet Feb 28, 2022
a2e516f
- fixes dll path for binskim analysis
baywet Feb 28, 2022
0db1483
- adds PR trigger for pipeline
baywet Mar 1, 2022
f31d6bc
- moves to separate jobs for each nupkg
baywet Mar 1, 2022
1127aed
- adds a copy task to align folder nams
baywet Mar 1, 2022
8431e6e
- fixes task name
baywet Mar 1, 2022
1752217
- enables trimming for hidi executable
baywet Mar 1, 2022
082f0bd
Merge pull request #752 from microsoft/feature/pipeline-upgrades
baywet Mar 1, 2022
75267c2
- bumps reference to openapi.odata
baywet Mar 3, 2022
b868ffc
Merge pull request #768 from microsoft/feature/odata-bump
baywet Mar 3, 2022
cbbf608
Merge pull request #769 from microsoft/vnext
baywet Mar 3, 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
Prev Previous commit
Next Next commit
- moves to separate jobs for each nupkg
Signed-off-by: Vincent Biret <[email protected]>
  • Loading branch information
baywet committed Mar 1, 2022
commit f31d6bcbb7054b4999dedd51fb0d47821b01b59e
98 changes: 89 additions & 9 deletions .azure-pipelines/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -216,34 +216,36 @@ stages:
$xml = [Xml] (Get-Content .\src\Microsoft.OpenApi.Hidi\Microsoft.OpenApi.Hidi.csproj)
$version = $xml.Project.PropertyGroup.Version
echo $version
echo "##vso[task.setvariable variable=version]$version"
echo "##vso[task.setvariable variable=hidiversion]$version"

# publish hidi as an .exe
- task: DotNetCoreCLI@2
displayName: publish Hidi as executable
inputs:
command: 'publish'
arguments: -c Release --runtime win-x64 /p:PublishSingleFile=true --self-contained --output $(Build.ArtifactStagingDirectory)/Microsoft.OpenApi.Hidi-v$(version) --no-dependencies
arguments: -c Release --runtime win-x64 /p:PublishSingleFile=true --self-contained --output $(Build.ArtifactStagingDirectory)/Microsoft.OpenApi.Hidi-v$(hidiversion) --no-dependencies
projects: 'src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj'
publishWebProjects: False
zipAfterPublish: false

- task: PublishBuildArtifacts@1
displayName: 'Publish Artifact: Hidi'
inputs:
ArtifactName: Microsoft.OpenApi.Hidi-v$(version)
PathtoPublish: '$(Build.ArtifactStagingDirectory)/Microsoft.OpenApi.Hidi-v$(version)'

- task: PublishBuildArtifacts@1
displayName: 'Publish Artifact: Nugets'
inputs:
ArtifactName: Nugets
PathtoPublish: '$(Build.ArtifactStagingDirectory)/Nugets'

- task: PublishBuildArtifacts@1
displayName: 'Publish Artifact: Hidi'
inputs:
ArtifactName: Microsoft.OpenApi.Hidi-v$(hidiversion)
PathtoPublish: '$(Build.ArtifactStagingDirectory)/Microsoft.OpenApi.Hidi-v$(hidiversion)'

- stage: deploy
condition: and(contains(variables['build.sourceBranch'], 'refs/heads/vnext'), succeeded())
dependsOn: build
jobs:
- deployment: deploy
- deployment: deploy_hidi
dependsOn: []
environment: nuget-org
strategy:
runOnce:
Expand All @@ -256,10 +258,88 @@ stages:
inputs:
artifact: Nugets
source: current
# TODO update that script so it looks at the artifact name (name starts with) rather than a fixed index
- powershell: |
$url = "$($env:SYSTEM_TEAMFOUNDATIONCOLLECTIONURI)$env:SYSTEM_TEAMPROJECTID/_apis/build/builds/$env:BUILD_BUILDID/artifacts?api-version=4.1"
Write-Host "URL: $url"
$pipeline = Invoke-RestMethod -Uri $url -Headers @{
Authorization = "Bearer $env:SYSTEM_ACCESSTOKEN"
}
Write-Host "artifactName:" ($artifactName = $Pipeline.value.name[1])
#Set Variable $artifactName
Write-Host "##vso[task.setvariable variable=artifactName; isSecret=false; isOutput=true;]$artifactName"
displayName: 'Fetch Artifact Name'
- task: DownloadPipelineArtifact@2
displayName: Download hidi executable from artifacts
inputs:
artifact: $(artifactName)
source: current
- task: NuGetCommand@2
displayName: 'NuGet push'
inputs:
command: push
packagesToPush: '$(Pipeline.Workspace)/Nugets/Microsoft.OpenApi.Hidi.*.nupkg'
nuGetFeedType: external
publishFeedCredentials: 'OpenAPI Nuget Connection'
- task: GitHubRelease@1
displayName: 'GitHub release (create)'
inputs:
gitHubConnection: 'Github-MaggieKimani1'
tagSource: userSpecifiedTag
tag: '$(artifactName)'
title: '$(artifactName)'
releaseNotesSource: inline
assets: '$(System.DefaultWorkingDirectory)\**\*.exe'
changeLogType: issueBased

- deployment: deploy_lib
dependsOn: []
environment: nuget-org
strategy:
runOnce:
deploy:
pool:
vmImage: ubuntu-latest
steps:
- task: DownloadPipelineArtifact@2
displayName: Download nupkg from artifacts
inputs:
artifact: Nugets
source: current
- powershell: |
$fileNames = "$(Pipeline.Workspace)/Nugets/Microsoft.OpenApi.Hidi.*.nupkg", "$(Pipeline.Workspace)/Nugets/Microsoft.OpenApi.Readers.*.nupkg", "$(Pipeline.Workspace)/Nugets/Microsoft.OpenApi.Workbench.*.nupkg"
foreach($fileName in $fileNames) {
if(Test-Path $fileName) {
rm $fileName -Verbose
}
}
displayName: remove other nupkgs to avoid duplication
- task: NuGetCommand@2
displayName: 'NuGet push'
inputs:
command: push
packagesToPush: '$(Pipeline.Workspace)/Nugets/Microsoft.OpenApi.*.nupkg'
nuGetFeedType: external
publishFeedCredentials: 'OpenAPI Nuget Connection'

- deployment: deploy_readers
dependsOn: deploy_lib
environment: nuget-org
strategy:
runOnce:
deploy:
pool:
vmImage: ubuntu-latest
steps:
- task: DownloadPipelineArtifact@2
displayName: Download nupkg from artifacts
inputs:
artifact: Nugets
source: current
- task: NuGetCommand@2
displayName: 'NuGet push'
inputs:
command: push
packagesToPush: '$(Pipeline.Workspace)/Nugets/Microsoft.OpenApi.Readers.*.nupkg'
nuGetFeedType: external
publishFeedCredentials: 'OpenAPI Nuget Connection'