Load Newtonsoft.Json 10.0.3 side-by-side with 6.0.8

.gitignore

@@ -14,6 +14,7 @@ msbuild.log
 # please do not commit any app.config files.
 app.config
 !src/ResourceManager/Profile/Commands.Profile.Test/App.config
+!src/Storage/Commands.Storage.Test/app.config
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 

setup/azurecmdfiles.wxi

@@ -126,6 +126,11 @@
                         <Component Id="cmp0BDE7E7D0ED7F2874130783D7C1B070C" Guid="*">
                             <File Id="fil47AF7653C00C10B18037E483A14A872F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Automation\Microsoft.Azure.Management.Automation.dll" />
                         </Component>
+                        <Directory Id="dir0A9D085676BEB82193EEF198F293B2B0" Name="StartupScripts">
+                            <Component Id="cmpE47EC5B729E4B2758CF8ABAD93EE6B23" Guid="*">
+                                <File Id="fil7B69E6E88EDE3A9BD7C02F1236B7AABB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Automation\StartupScripts\AzureRmAutomationStartup.ps1" />
+                            </Component>
+                        </Directory>
                     </Directory>
                     <Directory Id="dirC356D37A40B405FD605985242C6B68F1" Name="AzureRM.Backup">
                         <Component Id="cmp235245AE05B9E5ED010EE787C63217C5" Guid="*">
@@ -691,15 +696,6 @@
                         <Component Id="cmpC21AB0561E010A8A8BC1B56AF2401277" Guid="*">
                             <File Id="fil792BC186CD5628088468A8E68FE2C496" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\AzureRM.IotHub.psm1" />
                         </Component>
-                        <Component Id="cmpA2E684A10B5D1FE61816950EA488B619" Guid="*">
-                            <File Id="filED0A74764367CDCB2F139E0F579A43A9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Hyak.Common.dll" />
-                        </Component>
-                        <Component Id="cmp66C6BE87523BE39FE5A322FE66E678E7" Guid="*">
-                            <File Id="filBE6DD300B7F72099FD56C5BD95F6BB7A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.ApplicationInsights.dll" />
-                        </Component>
-                        <Component Id="cmp9DFE8C2688F7DF1A3DFF20EFA59BF3B5" Guid="*">
-                            <File Id="filD07D9749298A79293B824EFE6C420E49" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Azure.Commands.Common.Authentication.Abstractions.dll" />
-                        </Component>
                         <Component Id="cmpE29D513714759F365A7C0A2A7F2B5DC6" Guid="*">
                             <File Id="fil1DC7AA19B6A146E17F6C7BF32B2DC1DC" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Azure.Commands.IotHub.dll" />
                         </Component>
@@ -709,51 +705,9 @@
                         <Component Id="cmpD844DA64698210481D550B5CD8799D26" Guid="*">
                             <File Id="filA23D9B350E9B87D17B90B2181AE71E4B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Azure.Commands.IotHub.format.ps1xml" />
                         </Component>
-                        <Component Id="cmp31610C192ED2776279BBDA3D9905552E" Guid="*">
-                            <File Id="filB571C170B96736E7EE17BBF869A203A8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
-                        </Component>
-                        <Component Id="cmpB0A6B8E083FEAEC29D41F54189DC6605" Guid="*">
-                            <File Id="fil0CEDF2B42D00B6AA1ED0146F283B5678" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Azure.Common.dll" />
-                        </Component>
-                        <Component Id="cmpB2620706D83DB49D3434BB39A5495055" Guid="*">
-                            <File Id="fil25CE08F7EB56AE8EC1194FA03EBC6672" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Azure.Common.NetFramework.dll" />
-                        </Component>
-                        <Component Id="cmp1A91FF756560FC7B85B99C74CBE79BB2" Guid="*">
-                            <File Id="fil478DE461B4F0FF1A1E65C123A052BE0A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Azure.KeyVault.Core.dll" />
-                        </Component>
                         <Component Id="cmpF5573D31421ADB24A2D619C190A97C1F" Guid="*">
                             <File Id="fil4027DB096F59C3C354B02A083B2C8154" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Azure.Management.IotHub.dll" />
                         </Component>
