Testing

01_Demos_ASPNET5.sln

@@ -3,69 +3,67 @@ 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
 		Debug|Any CPU = Debug|Any CPU
 		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

global.json

@@ -1,6 +1,6 @@
 {
   "projects": [ "src", "test" ],
   "sdk": {
-    "version": "1.0.0-rc1-final"
+    "version": "1.0.0-preview2-003121"
   }
 }

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

src/MyHealth.API/Infrastructure/Policies.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNet.Authorization;
+using Microsoft.AspNetCore.Authorization;
 
 namespace MyHealth.API.Infrastructure
 {

src/MyHealth.API/MyHealth.API.xproj

@@ -5,16 +5,17 @@
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
 
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
-    <ProjectGuid>7db08917-fae6-4ad5-9e7d-ea6444227c21</ProjectGuid>
+    <ProjectGuid>42137795-6efb-41c8-9cdd-96e5ff3c5b6e</ProjectGuid>
     <RootNamespace>MyHealth.API</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
   </PropertyGroup>
 
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>

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")]

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

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"
     }
   }
 }