diff --git a/.gitignore b/.gitignore index 3a2238d..bc5d7fd 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ bld/ [Bb]in/ [Oo]bj/ +roperties/PublishProfiles/ # Visual Studio 2015 cache/options directory .vs/ @@ -68,6 +69,7 @@ artifacts/ *.pidb *.svclog *.scc +*.pubxml # Chutzpah Test files _Chutzpah* diff --git a/DbStructure/User/SensorHistory.cs b/DbStructure/User/SensorHistory.cs index 222a162..03679f4 100644 --- a/DbStructure/User/SensorHistory.cs +++ b/DbStructure/User/SensorHistory.cs @@ -106,6 +106,9 @@ public static SensorHistory Merge(SensorHistory slice1, SensorHistory slice2) public void SerialiseData() { var dataSize = SensorDatapoint.BinarySize; + if (Data == null) + return; + var dataRaw = new byte[Data.Count*dataSize]; for (var i = 0; i < Data.Count; i++) diff --git a/GhAPIAzure/Properties/PublishProfiles/greenhouseAPI - FTP.pubxml b/GhAPIAzure/Properties/PublishProfiles/greenhouseAPI - FTP.pubxml deleted file mode 100644 index 71e58f6..0000000 --- a/GhAPIAzure/Properties/PublishProfiles/greenhouseAPI - FTP.pubxml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - FTP - AzureWebSite - Release - Any CPU - http://greenhouseapi.azurewebsites.net - True - False - ftp://waws-prod-ln1-005.ftp.azurewebsites.windows.net - False - True - site/wwwroot - greenhouseAPI\$greenhouseAPI - <_SavePWD>True - - \ No newline at end of file diff --git a/GhAPIAzure/Properties/PublishProfiles/greenhouseAPI - Web Deploy.pubxml b/GhAPIAzure/Properties/PublishProfiles/greenhouseAPI - Web Deploy.pubxml deleted file mode 100644 index 04d7979..0000000 --- a/GhAPIAzure/Properties/PublishProfiles/greenhouseAPI - Web Deploy.pubxml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - MSDeploy - /subscriptions/2adf1b62-0dd5-47ba-9352-8d698895d83b/resourceGroups/IoTStuff/providers/Microsoft.Web/sites/greenhouseAPI - IoTStuff - AzureWebSite - Release - Any CPU - http://greenhouseapi.azurewebsites.net - True - False - greenhouseapi.scm.azurewebsites.net:443 - greenhouseAPI - - True - WMSVC - True - $greenhouseAPI - <_SavePWD>True - <_DestinationType>AzureWebSite - - - - - - - - - - - - - - - - - - - - - - - - - Data Source=tcp:quickbird.database.windows.net,1433;Initial Catalog=GreenhouseAPiDB;User ID=quickbird@quickbird;Password=77D56j97d85f5 - - - - <_ConnectionStringsToInsert Include="GhAPIAzure.Models.DataContext" /> - - \ No newline at end of file