diff --git a/src/Az.autorest.hybrid.props b/src/Az.autorest.hybrid.props index bc5cf632cd53..e85cb7798c4f 100644 --- a/src/Az.autorest.hybrid.props +++ b/src/Az.autorest.hybrid.props @@ -65,9 +65,6 @@ - - - diff --git a/src/Az.autorest.hybrid.v2.props b/src/Az.autorest.hybrid.v2.props index 0bc27761c301..9dc5f1bf44af 100644 --- a/src/Az.autorest.hybrid.v2.props +++ b/src/Az.autorest.hybrid.v2.props @@ -50,7 +50,6 @@ - diff --git a/src/Az.autorest.props b/src/Az.autorest.props index 6c9061968412..be1f31642658 100644 --- a/src/Az.autorest.props +++ b/src/Az.autorest.props @@ -60,9 +60,6 @@ - - - diff --git a/src/DeviceProvisioningServices/DeviceProvisioningServices/DeviceProvisioningServices.csproj b/src/DeviceProvisioningServices/DeviceProvisioningServices/DeviceProvisioningServices.csproj index 04df37b46220..8a1bbe1d4944 100644 --- a/src/DeviceProvisioningServices/DeviceProvisioningServices/DeviceProvisioningServices.csproj +++ b/src/DeviceProvisioningServices/DeviceProvisioningServices/DeviceProvisioningServices.csproj @@ -15,10 +15,6 @@ - - - - diff --git a/src/IotHub/IotHub/IotHub.csproj b/src/IotHub/IotHub/IotHub.csproj index b972ebc3280c..ce15d3d086ea 100644 --- a/src/IotHub/IotHub/IotHub.csproj +++ b/src/IotHub/IotHub/IotHub.csproj @@ -17,10 +17,6 @@ - - - - diff --git a/src/Resources/ResourceManager/Extensions/JsonExtensions.cs b/src/Resources/ResourceManager/Extensions/JsonExtensions.cs index cf269a9f6154..233bf8155a56 100644 --- a/src/Resources/ResourceManager/Extensions/JsonExtensions.cs +++ b/src/Resources/ResourceManager/Extensions/JsonExtensions.cs @@ -18,6 +18,8 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions using Newtonsoft.Json; using Newtonsoft.Json.Converters; using Newtonsoft.Json.Linq; + using Newtonsoft.Json.Serialization; + using System; using System.Collections; using System.Collections.Generic; @@ -49,7 +51,7 @@ public static class JsonExtensions Converters = new List { new TimeSpanConverter(), - new StringEnumConverter { CamelCaseText = false }, + new StringEnumConverter(new DefaultNamingStrategy()), new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AdjustToUniversal }, }, }; @@ -67,7 +69,7 @@ public static class JsonExtensions Converters = new List { new TimeSpanConverter(), - new StringEnumConverter { CamelCaseText = false }, + new StringEnumConverter(new DefaultNamingStrategy()), new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AdjustToUniversal }, }, }; diff --git a/src/Resources/ResourceManager/ResourceManager.csproj b/src/Resources/ResourceManager/ResourceManager.csproj index b1512881377b..37867fcf07ff 100644 --- a/src/Resources/ResourceManager/ResourceManager.csproj +++ b/src/Resources/ResourceManager/ResourceManager.csproj @@ -14,7 +14,6 @@ - diff --git a/src/Sql/Sql.LegacySdk/Sql.LegacySdk.csproj b/src/Sql/Sql.LegacySdk/Sql.LegacySdk.csproj index 4a897f4550d0..04d3e935365d 100644 --- a/src/Sql/Sql.LegacySdk/Sql.LegacySdk.csproj +++ b/src/Sql/Sql.LegacySdk/Sql.LegacySdk.csproj @@ -12,10 +12,6 @@ Microsoft.Azure.Management.$(PsModuleName).Legacy - - - - diff --git a/src/lib/Newtonsoft.Json.9.dll b/src/lib/Newtonsoft.Json.9.dll deleted file mode 100644 index be6558d2d48b..000000000000 Binary files a/src/lib/Newtonsoft.Json.9.dll and /dev/null differ diff --git a/src/lib/netfx/Newtonsoft.Json.dll b/src/lib/netfx/Newtonsoft.Json.dll index e4a63399d0d9..b7c659694370 100644 Binary files a/src/lib/netfx/Newtonsoft.Json.dll and b/src/lib/netfx/Newtonsoft.Json.dll differ diff --git a/tools/Common.Netcore.Dependencies.Test.targets b/tools/Common.Netcore.Dependencies.Test.targets index df5cada97d66..1d0ce6d35501 100644 --- a/tools/Common.Netcore.Dependencies.Test.targets +++ b/tools/Common.Netcore.Dependencies.Test.targets @@ -16,7 +16,7 @@ - + @@ -34,7 +34,7 @@ - + diff --git a/tools/Common.Netcore.Dependencies.targets b/tools/Common.Netcore.Dependencies.targets index a721d2908632..5daf58b7a186 100644 --- a/tools/Common.Netcore.Dependencies.targets +++ b/tools/Common.Netcore.Dependencies.targets @@ -19,6 +19,7 @@ + @@ -39,6 +40,6 @@ $(NugetPackageRoot)\microsoft.azure.powershell.storage\1.3.73-preview\tools\ - +