[6.8.0] Merge release --> master #7042
Merged
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
…nto freshrename
…dowsAzure.Storage dependency issues for Storage-related and ApiManagement modules. Included some help changes only for build to succeed.
# Conflicts: # Azure.PowerShell.Netcore.sln # TestMappings.json # build.proj # src/ResourceManager/Aks/Commands.Aks/AzureRM.Aks.psd1 # src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Commands.AnalysisServices.Dataplane.csproj # src/ResourceManager/Automation/Commands.Automation.Test/Commands.Automation.Test.csproj # src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj # src/ResourceManager/DataFactoryV2/Commands.DataFactoryV2.Test/Commands.DataFactoryV2.Test.csproj # src/ResourceManager/DataFactoryV2/DataFactoryV2.sln # src/ResourceManager/DevTestLabs/Commands.DevTestLabs.Test/ScenarioTests/PolicyTests.cs # src/ResourceManager/MachineLearning/Commands.MachineLearning.Test/ScenarioTests/WebServiceTests.cs # src/ResourceManager/ManagementPartner/Commands.Partner.Test/Commands.Partner.Test.csproj # src/ResourceManager/Maps/Maps.Test/Commands.Maps.Test.csproj # src/ResourceManager/Maps/Maps.sln # src/ResourceManager/Profile/Commands.Profile/AzureRM.Profile.Netcore.psd1 # src/ResourceManager/RecoveryServices/RecoveryServices.Backup.sln # src/ResourceManager/RecoveryServices/RecoveryServices.sln # src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/RoleAssignmentTests.cs # src/ResourceManager/ServiceBus/Commands.ServiceBus.Test/Commands.ServiceBus.Test.csproj # src/ResourceManager/ServiceFabric/Commands.ServiceFabric.Test/Commands.ServiceFabric.Test.csproj # src/ResourceManager/SignalR/Commands.SignalR.Test/Commands.SignalR.Test.csproj # src/ServiceManagement/Automation/Commands.Automation.Test/Commands.Automation.Test.csproj # src/ServiceManagement/Automation/Commands.Automation/Commands.Automation.csproj # src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/Commands.ServiceManagement.PlatformImageRepository.csproj # src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj # src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj # src/ServiceManagement/Compute/Commands.ServiceManagement/Commands.ServiceManagement.csproj # src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/Commands.ExpressRoute.csproj # src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj # src/ServiceManagement/HDInsight/Commands.HDInsight/HDInsight.csproj # src/ServiceManagement/Network/Commands.Network.Test/Commands.ServiceManagement.Network.Test.csproj # src/ServiceManagement/Network/Commands.Network/Commands.ServiceManagement.Network.csproj # src/ServiceManagement/Profile/Commands.Profile/Commands.Profile.csproj # src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/Commands.RecoveryServices.Test.csproj # src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Commands.RecoveryServicesRdfe.csproj # src/ServiceManagement/Services/Commands.Test.Utilities/Commands.Test.Utilities.csproj # src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj # src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj # src/ServiceManagement/Services/Commands.Utilities/packages.config # src/ServiceManagement/Services/Commands/Commands.csproj # src/ServiceManagement/Sql/Commands.SqlDatabase.Test/Commands.SqlDatabase.Test.csproj # src/ServiceManagement/Sql/Commands.SqlDatabase/Commands.SqlDatabase.csproj # src/ServiceManagement/StorSimple/Commands.StorSimple.Test/Commands.StorSimple.Test.csproj # src/ServiceManagement/StorSimple/Commands.StorSimple/Commands.StorSimple.csproj # src/ServiceManagement/TrafficManager/Commands.TrafficManager.Test/Commands.TrafficManager.Test.csproj # src/ServiceManagement/TrafficManager/Commands.TrafficManager/Commands.TrafficManager.csproj # tools/Common.Dependencies.Test.targets # tools/Common.Dependencies.targets
Add 64-bit build tools to prerequisites
Release to preview
…-powershell into release-2018-08-24
Version update and VersionController fix
ApiManagement - Fix Issues and Add support for AzureMonitor logger
Convert StaticAnalysis to .NET Core
[Insights] Using SDK 20.1-preview with some fixes. Fixing reported issues with the Diagnostic Settings cmdlets #6998
Update metadata for Az modules
maddieclayton
approved these changes
Aug 24, 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.
Removing pull request template as this is a part of the release process.
Merge the
release-2018-08-24branch intomaster.