diff options
author | Davis Goodin <dagood@microsoft.com> | 2016-03-03 15:41:17 -0600 |
---|---|---|
committer | Davis Goodin <dagood@microsoft.com> | 2016-03-10 09:19:53 -0600 |
commit | 3aadaff51856448d9a9f262e31cc5cdf6d2259ed (patch) | |
tree | bad7583d86d01c218e6d3927e6de34b8f61f8d7a | |
parent | 09f29a50f821dbdec83f7bc95d4073ccd4d3f151 (diff) | |
download | coreclr-3aadaff51856448d9a9f262e31cc5cdf6d2259ed.tar.gz coreclr-3aadaff51856448d9a9f262e31cc5cdf6d2259ed.tar.bz2 coreclr-3aadaff51856448d9a9f262e31cc5cdf6d2259ed.zip |
Add working validation rules for xunit packages and apply them.
-rw-r--r-- | tests/dir.props | 11 | ||||
-rw-r--r-- | tests/src/GC/Performance/Framework/project.json | 2 | ||||
-rw-r--r-- | tests/src/JIT/config/benchmark+roslyn/project.json | 8 | ||||
-rw-r--r-- | tests/src/JIT/config/benchmark+serialize/project.json | 8 | ||||
-rw-r--r-- | tests/src/JIT/config/benchmark/project.json | 8 |
5 files changed, 22 insertions, 15 deletions
diff --git a/tests/dir.props b/tests/dir.props index 5fa0916776..30eb8f3fba 100644 --- a/tests/dir.props +++ b/tests/dir.props @@ -42,9 +42,16 @@ <ValidationPattern Include="^(?i)((System\..%2A)|(Microsoft\.CSharp)|(Microsoft\.NETCore.%2A)|(Microsoft\.Win32\..%2A)|(Microsoft\.VisualBasic))(?<!TestData)$"> <ExpectedPrerelease>rc2-23816</ExpectedPrerelease> </ValidationPattern> - <ValidationPattern Include="^(?i)xunit\..%2A$"> + <ValidationPattern Include="^(?i)(xunit(\.assert|\.runner\.(utility|msbuild)))$"> <ExpectedVersion>2.1.0</ExpectedVersion> </ValidationPattern> + <!-- Add a dummy value so that the item isn't removed by msbuild. Without the | this item doesn't show up later. --> + <ValidationPattern Include="^(?i)(xunit\.console\.netcore|dummy value)$"> + <ExpectedVersion>1.0.2-prerelease-00101</ExpectedVersion> + </ValidationPattern> + <ValidationPattern Include="^(?i)Microsoft\.DotNet\.xunit\.performance.%2A$"> + <ExpectedVersion>1.0.0-alpha-build0028</ExpectedVersion> + </ValidationPattern> </ItemGroup> <!-- Common nuget properties --> @@ -100,7 +107,7 @@ <!-- Create a collection of all project.json files for dependency updates. --> <ItemGroup> <!-- Skip validation of the test_runtime project created by the test build. --> - <ProjectJsonFiles Include="$(SourceDir)**/project.json" + <ProjectJsonFiles Include="$(SourceDir)**\project.json" Exclude="$(SourceDir)Common\test_runtime\project.json" /> </ItemGroup> diff --git a/tests/src/GC/Performance/Framework/project.json b/tests/src/GC/Performance/Framework/project.json index 1071adbee3..e19904211f 100644 --- a/tests/src/GC/Performance/Framework/project.json +++ b/tests/src/GC/Performance/Framework/project.json @@ -10,7 +10,7 @@ "projectUrl": "", "licenseUrl": "", "dependencies": { - "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0027", + "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028", "Microsoft.NETCore.Platforms": "1.0.1-rc2-23816", "xunit": "2.1.0" }, diff --git a/tests/src/JIT/config/benchmark+roslyn/project.json b/tests/src/JIT/config/benchmark+roslyn/project.json index 5ffd9da791..5ca8e71ada 100644 --- a/tests/src/JIT/config/benchmark+roslyn/project.json +++ b/tests/src/JIT/config/benchmark+roslyn/project.json @@ -1,9 +1,9 @@ { "dependencies": { "Microsoft.CodeAnalysis.Compilers": "1.1.1", - "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0027", - "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0027", - "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0027", + "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028", + "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0028", + "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0028", "Microsoft.NETCore.Platforms": "1.0.1-rc2-23816", "System.Console": "4.0.0-rc2-23816", "System.Numerics.Vectors": "4.1.1-rc2-23816", @@ -17,7 +17,7 @@ "System.Threading.Tasks": "4.0.10", "System.Threading.Tasks.Parallel": "4.0.0", "xunit": "2.1.0", - "xunit.console.netcore": "2.1.0", + "xunit.console.netcore": "1.0.2-prerelease-00101", "xunit.runner.utility": "2.1.0" }, "frameworks": { diff --git a/tests/src/JIT/config/benchmark+serialize/project.json b/tests/src/JIT/config/benchmark+serialize/project.json index 45a6706167..06e9bc0a6c 100644 --- a/tests/src/JIT/config/benchmark+serialize/project.json +++ b/tests/src/JIT/config/benchmark+serialize/project.json @@ -1,8 +1,8 @@ { "dependencies": { - "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0027", - "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0027", - "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0027", + "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028", + "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0028", + "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0028", "Microsoft.NETCore.Platforms": "1.0.1-rc2-23816", "Newtonsoft.Json": "7.0.1", "System.Console": "4.0.0-rc2-23816", @@ -15,7 +15,7 @@ "System.Xml.XmlDocument": "4.0.0", "System.Xml.XmlSerializer": "4.0.10", "xunit": "2.1.0", - "xunit.console.netcore": "2.1.0", + "xunit.console.netcore": "1.0.2-prerelease-00101", "xunit.runner.utility": "2.1.0" }, "frameworks": { diff --git a/tests/src/JIT/config/benchmark/project.json b/tests/src/JIT/config/benchmark/project.json index ef7d37a4d2..b147a88d43 100644 --- a/tests/src/JIT/config/benchmark/project.json +++ b/tests/src/JIT/config/benchmark/project.json @@ -1,8 +1,8 @@ { "dependencies": { - "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0027", - "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0027", - "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0027", + "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028", + "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0028", + "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0028", "Microsoft.NETCore.Platforms": "1.0.1-rc2-23816", "System.Collections.NonGeneric": "4.0.0", "System.Console": "4.0.0-rc2-23816", @@ -15,7 +15,7 @@ "System.Threading.Tasks": "4.0.10", "System.Threading.Tasks.Parallel": "4.0.0", "xunit": "2.1.0", - "xunit.console.netcore": "2.1.0", + "xunit.console.netcore": "1.0.2-prerelease-00101", "xunit.runner.utility": "2.1.0" }, "frameworks": { |