Skip to content

Fix dogfood.sh #2801

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.

Sign up for GitHub

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
nguerrera merged 1 commit into from
Jan 9, 2019
Merged

Fix dogfood.sh #2801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions eng/dogfood.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@ done
scriptroot="$( cd -P "$( dirname "$SOURCE" )" && pwd )"

. "$scriptroot/common/tools.sh"
InitializeToolset
. "$scriptroot/restore-toolset.sh"

InitializeTools
ReadGlobalVersion "dotnet"
dotnet_sdk_version=$_ReadGlobalVersion

export SDK_REPO_ROOT="$RepoRoot"
export SDK_CLI_VERSION="$DotNetCliVersion"
export MSBuildSDKsPath="$ArtifactsConfigurationDir/bin/Sdks"
export SDK_REPO_ROOT="$repo_root"
export SDK_CLI_VERSION="$dotnet_sdk_version"
export MSBuildSDKsPath="$artifacts_dir/bin/$configuration/Sdks"
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"
export NETCoreSdkBundledVersionsProps="$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version/Microsoft.NETCoreSdk.BundledVersions.props"
export MicrosoftNETBuildExtensionsTargets="$MSBuildSDKsPath/Microsoft.NET.Build.Extensions/msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/Microsoft.NET.Build.Extensions.targets"
4 changes: 2 additions & 2 deletions eng/restore-toolset.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ function InitializeCustomSDKToolset {
return
fi

InstallDotnetCli true
InitializeDotNetCli true
InstallDotNetSharedFramework "1.0.5"
InstallDotNetSharedFramework "1.1.2"
InstallDotNetSharedFramework "2.1.0"
Expand All @@ -35,4 +35,4 @@ function InstallDotNetSharedFramework {
fi
}

InitializeCustomSDKToolset
InitializeCustomSDKToolset