Skip to content

Commit 9c5c77a

Browse files
authored
Merge pull request #1230 from microsoftgraph/dev
Latest dev changes.
2 parents 07f0e9c + 39bb1dc commit 9c5c77a

File tree

5 files changed

+16
-6
lines changed

5 files changed

+16
-6
lines changed

.azure-pipelines/generation-pipeline.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ resources:
2727
type: github
2828
endpoint: microsoftgraph (22)
2929
name: microsoftgraph/msgraph-sdk-php
30-
ref: dev
30+
ref: main
3131
- repository: msgraph-beta-sdk-php
3232
type: github
3333
endpoint: microsoftgraph (22)
@@ -517,7 +517,7 @@ stages:
517517
branchName: 'kiota/$(betaBranch)'
518518
targetClassName: "BaseGraphClient"
519519
targetNamespace: 'Microsoft\\Graph\\Beta\\Generated'
520-
baseBranchName: 'dev'
520+
baseBranchName: 'main'
521521
cleanMetadataFolder: $(cleanOpenAPIFolderBeta)
522522
languageSpecificSteps:
523523
- template: generation-templates/php-kiota.yml
@@ -546,7 +546,7 @@ stages:
546546
branchName: 'kiota/$(v1Branch)'
547547
targetClassName: "BaseGraphClient"
548548
targetNamespace: 'Microsoft\\Graph\\Generated'
549-
baseBranchName: 'dev'
549+
baseBranchName: 'main'
550550
cleanMetadataFolder: $(cleanOpenAPIFolderV1)
551551
languageSpecificSteps:
552552
- template: generation-templates/php-kiota.yml

CODE_OF_CONDUCT.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Microsoft Open Source Code of Conduct
2+
3+
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
4+
5+
Resources:
6+
7+
- [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/)
8+
- [Microsoft Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
9+
- Contact [[email protected]](mailto:[email protected]) with questions or concerns
10+
- Employees can reach out at [aka.ms/opensource/moderation-support](https://aka.ms/opensource/moderation-support)

apidoctor

src/Typewriter/Typewriter.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<Version>5.1.2</Version>
2727
</PackageReference>
2828
<PackageReference Include="NLog">
29-
<Version>5.2.8</Version>
29+
<Version>5.3.2</Version>
3030
</PackageReference>
3131
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
3232
</ItemGroup>

0 commit comments

Comments
 (0)