Merge pull request #2311 from microsoftgraph/dev

merge dev to master
microsoftgraph · Feb 3, 2025 · b1415b7 · b1415b7
2 parents d107f86 + dab9306
commit b1415b7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 81 deletions.
diff --git a/ExceptionMiddleware/ExceptionMiddleware.Test.csproj b/ExceptionMiddleware/ExceptionMiddleware.Test.csproj
@@ -13,7 +13,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="Microsoft.OData.Edm" Version="8.2.3" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.7.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.7.3" />
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.12.19">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>

diff --git a/OpenAPIService/OpenAPIService.csproj b/OpenAPIService/OpenAPIService.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
     <PackageReference Include="Microsoft.OData.Edm" Version="8.2.3" />
     <PackageReference Include="Microsoft.OpenApi" Version="1.6.23" />
-    <PackageReference Include="Microsoft.OpenApi.OData" Version="1.7.3" />
+    <PackageReference Include="Microsoft.OpenApi.OData" Version="1.7.4" />
     <PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.23" />
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.12.19">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/pipelines/release.yml b/pipelines/release.yml
@@ -160,82 +160,3 @@ extends:
           directory: 'microsoft-graph-devx-api'
           repoName: ReleasePipelines
           dependsOn: ['Build']
-
-    - stage: DeployStaging
-      condition: and(contains(variables['build.sourceBranch'], 'refs/heads/master'), succeeded())
-      dependsOn: BuildAndPublish
-      jobs:
-      - deployment: staging  
-        templateContext:
-          type: releaseJob
-          isProduction: false
-          inputs:
-          - input: pipelineArtifact
-            artifactName: drop
-            targetPath: $(Build.ArtifactStagingDirectory)
-        environment: graphexplorerapi-staging
-        strategy:
-          runOnce:
-            deploy:
-              steps:
-              - task: AzureRmWebAppDeployment@4
-                displayName: Staging
-                inputs:
-                  azureSubscription: 'Federated DevX API Managed Identity'
-                  WebAppName: graphexplorerapi
-                  deployToSlotOrASE: true
-                  ResourceGroupName: 'Graph-Explorer-API'
-                  packageForLinux: '$(Build.ArtifactStagingDirectory)/GraphWebApi.zip'
-                  JSONFiles: '**/appsettings.json'
-                  SlotName: 'staging'
-
-              - task: AzureAppServiceManage@0
-                displayName: 'Restart Azure App Service: graphexplorerapi staging'
-                inputs:
-                  azureSubscription: 'Federated DevX API Managed Identity'
-                  Action: 'Restart Azure App Service'
-                  WebAppName: graphexplorerapi
-                  SpecifySlotOrASE: true
-                  ResourceGroupName: 'Graph-Explorer-API'
-                  Slot: 'staging'
-
-
-    - stage: DeployProduction
-      condition: and(contains(variables['build.sourceBranch'], 'refs/heads/master'), succeeded())
-      dependsOn: [DeployStaging, BuildAndPublish]
-      jobs:
-      - deployment: production
-        templateContext:
-          type: releaseJob
-          isProduction: true
-        environment: graphexplorerapi-production
-        strategy:
-          runOnce:
-            deploy:
-              steps:
-              - task: AzureAppServiceManage@0
-                displayName: 'Manage Azure App Service - Slot Swap'
-                inputs:
-                  azureSubscription: 'Federated DevX API Managed Identity'
-                  WebAppName: graphexplorerapi
-                  ResourceGroupName: 'Graph-Explorer-API'
-                  SourceSlot: staging
-
-              - task: AzureAppServiceManage@0
-                displayName: 'Restart Azure App Service: graphexplorerapi'
-                inputs:
-                  azureSubscription: 'Federated DevX API Managed Identity'
-                  Action: 'Restart Azure App Service'
-                  WebAppName: graphexplorerapi
-                  SpecifySlotOrASE: true
-                  ResourceGroupName: 'Graph-Explorer-API'
-
-              - task: GitHubRelease@1
-                displayName: 'GitHub release (v$(Build.BuildNumber)-$(Build.BuildId))'
-                inputs:
-                  gitHubConnection: 'Github-MaggieKimani1'
-                  action: edit
-                  tag: 'v$(Build.BuildNumber)'
-                  title: 'DevX API - v$(Build.BuildNumber)'
-                  assets: '$(Build.ArtifactStagingDirectory)/drop/*.zip'
-                  changeLogType: issueBased