-
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
Changes from all commits
47b8c98
1c02679
0376be4
6924f53
ab38159
8e07794
f5a7b80
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -43,6 +43,7 @@ | |
<MicroBuildVersion>0.2.0</MicroBuildVersion> | ||
<GitVersioningVersion>1.6.35</GitVersioningVersion> | ||
<NuSpecReferenceGeneratorVersion>1.4.2</NuSpecReferenceGeneratorVersion> | ||
<NuGetVersion>4.5.0-preview1-4518</NuGetVersion> | ||
</PropertyGroup> | ||
|
||
<!-- Common repo directories --> | ||
|
@@ -56,8 +57,10 @@ | |
<GitVersioningDir>$(PackagesDir)\Nerdbank.GitVersioning\$(GitVersioningVersion)\build\</GitVersioningDir> | ||
|
||
<!-- Tell build tools to use the full framework dlls that contain build tasks (like the nuget assets task) --> | ||
<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 commentThe 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 commentThe reason will be displayed to describe this comment to others. Learn more. We don't download MSBuild when on |
||
<PackagingTaskDir Condition="'$(MSBuildRuntimeType)'=='Full'">$(ToolsDir)net45\</PackagingTaskDir> | ||
<PackagingTaskDir Condition="'$(MSBuildRuntimeType)'!='Full'">$(ToolsDir)</PackagingTaskDir> | ||
|
||
<!-- Output directories --> | ||
<BinDir>$(RepoRoot)bin$([System.IO.Path]::DirectorySeparatorChar)</BinDir> | ||
|
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) :)