From 0dba9660d6444901f63b52b2ab5efcf55f7911e5 Mon Sep 17 00:00:00 2001 From: Medeni Baykal <433724+Haplois@users.noreply.github.com> Date: Tue, 3 Nov 2020 22:32:24 +0100 Subject: [PATCH] Fixed linux build --- scripts/build.sh | 10 ++++++---- .../Microsoft.TestPlatform.PlatformAbstractions.csproj | 7 ++----- src/datacollector/datacollector.csproj | 10 ++++++---- .../vstest.console.UnitTests.csproj | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index d59176c1d4..9d40d0bc72 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -184,14 +184,16 @@ function install_cli() return 1 fi chmod u+x $install_script + # Get netcoreapp1.1 shared components + $install_script --runtime dotnet --version "2.1.0" --channel "release/2.1.0" --install-dir "$TP_DOTNET_DIR" --no-path --architecture x64 + $install_script --runtime dotnet --version "3.1.0" --channel "release/3.1.0" --install-dir "$TP_DOTNET_DIR" --no-path --architecture x64 log "install_cli: Get the latest dotnet cli toolset..." $install_script --install-dir "$TP_DOTNET_DIR" --no-path --channel "master" --version $DOTNET_CLI_VERSION - # Get netcoreapp1.1 shared components - $install_script --install-dir "$TP_DOTNET_DIR" --no-path --channel "release/2.1.0" --version "2.1.0" --runtime dotnet - #log "install_cli: Get shared components which is compatible with dotnet cli version $DOTNET_CLI_VERSION..." - #$install_script --install-dir "$TP_DOTNET_DIR" --no-path --channel "master" --version $DOTNET_RUNTIME_VERSION --runtime dotnet + + log " ---- dotnet x64" + "$TP_DOTNET_DIR/dotnet" --info fi local dotnet_path=$(_get_dotnet_path) diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj index d7e5483840..1fc83fc536 100644 --- a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj +++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj @@ -6,7 +6,8 @@ Microsoft.TestPlatform.PlatformAbstractions - netcoreapp2.1;net451;uap10.0;netstandard2.0;netstandard1.0 + netcoreapp2.1;netstandard2.0;netstandard1.0;net451 + $(TargetFrameworks);uap10.0 netstandard2.0;netstandard1.0;netcoreapp2.1 true NU1605 @@ -21,10 +22,6 @@ .NETPortable v4.6 $(DefineConstants);WINDOWS_UWP - - - .NETFramework - v4.5.1 diff --git a/src/datacollector/datacollector.csproj b/src/datacollector/datacollector.csproj index 24e3df7c4d..53179f3889 100644 --- a/src/datacollector/datacollector.csproj +++ b/src/datacollector/datacollector.csproj @@ -9,13 +9,15 @@ datacollector - netcoreapp2.1;net472 + netcoreapp2.1 + $(TargetFrameworks);net472 + $(TargetFrameworks);net451 netcoreapp2.1 true - AnyCPU + AnyCPU Exe - + win7-x64 @@ -29,7 +31,7 @@ true - + diff --git a/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj b/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj index b020663932..3560cdd9bd 100644 --- a/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj +++ b/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj @@ -19,7 +19,7 @@ true - +