security/stj tov1

.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'
@@ -206,10 +208,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,11 +227,6 @@ 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:
@@ -264,6 +268,13 @@ extends:
                     ]'
 
       - deployment: deploy_lib
+        templateContext:
+          type: releaseJob
+          isProduction: true
+          inputs:
+          - input: pipelineArtifact
+            artifactName: Nugets
+            targetPath: '$(Pipeline.Workspace)'
         dependsOn: []
         environment: nuget-org
         strategy:
@@ -272,11 +283,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 +300,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,11 +315,6 @@ 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:

.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.7.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.7.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 }}

src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj

@@ -45,7 +45,7 @@
     <!--STJ
     required until Microsoft.Extensions.Logging.Console and Microsoft.Extensions.Configuration.Json
     update their dependencies -->
-    <PackageReference Include="System.Text.Json" Version="8.0.4" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
 
   <ItemGroup>

test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
         <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
@@ -24,7 +24,7 @@
         <PackageReference Include="xunit" Version="2.9.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="all" />
         <!--STJ required until Microsoft.Extensions.Logging.Console and Microsoft.Extensions.Configuration.Json update their dependencies -->
-        <PackageReference Include="System.Text.Json" Version="8.0.4" />
+        <PackageReference Include="System.Text.Json" Version="8.0.5" />
     </ItemGroup>
 
     <ItemGroup>

test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiStreamReaderTests.cs

@@ -55,7 +55,7 @@ public async Task StreamShouldReadWhenInitializedAsync()
                 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/tests/v3.0/pass/petstore.yaml");
 
             // Read V3 as YAML
             var openApiDocument = new OpenApiStreamReader().Read(stream, out var diagnostic);