Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/resolve conflicts with dev #1390

Closed
wants to merge 590 commits into from
Closed

Fix/resolve conflicts with dev #1390

wants to merge 590 commits into from

Conversation

Ndiritu
Copy link
Contributor

@Ndiritu Ndiritu commented Nov 2, 2023 •
edited by microsoft-github-policy-service bot
Loading

Microsoft Reviewers: Open in CodeFlow

Ndiritu and others added 30 commits November 16, 2022 10:50
@Ndiritu
Merge pull request #1067 from microsoftgraph/beta/pipelinebuild/93081
4339c90 
Generated beta models using Typewriter
@Ndiritu
Merge branch 'dev' into v1.0/pipelinebuild/93081
e409ed1
@Ndiritu
Merge pull request #1066 from microsoftgraph/v1.0/pipelinebuild/93081
fe25207 
Generated models using Typewriter
Update generated files with build 93875
f79e916
Update generated files with build 93875
589969f
@Ndiritu
Re-enable static analysis
a8a2888
@Ndiritu
Enable static analysis for Kiota preview branch
4d5469c
@Ndiritu
Merge pull request #1071 from microsoftgraph/beta/pipelinebuild/93875
c962386 
Generated beta models using Typewriter
@Ndiritu
Merge branch 'dev' into v1.0/pipelinebuild/93875
93123f0
@Ndiritu
Merge pull request #1070 from microsoftgraph/v1.0/pipelinebuild/93875
0457403 
Generated models using Typewriter
@Ndiritu
Merge pull request #1073 from microsoftgraph/fix/re-enable-static-ana…
1449982 
…lysis

Re-enable static analysis
@Ndiritu
Merge pull request #1076 from microsoftgraph/fix/merge-main
39eee8c 
Merge main to dev
@Ndiritu
Merge pull request #1075 from microsoftgraph/dev
feb12aa 
Release 1.84.0
@Ndiritu
Merge pull request #1077 from microsoftgraph/main
72b63c5 
Merge pull request #1075 from microsoftgraph/dev
Update generated files with build 94810
a46fcf0
Bump up minor version
a875fe1
Update generated files with build 94810
6a67bdf
Bump up minor version
f506188
@Ndiritu
Merge pull request #1081 from microsoftgraph/beta/pipelinebuild/94810
7bef59b 
Generated beta models using Typewriter
@Ndiritu
Merge pull request #1080 from microsoftgraph/v1.0/pipelinebuild/94810
dd28bf1 
Generated models using Typewriter
Update generated files with build 96244
be9f504
Update generated files with build 96244
a7c0081
@SilasKenneth
Merge pull request #1085 from microsoftgraph/beta/pipelinebuild/96244
71beb7c 
Generated beta models using Typewriter
@SilasKenneth
Merge pull request #1084 from microsoftgraph/v1.0/pipelinebuild/96244
6ca6fd2 
Generated models using Typewriter
Update generated files with build 97328
044c115
Update generated files with build 97328
5ec717e
@SilasKenneth
Merge pull request #1091 from microsoftgraph/v1.0/pipelinebuild/97328
6eabf6b 
Generated models using Typewriter
@SilasKenneth
Merge pull request #1092 from microsoftgraph/beta/pipelinebuild/97328
1671b98 
Generated beta models using Typewriter
Update generated files with build 98848
fea7cd6
Update generated files with build 98848
ef70e69
Ndiritu and others added 22 commits July 25, 2023 17:23
@Ndiritu
Bump SDK version in README.md
937ea83
@Ndiritu
Merge pull request #1304 from microsoftgraph/v1.0/pipelinebuild/121145
3668657 
Generated  models and request builders
@Ndiritu
Merge pull request #1305 from microsoftgraph/beta/pipelinebuild/121145
b7bc521 
Generated beta models and request builders
Update generated files with build 122273
91fbff4
Update generated files with build 122273
539948e
@Ndiritu
Merge pull request #1314 from microsoftgraph/beta/pipelinebuild/122273
6901050 
Generated beta models and request builders
@Ndiritu
Merge pull request #1313 from microsoftgraph/v1.0/pipelinebuild/122273
593b19a 
Generated  models and request builders
Update generated files with build 122943
27da5c3
Update generated files with build 122943
81bcffd
@Ndiritu
Remove Kiota version workflows
e5e76dc
@Ndiritu
Fix bump SDK version workflow
dc5e95f
@Ndiritu
Update PR validation workflow
9df0a6f
@Ndiritu
Remove update-docs workflow since GH actions can no longer create PRs
d631829
@Ndiritu
Add create-release workflow
1f8f848
@SilasKenneth
Merge pull request #1320 from microsoftgraph/beta/pipelinebuild/122943
e3907fd 
Generated beta models and request builders
@SilasKenneth
Merge pull request #1319 from microsoftgraph/v1.0/pipelinebuild/122943
21d2ac0 
Generated  models and request builders
Update generated files with build 123456
7af4878
@Ndiritu
Merge pull request #1322 from microsoftgraph/fix/v1-gh-actions
2ab054e 
Update v1 SDK GH Workflows
@Ndiritu
Update generated files with build 123456
03e5dcb
@Ndiritu
Bump SDK version
6160d89
@Ndiritu
Merge pull request #1323 from microsoftgraph/v1.0/pipelinebuild/123456
514bfa5 
Generated  models and request builders
@Ndiritu
Merge pull request #1324 from microsoftgraph/beta/pipelinebuild/123456
c180d59 
Generated beta models and request builders
@Ndiritu Ndiritu self-assigned this Nov 2, 2023
@Ndiritu Ndiritu requested a review from a team as a code owner November 2, 2023 09:49
@Ndiritu Ndiritu force-pushed the fix/resolve-conflicts-with-dev branch from 8b1f97d to 0560e06 Compare November 2, 2023 09:53
@Ndiritu Ndiritu marked this pull request as draft November 2, 2023 09:54
@Ndiritu Ndiritu force-pushed the fix/resolve-conflicts-with-dev branch from 0560e06 to 84b051a Compare November 2, 2023 09:57
@Ndiritu Ndiritu closed this Nov 2, 2023
@Ndiritu Ndiritu deleted the fix/resolve-conflicts-with-dev branch November 30, 2023 13:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Ndiritu Ndiritu

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Ndiritu @SilasKenneth @2miroslav @baywet @scott-culverhouse @MIchaelMainer