[AzureRT] Update #1392
Merged
[AzureRT] Update #1392
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
…NRP Ignite feature.
Fix NRP API Version in Compute Tests
Revert "Fix NRP API Version in Compute Tests"
…extension optional.
…nto dev Conflicts: src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj src/Common/Commands.Common/Commands.Common.csproj src/ResourceManager/Common/Commands.ResourceManager.Common/Commands.ResourceManager.Common.csproj src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj src/ResourceManager/Compute/Commands.Compute.Test/packages.config src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj src/ResourceManager/Compute/Commands.Compute/packages.config src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj src/ResourceManager/Network/Commands.Network.Test/packages.config src/ResourceManager/Network/Commands.Network/Commands.Network.csproj src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/SetAzureExpressRouteCircuitCommand.cs src/ResourceManager/Network/Commands.Network/packages.config src/ResourceManager/Profile/Commands.Profile/Commands.Profile.csproj src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Commands.Resources.Rest.csproj src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj src/ResourceManager/Tags/Commands.Tags/Commands.Tags.csproj
Conflicts: src/ResourceManager/Compute/Commands.Compute/Extension/Diagnostics/SetAzureVMDiagnosticsExtension.cs
| @@ -19,7 +18,9 @@ | |||
| <package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.18.206251556" targetFramework="net45" /> | |||
| <package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" /> | |||
| <package id="Microsoft.Rest.ClientRuntime" version="1.4.1" targetFramework="net45" /> | |||
| <package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.11.0" targetFramework="net45" /> | |||
| <package id="Microsoft.Rest.ClientRuntime.Azure" version="2.1.0" targetFramework="net45" /> | |||
| <package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.9.3" targetFramework="net45" /> | |||
There was a problem hiding this comment.
@hyonholee Is there any reason this needs to be downgraded from 0.11.0 to 0.9.3?
There was a problem hiding this comment.
Also in Commands.Network.Test
There was a problem hiding this comment.
Yes. When I ran the tests, I got a System.IO.FileLoadException during loading this dll. After I downgraded to 0.9.3, it worked.
Update authentication and testframework packages
|
on-demand passing: http://azuresdkci.cloudapp.net/view/1-AzurePowerShell/job/powershell-demand/393/. Merging |
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.
ARM Compute:
ASM Compute:
This PR includes Network update with Swagger-generated library.