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

Merge ResourceGroup model in Resources with ResourceGroupData in Core #20904

Merged
merged 33 commits into from
May 19, 2021
Merged

Merge ResourceGroup model in Resources with ResourceGroupData in Core #20904

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
10f6ad0
Change the accessbility to virtual for Resource.Id
YalinLi0312 Mar 24, 2021
ccc17c7
merge from usptream
Apr 5, 2021
5060f5c
Merge branch 'feature/mgmt-track2' of https://github.com/Azure/azure-…
m-nash Apr 12, 2021
9a9a651
Merge branch 'feature/mgmt-track2' of https://github.com/Azure/azure-…
m-nash Apr 21, 2021
7764cb5
Merge branch 'feature/mgmt-track2' of https://github.com/Azure/azure-…
YalinLi0312 Apr 23, 2021
832483a
Merge branch 'feature/mgmt-track2' of https://github.com/Azure/azure-…
YalinLi0312 Apr 28, 2021
8d38700
Merge ResourceGroup model in Resources with Core ResourceGroupData
YalinLi0312 May 6, 2021
90a9cd4
Add and update scenario tests
YalinLi0312 May 6, 2021
3066cd2
Merge branch 'feature/mgmt-track2' of https://github.com/Azure/azure-…
YalinLi0312 May 6, 2021
b4c64dd
Resolve merge conflicts
YalinLi0312 May 6, 2021
c0ef2a0
Resolve merge conflicts
YalinLi0312 May 6, 2021
9597dc7
Merge branch 'feature/mgmt-track2' of https://github.com/Azure/azure-…
YalinLi0312 May 6, 2021
294034c
Update scenario tests
YalinLi0312 May 6, 2021
9877b8f
Merge branch 'mgmt-track2' into yall-5277-UpdateResourceGroupData
YalinLi0312 May 6, 2021
7f273c9
Record ResourceGroupContainerTests
YalinLi0312 May 6, 2021
d5bff88
Initialize Tags in base class
YalinLi0312 May 6, 2021
16051ca
Update ResourceGroupOperationsTests and re-record
YalinLi0312 May 7, 2021
38053bb
Fix the errors in Proto.Client scenario tests
YalinLi0312 May 7, 2021
818ee01
Move some files in Generated folder back
YalinLi0312 May 7, 2021
5a51e82
Address review comments
YalinLi0312 May 8, 2021
86547b0
Merge branch 'feature/mgmt-track2' of https://github.com/Azure/azure-…
m-nash May 10, 2021
4fa650c
Merge branch 'feature/mgmt-track2' of https://github.com/Azure/azure-…
m-nash May 10, 2021
ceceb44
Merge branch 'feature/mgmt-track2' of https://github.com/Azure/azure-…
YalinLi0312 May 12, 2021
9594d98
Resolve conflicts
YalinLi0312 May 12, 2021
06df72f
Add records
YalinLi0312 May 12, 2021
d94ab95
Fix the failing test StartExportTemplate
YalinLi0312 May 12, 2021
021dbb3
Merge branch 'feature/mgmt-track2' of https://github.com/Azure/azure-…
YalinLi0312 May 13, 2021
8125e3e
Merge branch 'mgmt-track2' into yall-5277-UpdateResourceGroupData
YalinLi0312 May 13, 2021
4facd8c
Address comments
YalinLi0312 May 14, 2021
ba541ff
Change tag lro operations to return its lro type
YalinLi0312 May 18, 2021
e0af752
Change rg CreateOrUpdate lro operations to return its lro object
YalinLi0312 May 19, 2021
4c094f7
Update CreateOrUpdate lro object
YalinLi0312 May 19, 2021
f497a5e
Run tests
YalinLi0312 May 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...e.ResourceManager.Core/src/ApiVersions.cs → ...Manager.Core/src/Generated/ApiVersions.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...sourceManager.Core/src/ApiVersionsBase.cs → ...ger.Core/src/Generated/ApiVersionsBase.cs
View file
Open in desktop
File renamed without changes.
0 ...ure.ResourceManager.Core/src/ArmClient.cs → ...ceManager.Core/src/Generated/ArmClient.cs
View file
Open in desktop
File renamed without changes.
7 changes: 2 additions & 5 deletions ...ourceManager.Core/src/ArmClientOptions.cs → ...er.Core/src/Generated/ArmClientOptions.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...ResourceManager.Core/src/ContainerBase.cs → ...nager.Core/src/Generated/ContainerBase.cs
View file
Open in desktop
File renamed without changes.
0 ...er.Core/src/ExtensionResourceContainer.cs → ...c/Generated/ExtensionResourceContainer.cs
View file
Open in desktop
File renamed without changes.
0 ...re/src/ExtensionResourceOperationsBase.cs → ...erated/ExtensionResourceOperationsBase.cs
View file
Open in desktop
File renamed without changes.
36 changes: 36 additions & 0 deletions ...er/Azure.ResourceManager.Core/src/Generated/Models/ExportTemplateRequest.Serialization.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 27 additions & 0 deletions sdk/resourcemanager/Azure.ResourceManager.Core/src/Generated/Models/ExportTemplateRequest.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

110 changes: 110 additions & 0 deletions ...anager/Azure.ResourceManager.Core/src/Generated/Models/ResourceGroupData.Serialization.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 43 additions & 0 deletions sdk/resourcemanager/Azure.ResourceManager.Core/src/Generated/Models/ResourceGroupData.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 46 additions & 0 deletions .../Azure.ResourceManager.Core/src/Generated/Models/ResourceGroupListResult.Serialization.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 36 additions & 0 deletions ...esourcemanager/Azure.ResourceManager.Core/src/Generated/Models/ResourceGroupListResult.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 47 additions & 0 deletions ...r/Azure.ResourceManager.Core/src/Generated/Models/ResourceGroupPatchable.Serialization.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading