Skip to content
This repository has been archived by the owner on Jan 11, 2024. It is now read-only.

Adding scripts that will bootstrap netcore msbuild and that can be called from repos. Also switching forward slashes to backslashes for OS X build. #396

Merged
merged 3 commits into from
Jan 27, 2016

Conversation

joperezr
Copy link
Member

[DO NOT MERGE YET] Adding scripts that will bootstrap netcore msbuild and that can be called from repos

@@ -74,11 +74,12 @@
<ItemGroup>
<!-- Need to escape double forward slash (%2F) or MSBuild will normalize to one slash on Unix. -->
<DnuSourceList Include="https:%2F%2Fwww.myget.org/F/dotnet-core/" />
<DnuSourceList Include="https:%2F%2Fwww.myget.org/F/roslyn-nightly/" />

This comment was marked as spam.

This comment was marked as spam.

@joperezr joperezr force-pushed the RestoreNetCoreMSBuild branch 4 times, most recently from b91f4f7 to 11aedda Compare January 26, 2016 21:41
@joperezr joperezr changed the title [DO NOT MERGE YET] Adding scripts that will bootstrap netcore msbuild and that can be called from repos Adding scripts that will bootstrap netcore msbuild and that can be called from repos. Also switching forward slashes to backslashes for OS X build. Jan 26, 2016
@joperezr
Copy link
Member Author

With my latest change, I've now removed the roslyn and the local feed for the restore since I have succesfully uploaded all required packages into buildtools feed, this means that CI should pass now, and that this PR is ready to be merge once feedback is done.

@joperezr
Copy link
Member Author

cc @weshaggard @JohnChen0 @naamunds

@@ -6,6 +6,7 @@ set DOTNET_CMD=%~2
set TOOLRUNTIME_DIR=%~3
IF [%BUILDTOOLS_TARGET_RUNTIME%]==[] set BUILDTOOLS_TARGET_RUNTIME=win7-x64
set BUILDTOOLS_PACKAGE_DIR=%~dp0
set MSBUILD_CONTENT_JSON={"dependencies": {"Microsoft.Portable.Targets": "0.1.1-dev"},"frameworks": {"dnxcore50": {},"net46": {}}}

This comment was marked as spam.

This comment was marked as spam.

@weshaggard
Copy link
Member

LGTM but please be sure to file the extra tracking issues for follow-up work.

@joperezr
Copy link
Member Author

I created issue #413 to track the package dependencies work, and #414 for removing the portable targets workaround once dotnet cli supports content files.

joperezr added a commit that referenced this pull request Jan 27, 2016
Adding scripts that will bootstrap netcore msbuild and that can be called from repos. Also switching forward slashes to backslashes for OS X build.
@joperezr joperezr merged commit ca64e7c into dotnet:master Jan 27, 2016
@joperezr joperezr deleted the RestoreNetCoreMSBuild branch January 27, 2016 16:45
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants