Update to netcoreapp deps

MichaCo · Aug 21, 2016 · 1ef7b9a · 1ef7b9a
1 parent 1394980
commit 1ef7b9a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 16 deletions.
diff --git a/samples/CacheManager.Examples/Program.cs b/samples/CacheManager.Examples/Program.cs
@@ -2,7 +2,7 @@
 using System.Reflection;
 using CacheManager.Core;
 using Microsoft.Extensions.Logging;
-#if NET45
+#if NET452
 using Microsoft.Practices.Unity;
 #else
 using Unity;

diff --git a/samples/CacheManager.Examples/project.json b/samples/CacheManager.Examples/project.json
@@ -13,15 +13,15 @@
  "CacheManager.Serialization.Json": { "target": "project" },
  "Microsoft.Extensions.Configuration.Json": "1.0.0",
  "Microsoft.Extensions.Logging.Console": "1.0.0",
- "Unity": "4.0.2"
+ "Unity": "4.0.1"
  },
 
  "commands": {
  "CacheManager.Examples": "CacheManager.Examples"
  },
 
  "frameworks": {
- "dnx451": {
+ "net452": {
  "dependencies": {
  "CacheManager.StackExchange.Redis": { "target": "project" },
  "CacheManager.SystemRuntimeCaching": { "target": "project" }

diff --git a/test/CacheManager.Config.Tests/Properties/launchSettings.json b/test/CacheManager.Config.Tests/Properties/launchSettings.json
@@ -1,8 +1,7 @@
 {
  "profiles": {
- "run": {
- "commandName": "run",
- "sdkVersion": "dnx-clr-win-x64.1.0.0-rc1-update1"
+ "CacheManager.Config.Tests": {
+ "commandName": "Project"
  }
  }
 }
diff --git a/test/CacheManager.Config.Tests/project.json b/test/CacheManager.Config.Tests/project.json
@@ -19,12 +19,6 @@
  "cache.json"
  ]
  },
- "commands": {
- "run": "CacheManager.Config.Tests"
- },
- "runtimes": {
- "win7-x64": { }
- },
  "frameworks": {
  "net452": {
  "frameworkAssemblies": {
@@ -37,6 +31,10 @@
  "netcoreapp1.0": {
  "buildOptions": { "define": [ "NETCORE" ] },
  "dependencies": {
+ "Microsoft.NETCore.App": {
+ "version": "1.0.0",
+ "type": "platform"
+ },
  "System.Threading.Thread": "4.0.0",
  "System.Threading.Tasks.Parallel": "4.0.1",
  "System.Console": "4.0.0",

diff --git a/test/CacheManager.Tests/project.json b/test/CacheManager.Tests/project.json
@@ -22,10 +22,6 @@
  ]
  },
  "testRunner": "xunit",
- "runtimes": {
- "win7-x64": {},
- "ubuntu.14.04-x64": {}
- },
  "frameworks": {
  "net452": {
  "buildOptions": {
@@ -51,6 +47,10 @@
  "netcoreapp1.0": {
  "buildOptions": { "define": [ "REDISENABLED", "DNXCORE50" ] },
  "dependencies": {
+ "Microsoft.NETCore.App": {
+ "version": "1.0.0",
+ "type": "platform"
+ },
  "System.Diagnostics.TraceSource": "4.0.0"
  }
  }