Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not publish in tests.sh #23398

Merged
merged 3 commits into from
Nov 29, 2017
Merged

Do not publish in tests.sh #23398

merged 3 commits into from
Nov 29, 2017

Conversation

khyperia
Copy link
Contributor

ILAsm is the only asset needed, so put that in CoreToolset

Ping @jaredpar

Note that CoreToolset is currently publishing into Binaries/Tools directly. This makes sense for the binary paths (Binaries/Tools/ilasm), but it clutters the Tools directory immensely (lots of dlls, e.g. System.IO.Pipes.dll)

I also synced the location of dotnet to be the same as the place where the windows build installs it, which is Binaries/Tools/dotnet

I also tried running dotnet-xunit.dll directly out of Binaries/Tools instead of digging into .nuget, but that was giving super weird errors, so I left that for a later time.

Also note that #23316 would be super nice to have here, but that PR has super absurd errors, so that can go in separately.

@khyperia khyperia requested a review from a team November 27, 2017 18:05
{
directory = Path.GetDirectoryName(directory);
}
return directory == null ? null : path;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the case of directory == null we should throw an exception. Everything is busted at that point. Should have a declarative error message stating what went wrong.

@khyperia
Copy link
Contributor Author

(Waiting for #23405 to go in, then going to heavily refactor this PR)

It's gross, but we need to publish *something* until ILAsm is exposed as
a normal assembly
else
{
ilasmExeName = "ilasm";
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider using a conditional operator here.

@khyperia
Copy link
Contributor Author

retest windows_release_unit32_prtest please

@khyperia khyperia merged commit 10697d0 into dotnet:master Nov 29, 2017
@khyperia khyperia deleted the no_publish branch November 29, 2017 16:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants