David Woods d35667053a Merging changes from s65 back into master. ... # Conflicts: # External/Nuget/nuget.exe # Microsoft.HealthVault.Client.Android/AndroidHealthVaultConnectionFactory.cs # Microsoft.HealthVault.Client.Bait/HealthVaultConnectionFactory.cs # Microsoft.HealthVault.Client.Ios/IosHealthVaultConnectionFactory.cs # Microsoft.HealthVault.Client.Uwp/UwpHealthVaultConnectionFactory.cs # Microsoft.HealthVault.IntegrationTest/ActionPlanTests.cs # Microsoft.HealthVault.RestApi/Generated/ActionPlanObjectives.cs # Microsoft.HealthVault.RestApi/Generated/ActionPlanObjectivesExtensions.cs # Microsoft.HealthVault.RestApi/Generated/ActionPlanTasks.cs # Microsoft.HealthVault.RestApi/Generated/ActionPlanTasksExtensions.cs # Microsoft.HealthVault.RestApi/Generated/ActionPlans.cs # Microsoft.HealthVault.RestApi/Generated/ActionPlansExtensions.cs # Microsoft.HealthVault.RestApi/Generated/Goals.cs # Microsoft.HealthVault.RestApi/Generated/GoalsExtensions.cs # Microsoft.HealthVault.RestApi/Generated/IActionPlanObjectives.cs # Microsoft.HealthVault.RestApi/Generated/IActionPlanTasks.cs # Microsoft.HealthVault.RestApi/Generated/IActionPlans.cs # Microsoft.HealthVault.RestApi/Generated/IGoals.cs # Microsoft.HealthVault.RestApi/Generated/IMicrosoftHealthVaultRestApi.cs # Microsoft.HealthVault.RestApi/Generated/IOnboarding.cs # Microsoft.HealthVault.RestApi/Generated/MicrosoftHealthVaultRestApi.cs # Microsoft.HealthVault.RestApi/Generated/Onboarding.cs # Microsoft.HealthVault.RestApi/Generated/OnboardingExtensions.cs # Microsoft.HealthVault.RestApi/HealthVaultRestCredentials.cs # Microsoft.HealthVault.RestApi/KnownRestHeaders.cs # Microsoft.HealthVault.UnitTest/Clients/ThingClientTests.cs # Microsoft.HealthVault.UnitTest/Microsoft.HealthVault.UnitTest.csproj # Microsoft.HealthVault.UnitTest/app.config # Microsoft.HealthVault.Web/WebHealthVaultFactory.cs # Microsoft.HealthVault/Clients/Deserializers/ThingDeserializer.cs # Microsoft.HealthVault/ItemTypes/ItemTypeRegistrar.cs # Microsoft.HealthVault/Thing/ItemTypeManager.cs # Microsoft.HealthVault/Thing/ThingTypeHandler.cs		2017-06-30 17:23:22 -07:00
..
PersonClientTests.cs	Formatting Pass (#38)	2017-05-25 09:49:46 -07:00
PlatformClientTests.cs	Switched OneSDK to expose NodaTime types instead of DateTime (#44)	2017-06-02 16:43:44 -07:00
ThingClientTests.cs	Merging changes from s65 back into master.	2017-06-30 17:23:22 -07:00
ThingDeserializerTests.cs	Merging changes from s65 back into master.	2017-06-30 17:23:22 -07:00
VocabularyClientTests.cs	Formatting Pass (#38)	2017-05-25 09:49:46 -07:00