replacing dnx with dotnet cli

dotnet · Feb 12, 2016 · 3402f01 · 3402f01
1 parent 74020c5
commit 3402f01
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 308 deletions.
diff --git a/BenchmarkDotNet.IntegrationTests/project.json b/BenchmarkDotNet.IntegrationTests/project.json
@@ -12,8 +12,6 @@
       },
       "dependencies": {
         "BenchmarkDotNet.Diagnostics": "1.0.0-*",
-        "Dia2Lib": "1.0.0-*",
-        "Interop.Dia2Lib": "1.0.0-*",
         "Microsoft.Diagnostics.Runtime": "1.0.0-*",
         "xunit.runner.visualstudio": "2.1.0"
       },
@@ -28,14 +26,14 @@
         "System.Threading.Tasks": "4.0.0.0"
       },
       "dependencies": {
-        "Microsoft.Diagnostics.Runtime": "1.0.0-*",
         "xunit.runner.dnx": "2.1.0-rc1-build204"
       }
     }
   },
   "dependencies": {
     "BenchmarkDotNet": {
-      "target": "project"
+      "target": "project",
+      "version": "1.0.0-*"
     },
     "xunit": "2.1.0",
     "xunit.abstractions": "2.0.0",

diff --git a/BenchmarkDotNet.IntegrationTests/project.lock.json b/BenchmarkDotNet.IntegrationTests/project.lock.json
@@ -111,17 +111,6 @@
           "System.Runtime"
         ]
       },
-      "Dia2Lib/1.0.0": {
-        "type": "project",
-        "framework": ".NETFramework,Version=v4.0"
-      },
-      "Microsoft.Diagnostics.Runtime/1.0.0": {
-        "type": "project",
-        "framework": ".NETFramework,Version=v4.0",
-        "dependencies": {
-          "Dia2Lib": "1.0.0"
-        }
-      },
       "Microsoft.Dnx.Compilation.Abstractions/1.0.0-rc1-final": {
         "type": "package",
         "dependencies": {
@@ -569,17 +558,6 @@
           "System.Runtime"
         ]
       },
-      "Dia2Lib/1.0.0": {
-        "type": "project",
-        "framework": ".NETFramework,Version=v4.0"
-      },
-      "Microsoft.Diagnostics.Runtime/1.0.0": {
-        "type": "project",
-        "framework": ".NETFramework,Version=v4.0",
-        "dependencies": {
-          "Dia2Lib": "1.0.0"
-        }
-      },
       "Microsoft.Dnx.Compilation.Abstractions/1.0.0-rc1-final": {
         "type": "package",
         "dependencies": {
@@ -831,17 +809,6 @@
           "System.Runtime"
         ]
       },
