Skip to content

Commit

Permalink
Specify version of xunit.console.dll during the custom build (dotnet/…
Browse files Browse the repository at this point in the history
…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 dotnet/coreclr@124a8b9
  • Loading branch information
echesakov authored Nov 13, 2018
1 parent c974804 commit 3991fc2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/coreclr/dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/tests/runtest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
#
Expand All @@ -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:
Expand Down

0 comments on commit 3991fc2

Please sign in to comment.