Skip to content

Commit 653637d

Browse files
andrueastmanandrueastman
authored
Merge pull request #1164 from microsoftgraph/dev
Merge dev to main
2 parents 869b863 + c9fdd69 commit 653637d

File tree

7 files changed

+48
-27
lines changed

7 files changed

+48
-27
lines changed

‎.azure-pipelines/generation-pipeline.yml‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,106 +15,106 @@ resources:
1515
repositories:
1616
- repository: msgraph-sdk-dotnet
1717
type: github
18-
endpoint: microsoftgraph
18+
endpoint: microsoftgraph (22)
1919
name: microsoftgraph/msgraph-sdk-dotnet
2020
ref: master
2121
- repository: msgraph-beta-sdk-dotnet
2222
type: github
23-
endpoint: microsoftgraph
23+
endpoint: microsoftgraph (22)
2424
name: microsoftgraph/msgraph-beta-sdk-dotnet
2525
ref: master
2626
- repository: msgraph-sdk-php
2727
type: github
28-
endpoint: microsoftgraph
28+
endpoint: microsoftgraph (22)
2929
name: microsoftgraph/msgraph-sdk-php
3030
ref: dev
3131
- repository: msgraph-beta-sdk-php
3232
type: github
33-
endpoint: microsoftgraph
33+
endpoint: microsoftgraph (22)
3434
name: microsoftgraph/msgraph-beta-sdk-php
3535
ref: main
3636
- repository: msgraph-typescript-typings
3737
type: github
38-
endpoint: microsoftgraph
38+
endpoint: microsoftgraph (22)
3939
name: microsoftgraph/msgraph-typescript-typings
4040
ref: main
4141
- repository: msgraph-beta-typescript-typings
4242
type: github
43-
endpoint: microsoftgraph
43+
endpoint: microsoftgraph (22)
4444
name: microsoftgraph/msgraph-beta-typescript-typings
4545
ref: main
4646
- repository: msgraph-sdk-objc-models
4747
type: github
48-
endpoint: microsoftgraph
48+
endpoint: microsoftgraph (22)
4949
name: microsoftgraph/msgraph-sdk-objc-models
5050
ref: dev
5151
- repository: msgraph-sdk-java
5252
type: github
53-
endpoint: microsoftgraph
53+
endpoint: microsoftgraph (22)
5454
name: microsoftgraph/msgraph-sdk-java
5555
ref: dev
5656
- repository: msgraph-beta-sdk-java
5757
type: github
58-
endpoint: microsoftgraph
58+
endpoint: microsoftgraph (22)
5959
name: microsoftgraph/msgraph-beta-sdk-java
6060
ref: dev
6161
- repository: msgraph-sdk-go
6262
type: github
63-
endpoint: microsoftgraph
63+
endpoint: microsoftgraph (22)
6464
name: microsoftgraph/msgraph-sdk-go
6565
ref: main
6666
- repository: msgraph-beta-sdk-go
6767
type: github
68-
endpoint: microsoftgraph
68+
endpoint: microsoftgraph (22)
6969
name: microsoftgraph/msgraph-beta-sdk-go
7070
ref: main
7171
- repository: msgraph-sdk-ruby
7272
type: github
73-
endpoint: microsoftgraph
73+
endpoint: microsoftgraph (22)
7474
name: microsoftgraph/msgraph-sdk-ruby
7575
ref: main
7676
- repository: msgraph-beta-sdk-ruby
7777
type: github
78-
endpoint: microsoftgraph
78+
endpoint: microsoftgraph (22)
7979
name: microsoftgraph/msgraph-beta-sdk-ruby
8080
ref: main
8181
- repository: msgraph-sdk-typescript
8282
type: github
83-
endpoint: microsoftgraph
83+
endpoint: microsoftgraph (22)
8484
name: microsoftgraph/msgraph-sdk-typescript
8585
ref: dev
8686
- repository: msgraph-beta-sdk-typescript
8787
type: github
88-
endpoint: microsoftgraph
88+
endpoint: microsoftgraph (22)
8989
name: microsoftgraph/msgraph-beta-sdk-typescript
9090
ref: main
9191
- repository: msgraph-sdk-python
9292
type: github
93-
endpoint: microsoftgraph
93+
endpoint: microsoftgraph (22)
9494
name: microsoftgraph/msgraph-sdk-python
9595
ref: main
9696
- repository: msgraph-beta-sdk-python
9797
type: github
98-
endpoint: microsoftgraph
98+
endpoint: microsoftgraph (22)
9999
name: microsoftgraph/msgraph-beta-sdk-python
100100
ref: main
101101
- repository: msgraph-cli
102102
type: github
103-
endpoint: microsoftgraph
103+
endpoint: microsoftgraph (22)
104104
name: microsoftgraph/msgraph-cli
105105
ref: main
106106
- repository: msgraph-beta-cli
107107
type: github
108-
endpoint: microsoftgraph
108+
endpoint: microsoftgraph (22)
109109
name: microsoftgraph/msgraph-beta-cli
110110
ref: main
111111
- repository: msgraph-metadata
112112
type: github
113-
endpoint: microsoftgraph
113+
endpoint: microsoftgraph (22)
114114
name: microsoftgraph/msgraph-metadata
115115
- repository: microsoft-graph-docs
116116
type: github
117-
endpoint: microsoftgraph
117+
endpoint: microsoftgraph (22)
118118
name: microsoftgraph/microsoft-graph-docs
119119
- repository: kiota
120120
type: github
@@ -798,6 +798,7 @@ stages:
798798
targetNamespace: "ApiSdk"
799799
customArguments: "-e '/me' -e '/me/**'"
800800
cleanMetadataFolder: $(cleanOpenAPIFolderV1)
801+
commitMessagePrefix: "feat(generation): update request builders and models"
801802
languageSpecificSteps:
802803
- template: generation-templates/cli-kiota.yml
803804
parameters:

