release of preview 3

.azure-pipelines/ci-build.yml

@@ -5,13 +5,15 @@ name: $(BuildDefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
 trigger:
   branches:
     include:
-    - master
-    - vnext
+    - main
+    - dev
+    - support/v1
 pr:
   branches:
     include:
-    - master
-    - vnext
+    - main
+    - dev
+    - support/v1
 variables:
   buildPlatform: 'Any CPU'
   buildConfiguration: 'Release'
@@ -41,10 +43,6 @@ extends:
             displayName: 'Publish Artifact: Nugets'
             artifactName: Nugets
             targetPath: '$(Build.ArtifactStagingDirectory)/Nugets'
-          - output: pipelineArtifact
-            displayName: 'Publish Artifact: Hidi'
-            artifactName: Microsoft.OpenApi.Hidi-v$(hidiversion)
-            targetPath: '$(Build.ArtifactStagingDirectory)/Microsoft.OpenApi.Hidi-v$(hidiversion)'
         steps:
         - task: UseDotNet@2
           displayName: 'Use .NET 6'
@@ -177,23 +175,13 @@ extends:
             MaxConcurrency: '50'
             MaxRetryAttempts: '5'
             PendingAnalysisWaitTimeoutMinutes: '5'
-
-        - task: PowerShell@2
-          displayName: "Get Hidi's version-number from .csproj"
-          inputs:
-            targetType: 'inline'
-            script: |
-              $xml = [Xml] (Get-Content .\src\Microsoft.OpenApi.Hidi\Microsoft.OpenApi.Hidi.csproj)
-              $version = $xml.Project.PropertyGroup.Version
-              echo $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 /p:PackAsTool=false --self-contained --output $(Build.ArtifactStagingDirectory)/Microsoft.OpenApi.Hidi-v$(hidiversion)
+            arguments: -c Release --runtime win-x64 /p:PublishSingleFile=true /p:PackAsTool=false --self-contained --output $(Build.ArtifactStagingDirectory)/Microsoft.OpenApi.Hidi
             projects: 'src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj'
             publishWebProjects: False
             zipAfterPublish: false
@@ -206,10 +194,17 @@ extends:
             content: '*.nupkg'
 
     - stage: deploy
-      condition: and(contains(variables['build.sourceBranch'], 'refs/heads/master'), succeeded())
+      condition: and(or(contains(variables['build.sourceBranch'], 'refs/heads/main'),contains(variables['build.sourceBranch'], 'refs/heads/support/v1')), succeeded())
       dependsOn: build
       jobs:
       - deployment: deploy_hidi
+        templateContext:
+          type: releaseJob
+          isProduction: true
+          inputs:
+          - input: pipelineArtifact
+            artifactName: Nugets
+            targetPath: '$(Pipeline.Workspace)'
         dependsOn: []
         environment: nuget-org
         strategy:
@@ -218,52 +213,22 @@ extends:
               pool:
                 vmImage: ubuntu-latest
               steps:
-              - task: DownloadPipelineArtifact@2
-                displayName: Download nupkg from artifacts
-                inputs:
-                  artifact: Nugets
-                  source: current
-              - task: DownloadPipelineArtifact@2
-                displayName: Download hidi executable from artifacts
-                inputs:
-                  source: current
-              - pwsh: |
-                  $artifactName = Get-ChildItem -Path $(Pipeline.Workspace)\Nugets -Filter Microsoft.OpenApi.*.nupkg -recurse | select -First 1
-                  $artifactVersion= $artifactName.Name -replace "Microsoft.OpenApi.", "" -replace ".nupkg", ""
-                  #Set Variable $artifactName and $artifactVersion
-                  Write-Host "##vso[task.setvariable variable=artifactVersion; isSecret=false; isOutput=true]$artifactVersion"
-                  Write-Host "##vso[task.setvariable variable=artifactName; isSecret=false; isOutput=true]$artifactName.FullName"
-                  echo "$artifactName"
-                  echo "$artifactVersion"
-                displayName: 'Fetch Artifact Name'
               - task: 1ES.PublishNuget@1
                 displayName: 'NuGet push'
                 inputs:
                   packagesToPush: '$(Pipeline.Workspace)/Nugets/Microsoft.OpenApi.Hidi.*.nupkg'
                   packageParentPath: '$(Pipeline.Workspace)'
                   nuGetFeedType: external
                   publishFeedCredentials: 'OpenAPI Nuget Connection'
-              - task: GitHubRelease@1
-                displayName: 'GitHub release (edit)'
-                condition: succeededOrFailed()
-                inputs:
-                  gitHubConnection: 'Github-MaggieKimani1'
-                  action: edit
-                  tagSource: userSpecifiedTag
-                  tag: '$(artifactVersion)'
-                  title: '$(artifactVersion)'
-                  releaseNotesSource: inline
-                  assets: '$(Pipeline.Workspace)\**\*.exe'
-                  changeLogType: issueBased
-                  changeLogLabels: '[ 
-                    { "label" : "feature-work", "feature", "displayName" : "New Features", "state" : "closed" }, 
-                    { "label" : "enhancement", "V2-Enhancement", "displayName" : "Enhancements", "state" : "closed" }, 
-                    { "label" : "bug", "bug-fix", "displayName" : "Bugs", "state" : "closed" }, 
-                    { "label" : "documentation", "doc", "displayName" : "Documentation", "state" : "closed"}, 
-                    { "label" : "dependencies", "displayName" : "Package Updates", "state" : "closed" }
-                    ]'
 
       - deployment: deploy_lib