-      "Dia2Lib/1.0.0": {
-        "type": "project",
-        "framework": ".NETFramework,Version=v4.0"
-      },
-      "Microsoft.Diagnostics.Runtime/1.0.0": {
-        "type": "project",
-        "framework": ".NETFramework,Version=v4.0",
-        "dependencies": {
-          "Dia2Lib": "1.0.0"
-        }
-      },
       "Microsoft.Dnx.Compilation.Abstractions/1.0.0-rc1-final": {
         "type": "package",
         "dependencies": {
@@ -1429,7 +1396,7 @@
   },
   "projectFileDependencyGroups": {
     "": [
-      "BenchmarkDotNet ",
+      "BenchmarkDotNet >= 1.0.0-*",
       "xunit >= 2.1.0",
       "xunit.abstractions >= 2.0.0",
       "xunit.assert >= 2.1.0",
@@ -1439,15 +1406,12 @@
     ],
     ".NETFramework,Version=v4.5": [
       "BenchmarkDotNet.Diagnostics >= 1.0.0-*",
-      "Dia2Lib >= 1.0.0-*",
-      "Interop.Dia2Lib >= 1.0.0-*",
       "Microsoft.Diagnostics.Runtime >= 1.0.0-*",
       "xunit.runner.visualstudio >= 2.1.0",
       "fx/System.Runtime >= 4.0.0",
       "fx/System.Threading.Tasks >= 4.0.0"
     ],
     "DNX,Version=v4.5.1": [
-      "Microsoft.Diagnostics.Runtime >= 1.0.0-*",
       "xunit.runner.dnx >= 2.1.0-rc1-build204",
       "fx/System.Runtime >= 4.0.10",
       "fx/System.Threading.Tasks >= 4.0.0"

diff --git a/BenchmarkDotNet.Samples/Properties/launchSettings.json b/BenchmarkDotNet.Samples/Properties/launchSettings.json
@@ -3,13 +3,6 @@
     "DEBUG_4.0": {
       "executablePath": "BenchmarkDotNet.Samples.dll",
       "workingDirectory": "..\\artifacts\\bin\\BenchmarkDotNet.Samples\\Debug\\net40\\"
-    },
-    "DNX_TRACE": {
-      "commandName": "run",
-      "environmentVariables": {
-        "DNX_TRACE": "1"
-      },
-      "comment": "setting DNX_TRACE = 1 makes dnx tools gives much more details, use for troubleshooting DNX"
     }
   }
 }
diff --git a/BenchmarkDotNet.Samples/project.json b/BenchmarkDotNet.Samples/project.json
@@ -10,15 +10,16 @@
   },
   "frameworks": {
     "net40": {
+      "BenchmarkDotNet.Diagnostics": "1.0.0-*"
     },
     "dnx451": {
     }
   },
   "dependencies": {
     "BenchmarkDotNet": {
-      "target": "project"
-    },
-    "BenchmarkDotNet.Diagnostics": "1.0.0-*"
+      "target": "project",
+      "version": "1.0.0-*"
+    }
   },
   "scripts": {
     "postbuild": [

diff --git a/BenchmarkDotNet.Samples/project.lock.json b/BenchmarkDotNet.Samples/project.lock.json
@@ -12,31 +12,6 @@
           "Microsoft.Build.Utilities.v4.0",
           "System.Management"
         ]
-      },
-      "BenchmarkDotNet.Diagnostics/1.0.0": {
-        "type": "project",
-        "framework": ".NETFramework,Version=v4.0",
-        "dependencies": {
-          "BenchmarkDotNet": null,
-          "Dia2Lib": "1.0.0",
-          "Interop.Dia2Lib": "1.0.0",
-          "Microsoft.Diagnostics.Runtime": "1.0.0"
-        }
-      },
-      "Dia2Lib/1.0.0": {
-        "type": "project",
-        "framework": ".NETFramework,Version=v4.0"
-      },
-      "Interop.Dia2Lib/1.0.0": {
-        "type": "project",
-        "framework": ".NETFramework,Version=v4.0"
-      },
-      "Microsoft.Diagnostics.Runtime/1.0.0": {
-        "type": "project",
-        "framework": ".NETFramework,Version=v4.0",
-        "dependencies": {
-          "Dia2Lib": "1.0.0"
-        }
       }
     },
     "DNX,Version=v4.5.1": {
@@ -49,34 +24,6 @@
           "System.Reflection",
           "System.Runtime"
         ]
-      },
-      "BenchmarkDotNet.Diagnostics/1.0.0": {
-        "type": "project",
-        "framework": "DNX,Version=v4.5.1",
-        "dependencies": {
-          "BenchmarkDotNet": null,
-          "Dia2Lib": "1.0.0",
-          "Interop.Dia2Lib": "1.0.0",
-          "Microsoft.Diagnostics.Runtime": "1.0.0"
-        },
-        "frameworkAssemblies": [
-          "System.Runtime"
-        ]
-      },
-      "Dia2Lib/1.0.0": {
-        "type": "project",
-        "framework": ".NETFramework,Version=v4.0"
-      },
-      "Interop.Dia2Lib/1.0.0": {
-        "type": "project",
-        "framework": ".NETFramework,Version=v4.0"
-      },
-      "Microsoft.Diagnostics.Runtime/1.0.0": {
-        "type": "project",
-        "framework": ".NETFramework,Version=v4.0",
-        "dependencies": {
-          "Dia2Lib": "1.0.0"
-        }
       }
     },
     ".NETFramework,Version=v4.0/win7-x86": {
@@ -89,31 +36,6 @@
           "Microsoft.Build.Utilities.v4.0",
           "System.Management"
         ]
-      },
-      "BenchmarkDotNet.Diagnostics/1.0.0": {
-        "type": "project",
-        "framework": ".NETFramework,Version=v4.0",
-        "dependencies": {
-          "BenchmarkDotNet": null,
-          "Dia2Lib": "1.0.0",
-          "Interop.Dia2Lib": "1.0.0",
-          "Microsoft.Diagnostics.Runtime": "1.0.0"
-        }
-      },
-      "Dia2Lib/1.0.0": {
-        "type": "project",
-        "framework": ".NETFramework,Version=v4.0"
-      },
-      "Interop.Dia2Lib/1.0.0": {
-        "type": "project",
-        "framework": ".NETFramework,Version=v4.0"
-      },
-      "Microsoft.Diagnostics.Runtime/1.0.0": {
-        "type": "project",
-        "framework": ".NETFramework,Version=v4.0",
-        "dependencies": {
-          "Dia2Lib": "1.0.0"
-        }
       }
     },
     ".NETFramework,Version=v4.0/win7-x64": {
@@ -126,31 +48,6 @@
           "Microsoft.Build.Utilities.v4.0",
           "System.Management"
         ]
