fixing non-windows build

aliostad · May 24, 2018 · c410239 · c410239
1 parent 598ce0f
commit c410239
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/build.sh b/build.sh
@@ -1,2 +1,2 @@
-dotnet restore CacheCow.sln -r netcoreapp2.0 -r netstandard2.0
-dotnet test CacheCow.sln -f netcoreapp2.0
+dotnet restore CacheCow.CoreOnly.sln -r netcoreapp2.0 -r netstandard2.0
+dotnet test CacheCow.CoreOnly.sln -f netcoreapp2.0
diff --git a/src/CacheCow.Client/CacheCow.Client.csproj b/src/CacheCow.Client/CacheCow.Client.csproj
@@ -19,7 +19,7 @@
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
 		<Reference Include="System.Runtime.Caching" />
 	</ItemGroup>	
-	<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+	<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netcoreapp2.0' ">
 		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.0.1" />
 	</ItemGroup>	
 </Project>
diff --git a/src/CacheCow.Server/CacheCow.Server.csproj b/src/CacheCow.Server/CacheCow.Server.csproj
@@ -19,8 +19,8 @@
 	</ItemGroup>
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
 		<PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="5.2.5" />
-	</ItemGroup>	
-	<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+	</ItemGroup>		
+	<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netcoreapp2.0' ">
 		<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.3" />
 	</ItemGroup>