+        templateContext:
+          type: releaseJob
+          isProduction: true
+          inputs:
+          - input: pipelineArtifact
+            artifactName: Nugets
+            targetPath: '$(Pipeline.Workspace)'
         dependsOn: []
         environment: nuget-org
         strategy:
@@ -272,11 +237,6 @@ extends:
               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) {
@@ -294,6 +254,13 @@ extends:
                   publishFeedCredentials: 'OpenAPI Nuget Connection'
 
       - deployment: deploy_readers
+        templateContext:
+          type: releaseJob
+          isProduction: true
+          inputs:
+          - input: pipelineArtifact
+            artifactName: Nugets
+            targetPath: '$(Pipeline.Workspace)'
         dependsOn: deploy_lib
         environment: nuget-org
         strategy:
@@ -302,15 +269,55 @@ extends:
               pool:
                 vmImage: ubuntu-latest
               steps:
-              - task: DownloadPipelineArtifact@2
-                displayName: Download nupkg from artifacts
-                inputs:
-                  artifact: Nugets
-                  source: current
               - task: 1ES.PublishNuget@1
                 displayName: 'NuGet push'
                 inputs:
                   packagesToPush: '$(Pipeline.Workspace)/Nugets/Microsoft.OpenApi.Readers.*.nupkg'
                   packageParentPath: '$(Pipeline.Workspace)'
                   nuGetFeedType: external
-                  publishFeedCredentials: 'OpenAPI Nuget Connection'
+                  publishFeedCredentials: 'OpenAPI Nuget Connection'
+
+      - deployment: create_github_release
+        templateContext:
+          type: releaseJob
+          isProduction: true
+          inputs:
+          - input: pipelineArtifact
+            artifactName: Nugets
+            targetPath: '$(Pipeline.Workspace)'
+        dependsOn: []
+        environment: kiota-github-releases
+        strategy:
+          runOnce:
+            deploy:
+              pool:
+                vmImage: ubuntu-latest
+              steps:
+              - pwsh: |
+                  $artifactName = Get-ChildItem -Path $(Pipeline.Workspace)\Nugets -Filter Microsoft.OpenApi.*.nupkg -recurse | select -First 1
+                  $artifactVersion= $artifactName.Name -replace "Microsoft.OpenApi.", "" -replace ".nupkg", ""
+                  #Set Variable $artifactName and $artifactVersion
+                  Write-Host "##vso[task.setvariable variable=artifactVersion; isSecret=false; isOutput=true]$artifactVersion"
+                  echo "$artifactVersion"
+                displayName: 'Fetch Artifact Name'
+                name: getTagVersion
+              - task: GitHubRelease@1
+                displayName: 'GitHub release (edit)'
+                condition: succeededOrFailed()
+                inputs:
+                  gitHubConnection: 'Github-MaggieKimani1'
+                  action: create
+                  tagSource: userSpecifiedTag
+                  tag: '$(getTagVersion.artifactVersion)'
+                  title: '$(getTagVersion.artifactVersion)'
+                  releaseNotesSource: inline
+                  assets: '$(Pipeline.Workspace)\**\*.exe'
+                  changeLogType: issueBased
+                  changeLogLabels: '[ 
+                    { "label" : "feature-work", "feature", "displayName" : "New Features", "state" : "closed" }, 
+                    { "label" : "enhancement", "V2-Enhancement", "displayName" : "Enhancements", "state" : "closed" }, 
+                    { "label" : "bug", "bug-fix", "displayName" : "Bugs", "state" : "closed" }, 
+                    { "label" : "documentation", "doc", "displayName" : "Documentation", "state" : "closed"}, 
+                    { "label" : "dependencies", "displayName" : "Package Updates", "state" : "closed" }
+                    ]'
+

.github/CODEOWNERS

@@ -1 +1 @@
-* @irvinesunday @darrelmiller @gavinbarron @millicentachieng @MaggieKimani1 @andrueastman
+* @irvinesunday @darrelmiller @gavinbarron @millicentachieng @MaggieKimani1 @andrueastman @baywet

.github/workflows/ci-cd.yml

@@ -3,15 +3,12 @@ name: CI/CD Pipeline
 on: [push, pull_request, workflow_dispatch]
 
 permissions:
-  contents: write
+  contents: read
 
 jobs:
   ci:
     name: Continuous Integration
     runs-on: ubuntu-latest
-    outputs:
-      latest_version: ${{ steps.tag_generator.outputs.new_version }}
-      is_default_branch: ${{ steps.conditionals_handler.outputs.is_default_branch }}
     env:
       ARTIFACTS_FOLDER: ${{ github.workspace }}/Artifacts
       GITHUB_RUN_NUMBER: ${{ github.run_number }}
@@ -21,43 +18,13 @@ jobs:
         with:
           dotnet-version: 8.0.x
 
-      - name: Data gatherer
-        id: data_gatherer
-        shell: pwsh
-        run: |
-          # Get default branch
-          $repo = 'microsoft/OpenAPI.NET'
-          $defaultBranch = Invoke-RestMethod -Method GET -Uri https://api.github.com/repos/$repo | Select-Object -ExpandProperty default_branch
-          Write-Output "::set-output name=default_branch::$(echo $defaultBranch)"
-
-      - name: Conditionals handler
-        id: conditionals_handler
-        shell: pwsh
-        run: |
-          $defaultBranch = "${{ steps.data_gatherer.outputs.default_branch }}"
-          $githubRef = "${{ github.ref }}"
-          $isDefaultBranch = 'false'
-          if ( $githubRef -like "*$defaultBranch*" ) {
-            $isDefaultBranch = 'true'
-          }
-          Write-Output "::set-output name=is_default_branch::$(echo $isDefaultBranch)"
-
       - name: Checkout repository
         id: checkout_repo
         uses: actions/checkout@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           fetch-depth: 0
 
-      - if: steps.conditionals_handler.outputs.is_default_branch == 'true'
-        name: Bump GH tag
-        id: tag_generator
-        uses: mathieudutour/[email protected]
-        with: 
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          default_bump: false
-          release_branches: ${{ steps.data_gatherer.outputs.default_branch }}
-
       - name: Build projects
         id: build_projects
         shell: pwsh

.github/workflows/codeql-analysis.yml

@@ -2,7 +2,7 @@ name: CodeQL Analysis
 
 on:
   push:
-    branches: [ vnext ]
+    branches: [ main, dev ]
   pull_request:
   schedule:
     - cron: '0 8 * * *'

.github/workflows/docker.yml

@@ -2,7 +2,7 @@ name: Publish Docker image
 on:
   workflow_dispatch:
   push:
-    branches: [master, vnext]
+    branches: [main, dev, support/v1]
     paths: ['src/Microsoft.OpenApi.Hidi/**', '.github/workflows/**']
 env:
   REGISTRY: msgraphprod.azurecr.io