-                        <Component Id="cmpBE50235D76A86D1FCDD23FB9F4F11656" Guid="*">
-                            <File Id="fil3C4B3CF7411853653290931AD6AC008D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Rest.ClientRuntime.Azure.dll" />
-                        </Component>
-                        <Component Id="cmp34F1F991C47614267C6CCECB4F2F10BB" Guid="*">
-                            <File Id="fil3E4080973B3233082A3B718B70A08143" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Rest.ClientRuntime.dll" />
-                        </Component>
-                        <Component Id="cmp23612602759A96AFDD9DD8C6C6E932E9" Guid="*">
-                            <File Id="filE005DDDCC0DE7E9DD8A7E3DB2FDB4071" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Threading.Tasks.dll" />
-                        </Component>
-                        <Component Id="cmpC95225AB5874255AE792917E171148B2" Guid="*">
-                            <File Id="filFF8EE46D449BE0856CE7477F883B9530" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Threading.Tasks.Extensions.Desktop.dll" />
-                        </Component>
-                        <Component Id="cmpEBC18C0FE0A850F66836998A664CAC3E" Guid="*">
-                            <File Id="fil772EB85D5EE3C1E9921C5AEE75CAA6D1" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Threading.Tasks.Extensions.dll" />
-                        </Component>
-                        <Component Id="cmpE8882F4395006099566B21CF86176666" Guid="*">
-                            <File Id="filCCA9DDA286BAE690774FAA2B86D1065C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.WindowsAzure.Commands.Common.dll" />
-                        </Component>
-                        <Component Id="cmpE06CD28C88905792B5090E630E7A8716" Guid="*">
-                            <File Id="fil1A7DFE0B8A7CDD3BAC8391D2D79DE6D9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.WindowsAzure.Management.dll" />
-                        </Component>
-                        <Component Id="cmpB1CD14B4C7D4BD71D820606900089681" Guid="*">
-                            <File Id="fil41CD3B4B683419526E6C17ECD9CCA694" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Newtonsoft.Json.dll" />
-                        </Component>
-                        <Component Id="cmpBC8703CB86D6D28FF2DDF3D7DCBA7581" Guid="*">
-                            <File Id="filB646D1164B2E1DBF9AD26722A576446F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\System.Net.Http.Extensions.dll" />
-                        </Component>
-                        <Component Id="cmpCDA6F66356C3D5DF72135BBDC8F07704" Guid="*">
-                            <File Id="fil7D13238354C7869C2120D1A482143BAC" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\System.Net.Http.Primitives.dll" />
-                        </Component>
                     </Directory>
                     <Directory Id="dirA5BF4C5FC88CC5FD4E43A0FA840806C7" Name="AzureRM.KeyVault">
                         <Component Id="cmpAB04FC1EEE889CA90013762F64086BFF" Guid="*">
@@ -954,6 +908,9 @@
                         <Component Id="cmpFCA52566084FFD038E15FCF00D5071BB" Guid="*">
                             <File Id="fil71DEBB8D2D6EB538CB829822D5E4434A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.OperationalInsights\Microsoft.Azure.Management.OperationalInsights.dll" />
                         </Component>
+                        <Component Id="cmp7AC9390DE20E61AF8CFAF02286919EA1" Guid="*">
+                            <File Id="fil13175E35C3512FF4330C5570213226C3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.OperationalInsights\Microsoft.Azure.OperationalInsights.dll" />
+                        </Component>
                         <Directory Id="dir2AED8DFFFA070A29B9A720A49151FF93" Name="StartupScripts">
                             <Component Id="cmpD9B5738661C38281559B293A829E8996" Guid="*">
                                 <File Id="fil46340AF5037C5321E21125FC5416499C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.OperationalInsights\StartupScripts\OperationalInsightsStartup.ps1" />
@@ -1083,6 +1040,11 @@
                         <Component Id="cmp103ACA9079CDD574094214F46E76D71B" Guid="*">
                             <File Id="fil45E326DA0D2C1D13454049F145FE496E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Profile\System.Net.Http.Primitives.dll" />
                         </Component>
+                        <Directory Id="dir53ED56BB91C2D7A278B9507EEBCF53AC" Name="NewAssemblies">
+                            <Component Id="cmpBCB3F9138DF4705BEF88A96C1B76EFAE" Guid="*">
+                                <File Id="fil7EEADC3B5E39AC38F9352B45FF8802D6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Profile\NewAssemblies\Newtonsoft.Json.dll" />
+                            </Component>
+                        </Directory>
                         <Directory Id="dirADE497B7123A8BD2518F2F05F71FFC2C" Name="StartupScripts">
                             <Component Id="cmp99DA93517DEB40063701810CFEF410FB" Guid="*">
                                 <File Id="fil05708E17439E3A7019C12B693F148D64" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Profile\StartupScripts\AzureRmProfileStartup.ps1" />
@@ -1315,6 +1277,11 @@
                         <Component Id="cmp8F0D94EDAEEDE0C50766C20F5F1D03D9" Guid="*">
                             <File Id="fil0AD641444E7DA2EE6DDA300C4C08ACC4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Resources\Microsoft.Azure.ResourceManager.dll" />
                         </Component>
+                        <Directory Id="dirC92FD9E295852F9742ACFEABB82051BE" Name="StartupScripts">
+                            <Component Id="cmp60EB4A32D99FB19809A465AC2C849FF3" Guid="*">
+                                <File Id="filA9E07AA865C95021011F6698992DE2C0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Resources\StartupScripts\AzureRmResourcesStartup.ps1" />
+                            </Component>
+                        </Directory>
                     </Directory>
                     <Directory Id="dirA80C2E0B6C83F58BD8B627AF03F627A8" Name="AzureRM.Scheduler">
                         <Component Id="cmp890B1E2923E26CE2A15A652293EA92BE" Guid="*">
@@ -3257,6 +3224,7 @@
             <ComponentRef Id="cmp46AB67763AA4CB2288EC5BCF65A0B426" />
             <ComponentRef Id="cmpA65D73385573335093ACC5E990D65AF8" />
             <ComponentRef Id="cmp0BDE7E7D0ED7F2874130783D7C1B070C" />
+            <ComponentRef Id="cmpE47EC5B729E4B2758CF8ABAD93EE6B23" />
             <ComponentRef Id="cmp235245AE05B9E5ED010EE787C63217C5" />
             <ComponentRef Id="cmp415DFA145BB81C94E140A84746C71804" />
             <ComponentRef Id="cmp2A379397CB30B376A85BCA91AC27B299" />
@@ -3428,27 +3396,10 @@
             <ComponentRef Id="cmp14BC637DD002112A9E697E975FB04D0D" />
             <ComponentRef Id="cmp15C1FCDD65CEFB52792FB6ED02513E11" />
             <ComponentRef Id="cmpC21AB0561E010A8A8BC1B56AF2401277" />
-            <ComponentRef Id="cmpA2E684A10B5D1FE61816950EA488B619" />
-            <ComponentRef Id="cmp66C6BE87523BE39FE5A322FE66E678E7" />
-            <ComponentRef Id="cmp9DFE8C2688F7DF1A3DFF20EFA59BF3B5" />
             <ComponentRef Id="cmpE29D513714759F365A7C0A2A7F2B5DC6" />
             <ComponentRef Id="cmpC67F14F377421F1BCD74EC5A579D43CB" />
             <ComponentRef Id="cmpD844DA64698210481D550B5CD8799D26" />
-            <ComponentRef Id="cmp31610C192ED2776279BBDA3D9905552E" />
-            <ComponentRef Id="cmpB0A6B8E083FEAEC29D41F54189DC6605" />
-            <ComponentRef Id="cmpB2620706D83DB49D3434BB39A5495055" />
-            <ComponentRef Id="cmp1A91FF756560FC7B85B99C74CBE79BB2" />
             <ComponentRef Id="cmpF5573D31421ADB24A2D619C190A97C1F" />
-            <ComponentRef Id="cmpBE50235D76A86D1FCDD23FB9F4F11656" />
-            <ComponentRef Id="cmp34F1F991C47614267C6CCECB4F2F10BB" />
-            <ComponentRef Id="cmp23612602759A96AFDD9DD8C6C6E932E9" />
-            <ComponentRef Id="cmpC95225AB5874255AE792917E171148B2" />
-            <ComponentRef Id="cmpEBC18C0FE0A850F66836998A664CAC3E" />
-            <ComponentRef Id="cmpE8882F4395006099566B21CF86176666" />
-            <ComponentRef Id="cmpE06CD28C88905792B5090E630E7A8716" />
-            <ComponentRef Id="cmpB1CD14B4C7D4BD71D820606900089681" />
-            <ComponentRef Id="cmpBC8703CB86D6D28FF2DDF3D7DCBA7581" />
-            <ComponentRef Id="cmpCDA6F66356C3D5DF72135BBDC8F07704" />
             <ComponentRef Id="cmpAB04FC1EEE889CA90013762F64086BFF" />
             <ComponentRef Id="cmpB95EF10A804EB1B52CD7096474922A5E" />
             <ComponentRef Id="cmpBCA648A3B7B30300ACDCC83746172368" />
