From 3991fc2699814a69498cecc45240df5913ff6a28 Mon Sep 17 00:00:00 2001 From: Egor Chesakov Date: Tue, 13 Nov 2018 14:37:04 -0800 Subject: [PATCH] Specify version of xunit.console.dll during the custom build (dotnet/coreclr#20975) * Use stable Xunit v2.4.1 * Use xunit.console.dll with specified assembly version to avoid issues with Ready2Run jobs * Update comment regarding building xunit with specified version in tests/runtest.py Commit migrated from https://github.com/dotnet/coreclr/commit/124a8b9438ddb12514b5f28dc8001b8d23abb18f --- src/coreclr/dependencies.props | 2 +- src/coreclr/tests/runtest.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/coreclr/dependencies.props b/src/coreclr/dependencies.props index 13d930e..9dcd447 100644 --- a/src/coreclr/dependencies.props +++ b/src/coreclr/dependencies.props @@ -38,7 +38,7 @@ 99.99.99-master-20181112-0043 3.0.0-preview-27112-01 3.0.0-preview-27109-05 - 2.4.1-pre.build.4059 + 2.4.1 99.99.99-master-20181112-0045 4.6.0-alpha-00001 1.0.0-beta-build0015 diff --git a/src/coreclr/tests/runtest.py b/src/coreclr/tests/runtest.py index d1b4683..f847b2c 100755 --- a/src/coreclr/tests/runtest.py +++ b/src/coreclr/tests/runtest.py @@ -791,7 +791,7 @@ def run_tests(host_os, # 1) git clone https://github.com/echesakovMSFT/xunit.git --branch UseConcurrentDictionaryInDependencyContextAssemblyCache --single-branch # 2) cd xunit # 3) git submodule update --init - # 4) powershell .\build.ps1 + # 4) powershell .\build.ps1 -target packages -buildAssemblyVersion 2.4.1 -buildSemanticVersion 2.4.1-coreclr # # Then file "xunit\src\xunit.console\bin\Release\netcoreapp2.0\xunit.console.dll" was archived and uploaded to the clrjit blob storage. # @@ -809,7 +809,7 @@ def run_tests(host_os, urlretrieve = urllib.urlretrieve if sys.version_info.major < 3 else urllib.request.urlretrieve zipfilename = os.path.join(tempfile.gettempdir(), "xunit.console.dll.zip") - url = r"https://clrjit.blob.core.windows.net/xunit-console/xunit.console.dll.zip" + url = r"https://clrjit.blob.core.windows.net/xunit-console/xunit.console.dll-v2.4.1.zip" urlretrieve(url, zipfilename) with zipfile.ZipFile(zipfilename,"r") as ziparch: -- 2.7.4