microsoft · millicentachieng · Oct 6, 2023 · Oct 6, 2023 · Oct 6, 2023 · Oct 6, 2023
diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml
@@ -21,7 +21,7 @@ pool:
 variables:
  buildPlatform: 'Any CPU'
  buildConfiguration: 'Release'
-  ProductBinPath: '$(Build.SourcesDirectory)\src\Microsoft.OpenApi\bin\$(BuildConfiguration)' 
+  ProductBinPath: '$(Build.SourcesDirectory)\src\Microsoft.OpenApi\bin\$(BuildConfiguration)'


 stages:
@@ -31,17 +31,22 @@ stages:
    - job: build
      steps:
      - task: UseDotNet@2
-        displayName: 'Use .NET 6'
+        displayName: 'Use .NET 6' # needed for ESRP signing
        inputs:
          version: 6.x

-      - task: PoliCheck@1
+      - task: UseDotNet@2
+        displayName: 'Use .NET 7'
+        inputs:
+          version: 7.x
+
+      - task: PoliCheck@2
        displayName: 'Run PoliCheck "/src"'
        inputs:
          inputType: CmdLine
          cmdLineArgs: '/F:$(Build.SourcesDirectory)/src /T:9 /Sev:"1|2" /PE:2 /O:poli_result_src.xml'

-      - task: PoliCheck@1
+      - task: PoliCheck@2
        displayName: 'Run PoliCheck "/test"'
        inputs:
          inputType: CmdLine
@@ -70,14 +75,14 @@ stages:
          arguments: '--configuration $(BuildConfiguration) --no-build'

      # CredScan
-      - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2
+      - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@3
        displayName: 'Run CredScan - Src'
        inputs:
          toolMajorVersion: 'V2'
          scanFolder: '$(Build.SourcesDirectory)\src'
          debugMode: false

-      - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2
+      - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@3
        displayName: 'Run CredScan - Test'
        inputs:
          toolMajorVersion: 'V2'
@@ -90,34 +95,38 @@ stages:
          FileDirPath: '$(ProductBinPath)'
        enabled: false

-      - task: BinSkim@3
+      - task: BinSkim@4
        displayName: 'Run BinSkim - Product Binaries'
        inputs:
          InputType: Basic
-          AnalyzeTarget: '$(ProductBinPath)\**\Microsoft.OpenApi.dll'
+          AnalyzeTargetGlob: '$(ProductBinPath)\**\Microsoft.OpenApi.dll'
          AnalyzeSymPath: '$(ProductBinPath)'
          AnalyzeVerbose: true
          AnalyzeHashes: true
          AnalyzeEnvironment: true

-      - task: PublishSecurityAnalysisLogs@2
+      - task: PublishSecurityAnalysisLogs@3
        displayName: 'Publish Security Analysis Logs'
        inputs:
          ArtifactName: SecurityLogs

-      - task: PostAnalysis@1
+      - task: PostAnalysis@2
        displayName: 'Post Analysis'
        inputs:
          BinSkim: true
          CredScan: true
          PoliCheck: true

-      - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+      - task: EsrpCodeSigning@2
        displayName: 'ESRP CodeSigning'
        inputs:
          ConnectedServiceName: 'microsoftgraph ESRP CodeSign DLL and NuGet (AKV)'
          FolderPath: src
          signConfigType: inlineSignParams
+          UseMinimatch: true
+          Pattern: |
+            **\*.exe
+            **\*.dll
          inlineOperation: |
            [
                {
@@ -157,38 +166,27 @@ stages:
                }
            ]
          SessionTimeout: 20
-      
+
      # Pack
-      - task: DotNetCoreCLI@2
+      - pwsh: dotnet pack $(Build.SourcesDirectory)/src/Microsoft.OpenApi/Microsoft.OpenApi.csproj -o $(Build.ArtifactStagingDirectory) --configuration $(BuildConfiguration) --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg
        displayName: 'pack OpenAPI'
-        inputs:
-          command: pack
-          projects: src/Microsoft.OpenApi/Microsoft.OpenApi.csproj
-          arguments: '-o $(Build.ArtifactStagingDirectory) --configuration $(BuildConfiguration) --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg'
-
+
      # Pack
-      - task: DotNetCoreCLI@2
+      - pwsh: dotnet pack $(Build.SourcesDirectory)/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj -o $(Build.ArtifactStagingDirectory) --configuration $(BuildConfiguration) --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg
        displayName: 'pack Readers'
-        inputs:
-          command: pack
-          projects: src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj
-          arguments: '-o $(Build.ArtifactStagingDirectory) --configuration $(BuildConfiguration) --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg'
-
+
      # Pack
