Skip to content

Commit 8d071a3

Browse files
authored
Merge pull request #1351 from microsoftgraph/dev
main refresh
2 parents a17b850 + d422517 commit 8d071a3

File tree

2 files changed

+9
-39
lines changed

2 files changed

+9
-39
lines changed

.azure-pipelines/generation-pipeline.yml

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@ resources:
4343
endpoint: microsoftgraph (22)
4444
name: microsoftgraph/msgraph-beta-typescript-typings
4545
ref: main
46-
- repository: msgraph-sdk-objc-models
47-
type: github
48-
endpoint: microsoftgraph (22)
49-
name: microsoftgraph/msgraph-sdk-objc-models
50-
ref: dev
5146
- repository: msgraph-sdk-java
5247
type: github
5348
endpoint: microsoftgraph (22)
@@ -73,11 +68,6 @@ resources:
7368
endpoint: microsoftgraph (22)
7469
name: microsoftgraph/msgraph-sdk-ruby
7570
ref: main
76-
- repository: msgraph-beta-sdk-ruby
77-
type: github
78-
endpoint: microsoftgraph (22)
79-
name: microsoftgraph/msgraph-beta-sdk-ruby
80-
ref: main
8171
- repository: msgraph-sdk-typescript
8272
type: github
8373
endpoint: microsoftgraph (22)
@@ -409,35 +399,6 @@ stages:
409399
repoName: msgraph-sdk-ruby
410400
barrelFileName: microsoft_graph.rb
411401

412-
- stage: stage_ruby_beta
413-
dependsOn:
414-
- stage_build_and_publish_kiota
415-
- stage_beta_openapi
416-
condition: |
417-
and
418-
(
419-
eq(dependencies.stage_build_and_publish_kiota.result, 'Succeeded'),
420-
in(dependencies.stage_beta_openapi.result, 'Succeeded', 'Skipped')
421-
)
422-
jobs:
423-
- job: ruby_beta
424-
steps:
425-
- template: generation-templates/language-generation-kiota.yml
426-
parameters:
427-
language: 'ruby'
428-
version: 'beta'
429-
repoName: 'msgraph-beta-sdk-ruby'
430-
branchName: $(betaBranch)
431-
targetClassName: "GraphBaseServiceClient"
432-
targetNamespace: "MicrosoftGraphBeta"
433-
cleanMetadataFolder: $(cleanOpenAPIFolderBeta)
434-
customArguments: "-e '/me' -e '/me/**'" # Exclude me
435-
languageSpecificSteps:
436-
- template: generation-templates/ruby.yml
437-
parameters:
438-
repoName: msgraph-beta-sdk-ruby
439-
barrelFileName: microsoft_graph_beta.rb
440-
441402
- stage: stage_java_v1_kiota
442403
dependsOn:
443404
- stage_build_and_publish_kiota

.azure-pipelines/generation-templates/capture-metadata.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,10 @@ steps:
5252

5353
- template: download-typewriter.yml
5454

55+
# required for typewriter
5556
- template: use-dotnet-sdk.yml
57+
parameters:
58+
version: '8.x'
5659

5760
## Only run if the previous step was successful
5861
- pwsh: '$(scriptsDirectory)/run-typewriter-clean-metadata.ps1'
@@ -113,7 +116,13 @@ steps:
113116

114117
# Use the clean metadata from the last step to generate DotNet files.
115118

119+
# required for the hidi installation validation
116120
- template: use-dotnet-sdk.yml
121+
parameters:
122+
version: '9.x'
123+
124+
- pwsh: dotnet tool install -g Microsoft.OpenApi.Hidi
125+
displayName: 'Install hidi tool'
117126

118127
# verify that generated metadata is parsable as an Edm model
119128
- pwsh: $(Build.SourcesDirectory)/msgraph-metadata/scripts/run-metadata-validation.ps1 -repoDirectory "$(Build.SourcesDirectory)/msgraph-metadata/" -version "${{ parameters.endpoint }}"

0 commit comments

Comments
 (0)