diff --git a/PhotoSharingApp/PhotoSharingApp.AppService.Shared/PhotoSharingApp.AppService.Shared.csproj b/PhotoSharingApp/PhotoSharingApp.AppService.Shared/PhotoSharingApp.AppService.Shared.csproj index 68fd34c..407cb7c 100644 --- a/PhotoSharingApp/PhotoSharingApp.AppService.Shared/PhotoSharingApp.AppService.Shared.csproj +++ b/PhotoSharingApp/PhotoSharingApp.AppService.Shared/PhotoSharingApp.AppService.Shared.csproj @@ -9,8 +9,11 @@ Properties PhotoSharingApp.AppService.Shared PhotoSharingApp.AppService.Shared - v4.5 + v4.6 512 + + + true @@ -30,8 +33,12 @@ 4 - - ..\..\packages\Microsoft.Azure.DocumentDB.1.5.2\lib\net40\Microsoft.Azure.Documents.Client.dll + + ..\..\packages\Microsoft.Azure.DocumentDB.1.9.2\lib\net45\Microsoft.Azure.Documents.Client.dll + True + + + ..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll True @@ -42,40 +49,40 @@ ..\..\packages\Microsoft.Azure.Mobile.Server.CrossDomain.1.1.157.1\lib\net45\Microsoft.Azure.Mobile.Server.CrossDomain.dll True - + + ..\..\packages\Microsoft.Data.Edm.5.7.0\lib\net40\Microsoft.Data.Edm.dll True - ..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll - + + ..\..\packages\Microsoft.Data.OData.5.7.0\lib\net40\Microsoft.Data.OData.dll True - ..\..\packages\Microsoft.Data.OData.5.6.0\lib\net40\Microsoft.Data.OData.dll - + + ..\..\packages\Microsoft.Data.Services.Client.5.7.0\lib\net40\Microsoft.Data.Services.Client.dll True - ..\..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll ..\..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll True - - False - ..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.1.8.0.0\lib\net35-full\Microsoft.WindowsAzure.Configuration.dll + + ..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.1\lib\net40\Microsoft.WindowsAzure.Configuration.dll + True - - False - ..\..\packages\WindowsAzure.Storage.3.1.0.1\lib\net40\Microsoft.WindowsAzure.Storage.dll + + ..\..\packages\WindowsAzure.Storage.7.1.2\lib\net40\Microsoft.WindowsAzure.Storage.dll + True - - ..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll True ..\..\packages\Owin.1.0\lib\net40\Owin.dll True - - ..\..\packages\RazorEngine.3.7.0\lib\net45\RazorEngine.dll + + ..\..\packages\RazorEngine.3.9.0\lib\net45\RazorEngine.dll True @@ -97,9 +104,9 @@ - + + ..\..\packages\System.Spatial.5.7.0\lib\net40\System.Spatial.dll True - ..\..\packages\System.Spatial.5.6.0\lib\net40\System.Spatial.dll @@ -193,7 +200,9 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + - - - - - - - - - - - - - - - - - - - - - - + System.Web.Handlers.TransferRequestHandler + Microsoft.VisualStudio.Web.PageInspector.Runtime.Tracing.RequestDataHttpHandler + System.Web.StaticFileHandler + System.Web.Handlers.AssemblyResourceLoader + System.Web.Optimization.BundleHandler + System.Web.Script.Services.ScriptHandlerFactory + System.Web.Handlers.TraceHandler + System.Web.Services.Discovery.DiscoveryRequestHandler + System.Web.HttpDebugHandler + + + + + + + + 5 + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PhotoSharingApp/PhotoSharingApp.AppService.Tests/PhotoSharingApp.AppService.Tests.csproj b/PhotoSharingApp/PhotoSharingApp.AppService.Tests/PhotoSharingApp.AppService.Tests.csproj index ef566a8..e3cf478 100644 --- a/PhotoSharingApp/PhotoSharingApp.AppService.Tests/PhotoSharingApp.AppService.Tests.csproj +++ b/PhotoSharingApp/PhotoSharingApp.AppService.Tests/PhotoSharingApp.AppService.Tests.csproj @@ -8,7 +8,7 @@ Properties PhotoSharingApp.AppService.Tests PhotoSharingApp.AppService.Tests - v4.5.2 + v4.6 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 10.0 @@ -16,6 +16,9 @@ $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages False UnitTest + + + true @@ -35,32 +38,36 @@ 4 - - ..\..\packages\Microsoft.ApplicationInsights.DependencyCollector.1.2.3\lib\net45\Microsoft.AI.DependencyCollector.dll + + ..\..\packages\Microsoft.ApplicationInsights.Agent.Intercept.2.0.1\lib\net45\Microsoft.AI.Agent.Intercept.dll True - - ..\..\packages\Microsoft.ApplicationInsights.PerfCounterCollector.1.2.3\lib\net45\Microsoft.AI.PerfCounterCollector.dll + + ..\..\packages\Microsoft.ApplicationInsights.DependencyCollector.2.1.0\lib\net45\Microsoft.AI.DependencyCollector.dll True - - ..\..\packages\Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.1.2.3\lib\net45\Microsoft.AI.ServerTelemetryChannel.dll + + ..\..\packages\Microsoft.ApplicationInsights.PerfCounterCollector.2.1.0\lib\net45\Microsoft.AI.PerfCounterCollector.dll True - - ..\..\packages\Microsoft.ApplicationInsights.Web.1.2.3\lib\net45\Microsoft.AI.Web.dll + + ..\..\packages\Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.2.1.0\lib\net45\Microsoft.AI.ServerTelemetryChannel.dll True - - ..\..\packages\Microsoft.ApplicationInsights.WindowsServer.1.2.3\lib\net45\Microsoft.AI.WindowsServer.dll + + ..\..\packages\Microsoft.ApplicationInsights.Web.2.1.0\lib\net45\Microsoft.AI.Web.dll True - - ..\..\packages\Microsoft.ApplicationInsights.1.2.3\lib\net45\Microsoft.ApplicationInsights.dll + + ..\..\packages\Microsoft.ApplicationInsights.WindowsServer.2.1.0\lib\net45\Microsoft.AI.WindowsServer.dll True - - ..\..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Microsoft.ApplicationInsights.2.1.0\lib\net46\Microsoft.ApplicationInsights.dll + True + + + ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll True @@ -174,10 +181,12 @@ - - - - + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + - - - - - - - + + + + + + + + + + + + +System.Web.Handlers.TransferRequestHandler +Microsoft.VisualStudio.Web.PageInspector.Runtime.Tracing.RequestDataHttpHandler +System.Web.StaticFileHandler +System.Web.Handlers.AssemblyResourceLoader +System.Web.Optimization.BundleHandler +System.Web.Script.Services.ScriptHandlerFactory +System.Web.Handlers.TraceHandler +System.Web.Services.Discovery.DiscoveryRequestHandler +System.Web.HttpDebugHandler + + + + + + + +5 + + + + - - + + + + + + + + - - + + + \ No newline at end of file diff --git a/PhotoSharingApp/PhotoSharingApp.AppService/PhotoSharingApp.AppService.csproj b/PhotoSharingApp/PhotoSharingApp.AppService/PhotoSharingApp.AppService.csproj index 198d0f2..585c774 100644 --- a/PhotoSharingApp/PhotoSharingApp.AppService/PhotoSharingApp.AppService.csproj +++ b/PhotoSharingApp/PhotoSharingApp.AppService/PhotoSharingApp.AppService.csproj @@ -11,7 +11,7 @@ Properties PhotoSharingApp.AppService PhotoSharingApp.AppService - v4.5 + v4.6 false true @@ -23,6 +23,7 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) ..\ + true @@ -76,32 +77,36 @@ ..\..\packages\Autofac.WebApi2.Owin.3.3.0\lib\net45\Autofac.Integration.WebApi.Owin.dll True - - ..\..\packages\Microsoft.ApplicationInsights.Agent.Intercept.1.2.0\lib\net45\Microsoft.AI.Agent.Intercept.dll + + ..\..\packages\AutoMapper.5.0.2\lib\net45\AutoMapper.dll True - - ..\..\packages\Microsoft.ApplicationInsights.DependencyCollector.1.2.3\lib\net45\Microsoft.AI.DependencyCollector.dll + + ..\..\packages\Microsoft.ApplicationInsights.Agent.Intercept.2.0.1\lib\net45\Microsoft.AI.Agent.Intercept.dll True - - ..\..\packages\Microsoft.ApplicationInsights.PerfCounterCollector.1.2.3\lib\net45\Microsoft.AI.PerfCounterCollector.dll + + ..\..\packages\Microsoft.ApplicationInsights.DependencyCollector.2.1.0\lib\net45\Microsoft.AI.DependencyCollector.dll True - - ..\..\packages\Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.1.2.3\lib\net45\Microsoft.AI.ServerTelemetryChannel.dll + + ..\..\packages\Microsoft.ApplicationInsights.PerfCounterCollector.2.1.0\lib\net45\Microsoft.AI.PerfCounterCollector.dll True - - ..\..\packages\Microsoft.ApplicationInsights.Web.1.2.3\lib\net45\Microsoft.AI.Web.dll + + ..\..\packages\Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.2.1.0\lib\net45\Microsoft.AI.ServerTelemetryChannel.dll True - - ..\..\packages\Microsoft.ApplicationInsights.WindowsServer.1.2.3\lib\net45\Microsoft.AI.WindowsServer.dll + + ..\..\packages\Microsoft.ApplicationInsights.Web.2.1.0\lib\net45\Microsoft.AI.Web.dll True - - ..\..\packages\Microsoft.ApplicationInsights.1.2.3\lib\net45\Microsoft.ApplicationInsights.dll + + ..\..\packages\Microsoft.ApplicationInsights.WindowsServer.2.1.0\lib\net45\Microsoft.AI.WindowsServer.dll + True + + + ..\..\packages\Microsoft.ApplicationInsights.2.1.0\lib\net46\Microsoft.ApplicationInsights.dll True @@ -109,11 +114,27 @@ True - ..\..\packages\Microsoft.Azure.NotificationHubs.1.0.3\lib\net45-full\Microsoft.Azure.NotificationHubs.dll + ..\..\packages\Microsoft.Azure.NotificationHubs.1.0.6\lib\net45-full\Microsoft.Azure.NotificationHubs.dll + True + + + ..\..\packages\Microsoft.Data.Edm.5.7.0\lib\net40\Microsoft.Data.Edm.dll True - - ..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll + + ..\..\packages\Microsoft.Data.OData.5.7.0\lib\net40\Microsoft.Data.OData.dll + True + + + ..\..\packages\Microsoft.Data.Services.Client.5.7.0\lib\net40\Microsoft.Data.Services.Client.dll + True + + + ..\..\packages\Microsoft.IdentityModel.Logging.1.0.0\lib\net451\Microsoft.IdentityModel.Logging.dll + True + + + ..\..\packages\Microsoft.IdentityModel.Tokens.5.0.0\lib\net451\Microsoft.IdentityModel.Tokens.dll True @@ -146,12 +167,16 @@ ..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll - - ..\..\packages\WindowsAzure.Storage.3.1.0.1\lib\net40\Microsoft.WindowsAzure.Storage.dll + + ..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.1\lib\net40\Microsoft.WindowsAzure.Configuration.dll True - - ..\..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\WindowsAzure.Storage.7.1.2\lib\net40\Microsoft.WindowsAzure.Storage.dll + True + + + ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll True @@ -159,6 +184,10 @@ True + + ..\..\packages\System.IdentityModel.Tokens.Jwt.5.0.0\lib\net451\System.IdentityModel.Tokens.Jwt.dll + True + ..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll True @@ -169,16 +198,16 @@ + + ..\..\packages\System.Spatial.5.7.0\lib\net40\System.Spatial.dll + True + False ..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll - - ..\..\packages\Microsoft.AspNet.WebApi.OData.5.5.1\lib\net45\System.Web.Http.OData.dll - - @@ -192,38 +221,20 @@ ..\..\packages\Owin.1.0\lib\net40\Owin.dll + + ..\..\packages\Microsoft.AspNet.WebApi.OData.5.7.0\lib\net45\System.Web.Http.OData.dll + True + ..\..\packages\Microsoft.AspNet.WebApi.Owin.5.2.3\lib\net45\System.Web.Http.Owin.dll ..\..\packages\Microsoft.Owin.Security.3.0.1\lib\net45\Microsoft.Owin.Security.dll - - ..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll - - - ..\..\packages\System.IdentityModel.Tokens.Jwt.4.0.2.205111437\lib\net45\System.IdentityModel.Tokens.Jwt.dll - - - ..\..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll - - - ..\..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll - - - ..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll - - - ..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll - - - ..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll - ..\..\packages\Microsoft.AspNet.WebApi.Tracing.5.2.3\lib\net45\System.Web.Http.Tracing.dll - diff --git a/PhotoSharingApp/PhotoSharingApp.AppService/Web.config b/PhotoSharingApp/PhotoSharingApp.AppService/Web.config index fd3fc2a..8a2abb7 100644 --- a/PhotoSharingApp/PhotoSharingApp.AppService/Web.config +++ b/PhotoSharingApp/PhotoSharingApp.AppService/Web.config @@ -6,7 +6,8 @@
- + + @@ -17,15 +18,22 @@ - + - + @@ -55,15 +63,15 @@ - + - + - + @@ -75,7 +83,7 @@ - + @@ -99,7 +107,23 @@ - + + + + + + + + + + + + + + + + + diff --git a/PhotoSharingApp/PhotoSharingApp.AppService/packages.config b/PhotoSharingApp/PhotoSharingApp.AppService/packages.config index 270d90f..95500a2 100644 --- a/PhotoSharingApp/PhotoSharingApp.AppService/packages.config +++ b/PhotoSharingApp/PhotoSharingApp.AppService/packages.config @@ -4,19 +4,19 @@ - + - - - + + + - - - - + + + + - + @@ -27,21 +27,23 @@ - + - - - + + + + + - - + + - - - + + + \ No newline at end of file diff --git a/PhotoSharingApp/PhotoSharingApp.Universal/Services/ServiceClient.cs b/PhotoSharingApp/PhotoSharingApp.Universal/Services/ServiceClient.cs index ed0cad9..9b2dcc3 100644 --- a/PhotoSharingApp/PhotoSharingApp.Universal/Services/ServiceClient.cs +++ b/PhotoSharingApp/PhotoSharingApp.Universal/Services/ServiceClient.cs @@ -730,7 +730,7 @@ public async Task UploadPhoto(Stream stream, string localPath, string cap stream.AsRandomAccessStream(), sideLength, sideLength); - await blob.UploadFromStreamAsync(resizedStream); + await blob.UploadFromStreamAsync(resizedStream.AsStream()); } var photoContract = new PhotoContract diff --git a/PhotoSharingApp/PhotoSharingApp.Universal/project.json b/PhotoSharingApp/PhotoSharingApp.Universal/project.json index f605b35..fddb001 100644 --- a/PhotoSharingApp/PhotoSharingApp.Universal/project.json +++ b/PhotoSharingApp/PhotoSharingApp.Universal/project.json @@ -1,10 +1,10 @@ { "dependencies": { - "Microsoft.Azure.Mobile.Client": "2.0.1", + "Microsoft.Azure.Mobile.Client": "2.1.1", "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0", - "Unity": "3.5.1404", + "Unity": "4.0.1", "WindowsAzure.Messaging.Managed": "0.1.7.9", - "WindowsAzure.Storage": "5.0.0" + "WindowsAzure.Storage": "7.1.2" }, "frameworks": { "uap10.0": {}