@@ -3509,6 +3460,7 @@
             <ComponentRef Id="cmp05BE3ECEE00FF8C8EA0CCCA10B35B66F" />
             <ComponentRef Id="cmpC9691E1D00FBDB44AFB6B17AF835B85C" />
             <ComponentRef Id="cmpFCA52566084FFD038E15FCF00D5071BB" />
+            <ComponentRef Id="cmp7AC9390DE20E61AF8CFAF02286919EA1" />
             <ComponentRef Id="cmpD9B5738661C38281559B293A829E8996" />
             <ComponentRef Id="cmp07ACD4A07ADD8A358045C237522DA4C4" />
             <ComponentRef Id="cmpFDAC8616C4E824FA6880ECA8F8FF5128" />
@@ -3550,6 +3502,7 @@
             <ComponentRef Id="cmpEBB62AC41F55737CBA5B67CD38320203" />
             <ComponentRef Id="cmpAB89DA9A645E197D78DE69AEF963C260" />
             <ComponentRef Id="cmp103ACA9079CDD574094214F46E76D71B" />
+            <ComponentRef Id="cmpBCB3F9138DF4705BEF88A96C1B76EFAE" />
             <ComponentRef Id="cmp99DA93517DEB40063701810CFEF410FB" />
             <ComponentRef Id="cmpC96DAF4A31F86D19246E39394F496F83" />
             <ComponentRef Id="cmpFC2D2FD1A5405DC880D09C7965DDB9F9" />
@@ -3620,6 +3573,7 @@
             <ComponentRef Id="cmpEE349C51ED897F3FA2EB83EC1B30FE67" />
             <ComponentRef Id="cmpF4C5AB0BA43DC11E22F9BA4B39EEB532" />
             <ComponentRef Id="cmp8F0D94EDAEEDE0C50766C20F5F1D03D9" />
+            <ComponentRef Id="cmp60EB4A32D99FB19809A465AC2C849FF3" />
             <ComponentRef Id="cmp890B1E2923E26CE2A15A652293EA92BE" />
             <ComponentRef Id="cmp40EE6708968532EB5D44F6D0AFCB1095" />
             <ComponentRef Id="cmp55BE4765EDBEFBEF3B37D94217BCE247" />

src/ResourceManager/Profile/AzureRM.Profile.psd1

@@ -77,6 +77,7 @@ RequiredAssemblies =
                '.\Microsoft.Threading.Tasks.Extensions.dll', 
                '.\Microsoft.Threading.Tasks.Extensions.Desktop.dll', 
                '.\Microsoft.WindowsAzure.Management.dll', '.\Newtonsoft.Json.dll', 
+               '.\NewAssemblies\Newtonsoft.Json.dll', 
                '.\System.Net.Http.Extensions.dll', 
                '.\System.Net.Http.Primitives.dll'
 

src/ResourceManager/Profile/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Load version 10.0.3 of Newtonsoft.Json side-by-side with version 6.0.8
 
 ## Version 4.3.0
 * Added deprecation warning for PowerShell 3 and 4

src/ResourceManager/Profile/Commands.Profile/Commands.Profile.csproj

@@ -190,7 +190,11 @@
     <ItemGroup>
       <OutFiles Include="$(OutDir)\**\*.*" />
     </ItemGroup>
+    <ItemGroup>
+      <NewtonsoftJson Include="$(ProjectDir)..\..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll" />
+    </ItemGroup>
     <Copy SourceFiles="@(OutFiles)" DestinationFiles="@(OutFiles->'..\..\..\Stack\$(Configuration)\ResourceManager\AzureResourceManager\AzureRM.Profile\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(MarkdownFiles)" DestinationFolder="$(OutputPath)\help\" ContinueOnError="false" />
+    <Copy SourceFiles="@(NewtonsoftJson)" DestinationFolder="$(OutputPath)\NewAssemblies\" ContinueOnError="false" />
   </Target>
 </Project>

src/ResourceManager/Profile/Commands.Profile/StartupScripts/AzureRmProfileStartup.ps1

@@ -24,3 +24,7 @@
 	"Logout-AzureRmAccount" = "Disconnect-AzureRmAccount";
 }.GetEnumerator() | Select @{Name='Name'; Expression={$_.Key}}, @{Name='Value'; Expression={$_.Value}} | Set-Alias -Description "AzureAlias" | Out-Null
 
+if (Test-Path "$PSScriptRoot\..\NewAssemblies")
+{
+    Get-ChildItem "$PSScriptRoot\..\NewAssemblies" | % { Add-Type -Path $_.FullName }
+} 

src/ResourceManager/Profile/Commands.Profile/packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
 </packages>