Merge pull request #11055 from jorive/dev/xUnit-Performance-API

DrewScoggins · web-flow · commit 599e00cfba40 · 2017-04-22T02:16:01.000+09:00
Improving robustness of the run-xunit-perf.cmd script.
diff --git a/tests/scripts/run-xunit-perf.cmd b/tests/scripts/run-xunit-perf.cmd
diff --git a/tests/src/Common/PerfHarness/project.json b/tests/src/Common/PerfHarness/project.json
@@ -12,7 +12,7 @@
           "type": "platform",
           "version": "1.1.0"
         },
-        "xunit.performance.api": "1.0.0-beta-build0002"
+        "xunit.performance.api": "1.0.0-beta-build0003"
       }
     }
   }
diff --git a/tests/src/Common/external/external.depproj b/tests/src/Common/external/external.depproj
@@ -24,9 +24,6 @@
     <PackageToInclude Include="xunit.extensibility.core"/>
     <PackageToInclude Include="xunit.extensibility.execution"/>
     <PackageToInclude Include="xunit.runner.utility"/>
-    <PackageToInclude Include="Microsoft.DotNet.xunit.performance"/>
-    <PackageToInclude Include="Microsoft.DotNet.xunit.performance.analysis"/>
-    <PackageToInclude Include="Microsoft.DotNet.xunit.performance.runner.Windows"/>
     <PackageToInclude Include="xunit.performance.api"/>
     <PackageToInclude Include="xunit.performance.core"/>
     <PackageToInclude Include="xunit.performance.execution"/>
@@ -37,7 +34,7 @@
     <PackageToInclude Include="Microsoft.CodeAnalysis.Common"/>
     <PackageToInclude Include="Microsoft.CodeAnalysis.Compilers"/>
     <PackageToInclude Include="Microsoft.CodeAnalysis.CSharp"/>
-    <PackageToInclude Include="Microsoft.CodeAnalysis.VisualBasic"/>    
+    <PackageToInclude Include="Microsoft.CodeAnalysis.VisualBasic"/>
     <PackageToInclude Include="$(XUnitRunnerPackageId)" />
   </ItemGroup>
 
@@ -48,7 +45,7 @@
             Text="Error: looks the package $(PackagesDir)$(XUnitRunnerPackageId)\$(XUnitPackageVersion) not restored or missing xunit.console.exe."
     />
     <ItemGroup>
-      <ReferenceCopyLocalPaths 
+      <ReferenceCopyLocalPaths
         Include="$(PackagesDir)$(XUnitRunnerPackageId)\$(XUnitPackageVersion)\tools\*.*"
         Exclude="$(PackagesDir)$(XUnitRunnerPackageId)\$(XUnitPackageVersion)\tools\xunit.console.exe.config"
       >
diff --git a/tests/src/Common/external/project.json b/tests/src/Common/external/project.json
@@ -1,10 +1,10 @@
 {
   "dependencies": {
     "Microsoft.CodeAnalysis.Compilers": "1.1.1",
-    "xunit.performance.api": "1.0.0-beta-build0002",
-    "xunit.performance.core": "1.0.0-beta-build0002",
-    "xunit.performance.execution": "1.0.0-beta-build0002",
-    "xunit.performance.metrics": "1.0.0-beta-build0002",
+    "xunit.performance.api": "1.0.0-beta-build0003",
+    "xunit.performance.core": "1.0.0-beta-build0003",
+    "xunit.performance.execution": "1.0.0-beta-build0003",
+    "xunit.performance.metrics": "1.0.0-beta-build0003",
     "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental",
     "Newtonsoft.Json": "9.0.1",
     "xunit": "2.2.0-beta2-build3300",
diff --git a/tests/src/JIT/config/benchmark+roslyn/project.json b/tests/src/JIT/config/benchmark+roslyn/project.json
@@ -1,10 +1,10 @@
 {
   "dependencies": {
     "Microsoft.CodeAnalysis.Compilers": "1.1.1",
-    "xunit.performance.api": "1.0.0-beta-build0002",
-    "xunit.performance.core": "1.0.0-beta-build0002",
-    "xunit.performance.execution": "1.0.0-beta-build0002",
-    "xunit.performance.metrics": "1.0.0-beta-build0002",
+    "xunit.performance.api": "1.0.0-beta-build0003",
+    "xunit.performance.core": "1.0.0-beta-build0003",
+    "xunit.performance.execution": "1.0.0-beta-build0003",
+    "xunit.performance.metrics": "1.0.0-beta-build0003",
     "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental",
     "Microsoft.NETCore.Platforms": "2.0.0-preview1-25221-01",
     "System.Console": "4.4.0-beta-24913-02",
diff --git a/tests/src/JIT/config/benchmark+serialize/project.json b/tests/src/JIT/config/benchmark+serialize/project.json
@@ -1,9 +1,9 @@
 {
   "dependencies": {
-    "xunit.performance.api": "1.0.0-beta-build0002",
-    "xunit.performance.core": "1.0.0-beta-build0002",
-    "xunit.performance.execution": "1.0.0-beta-build0002",
-    "xunit.performance.metrics": "1.0.0-beta-build0002",
+    "xunit.performance.api": "1.0.0-beta-build0003",
+    "xunit.performance.core": "1.0.0-beta-build0003",
+    "xunit.performance.execution": "1.0.0-beta-build0003",
+    "xunit.performance.metrics": "1.0.0-beta-build0003",
     "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental",
     "Microsoft.NETCore.Platforms": "2.0.0-preview1-25221-01",
     "Newtonsoft.Json": "7.0.1",
diff --git a/tests/src/JIT/config/benchmark/project.json b/tests/src/JIT/config/benchmark/project.json
@@ -1,9 +1,9 @@
 {
   "dependencies": {
-    "xunit.performance.api": "1.0.0-beta-build0002",
-    "xunit.performance.core": "1.0.0-beta-build0002",
-    "xunit.performance.execution": "1.0.0-beta-build0002",
-    "xunit.performance.metrics": "1.0.0-beta-build0002",
+    "xunit.performance.api": "1.0.0-beta-build0003",
+    "xunit.performance.core": "1.0.0-beta-build0003",
+    "xunit.performance.execution": "1.0.0-beta-build0003",
+    "xunit.performance.metrics": "1.0.0-beta-build0003",
     "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental",
     "Microsoft.NETCore.Platforms": "2.0.0-preview1-25221-01",
     "System.Collections.NonGeneric": "4.4.0-beta-24913-02",
diff --git a/tests/src/performance/project.json b/tests/src/performance/project.json
@@ -1,9 +1,9 @@
 {
   "dependencies": {
-    "xunit.performance.api": "1.0.0-beta-build0002",
-    "xunit.performance.core": "1.0.0-beta-build0002",
-    "xunit.performance.execution": "1.0.0-beta-build0002",
-    "xunit.performance.metrics": "1.0.0-beta-build0002",
+    "xunit.performance.api": "1.0.0-beta-build0003",
+    "xunit.performance.core": "1.0.0-beta-build0003",
+    "xunit.performance.execution": "1.0.0-beta-build0003",
+    "xunit.performance.metrics": "1.0.0-beta-build0003",
     "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental",
     "Microsoft.NETCore.Platforms": "2.0.0-preview1-25221-01",
     "System.Collections.NonGeneric": "4.4.0-beta-24913-02",

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`"type": "platform",`
`13`	`13`	`"version": "1.1.0"`
`14`	`14`	`},`
`15`		`- "xunit.performance.api": "1.0.0-beta-build0002"`
	`15`	`+ "xunit.performance.api": "1.0.0-beta-build0003"`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`	`}`