Merge Master to Preview #6391
Merged
Merge Master to Preview #6391
Conversation
This file contains hidden or 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
…e UnitTests properly. ScenarioTests have an UndoContext and needs further work.
… it no longer requires Gallery or Authorization.
…hell into netcore-test-convert
…d up the Network controller to no longer use any Hyak clients.
…hell into netcore-test-convert
…d the rest of the changes to make Network tests run properly. Minor cleanup in the network controller.
…e since it is only netcore.
…esources (Commands.Common.ResourceManager) instead of the management SDK version. Remove legacy ResourceManagementClient usage from Sql.
…s actually not being used. Removed the use of a custom environment setup helper.
…of Hyak clients that are generated as-needed instead of precreated. Removed LegacySqlClient precreation from scenario tests. Changed hard-coded sleeps to TestMockSupport.Delay.
…) for tests that should only be ran on desktop (non-netcore). Also, made tests skipped explicitly so that it is easier to test/debug later. Fixed up some references for Microsoft.Azure.Test to use Microsoft.Rest.ClientRuntime.Azure.TestFramework instead.
… run. #if tests that don't apply to netcore.
…. Minor updates to the test controller. The Common.ps1 was bugged with unicode character 0xFFFD instead of spaces on the line I edited, which made it uncompilable for PS6.
… of Storage for websites test in desktop to be compatible with using MockContext, but still have the recordings work. Got the netcore Websites tests working but skip some because of the storage version being out-of-date.
…p helper. Made the KeyVault tests build and run on netcore. Cleaned up code for setting up KeyVault tests. Removed unused methods.
… project building and passing.
…ome tests are skipped due to certain issues, primarily test parallelization.
…ompatible). Now, the automation netcore tests build and pass properly.
# Conflicts: # src/ResourceManager/KeyVault/Commands.KeyVault.Test/ScenarioTests/KeyVaultManagementController.cs # src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/RoleAssignmentTests.cs # src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/RoleDefinitionTests.cs # src/ResourceManager/Websites/AzureRM.Websites.psd1 # src/ResourceManager/Websites/Commands.Websites.Test/ScenarioTests/WebAppBackupRestoreTests.ps1 # src/ResourceManager/Websites/Commands.Websites.Test/ScenarioTests/WebAppSlotTests.ps1 # src/ResourceManager/Websites/Commands.Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppBackupRestoreTests/TestRestoreWebAppSnapshot.json # src/ResourceManager/Websites/Commands.Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppSlotTests/TestSetWebAppSlot.json # src/ResourceManager/Websites/Commands.Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppTests/TestSetWebApp.json # src/ResourceManager/Websites/Commands.Websites.Test/packages.config # src/ResourceManager/Websites/Commands.Websites/Cmdlets/BackupRestore/RestoreAzureWebAppSnapshot.cs # src/ResourceManager/Websites/Commands.Websites/Cmdlets/WebApps/SetAzureWebApp.cs # src/ResourceManager/Websites/Commands.Websites/Commands.Websites.Netcore.csproj # src/ResourceManager/Websites/Commands.Websites/Properties/AssemblyInfo.cs # src/ResourceManager/Websites/Commands.Websites/help/Set-AzureRmWebApp.md
…o DLL cleanup again.
…netcore resources were being optimized away.
Versioning for 6.2.0
…BLE BREAKING CHANGE FOR DATA ANALYTICS! There is 1 cmdlet that outputs multiple types, but boxed as a base type. I've updated the calls to the management SDK as to no longer use obsolete calls. However, the type from those calls is slightly changed to removed a few properties. But, that type isn't DIRECTLY returned. Again, boxed as the same base type that was returned prior. Made PowerBI dependent on Management.PowerBI as to remove an output conflict warning. # Conflicts: # src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Models/PSDataLakeAnalyticsAccountBasic.cs # src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Models/PSJobInformationBasic.cs # src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Models/PSDataLakeStoreAccountBasic.cs # src/ResourceManager/Resources/Commands.Resources.Test/Models.ResourceGroups/GalleryTemplatesClientTests.cs
…d out file. Removed excess dependencies from netcore projects that were manually converted. # Conflicts: # src/ResourceManager/Profile/AzureRM.Profile.Netcore.psd1
# Conflicts: # src/ResourceManager/Sql/Commands.Sql.Test/UnitTests/AzureSqlServerUpgradeAttributeTests.cs
Net core warnings v2
…run properly. Fixes merge for a Sql test.
…tests could pass (specifically AdlaTests.TestAdlaCatalog and AdlaAliasTests.TestAdlaCatalog). Made keyvault pshtest.pfx ALWAYS copy (in CI, it sometimes wouldn't copy???). Altered setup of 2 Sql tests and linked to issue.
Release 6.2.0 merge
[0.12.0] NetCore initial test projects
markcowl
approved these changes
Jun 5, 2018
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.
Description
Merges 6.2.0 Desktop and 0.12.0 NetCore to preview.
Checklist
CONTRIBUTING.mdplatyPSmodule