From 65862b9fa19886202614e60aaffb6e57a855f110 Mon Sep 17 00:00:00 2001 From: Codrin Poienaru Date: Mon, 23 Mar 2020 19:35:00 +0100 Subject: [PATCH 1/9] Updated test platform external versions to 16.6 --- scripts/build.ps1 | 2 +- scripts/build/TestPlatform.Dependencies.props | 2 +- src/package/external/external.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/build.ps1 b/scripts/build.ps1 index a17998919e..cdc3065751 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -570,7 +570,7 @@ function Create-VsixPackage $testPlatformExternalsVersion = ([xml](Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props)).Project.PropertyGroup.TestPlatformExternalsVersion # Copy legacy dependencies - $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.TestPlatform.Extensions\$testPlatformExternalsVersion-patched4\contentFiles\any\any" + $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.TestPlatform.Extensions\$testPlatformExternalsVersion-patched1\contentFiles\any\any" Copy-Item -Recurse $legacyDir\* $packageDir -Force # Copy Microsoft.VisualStudio.ArchitectureTools.PEReader to Extensions diff --git a/scripts/build/TestPlatform.Dependencies.props b/scripts/build/TestPlatform.Dependencies.props index 1a5df47c2d..8e22caf046 100644 --- a/scripts/build/TestPlatform.Dependencies.props +++ b/scripts/build/TestPlatform.Dependencies.props @@ -31,7 +31,7 @@ 5.0.0 9.0.1 4.7.63 - 16.0.0-preview-2148743 + 16.6.0-preview-3565156 16.0.461 $(MicrosoftBuildPackageVersion) diff --git a/src/package/external/external.csproj b/src/package/external/external.csproj index 19bf12b12a..50c2f6073c 100644 --- a/src/package/external/external.csproj +++ b/src/package/external/external.csproj @@ -50,7 +50,7 @@ All - $(TestPlatformExternalsVersion)-patched4 + $(TestPlatformExternalsVersion)-patched1 All From 33d00192e99f4ff8a32cc8406b5afcdc59d8c955 Mon Sep 17 00:00:00 2001 From: Codrin Poienaru Date: Wed, 25 Mar 2020 13:07:04 +0100 Subject: [PATCH 2/9] Changed external dependencies to use mainstream 16.6 packages --- scripts/build.ps1 | 4 ++-- scripts/build/TestPlatform.Dependencies.props | 2 +- src/package/external/external.csproj | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/build.ps1 b/scripts/build.ps1 index a17998919e..71a6dc7b93 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -570,7 +570,7 @@ function Create-VsixPackage $testPlatformExternalsVersion = ([xml](Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props)).Project.PropertyGroup.TestPlatformExternalsVersion # Copy legacy dependencies - $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.TestPlatform.Extensions\$testPlatformExternalsVersion-patched4\contentFiles\any\any" + $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.TestPlatform.Extensions\$testPlatformExternalsVersion\contentFiles\any\any" Copy-Item -Recurse $legacyDir\* $packageDir -Force # Copy Microsoft.VisualStudio.ArchitectureTools.PEReader to Extensions @@ -990,4 +990,4 @@ Publish-Tests Write-Log "Build complete. {$(Get-ElapsedTime($timer))}" if ($Script:ScriptFailed) { Exit 1 } else { Exit 0 } - \ No newline at end of file + diff --git a/scripts/build/TestPlatform.Dependencies.props b/scripts/build/TestPlatform.Dependencies.props index 1a5df47c2d..8e22caf046 100644 --- a/scripts/build/TestPlatform.Dependencies.props +++ b/scripts/build/TestPlatform.Dependencies.props @@ -31,7 +31,7 @@ 5.0.0 9.0.1 4.7.63 - 16.0.0-preview-2148743 + 16.6.0-preview-3565156 16.0.461 $(MicrosoftBuildPackageVersion) diff --git a/src/package/external/external.csproj b/src/package/external/external.csproj index 19bf12b12a..a9cb55a539 100644 --- a/src/package/external/external.csproj +++ b/src/package/external/external.csproj @@ -50,7 +50,7 @@ All - $(TestPlatformExternalsVersion)-patched4 + $(TestPlatformExternalsVersion) All From e7619e4f346acdd754e2c56f1e9c97da4d88f25e Mon Sep 17 00:00:00 2001 From: Codrin Poienaru Date: Wed, 25 Mar 2020 15:30:26 +0100 Subject: [PATCH 3/9] Changed test platform external dependencies to use mainstream 16.6 nuget packages --- scripts/build.ps1 | 4 ++-- src/package/external/external.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/build.ps1 b/scripts/build.ps1 index cdc3065751..71a6dc7b93 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -570,7 +570,7 @@ function Create-VsixPackage $testPlatformExternalsVersion = ([xml](Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props)).Project.PropertyGroup.TestPlatformExternalsVersion # Copy legacy dependencies - $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.TestPlatform.Extensions\$testPlatformExternalsVersion-patched1\contentFiles\any\any" + $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.TestPlatform.Extensions\$testPlatformExternalsVersion\contentFiles\any\any" Copy-Item -Recurse $legacyDir\* $packageDir -Force # Copy Microsoft.VisualStudio.ArchitectureTools.PEReader to Extensions @@ -990,4 +990,4 @@ Publish-Tests Write-Log "Build complete. {$(Get-ElapsedTime($timer))}" if ($Script:ScriptFailed) { Exit 1 } else { Exit 0 } - \ No newline at end of file + diff --git a/src/package/external/external.csproj b/src/package/external/external.csproj index 50c2f6073c..a9cb55a539 100644 --- a/src/package/external/external.csproj +++ b/src/package/external/external.csproj @@ -50,7 +50,7 @@ All - $(TestPlatformExternalsVersion)-patched1 + $(TestPlatformExternalsVersion) All From d1a20c31b22272f576bda975033eefbd0a30b44c Mon Sep 17 00:00:00 2001 From: Codrin Poienaru Date: Thu, 26 Mar 2020 12:49:53 +0100 Subject: [PATCH 4/9] Reverted TP external dependencies version bump and changed only QualityTools --- scripts/build.ps1 | 4 ++-- scripts/build/TestPlatform.Dependencies.props | 2 +- src/package/external/external.csproj | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/build.ps1 b/scripts/build.ps1 index 71a6dc7b93..81b7c50793 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -570,14 +570,14 @@ function Create-VsixPackage $testPlatformExternalsVersion = ([xml](Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props)).Project.PropertyGroup.TestPlatformExternalsVersion # Copy legacy dependencies - $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.TestPlatform.Extensions\$testPlatformExternalsVersion\contentFiles\any\any" + $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.TestPlatform.Extensions\$testPlatformExternalsVersion-patched4\contentFiles\any\any" Copy-Item -Recurse $legacyDir\* $packageDir -Force # Copy Microsoft.VisualStudio.ArchitectureTools.PEReader to Extensions Copy-Item $legacyDir\Microsoft.VisualStudio.ArchitectureTools.PEReader.dll $extensionsPackageDir -Force # Copy QtAgent Related depedencies - $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.QualityTools\$testPlatformExternalsVersion\contentFiles\any\any" + $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.QualityTools\16.6.0-preview-3585703\contentFiles\any\any" Copy-Item -Recurse $legacyDir\* $packageDir -Force # Copy Legacy data collectors Related depedencies diff --git a/scripts/build/TestPlatform.Dependencies.props b/scripts/build/TestPlatform.Dependencies.props index 8e22caf046..1a5df47c2d 100644 --- a/scripts/build/TestPlatform.Dependencies.props +++ b/scripts/build/TestPlatform.Dependencies.props @@ -31,7 +31,7 @@ 5.0.0 9.0.1 4.7.63 - 16.6.0-preview-3565156 + 16.0.0-preview-2148743 16.0.461 $(MicrosoftBuildPackageVersion) diff --git a/src/package/external/external.csproj b/src/package/external/external.csproj index a9cb55a539..8f4e90f1b0 100644 --- a/src/package/external/external.csproj +++ b/src/package/external/external.csproj @@ -50,11 +50,11 @@ All - $(TestPlatformExternalsVersion) + $(TestPlatformExternalsVersion)-patched4 All - $(TestPlatformExternalsVersion) + 16.6.0-preview-3585703 All From 6aa46b55c4c3db5ad5d11fbef2f78bb9bc796a0c Mon Sep 17 00:00:00 2001 From: Codrin Poienaru Date: Wed, 15 Apr 2020 12:25:18 +0200 Subject: [PATCH 5/9] Fixed acceptance tests --- scripts/build.ps1 | 2 +- scripts/build/TestPlatform.Dependencies.props | 2 +- src/package/external/external.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/build.ps1 b/scripts/build.ps1 index 81b7c50793..38ac0b3865 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -577,7 +577,7 @@ function Create-VsixPackage Copy-Item $legacyDir\Microsoft.VisualStudio.ArchitectureTools.PEReader.dll $extensionsPackageDir -Force # Copy QtAgent Related depedencies - $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.QualityTools\16.6.0-preview-3585703\contentFiles\any\any" + $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.QualityTools\16.7.0-preview-3643950\contentFiles\any\any" Copy-Item -Recurse $legacyDir\* $packageDir -Force # Copy Legacy data collectors Related depedencies diff --git a/scripts/build/TestPlatform.Dependencies.props b/scripts/build/TestPlatform.Dependencies.props index 1a5df47c2d..7bed470e0b 100644 --- a/scripts/build/TestPlatform.Dependencies.props +++ b/scripts/build/TestPlatform.Dependencies.props @@ -31,7 +31,7 @@ 5.0.0 9.0.1 4.7.63 - 16.0.0-preview-2148743 + 16.7.0-preview-3643950 16.0.461 $(MicrosoftBuildPackageVersion) diff --git a/src/package/external/external.csproj b/src/package/external/external.csproj index 8f4e90f1b0..6f7e8aed7f 100644 --- a/src/package/external/external.csproj +++ b/src/package/external/external.csproj @@ -54,7 +54,7 @@ All - 16.6.0-preview-3585703 + 16.7.0-preview-3643950 All From b998fded982203b545c973ab642c67ae466e8be2 Mon Sep 17 00:00:00 2001 From: Codrin Poienaru Date: Wed, 15 Apr 2020 12:28:36 +0200 Subject: [PATCH 6/9] Using original TP external versions --- scripts/build/TestPlatform.Dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build/TestPlatform.Dependencies.props b/scripts/build/TestPlatform.Dependencies.props index 7bed470e0b..1a5df47c2d 100644 --- a/scripts/build/TestPlatform.Dependencies.props +++ b/scripts/build/TestPlatform.Dependencies.props @@ -31,7 +31,7 @@ 5.0.0 9.0.1 4.7.63 - 16.7.0-preview-3643950 + 16.0.0-preview-2148743 16.0.461 $(MicrosoftBuildPackageVersion) From 490b7de1ffbe63ea6aa6c0ca5a04dc2438cbf22b Mon Sep 17 00:00:00 2001 From: Codrin Poienaru Date: Wed, 15 Apr 2020 18:35:16 +0200 Subject: [PATCH 7/9] Fixed quality tools dependencies for test projects --- test/TestAssets/CUITTestProject/CUITTestProject.csproj | 2 +- .../LegacySettingsUnitTestProject.csproj | 2 +- .../MstestV1UnitTestProject/MstestV1UnitTestProject.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/TestAssets/CUITTestProject/CUITTestProject.csproj b/test/TestAssets/CUITTestProject/CUITTestProject.csproj index 0144f88502..98edbfb781 100644 --- a/test/TestAssets/CUITTestProject/CUITTestProject.csproj +++ b/test/TestAssets/CUITTestProject/CUITTestProject.csproj @@ -31,7 +31,7 @@ $(TestPlatformExternalsVersion) - $(TestPlatformExternalsVersion) + 16.7.0-preview-3643950 diff --git a/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj b/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj index f4349195a1..56c6d0ac28 100644 --- a/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj +++ b/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj @@ -23,7 +23,7 @@ - $(TestPlatformExternalsVersion) + 16.7.0-preview-3643950 diff --git a/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj b/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj index 6be1dc6e80..707a2350f4 100644 --- a/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj +++ b/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj @@ -19,7 +19,7 @@ - $(TestPlatformExternalsVersion) + 16.7.0-preview-3643950 From 916f5de8547b339381de83937edc474f3f74a1b3 Mon Sep 17 00:00:00 2001 From: Codrin Poienaru Date: Wed, 15 Apr 2020 21:58:21 +0200 Subject: [PATCH 8/9] Used signed build NuGet packages --- scripts/build.ps1 | 2 +- src/package/external/external.csproj | 2 +- test/TestAssets/CUITTestProject/CUITTestProject.csproj | 2 +- .../LegacySettingsUnitTestProject.csproj | 2 +- .../MstestV1UnitTestProject/MstestV1UnitTestProject.csproj | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/build.ps1 b/scripts/build.ps1 index b9b859c614..f2405613f7 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -578,7 +578,7 @@ function Create-VsixPackage Copy-Item $legacyDir\Microsoft.VisualStudio.ArchitectureTools.PEReader.dll $extensionsPackageDir -Force # Copy QtAgent Related depedencies - $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.QualityTools\16.7.0-preview-3643950\contentFiles\any\any" + $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.QualityTools\16.7.0-preview-3645374\contentFiles\any\any" Copy-Item -Recurse $legacyDir\* $packageDir -Force # Copy Legacy data collectors Related depedencies diff --git a/src/package/external/external.csproj b/src/package/external/external.csproj index c3c655cc77..7dfc8ff428 100644 --- a/src/package/external/external.csproj +++ b/src/package/external/external.csproj @@ -54,7 +54,7 @@ All - 16.7.0-preview-3643950 + 16.7.0-preview-3645374 All diff --git a/test/TestAssets/CUITTestProject/CUITTestProject.csproj b/test/TestAssets/CUITTestProject/CUITTestProject.csproj index 98edbfb781..896eea5927 100644 --- a/test/TestAssets/CUITTestProject/CUITTestProject.csproj +++ b/test/TestAssets/CUITTestProject/CUITTestProject.csproj @@ -31,7 +31,7 @@ $(TestPlatformExternalsVersion) - 16.7.0-preview-3643950 + 16.7.0-preview-3645374 diff --git a/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj b/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj index 56c6d0ac28..ffaf4c1981 100644 --- a/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj +++ b/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj @@ -23,7 +23,7 @@ - 16.7.0-preview-3643950 + 16.7.0-preview-3645374 diff --git a/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj b/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj index 707a2350f4..c4a6250ba8 100644 --- a/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj +++ b/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj @@ -19,7 +19,7 @@ - 16.7.0-preview-3643950 + 16.7.0-preview-3645374 From 7a2a7948fbd3710258801f9cc4b363cd8fe57ccf Mon Sep 17 00:00:00 2001 From: Codrin Poienaru Date: Thu, 16 Apr 2020 12:04:08 +0200 Subject: [PATCH 9/9] Bumped all external dependency versions to 16.7.0-preview-3645374 --- scripts/build.ps1 | 4 ++-- scripts/build/TestPlatform.Dependencies.props | 2 +- src/package/external/external.csproj | 4 ++-- test/TestAssets/CUITTestProject/CUITTestProject.csproj | 2 +- .../LegacySettingsUnitTestProject.csproj | 2 +- .../MstestV1UnitTestProject/MstestV1UnitTestProject.csproj | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/build.ps1 b/scripts/build.ps1 index f2405613f7..9ed75970e6 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -571,14 +571,14 @@ function Create-VsixPackage $testPlatformExternalsVersion = ([xml](Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props)).Project.PropertyGroup.TestPlatformExternalsVersion # Copy legacy dependencies - $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.TestPlatform.Extensions\$testPlatformExternalsVersion-patched7\contentFiles\any\any" + $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.TestPlatform.Extensions\$testPlatformExternalsVersion\contentFiles\any\any" Copy-Item -Recurse $legacyDir\* $packageDir -Force # Copy Microsoft.VisualStudio.ArchitectureTools.PEReader to Extensions Copy-Item $legacyDir\Microsoft.VisualStudio.ArchitectureTools.PEReader.dll $extensionsPackageDir -Force # Copy QtAgent Related depedencies - $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.QualityTools\16.7.0-preview-3645374\contentFiles\any\any" + $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.QualityTools\$testPlatformExternalsVersion\contentFiles\any\any" Copy-Item -Recurse $legacyDir\* $packageDir -Force # Copy Legacy data collectors Related depedencies diff --git a/scripts/build/TestPlatform.Dependencies.props b/scripts/build/TestPlatform.Dependencies.props index 289396f3f4..bde4085577 100644 --- a/scripts/build/TestPlatform.Dependencies.props +++ b/scripts/build/TestPlatform.Dependencies.props @@ -31,7 +31,7 @@ 5.0.0 9.0.1 4.7.63 - 16.0.0-preview-2148743 + 16.7.0-preview-3645374 16.6.2-beta.20208.2 16.0.461 diff --git a/src/package/external/external.csproj b/src/package/external/external.csproj index 7dfc8ff428..5a85d51fc7 100644 --- a/src/package/external/external.csproj +++ b/src/package/external/external.csproj @@ -50,11 +50,11 @@ All - $(TestPlatformExternalsVersion)-patched7 + $(TestPlatformExternalsVersion) All - 16.7.0-preview-3645374 + $(TestPlatformExternalsVersion) All diff --git a/test/TestAssets/CUITTestProject/CUITTestProject.csproj b/test/TestAssets/CUITTestProject/CUITTestProject.csproj index 896eea5927..0144f88502 100644 --- a/test/TestAssets/CUITTestProject/CUITTestProject.csproj +++ b/test/TestAssets/CUITTestProject/CUITTestProject.csproj @@ -31,7 +31,7 @@ $(TestPlatformExternalsVersion) - 16.7.0-preview-3645374 + $(TestPlatformExternalsVersion) diff --git a/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj b/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj index ffaf4c1981..f4349195a1 100644 --- a/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj +++ b/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj @@ -23,7 +23,7 @@ - 16.7.0-preview-3645374 + $(TestPlatformExternalsVersion) diff --git a/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj b/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj index c4a6250ba8..6be1dc6e80 100644 --- a/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj +++ b/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj @@ -19,7 +19,7 @@ - 16.7.0-preview-3645374 + $(TestPlatformExternalsVersion)