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

fix path in ngen #2246

Merged
merged 3 commits into from
Nov 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion scripts/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1
# Dotnet build doesn't support --packages yet. See https://github.com/dotnet/cli/issues/2712
$env:NUGET_PACKAGES = $env:TP_PACKAGES_DIR
$env:NUGET_EXE_Version = "3.4.3"
$env:DOTNET_CLI_VERSION = "LATEST"
$env:DOTNET_CLI_VERSION = "3.1.100-preview2-014569"
# $env:DOTNET_RUNTIME_VERSION = "LATEST"
$env:VSWHERE_VERSION = "2.0.2"
$env:MSBUILD_VERSION = "15.0"
Expand Down
2 changes: 1 addition & 1 deletion scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ VERSION=$(test -z $VERSION && grep TPVersionPrefix $TP_ROOT_DIR/scripts/build/Te
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
# Dotnet build doesnt support --packages yet. See https://github.com/dotnet/cli/issues/2712
export NUGET_PACKAGES=$TP_PACKAGES_DIR
DOTNET_CLI_VERSION="LATEST"
DOTNET_CLI_VERSION="3.1.100-preview2-014569"
#DOTNET_RUNTIME_VERSION="LATEST"

#
Expand Down
2 changes: 1 addition & 1 deletion src/package/VSIXProject/TestPlatform.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<VsixInputFileLocation>$(TestPlatformRoot)artifacts\$(Configuration)\net451\win7-x64</VsixInputFileLocation>
<OutputPath>$(TestPlatformRoot)artifacts\$(Configuration)\VSIX</OutputPath>
<ExtensionInstallationFolder>TestPlatform</ExtensionInstallationFolder>
<ExtensionInstallationRelativeToVS>Common7\IDE\Extensions\TestPlatform</ExtensionInstallationRelativeToVS>
<ExtensionInstallationRelativeToVS>[installDir]\Common7\IDE\Extensions\TestPlatform</ExtensionInstallationRelativeToVS>

<!-- Disable warning that there are no source files. It is intentional. -->
<NoWarn>$(NoWarn);2008</NoWarn>
Expand Down