-      - task: DotNetCoreCLI@2
+      - 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'
-        inputs:
-          command: pack
-          projects: src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj
-          arguments: '-o $(Build.ArtifactStagingDirectory) --configuration $(BuildConfiguration) --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg'
-
-      - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+
+      - task: EsrpCodeSigning@2
        displayName: 'ESRP CodeSigning Nuget Packages'
        inputs:
          ConnectedServiceName: 'microsoftgraph ESRP CodeSign DLL and NuGet (AKV)'
          FolderPath: '$(Build.ArtifactStagingDirectory)'
          Pattern: '*.nupkg'
          signConfigType: inlineSignParams
+          UseMinimatch: true
          inlineOperation: |
            [
                {
@@ -216,17 +214,17 @@ 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=hidiversion]$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$(hidiversion) -p:PublishTrimmed=true
+          arguments: -c Release --runtime win-x64 /p:PublishSingleFile=true /p:PackAsTool=false --self-contained --output $(Build.ArtifactStagingDirectory)/Microsoft.OpenApi.Hidi-v$(hidiversion)
          projects: 'src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj'
          publishWebProjects: False
-          zipAfterPublish: false 
+          zipAfterPublish: false

      - task: CopyFiles@2
        displayName: Prepare staging folder for upload
@@ -243,7 +241,7 @@ stages:

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

@@ -270,13 +268,14 @@ stages:
              inputs:
                source: current
            - pwsh: |
-                $artifactMainDirectory = Get-ChildItem -Filter Microsoft.OpenApi.Hidi-* -Directory -Recurse | select -First 1
-                $artifactName = $artifactMainDirectory.Name -replace "Microsoft.OpenApi.Hidi-", ""
-                #Set Variable $artifactName
-                Write-Host "##vso[task.setvariable variable=artifactName; isSecret=false; isOutput=true;]$artifactName"
-                Write-Host "##vso[task.setvariable variable=artifactMainDirectory; isSecret=false; isOutput=true;]$artifactMainDirectory"
+                $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: NuGetCommand@2
              displayName: 'NuGet push'
              inputs:
@@ -285,16 +284,24 @@ stages:
                nuGetFeedType: external
                publishFeedCredentials: 'OpenAPI Nuget Connection'
            - task: GitHubRelease@1
-              displayName: 'GitHub release (create)'
+              displayName: 'GitHub release (edit)'
+              condition: succeededOrFailed()
              inputs:
                gitHubConnection: 'Github-MaggieKimani1'
+                action: edit
                tagSource: userSpecifiedTag
-                tag: '$(artifactName)'
-                title: '$(artifactName)'
+                tag: '$(artifactVersion)'
+                title: '$(artifactVersion)'
                releaseNotesSource: inline
-                assets: '$(artifactMainDirectory)\**\*.exe'
+                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
      dependsOn: []
      environment: nuget-org

diff --git a/.editorconfig b/.editorconfig
@@ -84,7 +84,7 @@ csharp_prefer_braces = true:silent
 csharp_style_deconstructed_variable_declaration = true:suggestion
 csharp_prefer_simple_default_expression = true:suggestion
 csharp_style_pattern_local_over_anonymous_function = true:suggestion
-csharp_style_inlined_variable_declaration = true:suggestion
+csharp_style_inlined_variable_declaration = true:error
 ###############################
 # C# Formatting Rules         #
 ###############################

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @irvinesunday @darrelmiller @peombwa @zengin @baywet @millicentachieng @MaggieKimani1 @andrueastman
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,24 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**OpenApi File To Reproduce**
+Add the OpenApi file you're using or a link to it as well as the steps to reproduce the current behavior.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots/Code Snippets**
+If applicable, add screenshots of the stack trace or a code snippet to help explain your problem.
+If applicable, add a link to your project
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is.
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/workflows/auto-merge-dependabot.yml b/.github/workflows/auto-merge-dependabot.yml
@@ -0,0 +1,32 @@
+name: Auto-merge dependabot updates
+
+on:
+  pull_request:
+    branches: [ main ]
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+
+  dependabot-merge:
+
+    runs-on: ubuntu-latest
+
+    if: ${{ github.actor == 'dependabot[bot]' }}
+
+    steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v1.6.0
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+
+      - name: Enable auto-merge for Dependabot PRs
+        # Only if version bump is not a major version change
+        if: ${{steps.metadata.outputs.update-type != 'version-update:semver-major'}}
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		* @irvinesunday @darrelmiller @peombwa @zengin @baywet @millicentachieng @MaggieKimani1 @andrueastman