Merge pull request #17 from tranpl/net-core-1.x

Net core 1.x as master
tranpl · Aug 30, 2017 · 35d0f6d · 35d0f6d
2 parents 9250681 + 4abacb2
commit 35d0f6d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/RedcapApi/Api/Redcap.cs b/RedcapApi/Api/Redcap.cs
@@ -871,7 +871,7 @@ public Task<string> ExportSurveyReturnCode(int[] arms, OverwriteBehavior overwri
         /// <param name="redcapFormat"></param>
         /// <param name="returnFormat"></param>
         /// <returns></returns>
-        public async Task<string> ExportUsers(RedcapFormat redcapFormat, ReturnFormat returnFormat = ReturnFormat.json)
+        public async Task<string> ExportUsersAsync(RedcapFormat redcapFormat, ReturnFormat returnFormat = ReturnFormat.json)
         {
             try
             {

diff --git a/RedcapApi/Interfaces/IRedcap.cs b/RedcapApi/Interfaces/IRedcap.cs
@@ -82,7 +82,7 @@ public interface IRedcap
         Task<string> ExportSurveyParticipants(int[] arms, OverwriteBehavior overwriteBehavior, RedcapFormat RedcapFormat, ReturnFormat returnFormat);
         Task<string> ExportSurveyQueueLink(int[] arms, OverwriteBehavior overwriteBehavior, RedcapFormat RedcapFormat, ReturnFormat returnFormat);
         Task<string> ExportSurveyReturnCode(int[] arms, OverwriteBehavior overwriteBehavior, RedcapFormat RedcapFormat, ReturnFormat returnFormat);
-        Task<string> ExportUsers(RedcapFormat RedcapFormat, ReturnFormat returnFormat = ReturnFormat.json);
+        Task<string> ExportUsersAsync(RedcapFormat RedcapFormat, ReturnFormat returnFormat = ReturnFormat.json);
         Task<string> ImportUsers(int[] arms, OverwriteBehavior overwriteBehavior, RedcapFormat RedcapFormat, ReturnFormat returnFormat);
 
         /// <summary>

diff --git a/RedcapApi/Redcap.csproj b/RedcapApi/Redcap.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp1.1</TargetFramework>
     <Authors>Michael Tran</Authors>
     <Company>Virginia Commonwealth University</Company>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
@@ -14,7 +14,7 @@
     <AssemblyVersion>0.2.4.0</AssemblyVersion>
     <PackageTags>redcap</PackageTags>
     <PackageReleaseNotes>initial alpha release</PackageReleaseNotes>
-    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -28,9 +28,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
     <PackageReference Include="Serilog" Version="2.5.1-dev-00873" />
     <PackageReference Include="System.ValueTuple" Version="4.4.0" />