‎.azure-pipelines/generation-templates/language-generation-kiota.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ parameters:
4040
type: string
4141
default: ''
4242

43+
- name: commitMessagePrefix
44+
type: string
45+
default: ''
46+
4347
steps:
4448
- template: set-up-for-generation-kiota.yml
4549
parameters:
@@ -85,6 +89,7 @@ steps:
8589
BranchName: ${{ parameters.branchName }}
8690
PublishChanges: $(publishChanges)
8791
OverrideSkipCI: $(overrideSkipCI)
92+
CommitMessagePrefix: ${{ parameters.commitMessagePrefix }}
8893
workingDirectory: ${{ parameters.repoName }}
8994

9095
- pwsh: '$(scriptsDirectory)/create-pull-request.ps1'

‎GraphODataTemplateWriter.Test/GraphODataTemplateWriter.Test.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</Content>
1717
</ItemGroup>
1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
2020
<PackageReference Include="MSTest.TestAdapter">
2121
<Version>3.2.0</Version>
2222
</PackageReference>

‎apidoctor‎

‎scripts/git-push-files.ps1‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,28 @@ if ($env:OverrideSkipCI -eq $True)
1212
}
1313

1414
git add . | Write-Host
15+
$commitMessage = "Update generated files with build $env:BUILD_BUILDID"
1516
if (($env:OverrideSkipCI -eq $False) -and ($env:BUILD_REASON -eq 'Manual')) # Skip CI if manually running this pipeline.
1617
{
17-
git commit -m "Update generated files with build $env:BUILD_BUILDID [skip ci]" | Write-Host
18+
if ($env:CommitMessagePrefix)
19+
{
20+
git commit -m "$env:CommitMessagePrefix" -m "$commitMessage [skip ci]" | Write-Host
21+
}
22+
else
23+
{
24+
git commit -m "$commitMessage [skip ci]" | Write-Host
25+
}
1826
}
1927
else
2028
{
21-
git commit -m "Update generated files with build $env:BUILD_BUILDID" | Write-Host
29+
if ($env:CommitMessagePrefix)
30+
{
31+
git commit -m "$env:CommitMessagePrefix" -m "$commitMessage" | Write-Host
32+
}
33+
else
34+
{
35+
git commit -m "$commitMessage" | Write-Host
36+
}
2237
}
2338

2439
Write-Host "Added and commited generated files." -ForegroundColor Green

‎submodules/vipr‎

‎test/Typewriter.Test/Typewriter.Test.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<ProjectReference Include="..\..\Templates\Templates.csproj" />
5656
</ItemGroup>
5757
<ItemGroup>
58-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
58+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
5959
<PackageReference Include="NUnit">
6060
<Version>4.0.1</Version>
6161
</PackageReference>

0 commit comments

Comments
 (0)