-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
Cleanup bootstrap build #2594
Cleanup bootstrap build #2594
Conversation
* Download NuGet.Build.Tasks from package (from myget feed) * On non-windows don't use net45 tasks path.
Although this isn't always defined, it always will be defined when running in `Full`.
@dotnet-bot test Ubuntu16.04 Build for CoreCLR please |
targets/BootStrapMSBuild.proj
Outdated
<NuGetCommonExtensions Include="$(ProjectDir)packages\nuget.protocol\$(NuGetVersion)\lib\net45\**\*.*" /> | ||
<NuGetCommonExtensions Include="$(ProjectDir)packages\nuget.versioning\$(NuGetVersion)\lib\net45\**\*.*" /> | ||
<NuGetCommonExtensions Include="$(ProjectDir)packages\nuspec.referencegenerator\$(NuGetVersion)\lib\net45\**\*.*" /> | ||
<NuGetCommonExtensions Include="$(ProjectDir)packages\Newtonsoft.Json\9.0.1\lib\net45\**\*.*" /> | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is really bad, but I hate to do anything fancy here in hopes that SDK migration will happen and this will need to change completely anyway.
targets/BootStrapMSBuild.proj
Outdated
@@ -46,6 +46,23 @@ | |||
<InstalledMicrosoftExtensions Include="$(MSBuildExtensionsPath)\Microsoft\**\*.*" /> | |||
|
|||
<InstalledNuGetFiles Include="$(MSBuildExtensionsPath)\Microsoft\NuGet\*" /> | |||
<!--<NuGetCommonExtensions Include="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\NuGet\**\*.*" />--> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this be removed?
@@ -11,7 +11,7 @@ | |||
<add key="nuget.org v2" value="https://nuget.org/api/v2/" /> | |||
<add key="myget.org roslyn nightly" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" /> | |||
<add key="dotnet.myget.org buildtools v3" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" /> | |||
<!-- <add key="myget.org nugetbuild" value="https://www.myget.org/F/nugetbuild/api/v3/index.json" /> --> | |||
<add key="myget.org nugetbuild" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" /> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove comment above . Seems unneeded.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I un-commented this (and updated the feed URL) :)
targets/BootStrapMSBuild.proj
Outdated
@@ -46,6 +46,23 @@ | |||
<InstalledMicrosoftExtensions Include="$(MSBuildExtensionsPath)\Microsoft\**\*.*" /> | |||
|
|||
<InstalledNuGetFiles Include="$(MSBuildExtensionsPath)\Microsoft\NuGet\*" /> | |||
<!--<NuGetCommonExtensions Include="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\NuGet\**\*.*" />--> | |||
<!-- TODO: Need NuGet.Build.Tasks.dll, would be not to not list out all of its dependencies! --> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Comment is unclear: would be not to not
targets/BootStrapMSBuild.proj
Outdated
@@ -46,6 +46,23 @@ | |||
<InstalledMicrosoftExtensions Include="$(MSBuildExtensionsPath)\Microsoft\**\*.*" /> | |||
|
|||
<InstalledNuGetFiles Include="$(MSBuildExtensionsPath)\Microsoft\NuGet\*" /> | |||
<!--<NuGetCommonExtensions Include="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\NuGet\**\*.*" />--> | |||
<!-- TODO: Need NuGet.Build.Tasks.dll, would be not to not list out all of its dependencies! --> | |||
<NuGetCommonExtensions Include="$(ProjectDir)packages\nuget.build.tasks\$(NuGetVersion)\lib\net45\**\*.*" /> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What was wrong with the initial way of getting them from under VS?
Potential problem with grabbing them from their packages is if they have a dependency closure that isn't covered by the enumerated packages.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need a new task from NuGet so we need to latest version. Getting it from VS won't work until that dependency has flowed through. Plus this is better anyway not to copy stuff from VS.
<BuildToolsTaskDir>$(ToolsDir)net45/</BuildToolsTaskDir> | ||
<PackagingTaskDir>$(ToolsDir)net45/</PackagingTaskDir> | ||
<BuildToolsTaskDir Condition="'$(MSBuildRuntimeType)'=='Full'">$(ToolsDir)net45\</BuildToolsTaskDir> | ||
<BuildToolsTaskDir Condition="'$(MSBuildRuntimeType)'!='Full'">$(ToolsDir)</BuildToolsTaskDir> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this work in our .net core builds because the bootstrap msbuild coming from build tools is so old that MSBuildRuntimeType is empty and therefore different from "Full"?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We don't download MSBuild when on Full
(machine install on the image). We only download it when on Core
. So == Core would not work, but != Full should.
* Download NuGet.Build.Tasks from package (from myget feed). * Avoid copying BuildTools blindly into the output folder. * On non-windows don't use net45 tasks path.
Needed for #2595