refactor(hidi): remove migrated v2 tool resources (#3109)

* refactor(hidi): remove migrated v2 tool resources

Follow accepted OpenAPI.NET.OData support/v2 import PR883. Retain core/YAML builds, signing, packaging and history; point hidi documentation to its new home. Publishing handoff remains gated pending destination official pipeline onboarding.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: c631d217-9378-4cee-8c7e-761043ff3ae5

* fix(hidi): retain GitHub release edit step

Co-authored-by: baywet <7905502+baywet@users.noreply.github.com>

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: baywet <7905502+baywet@users.noreply.github.com>
Copilot-Session: c631d217-9378-4cee-8c7e-761043ff3ae5

Author: 4 people

.azure-pipelines/ci-build.yml

@@ -22,9 +22,6 @@ variables:
   buildPlatform: 'Any CPU'
   buildConfiguration: 'Release'
   ProductBinPath: '$(Build.SourcesDirectory)\src\Microsoft.OpenApi\bin\$(BuildConfiguration)'
-  REGISTRY: 'msgraphprodregistry.azurecr.io'
-  IMAGE_NAME: 'public/openapi/hidi'
-  PREVIEW_BRANCH: 'refs/heads/main'
 
 resources:
   repositories:
@@ -51,10 +48,6 @@ extends:
             displayName: 'Publish Artifact: Nugets'
             artifactName: Nugets
             targetPath: '$(Build.ArtifactStagingDirectory)/Nugets'
-          - output: pipelineArtifact
-            displayName: 'Publish Artifact: RepoFiles'
-            artifactName: RepoFiles
-            targetPath: '$(Build.ArtifactStagingDirectory)/RepoFiles'
         steps:
         - task: UseDotNet@2
           displayName: 'Use .NET 6'
@@ -173,10 +166,6 @@ extends:
         - pwsh: dotnet pack $(Build.SourcesDirectory)/src/Microsoft.OpenApi.YamlReader/Microsoft.OpenApi.YamlReader.csproj -o $(Build.ArtifactStagingDirectory) --configuration $(BuildConfiguration) --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg
           displayName: 'pack YamlReader'
 
-        # Pack hidi
-        - pwsh: dotnet pack $(Build.SourcesDirectory)/src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj -o $(Build.ArtifactStagingDirectory) --configuration $(BuildConfiguration) --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg
-          displayName: 'pack Hidi'
-         
         - task: EsrpCodeSigning@6
           displayName: 'ESRP CodeSigning Nuget Packages'
           inputs:
@@ -211,68 +200,21 @@ extends:
             MaxRetryAttempts: '5'
             PendingAnalysisWaitTimeoutMinutes: '5'
 
-        # publish hidi as an .exe
-        - task: DotNetCoreCLI@2
-          displayName: publish Hidi as executable
-          inputs:
-            command: 'publish'
-            arguments: -c Release --runtime win-x64 -p:RestoreConfigFile=$(Build.SourcesDirectory)\nuget.config /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
-            
         - task: CopyFiles@2
           displayName: Prepare staging folder for upload
           inputs:
             targetFolder: $(Build.ArtifactStagingDirectory)/Nugets
             sourceFolder: $(Build.ArtifactStagingDirectory)
             content: '*.nupkg'
 
-        # Copy repository files to be used in the deploy stage
-        - task: CopyFiles@2
-          displayName: 'Copy repository files for deploy stage'
-          inputs:
-            SourceFolder: '$(Build.SourcesDirectory)'
-            Contents: |
-              **/*
-              !**/bin/**
-              !**/obj/**
-              !**/.git/**
-            TargetFolder: '$(Build.ArtifactStagingDirectory)/RepoFiles'
-
     - stage: deploy
-      condition: and(or(contains(variables['Build.SourceBranch'], 'refs/tags/v'), eq(variables['Build.SourceBranch'], variables['PREVIEW_BRANCH'])), succeeded())
+      condition: and(contains(variables['Build.SourceBranch'], 'refs/tags/v'), succeeded())
       dependsOn: build
       pool:
         name: Azure-Pipelines-1ESPT-ExDShared
         os: linux
         image: ubuntu-latest
       jobs:
-      - deployment: deploy_hidi
-        condition: and(contains(variables['build.SourceBranch'], 'refs/tags/v'), succeeded())
-        templateContext:
-          type: releaseJob
-          isProduction: true
-          inputs:
-          - input: pipelineArtifact
-            artifactName: Nugets
-            targetPath: '$(Pipeline.Workspace)'
-        dependsOn: []
-        environment: nuget-org
-        strategy:
-          runOnce:
-            deploy:
-              pool:
-                vmImage: ubuntu-latest
-              steps:
-              - task: 1ES.PublishNuget@1
-                displayName: 'NuGet push'
-                inputs:
-                  packagesToPush: '$(Pipeline.Workspace)/Microsoft.OpenApi.Hidi.*.nupkg'
-                  packageParentPath: '$(Pipeline.Workspace)'
-                  nuGetFeedType: external
-                  publishFeedCredentials: 'OpenAPI Nuget Connection'
-
       - deployment: deploy_lib
         condition: and(contains(variables['build.SourceBranch'], 'refs/tags/v'), succeeded())
         templateContext:
@@ -290,18 +232,10 @@ extends:
               pool:
                 vmImage: ubuntu-latest
               steps:
-              - pwsh: |
-                  $fileNames = "$(Pipeline.Workspace)/Microsoft.OpenApi.Hidi.*.nupkg", "$(Pipeline.Workspace)/Microsoft.OpenApi.YamlReader.*.nupkg"
-                  foreach($fileName in $fileNames) {
-                    if(Test-Path $fileName) {
-                      Remove-Item $fileName -Verbose
-                    }
-                  }
-                displayName: remove other nupkgs to avoid duplication
               - task: 1ES.PublishNuget@1
                 displayName: 'NuGet push'
                 inputs:
-                  packagesToPush: '$(Pipeline.Workspace)/Microsoft.OpenApi.*.nupkg'
+                  packagesToPush: '$(Pipeline.Workspace)/Microsoft.OpenApi.[0-9]*.nupkg'
                   packageParentPath: '$(Pipeline.Workspace)'
                   nuGetFeedType: external
                   publishFeedCredentials: 'OpenAPI Nuget Connection'
@@ -364,139 +298,8 @@ extends:
                   tagSource: userSpecifiedTag
                   tag: 'v$(artifactVersion)'
                   releaseNotesSource: inline
-                  assets: '$(Pipeline.Workspace)\**\*.exe'
                   addChangeLog: false
 
-      - deployment: deploy_docker_image
-        environment: docker-images-deploy
-        templateContext:
-          type: releaseJob
-          isProduction: true
-          inputs:
-          - input: pipelineArtifact
-            artifactName: RepoFiles
-            targetPath: '$(Pipeline.Workspace)'
-        strategy:
-          runOnce:
-            deploy:
-              pool:
-                vmImage: 'ubuntu-latest'
-              steps:
-                - task: AzureCLI@2
-                  displayName: 'Login to Azure Container Registry'
-                  inputs:
-                    azureSubscription: 'ACR Images Push Service Connection'
-                    scriptType: bash
-                    scriptLocation: inlineScript
-                    inlineScript: |
-                      az acr login --name $(REGISTRY)
-              
-                - pwsh: |
-                    $content = [XML](Get-Content $(Pipeline.Workspace)/Directory.Build.props)
-                    Write-Host "XML loaded, finding version..."
-                    
-                    # Handle PropertyGroup as either a single element or array
-                    $version = $null
-                    if ($content.Project.PropertyGroup -is [array]) {
-                      Write-Host "PropertyGroup is an array, checking each entry..."
-                      foreach ($pg in $content.Project.PropertyGroup) {
-                        if ($pg.Version) {
-                          $version = $pg.Version.ToString().Trim()
-                          Write-Host "Found version in PropertyGroup array: $version"
-                          break
-                        }
-                      }
-                    } else {
-                      # Single PropertyGroup
-                      $version = $content.Project.PropertyGroup.Version
-                      if ($version) {
-                        $version = $version.ToString().Trim()
-                        Write-Host "Found version in PropertyGroup: $version"
-                      }
-                    }
-                    
-                    if (-not $version) {
-                      Write-Host "##vso[task.logissue type=error]Version not found in Directory.Build.props"
-                      exit 1
-                    }
-                    
-                    Write-Host "Version found: $version" 
-                    Write-Host "##vso[task.setvariable variable=version;isoutput=true]$version"
-                    Write-Host "##vso[task.setvariable variable=VERSION]$version"
-                  displayName: 'Get version from csproj'
-                  name: getversion
-                
-                - bash: |
-                    # Debug output to verify version variable
-                    echo "Version from previous step: $VERSION"
-                  displayName: 'Verify version variable'
-                
-                - bash: |
-                    echo "Build Number: $(Build.BuildNumber)"
-                    # Extract the last 3 characters for the run number
-                    runnumber=$(echo "$(Build.BuildNumber)" | grep -o '[0-9]\+$')
-                    echo "Extracted Run Number: $runnumber"
-                    
-                    # If extraction fails, set a default
-                    if [ -z "$runnumber" ]; then
-                      echo "Extraction failed, using default value"
-                      runnumber=$(date +"%S%N" | cut -c1-3)
-                      echo "Generated fallback run number: $runnumber"
-                    fi
-                    
-                    # Set the variable for later steps
-                    echo "##vso[task.setvariable variable=RUNNUMBER]$runnumber"
-                    echo "##vso[task.setvariable variable=RUNNUMBER;isOutput=true]$runnumber"
-                  displayName: 'Get truncated run number'
-                  name: getrunnumber
-                  condition: eq(variables['Build.SourceBranch'], variables['PREVIEW_BRANCH'])
-                  
-                - bash: |
-                    date=$(date +'%Y%m%d')
-                    echo "Date value: $date"
-                    echo "##vso[task.setvariable variable=BUILDDATE;isOutput=true]$date"
-                    echo "##vso[task.setvariable variable=BUILDDATE]$date"
-                  displayName: 'Get current date'
-                  name: setdate
-                  condition: eq(variables['Build.SourceBranch'], variables['PREVIEW_BRANCH'])
-                
-                - script: |
-                    docker run --privileged --rm msgraphprodregistry.azurecr.io/tonistiigi/binfmt --install all
-                  displayName: "Enable multi-platform builds"
-
-                - script: |
-                    docker buildx create --use --name mybuilder
-                  displayName: "Set up Docker BuildX"
-
-                - script: |
-                    docker buildx inspect --bootstrap
-                  displayName: "Ensure BuildX is working"
-                
-                - bash: |
-                    echo "Building Docker image..."
-                    echo "Using build date: ${BUILDDATE}"
-                    # Using quotes around tags to prevent flag interpretation
-                    docker buildx build \
-                      --platform linux/amd64,linux/arm64/v8 \
-                      --push \
-                      -t "$(REGISTRY)/$(IMAGE_NAME):nightly" \
-                      -t "$(REGISTRY)/$(IMAGE_NAME):${VERSION}.${BUILDDATE}${RUNNUMBER}" \
-                      "$(Pipeline.Workspace)"
-
-                  displayName: 'Build and Push Nightly Image'
-                  condition: eq(variables['Build.SourceBranch'], variables['PREVIEW_BRANCH'])
-                
-                - bash: |
-                    echo "Building Docker image for release..."
-                    docker buildx build\
-                      --platform linux/amd64,linux/arm64/v8 \
-                      --push \
-                      -t "$(REGISTRY)/$(IMAGE_NAME):latest" \
-                      -t "$(REGISTRY)/$(IMAGE_NAME):${VERSION}" \
-                      "$(Pipeline.Workspace)"
-                  displayName: 'Build and Push Release Image'
-                  condition: contains(variables['Build.SourceBranch'], 'refs/tags/v')
-
 # once the nuget has been released, fill this form to get the public documentation updated.
 # https://dev.azure.com/msft-skilling/Content/_workitems/create/User%20Story?templateId=39fb91e3-64a2-4c8a-83db-b2bdf3603dd3&ownerId=c4a28f90-17ae-4384-b514-7273392b082b
 # https://learn.microsoft.com/en-us/dotnet/api/microsoft.openapi

.github/workflows/codeql-analysis.yml

@@ -44,8 +44,7 @@ jobs:
         run: |
           $projectsArray = @(
             '.\src\Microsoft.OpenApi\Microsoft.OpenApi.csproj',
-            '.\src\Microsoft.OpenApi.YamlReader\Microsoft.OpenApi.YamlReader.csproj',
-            '.\src\Microsoft.OpenApi.Hidi\Microsoft.OpenApi.Hidi.csproj'
+            '.\src\Microsoft.OpenApi.YamlReader\Microsoft.OpenApi.YamlReader.csproj'
           )
 
           $projectsArray | ForEach-Object {

.vscode/launch.json

@@ -1,24 +1,6 @@
 {
     "version": "0.2.0",
     "configurations": [
-        {
-            // 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/main/debugger-launchjson.md
-            "name": "Launch Hidi",
-            "type": "coreclr",
-            "request": "launch",
-            "preLaunchTask": "build",
-            // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/src/Microsoft.OpenApi.Hidi/bin/Debug/net8.0/Microsoft.OpenApi.Hidi.dll",
-            "args": ["plugin", 
-                    "-m","${workspaceFolder}/test/Microsoft.OpenApi.Hidi.Tests/UtilityFiles/exampleapimanifest.json", 
-                    "--of","./output"],
-            "cwd": "${workspaceFolder}/src/Microsoft.OpenApi.Hidi",
-            // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
-            "console": "internalConsole",
-            "stopAtEntry": false
-        },
         {
             // Use IntelliSense to find out which attributes exist for C# debugging
             // Use hover for the description of the existing attributes

.vscode/settings.json

@@ -6,7 +6,6 @@
     },
     "cSpell.words": [
         "csdl",
-        "Hidi",
         "Xunit"
     ]
 }

.vscode/tasks.json

@@ -29,20 +29,6 @@
                 "--collect:\"XPlat Code Coverage\""
             ],
             "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "watch",
-            "command": "dotnet",
-            "type": "process",
-            "group": "build",
-            "args": [
-                "watch",
-                "run",
-                "${workspaceFolder}/src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "problemMatcher": "$msCompile"
         }
     ]
 }

CONTRIBUTING.md

@@ -8,7 +8,9 @@ OpenAPI.net is a mono-repo containing source code for the following packages:
 |----------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | [Microsoft.OpenAPI](./src/Microsoft.OpenAPI/README.md)                         | [![NuGet Version](https://img.shields.io/nuget/vpre/Microsoft.OpenAPI?label=Latest&logo=nuget)](https://www.nuget.org/packages/Microsoft.OpenAPI/)                       |
 | [Microsoft.OpenAPI.YamlReader](./src/Microsoft.OpenApi.YamlReader/README.md)                         | [![NuGet Version](https://img.shields.io/nuget/vpre/Microsoft.OpenAPI.YamlReader?label=Latest&logo=nuget)](https://www.nuget.org/packages/Microsoft.OpenAPI.YamlReader/)                       |
-| [Microsoft.OpenAPI.Hidi](./src/Microsoft.OpenAPI.Hidi/README.md)                         | [![NuGet Version](https://img.shields.io/nuget/vpre/Microsoft.OpenAPI.Hidi?label=Latest&logo=nuget)](https://www.nuget.org/packages/Microsoft.OpenAPI.Hidi/)                       |
+
+The OpenAPI.NET v2-compatible [Microsoft.OpenApi.Hidi command line tool](https://github.com/microsoft/OpenAPI.NET.OData/blob/support/v2/src/Microsoft.OpenApi.Hidi/readme.md) is maintained separately.
+Contribute to Hidi in [OpenAPI.NET.OData's support/v2 branch](https://github.com/microsoft/OpenAPI.NET.OData/tree/support/v2).
 
 OpenAPI.net is open to contributions. There are a couple of different recommended paths to get contributions into the released version of this library.
 

Dockerfile

@@ -8,12 +8,10 @@
     <File Path="readme.md" />
   </Folder>
   <Folder Name="/src/">
-    <Project Path="src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj" />
     <Project Path="src/Microsoft.OpenApi.YamlReader/Microsoft.OpenApi.YamlReader.csproj" />
     <Project Path="src/Microsoft.OpenApi/Microsoft.OpenApi.csproj" />
   </Folder>
   <Folder Name="/test/">
-    <Project Path="test/Microsoft.OpenApi.Hidi.Tests/Microsoft.OpenApi.Hidi.Tests.csproj" />
     <Project Path="test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj" />
     <Project Path="test/Microsoft.OpenApi.Tests/Microsoft.OpenApi.Tests.csproj" />
     <Project Path="test/Microsoft.OpenApi.Trimming.Tests/Microsoft.OpenApi.Trimming.Tests.csproj" />

Microsoft.OpenApi.slnx

@@ -7,7 +7,6 @@
 |--|--|
 |Models and Writers|[![nuget](https://img.shields.io/nuget/v/Microsoft.OpenApi.svg)](https://www.nuget.org/packages/Microsoft.OpenApi/) |
 |YamlReader | [![nuget](https://img.shields.io/nuget/v/Microsoft.OpenApi.YamlReader.svg)](https://www.nuget.org/packages/Microsoft.OpenApi.YamlReader/) |
-|Hidi|[![nuget](https://img.shields.io/nuget/v/Microsoft.OpenApi.Hidi.svg)](https://www.nuget.org/packages/Microsoft.OpenApi.Hidi/)
 
 The **OpenAPI.NET** SDK contains a useful object model for OpenAPI documents in .NET along with common serializers to extract raw OpenAPI JSON and YAML documents from the model.
 
@@ -86,10 +85,9 @@ var outputString = await openApiDocument.SerializeAsJsonAsync(OpenApiSpecVersion
 ```
 
 # Validating/Testing OpenAPI descriptions
-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/main/src/Microsoft.OpenApi.Hidi/readme.md)
+[Microsoft.OpenApi.Hidi](https://www.nuget.org/packages/Microsoft.OpenApi.Hidi) is a command line tool for validating and transforming OpenAPI descriptions.
+The OpenAPI.NET v2-compatible tool is maintained in [OpenAPI.NET.OData's support/v2 branch](https://github.com/microsoft/OpenAPI.NET.OData/tree/support/v2/src/Microsoft.OpenApi.Hidi).
+See its [installation guidelines and documentation](https://github.com/microsoft/OpenAPI.NET.OData/blob/support/v2/src/Microsoft.OpenApi.Hidi/readme.md).
 
 # Contributing