Skip to content
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

Merging dev/release/2.0 into release/2.0.0 #1776

Merged
merged 34 commits into from
Nov 30, 2017
Merged

Merging dev/release/2.0 into release/2.0.0 #1776

merged 34 commits into from
Nov 30, 2017

Conversation

tannergooding
Copy link
Member

FYI. @dotnet/dotnet-cli

…t vs binary and which must have crlf (sln) vs lf (sh)
@tannergooding
Copy link
Member Author

VSO builds are green, and publishing successfully, so we should be good to plumb this through to all the branches.

CI will continue failing due to the netci.groovy changes which have to be checked in before they will work.

@@ -1,21 +0,0 @@
@echo off
Copy link
Contributor

Choose a reason for hiding this comment

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

I think my comment about these still being useful was lost in the original PR. Can we please fix up the paths and retain these?

Copy link
Member Author

Choose a reason for hiding this comment

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

Added a -dogfood option and an explicit build\dogfood.bat script

@@ -0,0 +1,3 @@
@echo off
powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -NoExit %~dp0Build.ps1 -dogfood %*
exit /b %ErrorLevel%
Copy link
Contributor

Choose a reason for hiding this comment

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

Will I actually get those environment variables set up for me if I do dogfood.cmd?

Copy link
Contributor

Choose a reason for hiding this comment

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

Seems like they'd be trapped in the powershell process

Copy link
Member Author

@tannergooding tannergooding Nov 29, 2017

Choose a reason for hiding this comment

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

-NoExit preserves the powershell context when the script finishes executing

Copy link
Contributor

Choose a reason for hiding this comment

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

I see.

export DOTNET_MSBUILD_SDK_RESOLVER_SDKS_DIR="$MSBuildSDKsPath"
export NETCoreSdkBundledVersionsProps="$DotNetRoot/sdk/$DotNetCliVersion/Microsoft.NETCoreSdk.BundledVersions.props"
export CustomAfterMicrosoftCommonTargets="$MSBuildSDKsPath/Microsoft.NET.Build.Extensions/msbuildExtensions-ver/Microsoft.Common.Targets/ImportAfter/Microsoft.NET.Build.Extensions.targets"
export MicrosoftNETBuildExtensionsTargets="$CustomAfterMicrosoftCommonTargets"
Copy link
Contributor

Choose a reason for hiding this comment

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

I want dotnet that was downloaded on my PATH too in this env.

Copy link
Member Author

Choose a reason for hiding this comment

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

Its added to the path already down below

@nguerrera nguerrera merged commit 2f40a81 into dotnet:release/2.0.0 Nov 30, 2017
JL03-Yue pushed a commit that referenced this pull request Mar 19, 2024
…201.3 (#1776)

[main] Update dependencies from dotnet/roslyn
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.

2 participants