-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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.
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
Resolve conflicts for -updated merge #18015
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sandido
requested review from
allenjzhang,
bquantump,
m-nash,
markcowl,
nisha-bhatia and
YalinLi0312
as code owners
January 15, 2021 20:33
ghost
added
the
Compute
label
Jan 15, 2021
markcowl
pushed a commit
that referenced
this pull request
Feb 18, 2021
* Delete test json files (#18003) * Delete TestVMExtensionOperations.json * Delete TestVMScaleSetExtensions.json * Resolve conflicts for -updated merge (#18015) * Update SdkInfo_ComputeManagementClient.cs * Update VirtualMachineRunCommandsOperations.cs * Update VirtualMachineScaleSetVMRunCommandsOperations.cs * Create TestVMExtensionOperations.json * Delete TestVMExtensionOperations.json * Create TestVMExtensionOperations.json * Create TestVMScaleSetExtensions.json * Compute 2020 12 updated (#17975) * adding 2020-12-01 compute generated files * update default sku * update tests * test updates * records * tests fixes * all the recorded tests * more update * more update * more update * last test fixes * Updated TestVMIdentitySystemAssignedUserAssigned SDK Test to create User Assigned Identity using SDK (#17861) * Updated TestVMIdentitySystemAssignedUserAssigned SDK Test to create User Assigned MI using MSI SDK * Resolved Merge Conflicts and updated the test Co-authored-by: Pavan Rachapudy <vrachapu@microsoft.com> * Delete AppGW tests (#17977) * Delete VMScaleSetAppGwWithAS.json * Delete VMScaleSetAppGwWithAS_A1V2.json * Delete VMScaleSetAppGwWithAS_SPG_False.json * Delete VMScaleSetAppGwWithAS_Spot.json * Delete VMScaleSetAppGWTests.cs * Delete deprecated ContainerService tests (#17976) * Delete ContainerServiceOperationalTests.cs * Delete ContainerServiceTestsBase.cs * Delete ContainerServiceUpdateTests.cs * Delete TestDCOSOperations.json * Delete TestSwarmOperations.json * Delete TestContainerServiceUpdateOperations.json * test * remove test text Co-authored-by: pavanrachapudy <pavanrachapudy@gmail.com> Co-authored-by: Pavan Rachapudy <vrachapu@microsoft.com> Co-authored-by: Adam Sandor <adsandor@microsoft.com> * new recording files * 2020-12 release features generated, tests pass * Update DiskRPTestsBase.cs (#18355) * Remove CloudService tests (#18423) * Delete CloudServiceExtensionTests.cs * Delete CloudServiceOperationTests.cs * Delete CloudServiceRoleInstanceTests.cs * Delete CloudServiceScenarioTests.cs * Delete CloudServiceTestsBase.cs * Delete CloudServiceUpdateTests.cs * Delete MultiRole_CreateUpdateGetAndDeleteWithExtension_WorkerAndWebRole.json * Delete MultiRole_CreateUpdateGetAndDeleteWithExtension_WorkerAndWebRole_MultiRoleExtension.json * Delete Test_Create_PowerOff_Start_CloudServiceOperation.json * Delete Test_ListCloudServicesOperation.json * Delete Test_CloudServiceRoleInstanceOperations.json * Delete TestCloudServiceScenarioOperations.json * Delete TestCloudServiceScenarioOperations_DeleteCloudService.json * Delete TestCloudServiceScenarioOperations_ExtensionProfile.json * Delete TestCloudServiceScenarioOperations_InstanceView.json * Delete TestCloudServiceOperations_ScaleIn_ScaleOut.json * Delete TestCloudServiceUpdateOperations.json * Update AzSdk.RP.props * Update AzSdk.RP.props remove containerService * Delete ServiceConfigurationHelpers.cs * regenerate on released 2020-12-01 swagger * re-recorded test jsons * test fixes * Update AssemblyInfo.cs * Update AzSdk.RP.props * Update Microsoft.Azure.Management.Compute.csproj * Update compute_resource-manager.txt * Update Microsoft.Azure.Management.Compute.csproj * customization for VMSSVMOperations * update for OMode and others * Update compute_resource-manager.txt * Update VirtualMachineScaleSetVMsOperations.cs full customization for this class * Update VirtualMachineScaleSetVMsOperations.cs full customization revision * Create VirtualMachineScaleSet.cs customizations for VMSS.cs * Create VirtualMachineUpdate.cs customizations for VMU * Create VirtualMachine.cs customization for VM.cs * Update VirtualMachineScaleSet.cs customization finalized * Update VirtualMachineScaleSetVMsOperations.cs customization edit * Create VirtualMachineImage.cs VMI.cs customization * Update VirtualMachine.cs cleanup * Update VirtualMachine.cs c;eamup2 * Update VirtualMachineUpdate.cs fix build error? removed Plan * Update VirtualMachineUpdate.cs resolve errors * Update VirtualMachine.cs resolve errors * Update VirtualMachineImage.cs resolve errors * Update VirtualMachineScaleSet.cs resolve errors * Update VirtualMachine.cs * Update VirtualMachineImage.cs * Update VirtualMachineScaleSet.cs * Update VirtualMachineUpdate.cs * Update VirtualMachineScaleSet.cs * Update VirtualMachineScaleSetVMsOperations.cs * Update VirtualMachineUpdate.cs * Create IVirtualMachineScaleSetVMsOperations.cs customizations * Update IVirtualMachineScaleSetVMsOperations.cs additional customizations * Create VirtualMachineScaleSetVMsOperationsExtensions.cs * Update VMInstanceViewPatchStatusTests.cs Co-authored-by: Theodore Chang <thchan@microsoft.com> Co-authored-by: pavanrachapudy <pavanrachapudy@gmail.com> Co-authored-by: Pavan Rachapudy <vrachapu@microsoft.com>
nisha-bhatia
pushed a commit
that referenced
this pull request
Mar 3, 2021
* Delete test json files (#18003) * Delete TestVMExtensionOperations.json * Delete TestVMScaleSetExtensions.json * Resolve conflicts for -updated merge (#18015) * Update SdkInfo_ComputeManagementClient.cs * Update VirtualMachineRunCommandsOperations.cs * Update VirtualMachineScaleSetVMRunCommandsOperations.cs * Create TestVMExtensionOperations.json * Delete TestVMExtensionOperations.json * Create TestVMExtensionOperations.json * Create TestVMScaleSetExtensions.json * Compute 2020 12 updated (#17975) * adding 2020-12-01 compute generated files * update default sku * update tests * test updates * records * tests fixes * all the recorded tests * more update * more update * more update * last test fixes * Updated TestVMIdentitySystemAssignedUserAssigned SDK Test to create User Assigned Identity using SDK (#17861) * Updated TestVMIdentitySystemAssignedUserAssigned SDK Test to create User Assigned MI using MSI SDK * Resolved Merge Conflicts and updated the test Co-authored-by: Pavan Rachapudy <vrachapu@microsoft.com> * Delete AppGW tests (#17977) * Delete VMScaleSetAppGwWithAS.json * Delete VMScaleSetAppGwWithAS_A1V2.json * Delete VMScaleSetAppGwWithAS_SPG_False.json * Delete VMScaleSetAppGwWithAS_Spot.json * Delete VMScaleSetAppGWTests.cs * Delete deprecated ContainerService tests (#17976) * Delete ContainerServiceOperationalTests.cs * Delete ContainerServiceTestsBase.cs * Delete ContainerServiceUpdateTests.cs * Delete TestDCOSOperations.json * Delete TestSwarmOperations.json * Delete TestContainerServiceUpdateOperations.json * test * remove test text Co-authored-by: pavanrachapudy <pavanrachapudy@gmail.com> Co-authored-by: Pavan Rachapudy <vrachapu@microsoft.com> Co-authored-by: Adam Sandor <adsandor@microsoft.com> * new recording files * 2020-12 release features generated, tests pass * Update DiskRPTestsBase.cs (#18355) * Remove CloudService tests (#18423) * Delete CloudServiceExtensionTests.cs * Delete CloudServiceOperationTests.cs * Delete CloudServiceRoleInstanceTests.cs * Delete CloudServiceScenarioTests.cs * Delete CloudServiceTestsBase.cs * Delete CloudServiceUpdateTests.cs * Delete MultiRole_CreateUpdateGetAndDeleteWithExtension_WorkerAndWebRole.json * Delete MultiRole_CreateUpdateGetAndDeleteWithExtension_WorkerAndWebRole_MultiRoleExtension.json * Delete Test_Create_PowerOff_Start_CloudServiceOperation.json * Delete Test_ListCloudServicesOperation.json * Delete Test_CloudServiceRoleInstanceOperations.json * Delete TestCloudServiceScenarioOperations.json * Delete TestCloudServiceScenarioOperations_DeleteCloudService.json * Delete TestCloudServiceScenarioOperations_ExtensionProfile.json * Delete TestCloudServiceScenarioOperations_InstanceView.json * Delete TestCloudServiceOperations_ScaleIn_ScaleOut.json * Delete TestCloudServiceUpdateOperations.json * Update AzSdk.RP.props * Update AzSdk.RP.props remove containerService * Delete ServiceConfigurationHelpers.cs * regenerate on released 2020-12-01 swagger * re-recorded test jsons * test fixes * Update VMScenarioTests.cs * Update VMTestBase.cs * Create TestVMScenarioOperations_TrustedLaunch.json * Update OrchestrationMode.cs Co-authored-by: Theodore Chang <thchan@microsoft.com> Co-authored-by: pavanrachapudy <pavanrachapudy@gmail.com> Co-authored-by: Pavan Rachapudy <vrachapu@microsoft.com>
nisha-bhatia
pushed a commit
that referenced
this pull request
Mar 4, 2021
* Delete test json files (#18003) * Delete TestVMExtensionOperations.json * Delete TestVMScaleSetExtensions.json * Resolve conflicts for -updated merge (#18015) * Update SdkInfo_ComputeManagementClient.cs * Update VirtualMachineRunCommandsOperations.cs * Update VirtualMachineScaleSetVMRunCommandsOperations.cs * Create TestVMExtensionOperations.json * Delete TestVMExtensionOperations.json * Create TestVMExtensionOperations.json * Create TestVMScaleSetExtensions.json * Compute 2020 12 updated (#17975) * adding 2020-12-01 compute generated files * update default sku * update tests * test updates * records * tests fixes * all the recorded tests * more update * more update * more update * last test fixes * Updated TestVMIdentitySystemAssignedUserAssigned SDK Test to create User Assigned Identity using SDK (#17861) * Updated TestVMIdentitySystemAssignedUserAssigned SDK Test to create User Assigned MI using MSI SDK * Resolved Merge Conflicts and updated the test Co-authored-by: Pavan Rachapudy <vrachapu@microsoft.com> * Delete AppGW tests (#17977) * Delete VMScaleSetAppGwWithAS.json * Delete VMScaleSetAppGwWithAS_A1V2.json * Delete VMScaleSetAppGwWithAS_SPG_False.json * Delete VMScaleSetAppGwWithAS_Spot.json * Delete VMScaleSetAppGWTests.cs * Delete deprecated ContainerService tests (#17976) * Delete ContainerServiceOperationalTests.cs * Delete ContainerServiceTestsBase.cs * Delete ContainerServiceUpdateTests.cs * Delete TestDCOSOperations.json * Delete TestSwarmOperations.json * Delete TestContainerServiceUpdateOperations.json * test * remove test text Co-authored-by: pavanrachapudy <pavanrachapudy@gmail.com> Co-authored-by: Pavan Rachapudy <vrachapu@microsoft.com> Co-authored-by: Adam Sandor <adsandor@microsoft.com> * new recording files * 2020-12 release features generated, tests pass * Update DiskRPTestsBase.cs (#18355) * Remove CloudService tests (#18423) * Delete CloudServiceExtensionTests.cs * Delete CloudServiceOperationTests.cs * Delete CloudServiceRoleInstanceTests.cs * Delete CloudServiceScenarioTests.cs * Delete CloudServiceTestsBase.cs * Delete CloudServiceUpdateTests.cs * Delete MultiRole_CreateUpdateGetAndDeleteWithExtension_WorkerAndWebRole.json * Delete MultiRole_CreateUpdateGetAndDeleteWithExtension_WorkerAndWebRole_MultiRoleExtension.json * Delete Test_Create_PowerOff_Start_CloudServiceOperation.json * Delete Test_ListCloudServicesOperation.json * Delete Test_CloudServiceRoleInstanceOperations.json * Delete TestCloudServiceScenarioOperations.json * Delete TestCloudServiceScenarioOperations_DeleteCloudService.json * Delete TestCloudServiceScenarioOperations_ExtensionProfile.json * Delete TestCloudServiceScenarioOperations_InstanceView.json * Delete TestCloudServiceOperations_ScaleIn_ScaleOut.json * Delete TestCloudServiceUpdateOperations.json * Update AzSdk.RP.props * Update AzSdk.RP.props remove containerService * Delete ServiceConfigurationHelpers.cs * regenerate on released 2020-12-01 swagger * re-recorded test jsons * test fixes * Update Helpers.cs * Update VMDataDiskTests.cs * Create TestVMDataDiskScenario_ManagedDisk_ForceDetach.json * Update OrchestrationMode.cs Co-authored-by: Theodore Chang <thchan@microsoft.com> Co-authored-by: pavanrachapudy <pavanrachapudy@gmail.com> Co-authored-by: Pavan Rachapudy <vrachapu@microsoft.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.