diff --git a/01_Demos_ASPNET5.sln b/01_Demos_ASPNET5.sln index 400cdec..20efdbf 100644 --- a/01_Demos_ASPNET5.sln +++ b/01_Demos_ASPNET5.sln @@ -3,27 +3,26 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{372998F0-9076-4CCF-8DA2-1F0534BF05F4}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MyHealth.Model", "src\MyHealth.Model\MyHealth.Model.xproj", "{74909452-94ED-4B8B-B452-6A40F5A8F58C}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2FC5C601-EA9C-482C-B5B7-3442E9A8357D}" - ProjectSection(SolutionItems) = preProject - global.json = global.json - NuGet.Config = NuGet.Config - EndProjectSection +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MyHealth.Data", "src\MyHealth.Data\MyHealth.Data.xproj", "{E4A09728-2A40-459F-983B-7DDBB8007AAB}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MyHealth.Model", "src\MyHealth.Model\MyHealth.Model.xproj", "{FB798BC9-D2CE-40A8-ADD4-5E59870425E0}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MyHealth.API", "src\MyHealth.API\MyHealth.API.xproj", "{42137795-6EFB-41C8-9CDD-96E5FF3C5B6E}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MyHealth.Data", "src\MyHealth.Data\MyHealth.Data.xproj", "{887EE144-8399-44CE-A636-06719E750915}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MyHealth.Office365", "src\MyHealth.Office365\MyHealth.Office365.xproj", "{48BDAB45-5E98-4F3E-B066-578BFB0A3EAB}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MyHealth.API", "src\MyHealth.API\MyHealth.API.xproj", "{7DB08917-FAE6-4AD5-9E7D-EA6444227C21}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{57584487-3A55-47C2-9FA5-5C62BF8D87ED}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MyHealth.Web", "src\MyHealth.Web\MyHealth.Web.xproj", "{278356DC-80DD-408F-9DE8-6FC4787C2F6E}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0C9AB56B-4835-4539-8439-799F459911A7}" + ProjectSection(SolutionItems) = preProject + global.json = global.json + EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{E59ECF10-F681-410C-B416-5345A33C869D}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MyHealth.Web", "src\MyHealth.Web\MyHealth.Web.xproj", "{11E2D7CC-1221-4E5C-9A4E-2653AE455ED4}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MyHealth.API.IntegrationTests", "test\MyHealth.API.IntegrationTests\MyHealth.API.IntegrationTests.xproj", "{6334D527-D046-4C5A-80D8-69E930EC77EC}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{F1E42E5B-586D-453B-A7D8-05D6E647C3D9}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MyHealth.Office365", "src\MyHealth.Office365\MyHealth.Office365.xproj", "{DFD09056-6B10-415F-A254-D05670F350F7}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MyHealth.API.IntegrationTests", "test\MyHealth.API.IntegrationTests\MyHealth.API.IntegrationTests.xproj", "{E150AB03-F223-4880-B248-90917C387899}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -31,41 +30,40 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {FB798BC9-D2CE-40A8-ADD4-5E59870425E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB798BC9-D2CE-40A8-ADD4-5E59870425E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB798BC9-D2CE-40A8-ADD4-5E59870425E0}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {FB798BC9-D2CE-40A8-ADD4-5E59870425E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB798BC9-D2CE-40A8-ADD4-5E59870425E0}.Release|Any CPU.Build.0 = Release|Any CPU - {887EE144-8399-44CE-A636-06719E750915}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {887EE144-8399-44CE-A636-06719E750915}.Debug|Any CPU.Build.0 = Debug|Any CPU - {887EE144-8399-44CE-A636-06719E750915}.Release|Any CPU.ActiveCfg = Release|Any CPU - {887EE144-8399-44CE-A636-06719E750915}.Release|Any CPU.Build.0 = Release|Any CPU - {7DB08917-FAE6-4AD5-9E7D-EA6444227C21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7DB08917-FAE6-4AD5-9E7D-EA6444227C21}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7DB08917-FAE6-4AD5-9E7D-EA6444227C21}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7DB08917-FAE6-4AD5-9E7D-EA6444227C21}.Release|Any CPU.Build.0 = Release|Any CPU - {278356DC-80DD-408F-9DE8-6FC4787C2F6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {278356DC-80DD-408F-9DE8-6FC4787C2F6E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {278356DC-80DD-408F-9DE8-6FC4787C2F6E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {278356DC-80DD-408F-9DE8-6FC4787C2F6E}.Release|Any CPU.Build.0 = Release|Any CPU - {6334D527-D046-4C5A-80D8-69E930EC77EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6334D527-D046-4C5A-80D8-69E930EC77EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6334D527-D046-4C5A-80D8-69E930EC77EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6334D527-D046-4C5A-80D8-69E930EC77EC}.Release|Any CPU.Build.0 = Release|Any CPU - {DFD09056-6B10-415F-A254-D05670F350F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DFD09056-6B10-415F-A254-D05670F350F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DFD09056-6B10-415F-A254-D05670F350F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DFD09056-6B10-415F-A254-D05670F350F7}.Release|Any CPU.Build.0 = Release|Any CPU + {74909452-94ED-4B8B-B452-6A40F5A8F58C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {74909452-94ED-4B8B-B452-6A40F5A8F58C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {74909452-94ED-4B8B-B452-6A40F5A8F58C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {74909452-94ED-4B8B-B452-6A40F5A8F58C}.Release|Any CPU.Build.0 = Release|Any CPU + {E4A09728-2A40-459F-983B-7DDBB8007AAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E4A09728-2A40-459F-983B-7DDBB8007AAB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E4A09728-2A40-459F-983B-7DDBB8007AAB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E4A09728-2A40-459F-983B-7DDBB8007AAB}.Release|Any CPU.Build.0 = Release|Any CPU + {42137795-6EFB-41C8-9CDD-96E5FF3C5B6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {42137795-6EFB-41C8-9CDD-96E5FF3C5B6E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {42137795-6EFB-41C8-9CDD-96E5FF3C5B6E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {42137795-6EFB-41C8-9CDD-96E5FF3C5B6E}.Release|Any CPU.Build.0 = Release|Any CPU + {48BDAB45-5E98-4F3E-B066-578BFB0A3EAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {48BDAB45-5E98-4F3E-B066-578BFB0A3EAB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {48BDAB45-5E98-4F3E-B066-578BFB0A3EAB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {48BDAB45-5E98-4F3E-B066-578BFB0A3EAB}.Release|Any CPU.Build.0 = Release|Any CPU + {11E2D7CC-1221-4E5C-9A4E-2653AE455ED4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {11E2D7CC-1221-4E5C-9A4E-2653AE455ED4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {11E2D7CC-1221-4E5C-9A4E-2653AE455ED4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {11E2D7CC-1221-4E5C-9A4E-2653AE455ED4}.Release|Any CPU.Build.0 = Release|Any CPU + {E150AB03-F223-4880-B248-90917C387899}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E150AB03-F223-4880-B248-90917C387899}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E150AB03-F223-4880-B248-90917C387899}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E150AB03-F223-4880-B248-90917C387899}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {FB798BC9-D2CE-40A8-ADD4-5E59870425E0} = {372998F0-9076-4CCF-8DA2-1F0534BF05F4} - {887EE144-8399-44CE-A636-06719E750915} = {372998F0-9076-4CCF-8DA2-1F0534BF05F4} - {7DB08917-FAE6-4AD5-9E7D-EA6444227C21} = {372998F0-9076-4CCF-8DA2-1F0534BF05F4} - {278356DC-80DD-408F-9DE8-6FC4787C2F6E} = {372998F0-9076-4CCF-8DA2-1F0534BF05F4} - {6334D527-D046-4C5A-80D8-69E930EC77EC} = {E59ECF10-F681-410C-B416-5345A33C869D} - {DFD09056-6B10-415F-A254-D05670F350F7} = {372998F0-9076-4CCF-8DA2-1F0534BF05F4} + {74909452-94ED-4B8B-B452-6A40F5A8F58C} = {57584487-3A55-47C2-9FA5-5C62BF8D87ED} + {E4A09728-2A40-459F-983B-7DDBB8007AAB} = {57584487-3A55-47C2-9FA5-5C62BF8D87ED} + {42137795-6EFB-41C8-9CDD-96E5FF3C5B6E} = {57584487-3A55-47C2-9FA5-5C62BF8D87ED} + {48BDAB45-5E98-4F3E-B066-578BFB0A3EAB} = {57584487-3A55-47C2-9FA5-5C62BF8D87ED} + {11E2D7CC-1221-4E5C-9A4E-2653AE455ED4} = {57584487-3A55-47C2-9FA5-5C62BF8D87ED} + {E150AB03-F223-4880-B248-90917C387899} = {F1E42E5B-586D-453B-A7D8-05D6E647C3D9} EndGlobalSection EndGlobal diff --git a/NuGet.Config b/NuGet.Config deleted file mode 100644 index 7b24038..0000000 --- a/NuGet.Config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/global.json b/global.json index e4870b2..e793049 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "projects": [ "src", "test" ], "sdk": { - "version": "1.0.0-rc1-final" + "version": "1.0.0-preview2-003121" } } diff --git a/src/MyHealth.API/AppExtensions/Extensions.cs b/src/MyHealth.API/AppExtensions/Extensions.cs index 9d28a28..3a98a57 100644 --- a/src/MyHealth.API/AppExtensions/Extensions.cs +++ b/src/MyHealth.API/AppExtensions/Extensions.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Primitives; using System.Linq; diff --git a/src/MyHealth.API/Controllers/ClinicAppointmentsController.cs b/src/MyHealth.API/Controllers/ClinicAppointmentsController.cs index 195124d..1c4f0e5 100644 --- a/src/MyHealth.API/Controllers/ClinicAppointmentsController.cs +++ b/src/MyHealth.API/Controllers/ClinicAppointmentsController.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNet.Mvc; +using Microsoft.AspNetCore.Mvc; using MyHealth.Data.Repositories; using MyHealth.Model; using System.Collections.Generic; diff --git a/src/MyHealth.API/Controllers/DoctorsController.cs b/src/MyHealth.API/Controllers/DoctorsController.cs index 47c9355..0d8d40b 100644 --- a/src/MyHealth.API/Controllers/DoctorsController.cs +++ b/src/MyHealth.API/Controllers/DoctorsController.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNet.Mvc; +using Microsoft.AspNetCore.Mvc; using MyHealth.Data.Repositories; using MyHealth.Model; using System.Collections.Generic; diff --git a/src/MyHealth.API/Controllers/HomeAppointmentsController.cs b/src/MyHealth.API/Controllers/HomeAppointmentsController.cs index e13382b..08073ee 100644 --- a/src/MyHealth.API/Controllers/HomeAppointmentsController.cs +++ b/src/MyHealth.API/Controllers/HomeAppointmentsController.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNet.Mvc; +using Microsoft.AspNetCore.Mvc; using MyHealth.Data.Repositories; using MyHealth.Model; using System.Collections.Generic; diff --git a/src/MyHealth.API/Controllers/MedicinesController.cs b/src/MyHealth.API/Controllers/MedicinesController.cs index 4577c4b..5c69f8d 100644 --- a/src/MyHealth.API/Controllers/MedicinesController.cs +++ b/src/MyHealth.API/Controllers/MedicinesController.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNet.Mvc; +using Microsoft.AspNetCore.Mvc; using MyHealth.Data.Repositories; using MyHealth.Model; using System.Collections.Generic; diff --git a/src/MyHealth.API/Controllers/Office365Controller.cs b/src/MyHealth.API/Controllers/Office365Controller.cs index 504165c..28bf97e 100644 --- a/src/MyHealth.API/Controllers/Office365Controller.cs +++ b/src/MyHealth.API/Controllers/Office365Controller.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNet.Mvc; +using Microsoft.AspNetCore.Mvc; using MyHealth.Model; using MyHealth.Office365; using System; diff --git a/src/MyHealth.API/Controllers/PatientsController.cs b/src/MyHealth.API/Controllers/PatientsController.cs index 92dd444..9476ed9 100644 --- a/src/MyHealth.API/Controllers/PatientsController.cs +++ b/src/MyHealth.API/Controllers/PatientsController.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNet.Mvc; +using Microsoft.AspNetCore.Mvc; using MyHealth.Data.Repositories; using MyHealth.Model; using System.Collections.Generic; diff --git a/src/MyHealth.API/Controllers/ReportsController.cs b/src/MyHealth.API/Controllers/ReportsController.cs index fcf45ac..e27c9f5 100644 --- a/src/MyHealth.API/Controllers/ReportsController.cs +++ b/src/MyHealth.API/Controllers/ReportsController.cs @@ -1,5 +1,5 @@ using System; -using Microsoft.AspNet.Mvc; +using Microsoft.AspNetCore.Mvc; using MyHealth.Data.Repositories; using MyHealth.Model; using System.Collections.Generic; diff --git a/src/MyHealth.API/Controllers/TenantsController.cs b/src/MyHealth.API/Controllers/TenantsController.cs index cd165f0..7e2e67c 100644 --- a/src/MyHealth.API/Controllers/TenantsController.cs +++ b/src/MyHealth.API/Controllers/TenantsController.cs @@ -1,5 +1,5 @@ -using Microsoft.AspNet.Authorization; -using Microsoft.AspNet.Mvc; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; using MyHealth.API.AppExtensions; using MyHealth.API.Validators; using MyHealth.Data.Repositories; diff --git a/src/MyHealth.API/Controllers/TipsController.cs b/src/MyHealth.API/Controllers/TipsController.cs index f3991b1..0af78fa 100644 --- a/src/MyHealth.API/Controllers/TipsController.cs +++ b/src/MyHealth.API/Controllers/TipsController.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNet.Mvc; +using Microsoft.AspNetCore.Mvc; using MyHealth.Data.Repositories; using MyHealth.Model; using System.Threading.Tasks; diff --git a/src/MyHealth.API/Controllers/UsersController.cs b/src/MyHealth.API/Controllers/UsersController.cs index 1be2e0b..c07accc 100644 --- a/src/MyHealth.API/Controllers/UsersController.cs +++ b/src/MyHealth.API/Controllers/UsersController.cs @@ -1,11 +1,10 @@ -using Microsoft.AspNet.Authorization; -using Microsoft.AspNet.Mvc; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; using MyHealth.Data; using System.Threading.Tasks; using System.Linq; -using Microsoft.Data.Entity; +using Microsoft.EntityFrameworkCore; using MyHealth.Model; -using Microsoft.AspNet.Identity; using System.Collections.Generic; using System.Security.Claims; using MyHealth.Data.Repositories; diff --git a/src/MyHealth.API/Infrastructure/Policies.cs b/src/MyHealth.API/Infrastructure/Policies.cs index 61df33d..9bb55aa 100644 --- a/src/MyHealth.API/Infrastructure/Policies.cs +++ b/src/MyHealth.API/Infrastructure/Policies.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNet.Authorization; +using Microsoft.AspNetCore.Authorization; namespace MyHealth.API.Infrastructure { diff --git a/src/MyHealth.API/MyHealth.API.xproj b/src/MyHealth.API/MyHealth.API.xproj index 7346ec7..5b81628 100644 --- a/src/MyHealth.API/MyHealth.API.xproj +++ b/src/MyHealth.API/MyHealth.API.xproj @@ -5,16 +5,17 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + - 7db08917-fae6-4ad5-9e7d-ea6444227c21 + 42137795-6efb-41c8-9cdd-96e5ff3c5b6e MyHealth.API - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + .\obj + .\bin\ + v4.5.2 2.0 - + diff --git a/src/MyHealth.API/Properties/AssemblyInfo.cs b/src/MyHealth.API/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..399f6a8 --- /dev/null +++ b/src/MyHealth.API/Properties/AssemblyInfo.cs @@ -0,0 +1,19 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Microsoft Corporation")] +[assembly: AssemblyProduct("MyHealth.API")] +[assembly: AssemblyTrademark("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("42137795-6efb-41c8-9cdd-96e5ff3c5b6e")] diff --git a/src/MyHealth.API/Validators/ApplicationUserValidators.cs b/src/MyHealth.API/Validators/ApplicationUserValidators.cs index 1318e40..e09d728 100644 --- a/src/MyHealth.API/Validators/ApplicationUserValidators.cs +++ b/src/MyHealth.API/Validators/ApplicationUserValidators.cs @@ -1,8 +1,5 @@ -using Microsoft.AspNet.Identity; +using Microsoft.AspNetCore.Identity; using MyHealth.Model; -using System; -using System.Collections.Generic; -using System.Linq; using System.Threading.Tasks; namespace MyHealth.API.Validators diff --git a/src/MyHealth.API/project.json b/src/MyHealth.API/project.json index 6d8c106..099b868 100644 --- a/src/MyHealth.API/project.json +++ b/src/MyHealth.API/project.json @@ -1,28 +1,22 @@ -{ +{ + "authors": [ + "Microsoft" + ], + "description": "HealthClinic.biz", "version": "1.0.0-*", - "description": "MyHealth", - "authors": [ "Microsoft" ], - "compilationOptions": { - "define": [ "O365INTEGRATION" ] - }, + "dependencies": { - "Microsoft.AspNet.Mvc": "6.0.0-rc1-final", - "Microsoft.Extensions.Configuration.Json": "1.0.0-rc1-final", - "Microsoft.Net.Http.Server": "1.0.0-rc1-final", - "MyHealth.Data": "", - "MyHealth.Model": "", - "MyHealth.Office365": "" + "Microsoft.AspNetCore.Mvc": "1.0.0", + "Microsoft.Extensions.Configuration.Json": "1.0.0", + "MyHealth.Data": "1.0.0-*", + "MyHealth.Model": "1.0.0-*", + "MyHealth.Office365": "1.0.0-*", + "NETStandard.Library": "1.6.0" }, "frameworks": { - "dnx451": { }, - "dnxcore50": { - "dependencies": { - "System.Collections": "4.0.11-beta-23409", - "System.Linq": "4.0.0-beta-23109", - "System.Threading": "4.0.11-beta-23409", - "System.Runtime": "4.0.21-beta-23409" - } + "netstandard1.6": { + "imports": "dnxcore50" } } } diff --git a/src/MyHealth.Client.Cordova/www/index.html b/src/MyHealth.Client.Cordova/www/index.html deleted file mode 100644 index c71366c..0000000 --- a/src/MyHealth.Client.Cordova/www/index.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - Doctors - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/MyHealth.Data/Infraestructure/MyHealthDataInitializer.cs b/src/MyHealth.Data/Infraestructure/MyHealthDataInitializer.cs index 26d5345..0a02dee 100644 --- a/src/MyHealth.Data/Infraestructure/MyHealthDataInitializer.cs +++ b/src/MyHealth.Data/Infraestructure/MyHealthDataInitializer.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNet.Identity; +using Microsoft.AspNetCore.Identity; using System; using System.Threading.Tasks; using Microsoft.Extensions.Configuration; @@ -7,7 +7,9 @@ using System.Security.Claims; using System.Collections.Generic; using System.Linq; -using Microsoft.Extensions.PlatformAbstractions; +using Microsoft.AspNetCore.Hosting; +using System.Data.SqlClient; +using System.Threading; namespace MyHealth.Data.Infraestructure { @@ -15,12 +17,10 @@ public class MyHealthDataInitializer { private static IServiceProvider _serviceProvider = null; private static UserManager _userManager = null; - private static IApplicationEnvironment _applicationEnvironment = null; private static IConfigurationRoot _configuration = null; - private static readonly Random Randomize = new Random(); - private const int AppointmentMonths = 6; + private int attempt = 1; public async Task InitializeDatabaseAsync(IServiceProvider serviceProvider) { @@ -38,10 +38,10 @@ async Task InitializeDatabaseData(IServiceProvider serviceProvider, MyHealthCont { _serviceProvider = serviceProvider; _userManager = serviceProvider.GetService>(); - _applicationEnvironment = serviceProvider.GetService(); + var env = serviceProvider.GetService(); var builder = new ConfigurationBuilder() - .SetBasePath(_applicationEnvironment.ApplicationBasePath) + .SetBasePath(env.ContentRootPath) .AddJsonFile("appsettings.json"); _configuration = builder.Build(); @@ -86,7 +86,8 @@ private static async Task CreateDefaultUser(int tenantId) var user = await _userManager.FindByNameAsync(_configuration["DefaultUsername"]); if (user == null) { - user = new ApplicationUser { + user = new ApplicationUser + { UserName = _configuration["DefaultUsername"], TenantId = tenantId }; @@ -374,7 +375,7 @@ static void CreatePatients(MyHealthContext context, int tenantId) Age = Randomize.Next(35, 38), DateOfBirth = DateTime.UtcNow.AddDays(-Randomize.Next(1, 30)).AddMonths(-Randomize.Next(1, 12)).AddYears(-Randomize.Next(30, 38)), Phone = "555-322-111", - Doctors = new List() { doctor }, + Doctors = new List() { doctor }, Id = Guid.NewGuid().ToString() }; patients.Add(patient); @@ -539,6 +540,7 @@ static void CreateMedicines(MyHealthContext context, int tenantId) TimeOfDay = TimeOfDay.Breakfast }, }; + var medicines = new List(); var patients = context.Patients .Where(p => p.TenantId == tenantId) @@ -565,8 +567,8 @@ static void CreateMedicines(MyHealthContext context, int tenantId) globalIdx = globalIdx % data.Length; } - context.Medicines.AddRange(medicines); } + context.Medicines.AddRange(medicines); context.SaveChanges(); } @@ -576,7 +578,7 @@ static void CreateTips(MyHealthContext context, int tenantId) { Title = "Daily Health Tip", Content = "Drinking two glassess of water in the morning helps activate internal organs.\n\nDrinking one glass of water before a meal will help with digestion.\n\nDrinking one glass of water before taking a shower helps prevent high blood pressure.\n\nDrinking a glass of water before bedtime helps prevent strokes or heart attack.", - Date = DateTime.UtcNow, + Date = DateTime.UtcNow, TenantId = tenantId }; @@ -915,6 +917,5 @@ private static byte[] GetDoctorPicture(int index) { return Convert.FromBase64String(DoctorsFakeImages.Doctors[index - 1]); } - } } diff --git a/src/MyHealth.Data/MyHealth.Data.xproj b/src/MyHealth.Data/MyHealth.Data.xproj index a9f2fb8..cb849e7 100644 --- a/src/MyHealth.Data/MyHealth.Data.xproj +++ b/src/MyHealth.Data/MyHealth.Data.xproj @@ -5,16 +5,17 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + - 887ee144-8399-44ce-a636-06719e750915 + e4a09728-2a40-459f-983b-7ddbb8007aab MyHealth.Data - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + .\obj + .\bin\ + v4.5.2 2.0 - + diff --git a/src/MyHealth.Data/MyHealthContext.cs b/src/MyHealth.Data/MyHealthContext.cs index 6fa5bc3..0fc928e 100644 --- a/src/MyHealth.Data/MyHealthContext.cs +++ b/src/MyHealth.Data/MyHealthContext.cs @@ -1,17 +1,12 @@ -using Microsoft.AspNet.Identity.EntityFramework; -using Microsoft.Data.Entity; -using Microsoft.Data.Entity.Infrastructure; -using Microsoft.Data.Entity.Metadata; +using Microsoft.AspNetCore.Identity.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Metadata; using MyHealth.Model; namespace MyHealth.Data { public class MyHealthContext : IdentityDbContext { - public MyHealthContext() - { - } - public MyHealthContext(DbContextOptions options) :base(options) { @@ -24,17 +19,18 @@ protected override void OnModelCreating(ModelBuilder builder) builder.Entity().Property(a => a.AppointmentId).UseSqlServerIdentityColumn(); builder.Entity().HasOne(c => c.Patient).WithMany(p => p.ClinicAppointment).OnDelete(DeleteBehavior.Restrict); - builder.Entity().HasOne(c => c.Tenant).WithOne().OnDelete(DeleteBehavior.Restrict); + builder.Entity().HasOne(c => c.Tenant).WithMany().OnDelete(DeleteBehavior.Restrict); builder.Entity().Property(a => a.AppointmentId).UseSqlServerIdentityColumn(); builder.Entity().HasOne(a => a.Patient).WithMany(p => p.HomeAppointments).OnDelete(DeleteBehavior.Restrict); - builder.Entity().HasOne(a => a.Tenant).WithOne().OnDelete(DeleteBehavior.Restrict); + builder.Entity().HasOne(a => a.Tenant).WithMany().OnDelete(DeleteBehavior.Restrict); - builder.Entity().HasOne(m => m.Tenant).WithOne().OnDelete(DeleteBehavior.Restrict); + builder.Entity().HasOne(m => m.Tenant).WithMany().OnDelete(DeleteBehavior.Restrict); builder.Entity().Property(d => d.DoctorId).UseSqlServerIdentityColumn(); builder.Entity().Property(p => p.PatientId).UseSqlServerIdentityColumn(); + } public DbSet Tenants { get; set; } diff --git a/src/MyHealth.Data/Properties/AssemblyInfo.cs b/src/MyHealth.Data/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..c706da4 --- /dev/null +++ b/src/MyHealth.Data/Properties/AssemblyInfo.cs @@ -0,0 +1,19 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Microsoft Corporation")] +[assembly: AssemblyProduct("MyHealth.Data")] +[assembly: AssemblyTrademark("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("e4a09728-2a40-459f-983b-7ddbb8007aab")] diff --git a/src/MyHealth.Data/Repositories/ApplicationUsersRepository.cs b/src/MyHealth.Data/Repositories/ApplicationUsersRepository.cs index 9920062..01db45c 100644 --- a/src/MyHealth.Data/Repositories/ApplicationUsersRepository.cs +++ b/src/MyHealth.Data/Repositories/ApplicationUsersRepository.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNet.Identity; +using Microsoft.AspNetCore.Identity; using MyHealth.Model; using System; using System.Collections.Generic; diff --git a/src/MyHealth.Data/Repositories/ClinicAppointmentsRepository.cs b/src/MyHealth.Data/Repositories/ClinicAppointmentsRepository.cs index 5e0c6ad..c0f48e8 100644 --- a/src/MyHealth.Data/Repositories/ClinicAppointmentsRepository.cs +++ b/src/MyHealth.Data/Repositories/ClinicAppointmentsRepository.cs @@ -1,7 +1,7 @@ using MyHealth.Model; using System.Collections.Generic; using System.Threading.Tasks; -using Microsoft.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; using System; diff --git a/src/MyHealth.Data/Repositories/DoctorsRepository.cs b/src/MyHealth.Data/Repositories/DoctorsRepository.cs index a4aad72..c18d69e 100644 --- a/src/MyHealth.Data/Repositories/DoctorsRepository.cs +++ b/src/MyHealth.Data/Repositories/DoctorsRepository.cs @@ -2,7 +2,7 @@ using MyHealth.Model; using System.Threading.Tasks; using System.Linq; -using Microsoft.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Collections.Generic; using System; diff --git a/src/MyHealth.Data/Repositories/HomeAppointmentRepository.cs b/src/MyHealth.Data/Repositories/HomeAppointmentRepository.cs index 89ab401..7365750 100644 --- a/src/MyHealth.Data/Repositories/HomeAppointmentRepository.cs +++ b/src/MyHealth.Data/Repositories/HomeAppointmentRepository.cs @@ -1,7 +1,7 @@ using MyHealth.Model; using System.Collections.Generic; using System.Threading.Tasks; -using Microsoft.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; using System; diff --git a/src/MyHealth.Data/Repositories/MedicinesRepository.cs b/src/MyHealth.Data/Repositories/MedicinesRepository.cs index 31dc6fb..9a8f545 100644 --- a/src/MyHealth.Data/Repositories/MedicinesRepository.cs +++ b/src/MyHealth.Data/Repositories/MedicinesRepository.cs @@ -1,9 +1,8 @@ using MyHealth.Model; using System.Collections.Generic; using System.Threading.Tasks; -using Microsoft.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; -using System; namespace MyHealth.Data.Repositories { diff --git a/src/MyHealth.Data/Repositories/PatientsRepository.cs b/src/MyHealth.Data/Repositories/PatientsRepository.cs index 8e61b43..87f4acb 100644 --- a/src/MyHealth.Data/Repositories/PatientsRepository.cs +++ b/src/MyHealth.Data/Repositories/PatientsRepository.cs @@ -1,7 +1,7 @@ using MyHealth.Model; using System.Threading.Tasks; using System.Linq; -using Microsoft.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Collections.Generic; namespace MyHealth.Data.Repositories diff --git a/src/MyHealth.Data/Repositories/ReportsRepository.cs b/src/MyHealth.Data/Repositories/ReportsRepository.cs index c635e37..e35372f 100644 --- a/src/MyHealth.Data/Repositories/ReportsRepository.cs +++ b/src/MyHealth.Data/Repositories/ReportsRepository.cs @@ -1,7 +1,7 @@ using MyHealth.Model; using System.Threading.Tasks; using System.Linq; -using Microsoft.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Collections.Generic; @@ -27,7 +27,7 @@ public async Task GetClinicSummaryAsync(int tenantId) public async Task> GetExpensesSummaryAsync(int tenantId, int year) { return await _context.ExpensesSummaries - .Where(e => e.TenantId == tenantId & e.Year == year) + .Where(p => p.TenantId == tenantId && p.Year == year) .OrderBy(e => e.Month) .ToListAsync(); } @@ -35,7 +35,8 @@ public async Task> GetExpensesSummaryAsync(int tena public async Task> GetPatientsSummaryAsync(int tenantId, int year) { return await _context.PatientsSummaries - .Where(p => p.TenantId == tenantId & p.Year == year) + .Where(p => p.TenantId == tenantId && p.Year == year) + .Where(p => p.Year == year) .OrderBy(p => p.Month) .ToListAsync(); } diff --git a/src/MyHealth.Data/Repositories/TenantRepository.cs b/src/MyHealth.Data/Repositories/TenantRepository.cs index c112722..eee3afc 100644 --- a/src/MyHealth.Data/Repositories/TenantRepository.cs +++ b/src/MyHealth.Data/Repositories/TenantRepository.cs @@ -1,11 +1,11 @@ using MyHealth.Model; using System.Threading.Tasks; -using Microsoft.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; using System; using System.Collections.Generic; using System.Security.Claims; -using Microsoft.AspNet.Identity; +using Microsoft.AspNetCore.Identity; using MyHealth.Data.Infraestructure; namespace MyHealth.Data.Repositories diff --git a/src/MyHealth.Data/Repositories/TipsRepository.cs b/src/MyHealth.Data/Repositories/TipsRepository.cs index 0acd1a3..e77c360 100644 --- a/src/MyHealth.Data/Repositories/TipsRepository.cs +++ b/src/MyHealth.Data/Repositories/TipsRepository.cs @@ -1,7 +1,7 @@ using MyHealth.Model; using System.Threading.Tasks; using System.Linq; -using Microsoft.Data.Entity; +using Microsoft.EntityFrameworkCore; namespace MyHealth.Data.Repositories { diff --git a/src/MyHealth.Data/project.json b/src/MyHealth.Data/project.json index 8628026..6225b8b 100644 --- a/src/MyHealth.Data/project.json +++ b/src/MyHealth.Data/project.json @@ -1,27 +1,27 @@ -{ +{ + "authors": [ + "Microsoft" + ], + "description": "HealthClinic.biz", "version": "1.0.0-*", - "description": "MyHealth", - "authors": [ "Microsoft" ], + "dependencies": { - "EntityFramework.MicrosoftSqlServer": "7.0.0-rc1-final", - "Microsoft.Extensions.OptionsModel": "1.0.0-rc1-final", - "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-rc1-final", - "Microsoft.Extensions.Configuration.Abstractions": "1.0.0-rc1-final", - "Microsoft.Extensions.Configuration.Json": "1.0.0-rc1-final", - "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-rc1-final", - "MyHealth.Model": "" + "Microsoft.EntityFrameworkCore.SqlServer": "1.0.0", + "Microsoft.AspNetCore.Identity": "1.0.0", + "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.0.0", + "Microsoft.EntityFrameworkCore": "1.0.0", + "Microsoft.Extensions.Configuration": "1.0.0", + "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0", + "Microsoft.Extensions.Configuration.Json": "1.0.0", + "MyHealth.Model": "1.0.0-*", + "NETStandard.Library": "1.6.0", + "Microsoft.Extensions.PlatformAbstractions": "1.0.0", + "Microsoft.AspNetCore.Hosting.Abstractions": "1.0.0" }, "frameworks": { - "dnx451": { }, - "dnxcore50": { - "dependencies": - { - "System.Collections": "4.0.11-beta-23409", - "System.Linq": "4.0.0-beta-23109", - "System.Threading": "4.0.11-beta-23409", - "System.Runtime": "4.0.21-beta-23409" - } + "netstandard1.6": { + "imports": "dnxcore50" } } } diff --git a/src/MyHealth.Model/ApplicationUser.cs b/src/MyHealth.Model/ApplicationUser.cs index 97137e0..b1f6793 100644 --- a/src/MyHealth.Model/ApplicationUser.cs +++ b/src/MyHealth.Model/ApplicationUser.cs @@ -1,9 +1,6 @@  -using Microsoft.AspNet.Identity.EntityFramework; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Identity.EntityFrameworkCore; namespace MyHealth.Model { diff --git a/src/MyHealth.Model/MyHealth.Model.xproj b/src/MyHealth.Model/MyHealth.Model.xproj index d4c04aa..81af825 100644 --- a/src/MyHealth.Model/MyHealth.Model.xproj +++ b/src/MyHealth.Model/MyHealth.Model.xproj @@ -5,16 +5,17 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + - fb798bc9-d2ce-40a8-add4-5e59870425e0 + 74909452-94ed-4b8b-b452-6a40f5a8f58c MyHealth.Model - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + .\obj + .\bin\ + v4.5.2 2.0 - + diff --git a/src/MyHealth.Model/Properties/AssemblyInfo.cs b/src/MyHealth.Model/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..3f2d98a --- /dev/null +++ b/src/MyHealth.Model/Properties/AssemblyInfo.cs @@ -0,0 +1,19 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Microsoft Corporation")] +[assembly: AssemblyProduct("MyHealth.Model")] +[assembly: AssemblyTrademark("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("74909452-94ed-4b8b-b452-6a40f5a8f58c")] diff --git a/src/MyHealth.Model/project.json b/src/MyHealth.Model/project.json index f4032cf..c869651 100644 --- a/src/MyHealth.Model/project.json +++ b/src/MyHealth.Model/project.json @@ -1,20 +1,19 @@ { + "authors": [ + "Microsoft" + ], + "description": "HealthClinic.biz", "version": "1.0.0-*", - "description": "MyHealth", - "authors": [ "Microsoft" ], + "dependencies": { - "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-rc1-final" + "NETStandard.Library": "1.6.0", + "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.0.0", + "Newtonsoft.Json": "9.0.1" }, + "frameworks": { - "dnx451": { }, - "dnxcore50": { - "dependencies": - { - "System.Collections": "4.0.11-beta-23409", - "System.Linq": "4.0.0-beta-23109", - "System.Threading": "4.0.11-beta-23409", - "System.Runtime": "4.0.21-beta-23409" - } + "netstandard1.6": { + "imports": "dnxcore50" } } } diff --git a/src/MyHealth.Office365/AppHttpRequest.cs b/src/MyHealth.Office365/AppHttpRequest.cs index 1f59037..b70474c 100644 --- a/src/MyHealth.Office365/AppHttpRequest.cs +++ b/src/MyHealth.Office365/AppHttpRequest.cs @@ -2,7 +2,6 @@ // using Newtonsoft.Json.Linq; using System; -using System.Collections.Generic; using System.IO; using System.Linq; using System.Net; diff --git a/src/MyHealth.Office365/MyHealth.Office365.xproj b/src/MyHealth.Office365/MyHealth.Office365.xproj index 276878f..db4af7d 100644 --- a/src/MyHealth.Office365/MyHealth.Office365.xproj +++ b/src/MyHealth.Office365/MyHealth.Office365.xproj @@ -5,16 +5,17 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + - dfd09056-6b10-415f-a254-d05670f350f7 + 48bdab45-5e98-4f3e-b066-578bfb0a3eab MyHealth.Office365 - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + .\obj + .\bin\ + v4.5.2 2.0 - + diff --git a/src/MyHealth.Office365/O365Repository.cs b/src/MyHealth.Office365/O365Repository.cs index 76117e4..7bd0a69 100644 --- a/src/MyHealth.Office365/O365Repository.cs +++ b/src/MyHealth.Office365/O365Repository.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNet.Hosting; +using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.PlatformAbstractions; using Microsoft.IdentityModel.Clients.ActiveDirectory; @@ -31,7 +31,7 @@ public class O365Repository string applicationBasePath { get; set; } - public O365Repository(IHostingEnvironment env, IApplicationEnvironment appEnv) + public O365Repository(IHostingEnvironment env, ApplicationEnvironment appEnv) { var builder = new ConfigurationBuilder() .SetBasePath(appEnv.ApplicationBasePath) diff --git a/src/MyHealth.Office365/Properties/AssemblyInfo.cs b/src/MyHealth.Office365/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..305a31c --- /dev/null +++ b/src/MyHealth.Office365/Properties/AssemblyInfo.cs @@ -0,0 +1,19 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Microsoft Corporation")] +[assembly: AssemblyProduct("MyHealth.Office365")] +[assembly: AssemblyTrademark("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("48bdab45-5e98-4f3e-b066-578bfb0a3eab")] diff --git a/src/MyHealth.Office365/project.json b/src/MyHealth.Office365/project.json index 326a55e..9652db3 100644 --- a/src/MyHealth.Office365/project.json +++ b/src/MyHealth.Office365/project.json @@ -1,27 +1,25 @@ { - "version": "1.0.0-*", - "description": "MyHealth Office365", - "authors": [ "Microsoft" ], + "authors": [ + "Microsoft" + ], + "description": "HealthClinic.biz", + "version": "1.0.0-*", - "dependencies": { - "System.Net.Http": "4.0.1-beta-*", - "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.5.208051316-alpha", - "Microsoft.Extensions.Configuration.Json": "1.0.0-rc1-final", - "Newtonsoft.Json": "7.0.1", - "MyHealth.Model": "", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-rc1-final" - }, + "dependencies": { + "Microsoft.AspNetCore.Hosting.Abstractions": "1.0.0", + "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.5.208051316-alpha", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0", + "Microsoft.Extensions.Configuration.Json": "1.0.0", + "NETStandard.Library": "1.6.0", + "Newtonsoft.Json": "9.0.1", + "MyHealth.Model": "1.0.0-*", + "System.Net.Requests": "4.0.11", + "Microsoft.Extensions.PlatformAbstractions": "1.0.0" + }, - "frameworks": { - "dnx451": { }, - "dnxcore50": { - "dependencies": { - "System.Net.Requests": "4.0.11-beta-23409", - "System.Collections": "4.0.10-beta-23109", - "System.Linq": "4.0.0-beta-23109", - "System.Threading": "4.0.10-beta-23109", - "System.Runtime": "4.0.21-beta-23409" - } - } + "frameworks": { + "netstandard1.6": { + "imports": "dnxcore50" } + } } diff --git a/src/MyHealth.Web/AppBuilderExtensions/DataContextConfigExtensions.cs b/src/MyHealth.Web/AppBuilderExtensions/DataContextConfigExtensions.cs deleted file mode 100644 index b0ca4ce..0000000 --- a/src/MyHealth.Web/AppBuilderExtensions/DataContextConfigExtensions.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Data.Entity.Infrastructure; - -namespace MyHealth.Web.AppBuilderExtensions -{ - public static class DataContextConfigExtensions - { - - public static EntityFrameworkServicesBuilder AddStore(this EntityFrameworkServicesBuilder services, bool useInMemoryStore) - { - // Add EF services to the services container - if (useInMemoryStore) - { - services.AddInMemoryDatabase(); - } - else - { - services.AddSqlServer(); - } - - return services; - } - } -} \ No newline at end of file diff --git a/src/MyHealth.Web/AppBuilderExtensions/Startup.DataContext.cs b/src/MyHealth.Web/AppBuilderExtensions/Startup.DataContext.cs deleted file mode 100644 index e2ce985..0000000 --- a/src/MyHealth.Web/AppBuilderExtensions/Startup.DataContext.cs +++ /dev/null @@ -1,30 +0,0 @@ -using MyHealth.Data; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Data.Entity; -using System; - -namespace MyHealth.Web.AppBuilderExtensions -{ - public static class DataContextExtensions - { - public static IServiceCollection ConfigureDataContext(this IServiceCollection services, IConfiguration configuration, bool useInMemoryStore) - { - services.AddEntityFramework() - .AddStore(useInMemoryStore) - .AddDbContext(options => - { - if (useInMemoryStore) - { - options.UseInMemoryDatabase(); - } - else - { - options.UseSqlServer(configuration["Data:DefaultConnection:Connectionstring"]); - } - }); - - return services; - } - } -} \ No newline at end of file diff --git a/src/MyHealth.Web/AppBuilderExtensions/Startup.Routes.cs b/src/MyHealth.Web/AppBuilderExtensions/Startup.Routes.cs index 5195ada..456142f 100644 --- a/src/MyHealth.Web/AppBuilderExtensions/Startup.Routes.cs +++ b/src/MyHealth.Web/AppBuilderExtensions/Startup.Routes.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNet.Builder; +using Microsoft.AspNetCore.Builder; namespace MyHealth.Web.AppBuilderExtensions { diff --git a/src/MyHealth.Web/AppBuilderExtensions/Startup.Security.cs b/src/MyHealth.Web/AppBuilderExtensions/Startup.Security.cs index 2cff5e0..cc01382 100644 --- a/src/MyHealth.Web/AppBuilderExtensions/Startup.Security.cs +++ b/src/MyHealth.Web/AppBuilderExtensions/Startup.Security.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNet.Builder; +using Microsoft.AspNetCore.Builder; namespace MyHealth.Web.AppBuilderExtensions { diff --git a/src/MyHealth.Web/Controllers/AccountController.cs b/src/MyHealth.Web/Controllers/AccountController.cs index 2c0120a..8018958 100644 --- a/src/MyHealth.Web/Controllers/AccountController.cs +++ b/src/MyHealth.Web/Controllers/AccountController.cs @@ -1,5 +1,5 @@ -using Microsoft.AspNet.Identity; -using Microsoft.AspNet.Mvc; +using Microsoft.AspNetCore.Identity; +using Microsoft.AspNetCore.Mvc; using MyHealth.Model; using MyHealth.Web.Viewmodels; using System.Threading.Tasks; diff --git a/src/MyHealth.Web/Controllers/DashboardController.cs b/src/MyHealth.Web/Controllers/DashboardController.cs index 7d86ad7..62987c8 100644 --- a/src/MyHealth.Web/Controllers/DashboardController.cs +++ b/src/MyHealth.Web/Controllers/DashboardController.cs @@ -1,5 +1,5 @@ -using Microsoft.AspNet.Authorization; -using Microsoft.AspNet.Mvc; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; namespace MyHealth.Web.Controllers { diff --git a/src/MyHealth.Web/Controllers/HomeController.cs b/src/MyHealth.Web/Controllers/HomeController.cs index 6ebf386..7a6cd5d 100644 --- a/src/MyHealth.Web/Controllers/HomeController.cs +++ b/src/MyHealth.Web/Controllers/HomeController.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNet.Mvc; +using Microsoft.AspNetCore.Mvc; namespace MyHealth.Web.Controllers { diff --git a/src/MyHealth.Web/Dockerfile b/src/MyHealth.Web/Dockerfile deleted file mode 100644 index 692485f..0000000 --- a/src/MyHealth.Web/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM microsoft/aspnet:1.0.0-rc1-final - -ADD . /app - -WORKDIR /app/approot - -ENTRYPOINT ["./web"] diff --git a/src/MyHealth.Web/MyHealth.Web.xproj b/src/MyHealth.Web/MyHealth.Web.xproj index 557fda7..15d3a14 100644 --- a/src/MyHealth.Web/MyHealth.Web.xproj +++ b/src/MyHealth.Web/MyHealth.Web.xproj @@ -4,21 +4,22 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + + - 278356dc-80dd-408f-9de8-6fc4787c2f6e + 11e2d7cc-1221-4e5c-9a4e-2653ae455ed4 MyHealth.Web - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + .\obj + .\bin\ + v4.5.2 + 2.0 - 34393 - 0 - - + + - - \ No newline at end of file + + diff --git a/src/MyHealth.Web/Platform.cs b/src/MyHealth.Web/Platform.cs deleted file mode 100644 index e9c9ce2..0000000 --- a/src/MyHealth.Web/Platform.cs +++ /dev/null @@ -1,90 +0,0 @@ -using System; -using System.Runtime.InteropServices; -using Microsoft.Dnx.Runtime; -using Microsoft.Extensions.PlatformAbstractions; - -namespace MyHealth.Web -{ - internal class Platform - { - // Defined in winnt.h - private const int PRODUCT_NANO_SERVER = 0x0000006D; - - [DllImport("api-ms-win-core-sysinfo-l1-2-1.dll", SetLastError = false)] - private static extern bool GetProductInfo( - int dwOSMajorVersion, - int dwOSMinorVersion, - int dwSpMajorVersion, - int dwSpMinorVersion, - out int pdwReturnedProductType); - - private readonly IRuntimeEnvironment _runtimeEnvironment; - - private bool? _isNano; - private bool? _isMono; - private bool? _isWindows; - - public Platform(IRuntimeEnvironment runtimeEnvironment) - { - _runtimeEnvironment = runtimeEnvironment; - } - - public bool IsRunningOnWindows - { - get - { - if (_isWindows == null) - { - _isWindows = _runtimeEnvironment.OperatingSystem.Equals("Windows", StringComparison.OrdinalIgnoreCase); - } - - return _isWindows.Value; - } - } - - public bool IsRunningOnMono - { - get - { - if (_isMono == null) - { - _isMono = _runtimeEnvironment.RuntimeType.Equals("Mono", StringComparison.OrdinalIgnoreCase); - } - - return _isMono.Value; - } - } - - public bool IsRunningOnNanoServer - { - get - { - if (_isNano == null) - { - var osVersion = new Version(_runtimeEnvironment.OperatingSystemVersion ?? ""); - - try - { - int productType; - if (GetProductInfo(osVersion.Major, osVersion.Minor, 0, 0, out productType)) - { - _isNano = productType == PRODUCT_NANO_SERVER; - } - else - { - _isNano = false; - } - } - catch - { - // If the API call fails, the API set is not there which means - // that we are definetely not running on Nano - _isNano = false; - } - } - - return _isNano.Value; - } - } - } -} diff --git a/src/MyHealth.Web/Program.cs b/src/MyHealth.Web/Program.cs new file mode 100644 index 0000000..467d6f6 --- /dev/null +++ b/src/MyHealth.Web/Program.cs @@ -0,0 +1,20 @@ +using System.IO; +using Microsoft.AspNetCore.Hosting; + +namespace MyHealth.Web +{ + public class Program + { + public static void Main(string[] args) + { + var host = new WebHostBuilder() + .UseKestrel() + .UseContentRoot(Directory.GetCurrentDirectory()) + .UseIISIntegration() + .UseStartup() + .Build(); + + host.Run(); + } + } +} diff --git a/src/MyHealth.Web/Project_Readme.html b/src/MyHealth.Web/Project_Readme.html index bc23184..1a0f5b5 100644 --- a/src/MyHealth.Web/Project_Readme.html +++ b/src/MyHealth.Web/Project_Readme.html @@ -2,7 +2,7 @@ - Welcome to ASP.NET 5 + Welcome to ASP.NET Core