-      },
-      "BenchmarkDotNet.Diagnostics/1.0.0": {
-        "type": "project",
-        "framework": ".NETFramework,Version=v4.0",
-        "dependencies": {
-          "BenchmarkDotNet": null,
-          "Dia2Lib": "1.0.0",
-          "Interop.Dia2Lib": "1.0.0",
-          "Microsoft.Diagnostics.Runtime": "1.0.0"
-        }
-      },
-      "Dia2Lib/1.0.0": {
-        "type": "project",
-        "framework": ".NETFramework,Version=v4.0"
-      },
-      "Interop.Dia2Lib/1.0.0": {
-        "type": "project",
-        "framework": ".NETFramework,Version=v4.0"
-      },
-      "Microsoft.Diagnostics.Runtime/1.0.0": {
-        "type": "project",
-        "framework": ".NETFramework,Version=v4.0",
-        "dependencies": {
-          "Dia2Lib": "1.0.0"
-        }
       }
     },
     "DNX,Version=v4.5.1/win7-x86": {
@@ -163,34 +60,6 @@
           "System.Reflection",
           "System.Runtime"
         ]
-      },
-      "BenchmarkDotNet.Diagnostics/1.0.0": {
-        "type": "project",
-        "framework": "DNX,Version=v4.5.1",
-        "dependencies": {
-          "BenchmarkDotNet": null,
-          "Dia2Lib": "1.0.0",
-          "Interop.Dia2Lib": "1.0.0",
-          "Microsoft.Diagnostics.Runtime": "1.0.0"
-        },
-        "frameworkAssemblies": [
-          "System.Runtime"
-        ]
-      },
-      "Dia2Lib/1.0.0": {
-        "type": "project",
-        "framework": ".NETFramework,Version=v4.0"
-      },
-      "Interop.Dia2Lib/1.0.0": {
-        "type": "project",
-        "framework": ".NETFramework,Version=v4.0"
-      },
-      "Microsoft.Diagnostics.Runtime/1.0.0": {
-        "type": "project",
-        "framework": ".NETFramework,Version=v4.0",
-        "dependencies": {
-          "Dia2Lib": "1.0.0"
-        }
       }
     },
     "DNX,Version=v4.5.1/win7-x64": {
@@ -203,63 +72,18 @@
           "System.Reflection",
           "System.Runtime"
         ]
-      },
-      "BenchmarkDotNet.Diagnostics/1.0.0": {
-        "type": "project",
-        "framework": "DNX,Version=v4.5.1",
-        "dependencies": {
-          "BenchmarkDotNet": null,
-          "Dia2Lib": "1.0.0",
-          "Interop.Dia2Lib": "1.0.0",
-          "Microsoft.Diagnostics.Runtime": "1.0.0"
-        },
-        "frameworkAssemblies": [
-          "System.Runtime"
-        ]
-      },
-      "Dia2Lib/1.0.0": {
-        "type": "project",
-        "framework": ".NETFramework,Version=v4.0"
-      },
-      "Interop.Dia2Lib/1.0.0": {
-        "type": "project",
-        "framework": ".NETFramework,Version=v4.0"
-      },
-      "Microsoft.Diagnostics.Runtime/1.0.0": {
-        "type": "project",
-        "framework": ".NETFramework,Version=v4.0",
-        "dependencies": {
-          "Dia2Lib": "1.0.0"
-        }
       }
     }
   },
   "libraries": {
     "BenchmarkDotNet/0.8.3": {
       "type": "project",
       "path": "../BenchmarkDotNet/project.json"
-    },
-    "BenchmarkDotNet.Diagnostics/1.0.0": {
-      "type": "project",
-      "path": "../BenchmarkDotNet.Diagnostics/project.json"
-    },
-    "Dia2Lib/1.0.0": {
-      "type": "project",
-      "path": "../wrap/Dia2Lib/project.json"
-    },
-    "Interop.Dia2Lib/1.0.0": {
-      "type": "project",
-      "path": "../wrap/Interop.Dia2Lib/project.json"
-    },
-    "Microsoft.Diagnostics.Runtime/1.0.0": {
-      "type": "project",
-      "path": "../wrap/Microsoft.Diagnostics.Runtime/project.json"
     }
   },
   "projectFileDependencyGroups": {
     "": [
-      "BenchmarkDotNet ",
-      "BenchmarkDotNet.Diagnostics >= 1.0.0-*"
+      "BenchmarkDotNet >= 1.0.0-*"
     ],
     ".NETFramework,Version=v4.0": [],
     "DNX,Version=v4.5.1": []