Skip to content

Update to latest msbuild vs15.7_source-build branch #500

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

Merged
merged 4 commits into from
May 4, 2018

Conversation

dseefeld
Copy link
Contributor

@dseefeld dseefeld commented May 2, 2018

The msbuild vs15.7_source-build branch has changes that update them to the latest version of repotoolset and remove remaining patch for msbuild.

@dseefeld dseefeld requested review from crummel and dagood May 2, 2018 22:29
@dleeapho dleeapho added no-merge and removed no-merge labels May 3, 2018
@@ -10,12 +10,18 @@
<BuildCommand>$(ProjectDirectory)build/build$(ShellExtension) build -DotNetBuildFromSource -DotNetCoreSdkDir $(DotNetCliToolDir) -bootstraponly -skiptests -pack -configuration $(Configuration) /p:GitHeadSha=$(GitCommitHash) $(OutputVersionArgs)</BuildCommand>
<SourceOverrideRepoApiImplemented>true</SourceOverrideRepoApiImplemented>
<RepoApiImplemented>false</RepoApiImplemented>
<UsesRepoToolset>true</UsesRepoToolset>
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
Copy link
Member

Choose a reason for hiding this comment

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

Interesting... MSBuild doesn't have an SDK version in its global.json. I'm adding a commit to remove this line.

@dseefeld
Copy link
Contributor Author

dseefeld commented May 3, 2018

cc @cdmihai - The last commit has a patch to update msbuild build scripts to uptake existing repotoolset.

@dseefeld
Copy link
Contributor Author

dseefeld commented May 4, 2018

@dagood @crummel Any more comments or is this OK to merge?

Copy link
Contributor

@crummel crummel left a comment

Choose a reason for hiding this comment

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

LGTM.

@dseefeld dseefeld merged commit fe4ae4b into dotnet:dev/release/2.1 May 4, 2018
@dseefeld dseefeld deleted the updateMsBuild branch May 4, 2018 02:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants