Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

fix merge conflict in build-test.sh #19744

Merged
merged 1 commit into from
Aug 30, 2018

Conversation

sandreenko
Copy link

This method was renamed in #19430, but #19213 did not notice this merge conflict.

@sandreenko
Copy link
Author

After this change build-test.sh still fails, but much later, at least it creates coreroot.
The new error is:

  Restoring packages for /home/sergey/git/coreclr/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj...
/home/sergey/git/coreclr/bin/tests/Linux.x64.Checked/TestWrappers/baseservices.compilerservices/baseservices.compilerservices.XUnitWrapper.csproj : error NU1102: Unable to find package Microsoft.NETCore.App with version (>= 3.0.0-preview1-26817-01)
/home/sergey/git/coreclr/bin/tests/Linux.x64.Checked/TestWrappers/baseservices.compilerservices/baseservices.compilerservices.XUnitWrapper.csproj : error NU1102:   - Found 40 version(s) in nuget.org [ Nearest version: 2.2.0-preview-26820-02 ]
  Restore failed in 278.95 ms for /home/sergey/git/coreclr/bin/tests/Linux.x64.Checked/TestWrappers/baseservices.compilerservices/baseservices.compilerservices.XUnitWrapper.csproj.
  Installing Microsoft.NETCore.DotNetAppHost 3.0.0-preview1-26817-01.
  Installing Microsoft.NETCore.DotNetHostResolver 3.0.0-preview1-26817-01.
  Installing Microsoft.NETCore.DotNetHostPolicy 3.0.0-preview1-26817-01.
  Installing Microsoft.NETCore.Platforms 3.0.0-preview1-26816-01.
  Installing Microsoft.NETCore.App 3.0.0-preview1-26817-01.
  Restore completed in 675.7 ms for /home/sergey/git/coreclr/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj.

Build FAILED.

/home/sergey/git/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj : warning NU1603: test_dependencies depends on System.Memory (>= 4.6.0-preview1-26817-04) but System.Memory 4.6.0-preview1-26817-04 was not found. An approximate best match of System.Memory 4.6.0-preview3-26501-01 was resolved.
/home/sergey/git/coreclr/bin/tests/Linux.x64.Checked/TestWrappers/baseservices.compilerservices/baseservices.compilerservices.XUnitWrapper.csproj : error NU1102: Unable to find package Microsoft.NETCore.App with version (>= 3.0.0-preview1-26817-01)
/home/sergey/git/coreclr/bin/tests/Linux.x64.Checked/TestWrappers/baseservices.compilerservices/baseservices.compilerservices.XUnitWrapper.csproj : error NU1102:   - Found 40 version(s) in nuget.org [ Nearest version: 2.2.0-preview-26820-02 ]
    1 Warning(s)
    1 Error(s)

Time Elapsed 00:00:08.11
Command execution failed with exit code 1.
ERROR: An error occured in /home/sergey/git/coreclr/Tools/dotnetcli/dotnet /home/sergey/git/coreclr/Tools/run 13. Check 13 logs under /home/sergey/git/coreclr.
Failed to build Test Xunit Wrapper. See the build logs:
    /home/sergey/git/coreclr/bin/Logs/Tests_XunitWrapper.Linux.x64.Checked.log
    /home/sergey/git/coreclr/bin/Logs/Tests_XunitWrapper.Linux.x64.Checked.wrn
    /home/sergey/git/coreclr/bin/Logs/Tests_XunitWrapper.Linux.x64.Checked.err

@sandreenko
Copy link
Author

cc @dotnet/jit-contrib

@sandreenko sandreenko merged commit d42cdd0 into dotnet:master Aug 30, 2018
@sandreenko sandreenko deleted the fixBuildTest.sh branch August 30, 2018 04:56
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants