From 5e78ff6aa45ad41d7f93a0a56cbd69c3fda9e821 Mon Sep 17 00:00:00 2001 From: nohwnd Date: Fri, 3 Jul 2020 11:36:27 +0200 Subject: [PATCH 1/8] Linux build fix --- .../Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj | 2 +- .../datacollector.PlatformTests.csproj | 2 +- test/datacollector.UnitTests/datacollector.UnitTests.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj index 9d7a332540..7165a95b87 100644 --- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj +++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj @@ -23,7 +23,7 @@ - + diff --git a/test/datacollector.PlatformTests/datacollector.PlatformTests.csproj b/test/datacollector.PlatformTests/datacollector.PlatformTests.csproj index 9def0ed7d6..5c1834b815 100644 --- a/test/datacollector.PlatformTests/datacollector.PlatformTests.csproj +++ b/test/datacollector.PlatformTests/datacollector.PlatformTests.csproj @@ -19,7 +19,7 @@ PreserveNewest - + diff --git a/test/datacollector.UnitTests/datacollector.UnitTests.csproj b/test/datacollector.UnitTests/datacollector.UnitTests.csproj index 8e21bb9594..e4dd4abe91 100644 --- a/test/datacollector.UnitTests/datacollector.UnitTests.csproj +++ b/test/datacollector.UnitTests/datacollector.UnitTests.csproj @@ -16,7 +16,7 @@ - + From 28742e0ba17932896e6047b4955f926a20502d15 Mon Sep 17 00:00:00 2001 From: nohwnd Date: Thu, 9 Jul 2020 14:13:49 +0200 Subject: [PATCH 2/8] a --- scripts/build.sh | 2 +- ...tform.Extensions.BlameDataCollector.csproj | 23 ++++++------------- src/package/external/external.csproj | 8 +++---- src/vstest.console/vstest.console.csproj | 1 + ...rosoft.TestPlatform.AcceptanceTests.csproj | 1 - ...nsions.BlameDataCollector.UnitTests.csproj | 4 +++- ...Platform.TestHostProvider.UnitTests.csproj | 4 ++-- 7 files changed, 18 insertions(+), 25 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index 009b5c3d82..f804885f09 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -238,7 +238,7 @@ function invoke_build() log ".. .. Build: Source: $TPB_Solution" # Workaround for https://github.com/dotnet/sdk/issues/335 - export FrameworkPathOverride=$TP_PACKAGES_DIR/microsoft.targetingpack.netframework.v4.6/1.0.1/lib/net46/ + export FrameworkPathOverride=$TP_PACKAGES_DIR/microsoft.targetingpack.netframework.v4.7.2/1.0.0/lib/net472/ if [ -z "$PROJECT_NAME_PATTERNS" ] then if [[ $TP_USE_REPO_API = 0 ]]; then diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj index 7165a95b87..f1cef62835 100644 --- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj +++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj @@ -28,6 +28,13 @@ + + + + + 0.2.0-preview.20220.1 + + @@ -42,21 +49,5 @@ Resources.Designer.cs - - - 0.2.0-preview.20220.1 - - - diff --git a/src/package/external/external.csproj b/src/package/external/external.csproj index 6e6bdc448c..9224602d52 100644 --- a/src/package/external/external.csproj +++ b/src/package/external/external.csproj @@ -4,7 +4,7 @@ - net46 + net472 restore win7-x64 false @@ -94,10 +94,10 @@ All - - 1.0.1 + + 1.0.0 All diff --git a/src/vstest.console/vstest.console.csproj b/src/vstest.console/vstest.console.csproj index 6843aaf587..0de0c734c8 100644 --- a/src/vstest.console/vstest.console.csproj +++ b/src/vstest.console/vstest.console.csproj @@ -43,6 +43,7 @@ + diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.csproj b/test/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.csproj index 928f62332f..47ed483288 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.csproj +++ b/test/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.csproj @@ -22,7 +22,6 @@ 2.0.0 - diff --git a/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests.csproj b/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests.csproj index 2852753cfa..84c0db3ec3 100644 --- a/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests.csproj @@ -17,12 +17,14 @@ + - + + diff --git a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj b/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj index 6c2c1139a8..0401f9b46c 100644 --- a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj @@ -16,11 +16,11 @@ - + From ed1b723f66e5d8fbb388223005ed5e50fbee2b54 Mon Sep 17 00:00:00 2001 From: nohwnd Date: Thu, 9 Jul 2020 15:28:40 +0200 Subject: [PATCH 3/8] aaa --- azure-pipelines.yml | 18 ++++++++---------- ...tPlatform.TestHostProvider.UnitTests.csproj | 7 ++++--- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c3ee2506eb..13674c0283 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -64,14 +64,12 @@ jobs: testResultsFiles: '**\*.trx' condition: succeededOrFailed() -# Linux build does not work when we mix runtimes and -# we don't use the results to do anything, skipping it for now -# - job: Linux -# pool: -# vmImage: 'ubuntu-16.04' -# variables: -# buildConfiguration: 'Release' -# steps: -# - script: ./build.sh -c $(buildConfiguration) -# displayName: './build.sh -c $(buildConfiguration)' +- job: Linux + pool: + vmImage: 'ubuntu-16.04' + variables: + buildConfiguration: 'Release' + steps: + - script: ./build.sh -c $(buildConfiguration) + displayName: './build.sh -c $(buildConfiguration)' diff --git a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj b/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj index 0401f9b46c..55577ebf34 100644 --- a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj @@ -8,7 +8,7 @@ Exe Microsoft.TestPlatform.TestHostProvider.UnitTests - netcoreapp2.1;net451 + netcoreapp2.1;net472 true @@ -16,11 +16,12 @@ - + + From c470098b2a07f553ded6441c75a0e9853e198214 Mon Sep 17 00:00:00 2001 From: nohwnd Date: Wed, 15 Jul 2020 12:24:27 +0200 Subject: [PATCH 4/8] build works --- .../Hosting/DotnetTestHostManagerTests.cs | 4 ++-- .../Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/DotnetTestHostManagerTests.cs b/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/DotnetTestHostManagerTests.cs index 2cf1a8889d..d602d8bcbb 100644 --- a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/DotnetTestHostManagerTests.cs +++ b/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/DotnetTestHostManagerTests.cs @@ -492,7 +492,7 @@ public void GetTestHostProcessStartInfoOnWindowsForValidPathReturnsFullPathOfDot char separator = ';'; var dotnetExeName = "dotnet.exe"; #if !NET451 - if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + if (!System.Environment.OSVersion.Platform.ToString().StartsWith("Win")) { separator = ':'; dotnetExeName = "dotnet"; @@ -519,7 +519,7 @@ public void GetTestHostProcessStartInfoShouldThrowExceptionWhenDotnetIsNotInstal char separator = ';'; var dotnetExeName = "dotnet.exe"; - if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + if (!System.Environment.OSVersion.Platform.ToString().StartsWith("Win")) { separator = ':'; dotnetExeName = "dotnet"; diff --git a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj b/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj index 55577ebf34..ac42301ead 100644 --- a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj @@ -13,8 +13,6 @@ - - From 200376bac70dac0b0213c6a57c16b4e4fa98c869 Mon Sep 17 00:00:00 2001 From: nohwnd Date: Wed, 15 Jul 2020 12:54:43 +0200 Subject: [PATCH 5/8] Use 18.04 --- scripts/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build.sh b/scripts/build.sh index f804885f09..fe0797beef 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -15,7 +15,7 @@ NOCOLOR='\033[0m' # Parse options # CONFIGURATION="Debug" -TARGET_RUNTIME="ubuntu.16.04-x64" +TARGET_RUNTIME="ubuntu.18.04-x64" VERSION="" # Will set this later by reading TestPlatform.Settings.targets file. VERSION_SUFFIX="dev" FAIL_FAST=false From 18edda6d1dee6e021b0e943bff867ce953cdc815 Mon Sep 17 00:00:00 2001 From: nohwnd Date: Wed, 15 Jul 2020 13:09:43 +0200 Subject: [PATCH 6/8] Add ref --- .../Microsoft.TestPlatform.Utilities.UnitTests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.csproj b/test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.csproj index d0c2957dff..47ac9bd9b4 100644 --- a/test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.csproj @@ -23,6 +23,7 @@ + From 80b1e93588fc2c6c856fc55771f3459cdbf994e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Wed, 15 Jul 2020 13:39:27 +0200 Subject: [PATCH 7/8] Actually update Ubuntu version --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 13674c0283..afcd052d01 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -66,7 +66,7 @@ jobs: - job: Linux pool: - vmImage: 'ubuntu-16.04' + vmImage: 'ubuntu-18.04' variables: buildConfiguration: 'Release' steps: From 71b2252ba373cdb8ec65dd0cebda5922717babc4 Mon Sep 17 00:00:00 2001 From: nohwnd Date: Thu, 16 Jul 2020 11:13:01 +0200 Subject: [PATCH 8/8] Procdump --- .../Microsoft.TestPlatform.AcceptanceTests.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.csproj b/test/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.csproj index 47ed483288..dbc75999c4 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.csproj +++ b/test/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.csproj @@ -22,6 +22,7 @@ 2.0.0 + @@ -34,5 +35,8 @@ + + +