diff options
| author | Egor Chesakov <Egor.Chesakov@microsoft.com> | 2018-11-13 14:37:04 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-13 14:37:04 -0800 |
| commit | 124a8b9438ddb12514b5f28dc8001b8d23abb18f (patch) | |
| tree | 59eede114706df889dd402cb1bdb1e72486f6dea | |
| parent | 56a2ffdc9413eb01c678eb215543bb2432f36fa4 (diff) | |
| download | coreclr-124a8b9438ddb12514b5f28dc8001b8d23abb18f.tar.gz coreclr-124a8b9438ddb12514b5f28dc8001b8d23abb18f.tar.bz2 coreclr-124a8b9438ddb12514b5f28dc8001b8d23abb18f.zip | |
Specify version of xunit.console.dll during the custom build (#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
| -rw-r--r-- | dependencies.props | 2 | ||||
| -rwxr-xr-x | tests/runtest.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/dependencies.props b/dependencies.props index 13d930ec5a..9dcd447645 100644 --- a/dependencies.props +++ b/dependencies.props @@ -38,7 +38,7 @@ <PgoDataPackageVersion>99.99.99-master-20181112-0043</PgoDataPackageVersion> <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview-27112-01</MicrosoftNETCoreRuntimeCoreCLRPackageVersion> <MicrosoftNETCoreAppPackageVersion>3.0.0-preview-27109-05</MicrosoftNETCoreAppPackageVersion> - <XunitPackageVersion>2.4.1-pre.build.4059</XunitPackageVersion> + <XunitPackageVersion>2.4.1</XunitPackageVersion> <IbcDataPackageVersion>99.99.99-master-20181112-0045</IbcDataPackageVersion> <IbcMergePackageVersion>4.6.0-alpha-00001</IbcMergePackageVersion> <XunitPerformanceApiPackageVersion>1.0.0-beta-build0015</XunitPerformanceApiPackageVersion> diff --git a/tests/runtest.py b/tests/runtest.py index d1b4683b0f..f847b2cdb8 100755 --- a/tests/runtest.py +++ b/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: |