@@ -16,7 +16,7 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
-      - name: Login to GitHub package feed
+      - name: Login to registry 
         uses: docker/[email protected] 
         with:
           username: ${{ secrets.ACR_USERNAME }}
@@ -28,15 +28,15 @@ jobs:
           echo "::set-output name=version::${version}"
         shell: pwsh
         id: getversion
-      - name: Push to GitHub Packages - Nightly
-        if: ${{ github.ref == 'refs/heads/vnext' }}
-        uses: docker/build-push-action@v6.9.0
+      - name: Push to registry - Nightly
+        if: ${{ github.ref == 'refs/heads/dev' }}
+        uses: docker/build-push-action@v6.10.0
         with:
           push: true
           tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:nightly
-      - name: Push to GitHub Packages - Release
-        if: ${{ github.ref == 'refs/heads/master' }}
-        uses: docker/build-push-action@v6.9.0
+      - name: Push to registry - Release
+        if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/support/v1' }}
+        uses: docker/build-push-action@v6.10.0
         with:
           push: true
           tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.getversion.outputs.version }}

.gitignore

@@ -1,7 +1,7 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 ##
-## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
 
 # User-specific files
 *.suo

.vscode/launch.json

@@ -4,7 +4,7 @@
         {
             // Use IntelliSense to find out which attributes exist for C# debugging
             // Use hover for the description of the existing attributes
-            // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+            // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/main/debugger-launchjson.md
             "name": "Launch Hidi",
             "type": "coreclr",
             "request": "launch",
@@ -22,7 +22,7 @@
         {
             // Use IntelliSense to find out which attributes exist for C# debugging
             // Use hover for the description of the existing attributes
-            // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+            // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/main/debugger-launchjson.md
             "name": "Launch Workbench",
             "type": "coreclr",
             "request": "launch",

Dockerfile

@@ -19,5 +19,5 @@ VOLUME /app/collection.json
 ENV HIDI_CONTAINER=true DOTNET_TieredPGO=1 DOTNET_TC_QuickJitForLoops=1
 ENTRYPOINT ["dotnet", "Microsoft.OpenApi.Hidi.dll"]
 LABEL description="# Welcome to Hidi \
-To start transforming OpenAPI documents checkout [the getting started documentation](https://github.com/microsoft/OpenAPI.NET/tree/vnext/src/Microsoft.OpenApi.Hidi)  \
-[Source dockerfile](https://github.com/microsoft/OpenAPI.NET/blob/vnext/Dockerfile)"
+To start transforming OpenAPI documents checkout [the getting started documentation](https://github.com/microsoft/OpenAPI.NET/tree/main/src/Microsoft.OpenApi.Hidi)  \
+[Source dockerfile](https://github.com/microsoft/OpenAPI.NET/blob/main/Dockerfile)"

README.md

@@ -81,7 +81,7 @@ var httpClient = new HttpClient
     BaseAddress = new Uri("https://raw.githubusercontent.com/OAI/OpenAPI-Specification/")
 };
 
-var stream = await httpClient.GetStreamAsync("master/examples/v3.0/petstore.yaml");
+var stream = await httpClient.GetStreamAsync("main/examples/v3.0/petstore.yaml");
 
 // Read V3 as YAML
 var openApiDocument = new OpenApiStreamReader().Read(stream, out var diagnostic);
@@ -95,7 +95,7 @@ var outputString = openApiDocument.Serialize(OpenApiSpecVersion.OpenApi2_0, Open
 In order to test the validity of an OpenApi document, we avail the following tools:
 - [Microsoft.OpenApi.Hidi](https://www.nuget.org/packages/Microsoft.OpenApi.Hidi)
 
-    A commandline tool for validating and transforming OpenAPI descriptions. [Installation guidelines and documentation](https://github.com/microsoft/OpenAPI.NET/blob/vnext/src/Microsoft.OpenApi.Hidi/readme.md)
+    A commandline tool for validating and transforming OpenAPI descriptions. [Installation guidelines and documentation](https://github.com/microsoft/OpenAPI.NET/blob/main/src/Microsoft.OpenApi.Hidi/readme.md)
 
 - Microsoft.OpenApi.Workbench