diff --git a/Common/Common.csproj b/Common/Common.csproj index 3cc02248..adf80fc7 100644 --- a/Common/Common.csproj +++ b/Common/Common.csproj @@ -66,8 +66,20 @@ ..\packages\Microsoft.Azure.Devices.1.0.5\lib\net451\Microsoft.Azure.Devices.dll True - - False + + ..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll + True + + + ..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll + True + + + ..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll + True + + + ..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.1\lib\net40\Microsoft.WindowsAzure.Configuration.dll True @@ -110,6 +122,10 @@ ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll True + + ..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll + True + True diff --git a/Common/Configurations/ConfigurationProvider.cs b/Common/Configurations/ConfigurationProvider.cs index 302f3519..fbdccb8b 100644 --- a/Common/Configurations/ConfigurationProvider.cs +++ b/Common/Configurations/ConfigurationProvider.cs @@ -1,10 +1,7 @@ using System; using System.Collections.Generic; -using System.Configuration; -using System.Diagnostics; using System.IO; using System.Reflection; -using Microsoft.WindowsAzure.ServiceRuntime; namespace Microsoft.Azure.Devices.Applications.RemoteMonitoring.Common.Configurations { @@ -22,29 +19,13 @@ namespace Microsoft.Azure.Devices.Applications.RemoteMonitoring.Common.Configura public string GetConfigurationSettingValueOrDefault(string configurationSettingName, string defaultValue) { - try - { + if (!this.configuration.ContainsKey(configurationSettingName)) { - string configValue = string.Empty; - bool isEmulated = true; - bool isAvailable = false; - try - { - isAvailable = RoleEnvironment.IsAvailable; - } - catch (TypeInitializationException) { } - if (isAvailable) - { - configValue = RoleEnvironment.GetConfigurationSettingValue(configurationSettingName); - isEmulated = RoleEnvironment.IsEmulated; - } - else - { - configValue = ConfigurationManager.AppSettings[configurationSettingName]; - isEmulated = Environment.CommandLine.Contains("iisexpress.exe") || - Environment.CommandLine.Contains("WebJob.vshost.exe"); - } + string configValue = CloudConfigurationManager.GetSetting(configurationSettingName); + bool isEmulated = Environment.CommandLine.Contains("iisexpress.exe") || + Environment.CommandLine.Contains("WebJob.vshost.exe"); + if (isEmulated && (configValue != null && configValue.StartsWith(ConfigToken, StringComparison.OrdinalIgnoreCase))) { if (environment == null) @@ -52,8 +33,8 @@ namespace Microsoft.Azure.Devices.Applications.RemoteMonitoring.Common.Configura LoadEnvironmentConfig(); } - configValue = - environment.GetSetting(configValue.Substring(configValue.IndexOf(ConfigToken, StringComparison.Ordinal) + ConfigToken.Length)); + configValue = environment.GetSetting( + configValue.Substring(configValue.IndexOf(ConfigToken, StringComparison.Ordinal) + ConfigToken.Length)); } try { @@ -65,14 +46,7 @@ namespace Microsoft.Azure.Devices.Applications.RemoteMonitoring.Common.Configura // thread, so we're fine to continue } } - } - catch (RoleEnvironmentException) - { - if (string.IsNullOrEmpty(defaultValue)) - throw; - this.configuration.Add(configurationSettingName, defaultValue); - } return this.configuration[configurationSettingName]; } diff --git a/Common/Deployment/DeploymentLib.ps1 b/Common/Deployment/DeploymentLib.ps1 index dc301f0a..1ecea76e 100644 --- a/Common/Deployment/DeploymentLib.ps1 +++ b/Common/Deployment/DeploymentLib.ps1 @@ -110,7 +110,7 @@ function GetSuiteLocation() Write-Host "Available locations:"; $regions = @(); $index = 1 - foreach ($loc in $locations) + foreach ($loc in $global:locations) { $region = New-Object System.Object $region | Add-Member -MemberType NoteProperty -Name "Option" -Value $index @@ -139,7 +139,7 @@ function GetSuiteLocation() continue } - $region = $locations[$selectedIndex - 1] + $region = $global:locations[$selectedIndex - 1] } return $region } @@ -157,7 +157,7 @@ function ValidateLocation() } Write-Warning "$(Get-Date –f $timeStampFormat) - Location $location is not available for this subscription. Specify different -Location"; Write-Warning "$(Get-Date –f $timeStampFormat) - Available Locations:"; - foreach ($loc in $locations) + foreach ($loc in $global:locations) { Write-Warning $loc } diff --git a/Common/app.config b/Common/app.config index b69ae05c..6ee9346b 100644 --- a/Common/app.config +++ b/Common/app.config @@ -18,21 +18,17 @@ - - - - - + - + - + diff --git a/Common/packages.config b/Common/packages.config index 643d0922..7e66a536 100644 --- a/Common/packages.config +++ b/Common/packages.config @@ -16,9 +16,10 @@ - - - + + + + @@ -26,7 +27,7 @@ - + \ No newline at end of file diff --git a/DeviceAdministration/Infrastructure.UnitTests/app.config b/DeviceAdministration/Infrastructure.UnitTests/app.config index 78e5e621..f16fc746 100644 --- a/DeviceAdministration/Infrastructure.UnitTests/app.config +++ b/DeviceAdministration/Infrastructure.UnitTests/app.config @@ -14,21 +14,17 @@ - - - - - + - + - + diff --git a/DeviceAdministration/Infrastructure/BusinessLogic/DeviceLogic.cs b/DeviceAdministration/Infrastructure/BusinessLogic/DeviceLogic.cs index e6a5ba7f..8d3b0bbf 100644 --- a/DeviceAdministration/Infrastructure/BusinessLogic/DeviceLogic.cs +++ b/DeviceAdministration/Infrastructure/BusinessLogic/DeviceLogic.cs @@ -1129,15 +1129,15 @@ namespace Microsoft.Azure.Devices.Applications.RemoteMonitoring.DeviceAdmin.Infr foreach (JObject field in device.Telemetry) { // Default displayName to null if not present - string displayName = field.GetValue("DisplayName", StringComparison.InvariantCultureIgnoreCase) != null ? - field.GetValue("DisplayName", StringComparison.InvariantCultureIgnoreCase).ToString() : + string displayName = field.GetValue("DisplayName", StringComparison.OrdinalIgnoreCase) != null ? + field.GetValue("DisplayName", StringComparison.OrdinalIgnoreCase).ToString() : null; deviceTelemetryFields.Add(new DeviceTelemetryFieldModel { DisplayName = displayName, - Name = field.GetValue("Name", StringComparison.InvariantCultureIgnoreCase).ToString(), - Type = field.GetValue("Type", StringComparison.InvariantCultureIgnoreCase).ToString() + Name = field.GetValue("Name", StringComparison.OrdinalIgnoreCase).ToString(), + Type = field.GetValue("Type", StringComparison.OrdinalIgnoreCase).ToString() }); } diff --git a/DeviceAdministration/Infrastructure/Infrastructure.csproj b/DeviceAdministration/Infrastructure/Infrastructure.csproj index 5e3ca577..36ec6316 100644 --- a/DeviceAdministration/Infrastructure/Infrastructure.csproj +++ b/DeviceAdministration/Infrastructure/Infrastructure.csproj @@ -69,6 +69,18 @@ ..\..\packages\Microsoft.Azure.Devices.1.0.5\lib\net451\Microsoft.Azure.Devices.dll True + + ..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll + True + + + ..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll + True + + + ..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll + True + False ..\..\packages\WindowsAzure.Storage.7.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll @@ -105,6 +117,10 @@ True + + ..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll + True + False diff --git a/DeviceAdministration/Infrastructure/app.config b/DeviceAdministration/Infrastructure/app.config index b69ae05c..6ee9346b 100644 --- a/DeviceAdministration/Infrastructure/app.config +++ b/DeviceAdministration/Infrastructure/app.config @@ -18,21 +18,17 @@ - - - - - + - + - + diff --git a/DeviceAdministration/Infrastructure/packages.config b/DeviceAdministration/Infrastructure/packages.config index 643d0922..54e1de14 100644 --- a/DeviceAdministration/Infrastructure/packages.config +++ b/DeviceAdministration/Infrastructure/packages.config @@ -16,9 +16,9 @@ - - - + + + @@ -26,7 +26,7 @@ - + \ No newline at end of file diff --git a/DeviceAdministration/Web/Web.config b/DeviceAdministration/Web/Web.config index ccb429d4..8b65cc20 100644 --- a/DeviceAdministration/Web/Web.config +++ b/DeviceAdministration/Web/Web.config @@ -10,9 +10,6 @@ - @@ -57,7 +54,7 @@ - + @@ -77,10 +74,6 @@ - - - - @@ -161,21 +154,17 @@ - - - - - + - + - + diff --git a/DeviceAdministration/Web/Web.csproj b/DeviceAdministration/Web/Web.csproj index dccee1d3..2237dcbe 100644 --- a/DeviceAdministration/Web/Web.csproj +++ b/DeviceAdministration/Web/Web.csproj @@ -122,6 +122,18 @@ True + + ..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll + True + + + ..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll + True + + + ..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll + True + ..\..\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.2.206221351\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll @@ -155,11 +167,6 @@ ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll True - - False - ..\..\packages\Unofficial.Microsoft.WindowsAzure.Diagnostics.2.9.0.0\lib\net40\Microsoft.WindowsAzure.Diagnostics.dll - True - False ..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll @@ -200,6 +207,10 @@ ..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll + + ..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll + True + False ..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll diff --git a/DeviceAdministration/Web/packages.config b/DeviceAdministration/Web/packages.config index b7aacfba..9c94fb6f 100644 --- a/DeviceAdministration/Web/packages.config +++ b/DeviceAdministration/Web/packages.config @@ -30,9 +30,9 @@ - - - + + + @@ -59,8 +59,7 @@ - - + diff --git a/EventProcessor/EventProcessor.WebJob/EventProcessor.WebJob.csproj b/EventProcessor/EventProcessor.WebJob/EventProcessor.WebJob.csproj index e9a6dcd9..8ea94203 100644 --- a/EventProcessor/EventProcessor.WebJob/EventProcessor.WebJob.csproj +++ b/EventProcessor/EventProcessor.WebJob/EventProcessor.WebJob.csproj @@ -40,6 +40,18 @@ ..\..\packages\Microsoft.Azure.Devices.1.0.5\lib\net451\Microsoft.Azure.Devices.dll True + + ..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll + True + + + ..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll + True + + + ..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll + True + False ..\..\packages\WindowsAzure.ServiceBus.3.1.7\lib\net45-full\Microsoft.ServiceBus.dll @@ -50,11 +62,6 @@ ..\..\packages\Microsoft.Azure.ServiceBus.EventProcessorHost.2.1.5\lib\net45-full\Microsoft.ServiceBus.Messaging.EventProcessorHost.dll True - - False - ..\..\packages\Unofficial.Microsoft.WindowsAzure.Diagnostics.2.9.0.0\lib\net40\Microsoft.WindowsAzure.Diagnostics.dll - True - False ..\..\packages\WindowsAzure.Storage.7.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll @@ -74,6 +81,10 @@ True + + ..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll + True + ..\..\packages\Twilio.4.7.1\lib\3.5\Twilio.Api.dll True diff --git a/EventProcessor/EventProcessor.WebJob/app.config b/EventProcessor/EventProcessor.WebJob/app.config index 155d5ade..83c725bd 100644 --- a/EventProcessor/EventProcessor.WebJob/app.config +++ b/EventProcessor/EventProcessor.WebJob/app.config @@ -4,9 +4,6 @@ - - - @@ -40,21 +37,17 @@ - - - - - + - + - + diff --git a/EventProcessor/EventProcessor.WebJob/packages.config b/EventProcessor/EventProcessor.WebJob/packages.config index 00f9e362..8a3d5dec 100644 --- a/EventProcessor/EventProcessor.WebJob/packages.config +++ b/EventProcessor/EventProcessor.WebJob/packages.config @@ -13,9 +13,9 @@ - - - + + + @@ -24,9 +24,8 @@ - + - \ No newline at end of file diff --git a/Simulator/Simulator.WebJob/Simulator.WebJob.csproj b/Simulator/Simulator.WebJob/Simulator.WebJob.csproj index cd39e5fc..50d56220 100644 --- a/Simulator/Simulator.WebJob/Simulator.WebJob.csproj +++ b/Simulator/Simulator.WebJob/Simulator.WebJob.csproj @@ -104,19 +104,16 @@ ..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll True - - False - ..\..\packages\Microsoft.Data.Edm.5.7.0\lib\net40\Microsoft.Data.Edm.dll + + ..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll True - - False - ..\..\packages\Microsoft.Data.OData.5.7.0\lib\net40\Microsoft.Data.OData.dll + + ..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll True - - False - ..\..\packages\Microsoft.Data.Services.Client.5.7.0\lib\net40\Microsoft.Data.Services.Client.dll + + ..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll True @@ -156,12 +153,11 @@ - - False - ..\..\packages\System.Spatial.5.7.0\lib\net40\System.Spatial.dll + True - + + ..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll True @@ -268,6 +264,7 @@ +