Skip to content

Commit 7ee8f67

Browse files
authored
Merge pull request #1286 from microsoftgraph/dev
sync main
2 parents a765e52 + 95defc8 commit 7ee8f67

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+6
-473132
lines changed

.azure-pipelines/generation-pipeline.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,7 @@ stages:
633633
repoName: 'msgraph-sdk-typescript'
634634
baseBranchName : 'main'
635635
branchName: $(v1Branch)
636+
commitMessagePrefix: "feat(generation): update request builders and models"
636637
targetClassName: "GraphBaseServiceClient"
637638
targetNamespace: "github.com/microsoftgraph/msgraph-sdk-typescript/"
638639
customArguments: "-b -e '/me' -e '/me/**'" # Exclude me and enable backing store
@@ -663,6 +664,7 @@ stages:
663664
repoName: 'msgraph-beta-sdk-typescript'
664665
baseBranchName : 'main'
665666
branchName: $(betaBranch)
667+
commitMessagePrefix: "feat(generation): update request builders and models"
666668
targetClassName: "GraphBetaBaseServiceClient"
667669
targetNamespace: "github.com/microsoftgraph/msgraph-sdk-typescript/"
668670
customArguments: "-b -e '/me' -e '/me/**'" # Exclude me and enable backing store

.azure-pipelines/generation-templates/typescript-sdk.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ steps:
1212
- pwsh: '$(scriptsDirectory)/copy-typescript-sdk-models.ps1 -sourceDirectory "$(kiotaDirectory)/output/" -targetDirectory "$(Build.SourcesDirectory)/${{ parameters.repoName }}/packages/" -packageName "${{ parameters.packageName }}"'
1313
displayName: 'Update models'
1414

15-
- pwsh : $(Build.SourcesDirectory)/${{ parameters.repoName }}/scripts/incrementMinorVersion.ps1
16-
displayName: 'Increment minor version number'
17-
workingDirectory: '$(Build.SourcesDirectory)/${{ parameters.repoName }}/scripts'
18-
19-
2015
- pwsh: |
2116
Move-Item -Path "*.txt","*.json" -Destination "$(Build.SourcesDirectory)/${{ parameters.repoName }}/packages/" -Force
2217
displayName: Move kiota specific metadata to expected location (txt for export file, json for lock or workspace file)

GraphODataTemplateWriter.Test/GraphODataTemplateWriter.Test.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
<ItemGroup>
1919
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
2020
<PackageReference Include="MSTest.TestAdapter">
21-
<Version>3.5.2</Version>
21+
<Version>3.6.1</Version>
2222
</PackageReference>
2323
<PackageReference Include="MSTest.TestFramework">
24-
<Version>3.5.2</Version>
24+
<Version>3.6.1</Version>
2525
</PackageReference>
2626
</ItemGroup>
2727
</Project>

metadata/2018_04_24/stagingv1.0_2018_04_24_descriptions_Intune.xml

Lines changed: 0 additions & 19700 deletions
This file was deleted.

metadata/2018_04_24/stagingv1.0_2018_04_24_descriptions_noIntune.xml

Lines changed: 0 additions & 7958 deletions
This file was deleted.

0 commit comments

Comments
 (0)