This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
Minor cleanup after moving to 2.0 toolset #18181
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
weshaggard
reviewed
Apr 11, 2017
| __PROJECT_JSON_FILE=$__PROJECT_JSON_PATH/project.json | ||
| __PROJECT_JSON_CONTENTS="<Project Sdk=\"Microsoft.NET.Sdk\"><PropertyGroup><TargetFramework>netcoreapp1.0</TargetFramework><DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences></PropertyGroup><ItemGroup><PackageReference Include=\"Microsoft.DotNet.BuildTools\" Version=\"$__BUILD_TOOLS_PACKAGE_VERSION\" /></ItemGroup></Project>" | ||
| __INIT_TOOLS_DONE_MARKER=$__PROJECT_JSON_PATH/done | ||
| __INIT_TOOLS_RESTORE_PROJECT=$__scriptpath/init-tools.msbuild |
There was a problem hiding this comment.
Doesn't this give use even more flexibility to reduce this script now? I suspect we can do any custom copying and what not directly in that project file now. It even gives us the ability to remove BuildToolsVersion.txt file completely and just have it in that project file.
There was a problem hiding this comment.
We can get rid of some of it, but I think there will still be quite a bit left over. Most of the script is locating and downloading the CLI archive, or running crossgen, etc. All we really do with init-tools.msbuild is restore it and then call the "inner init-tools" script inside the packages directory.
|
@mellinoe can we move this old one along |
This file is used in init-tools.cmd/sh, and replaces the "generated" project file used previously. Because we are using MSBuild projects for nuget restore now, we are able to "parameterize" the version of Microsoft.DotNet.BuildTools based on an MSBuild property which is passed in to the "dotnet restore" command in init-tools.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Includes two minor improvements based on PR feedback in #18035.
dotnet restore.chmod, with a link to this nuget issue: Executables restored from NuGet packages are no longer executable with .NET Core "2.0" NuGet/Home#4424@weshaggard