Skip to content

Commit 7f43a3f

Browse files
authored
Merge pull request #1050 from microsoftgraph/dev
Dev to Main
2 parents 5a5f49d + 2f9e967 commit 7f43a3f

File tree

14 files changed

+227
-1090
lines changed

14 files changed

+227
-1090
lines changed

.azure-pipelines/generation-pipeline.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,7 @@ stages:
492492
targetClassName: "BaseGraphServiceClient"
493493
targetNamespace: "com.Microsoft.Graph"
494494
cleanMetadataFolder: $(cleanOpenAPIFolderV1)
495+
customArguments: "-e '/me' -e '/me/**'" # Exclude /me
495496
languageSpecificSteps:
496497
- template: generation-templates/java-kiota.yml
497498
parameters:
@@ -520,6 +521,7 @@ stages:
520521
targetClassName: "BaseGraphServiceClient"
521522
targetNamespace: "com.Microsoft.Graph"
522523
cleanMetadataFolder: $(cleanOpenAPIFolderBeta)
524+
customArguments: "-e '/me' -e '/me/**'" # Exclude /me
523525
languageSpecificSteps:
524526
- template: generation-templates/java-kiota.yml
525527
parameters:
@@ -736,6 +738,7 @@ stages:
736738
branchName: $(v1Branch)
737739
targetClassName: "BaseGraphServiceClient"
738740
targetNamespace: "msgraph.generated"
741+
customArguments: "-e '/me' -e '/me/**'" # Exclude me
739742
cleanMetadataFolder: $(cleanOpenAPIFolderV1)
740743
languageSpecificSteps:
741744
- template: generation-templates/python.yml
@@ -763,6 +766,7 @@ stages:
763766
branchName: $(betaBranch)
764767
targetClassName: "BaseGraphServiceClient"
765768
targetNamespace: "msgraph.generated"
769+
customArguments: "-e '/me' -e '/me/**'" # Exclude me
766770
cleanMetadataFolder: $(cleanOpenAPIFolderBeta)
767771
languageSpecificSteps:
768772
- template: generation-templates/python.yml

.azure-pipelines/generation-templates/cli-kiota.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
parameters:
22
- name: repoName
33
type: string
4-
4+
- name: restorePath
5+
type: string
6+
default:
7+
- name: extraRestoreArgs
8+
type: string
9+
default:
510
steps:
611
- pwsh: '$(scriptsDirectory)/copy-cli-models-kiota.ps1'
712
displayName: 'Update models'
@@ -10,9 +15,14 @@ steps:
1015
OutputFullPath: $(kiotaDirectory)/output/*
1116
RepoModelsDir: $(Build.SourcesDirectory)/${{ parameters.repoName }}/src/generated/
1217

13-
- pwsh: 'dotnet restore'
14-
displayName: Restore dependencies for ${{ parameters.repoName }}
15-
workingDirectory: $(Build.SourcesDirectory)/${{ parameters.repoName }}
18+
- task: DotNetCoreCLI@2
19+
displayName: Restore packages
20+
inputs:
21+
command: restore
22+
includeNuGetOrg: true
23+
workingDirectory: $(Build.SourcesDirectory)/${{ parameters.repoName }}
24+
restoreArguments: --use-lock-file --locked-mode ${{parameters.extraRestoreArgs}}
25+
restoreDirectory: ${{parameters.restorePath}}
1626

1727
- pwsh: 'dotnet build --configuration $(buildConfiguration) --no-restore ./msgraph-cli.csproj --runtime linux-x64'
1828
displayName: Build project ${{ parameters.repoName }}

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @baywet @ddyett @MichaelMainer @nikithauc @zengin @ramsessanchez @Ndiritu @andrueastman @SilasKenneth @rkodev
1+
* @microsoftgraph/msgraph-sdk-code-generator-write

0 commit comments

Comments
 (0)