зеркало из https://github.com/aspnet/KoreBuild.git
Fix KoreBuild.sh to install newer CLI
Fix _dotnet-test.shade parse error
This commit is contained in:
Родитель
81c7351b9b
Коммит
422da146bf
|
@ -38,7 +38,7 @@ fi
|
|||
versionFile="$koreBuildFolder/$versionFileName"
|
||||
version=$(<$versionFile)
|
||||
|
||||
[ -z "$KOREBUILD_DOTNET_CHANNEL" ] && KOREBUILD_DOTNET_CHANNEL=preview
|
||||
[ -z "$KOREBUILD_DOTNET_CHANNEL" ] && KOREBUILD_DOTNET_CHANNEL=rel-1.0.0
|
||||
[ -z "$KOREBUILD_DOTNET_VERSION" ] && KOREBUILD_DOTNET_VERSION=$version
|
||||
|
||||
if [ ! -z "$KOREBUILD_SKIP_RUNTIME_INSTALL" ]; then
|
||||
|
@ -60,7 +60,7 @@ else
|
|||
$koreBuildFolder/dotnet/dotnet-install.1.0.sh --install-dir "$koreBuildFolder/dotnet" --channel rel-1.0.0 --version $(cat $koreBuildFolder/cli.version.msbuild)
|
||||
|
||||
# Install the version of dotnet-cli used to compile
|
||||
$koreBuildFolder/dotnet/dotnet-install.sh --channel $KOREBUILD_DOTNET_CHANNEL --version $KOREBUILD_DOTNET_VERSION
|
||||
$koreBuildFolder/dotnet/dotnet-install.1.0.sh --channel $KOREBUILD_DOTNET_CHANNEL --version $KOREBUILD_DOTNET_VERSION
|
||||
|
||||
# Add .NET installation directory to the path if it isn't yet included.
|
||||
[[ ":$PATH:" != *":$DOTNET_INSTALL_DIR:"* ]] && export PATH="$DOTNET_INSTALL_DIR:$PATH"
|
||||
|
|
|
@ -21,7 +21,7 @@ default test_options=''
|
|||
@{
|
||||
var content = File.ReadAllText(projectFile);
|
||||
// Desktop tests only work on Windows. Only run the test on xplat if it has a netcoreapp1.0 TFM.
|
||||
if ((projectFile.EndsWith("test.csproj", StringComparison.OrdinalIgnoreCase) || (projectFile.EndsWith("tests.csproj", StringComparison.OrdinalIgnoreCase))
|
||||
if ((projectFile.EndsWith("test.csproj", StringComparison.OrdinalIgnoreCase) || (projectFile.EndsWith("tests.csproj", StringComparison.OrdinalIgnoreCase)))
|
||||
&& (!IsLinux || content.Contains("netcoreapp1.0")))
|
||||
{
|
||||
var projectFolder = Path.GetDirectoryName(projectFile);
|
||||
|
|
Загрузка…
Ссылка в новой задаче