From 84a3603eaae1d1304a33784607c5fd8e45bb1143 Mon Sep 17 00:00:00 2001
From: Medeni Baykal <433724+Haplois@users.noreply.github.com>
Date: Wed, 28 Jul 2021 12:18:52 +0200
Subject: [PATCH] Updated externals to pick-up fixes.
---
scripts/build.ps1 | 13 +++++++------
scripts/build/TestPlatform.Dependencies.props | 5 +++--
.../Microsoft.TestPlatform.CoreUtilities.csproj | 2 +-
...crosoft.TestPlatform.PlatformAbstractions.csproj | 2 +-
src/package/external/external.csproj | 4 ++--
...ft.TestPlatform.ObjectModel.PlatformTests.csproj | 4 ++--
6 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/scripts/build.ps1 b/scripts/build.ps1
index 7cded34dbb..3b2c582554 100644
--- a/scripts/build.ps1
+++ b/scripts/build.ps1
@@ -502,15 +502,15 @@ function Publish-Package
################################################################################
# Publish msdia
- $testPlatformExternalsVersion = ([xml](Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props)).Project.PropertyGroup.TestPlatformExternalsVersion
- $comComponentsDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia\$testPlatformExternalsVersion\tools\net451"
+ $testPlatformMSDiaVersion = ([xml](Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props)).Project.PropertyGroup.TestPlatformMSDiaVersion
+ $comComponentsDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia\$testPlatformMSDiaVersion\tools\net451"
Copy-Item -Recurse $comComponentsDirectory\* $testhostCore20PackageDir -Force
Copy-Item -Recurse $comComponentsDirectory\* $testhostCore10PackageDir -Force
Copy-Item -Recurse $comComponentsDirectory\* $testhostFullPackageDir -Force
Copy-Item -Recurse $comComponentsDirectory\* $testhostUapPackageDir -Force
Copy-Item -Recurse $comComponentsDirectory\* $coreCLR20TestHostPackageDir -Force
- $microsoftInternalDiaInterop = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia.Interop\$testPlatformExternalsVersion\tools\net451"
+ $microsoftInternalDiaInterop = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia.Interop\$testPlatformMSDiaVersion\tools\net451"
Copy-Item -Recurse $microsoftInternalDiaInterop\* $coreCLR20TestHostPackageDir -Force
# Copy over the logger assemblies to the Extensions folder.
@@ -757,6 +757,7 @@ function Create-VsixPackage
$legacyTestImpactComComponentsDir = Join-Path $extensionsPackageDir "V1\TestImpact"
$testPlatformExternalsVersion = ([xml](Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props)).Project.PropertyGroup.TestPlatformExternalsVersion
+ $testPlatformMsDiaVersion = ([xml](Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props)).Project.PropertyGroup.TestPlatformMSDiaVersion
$codeCoverageExternalsVersion = ([xml](Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props)).Project.PropertyGroup.CodeCoverageExternalsVersion
# Copy Microsoft.VisualStudio.TraceDataCollector to Extensions
@@ -807,11 +808,11 @@ function Create-VsixPackage
Copy-Item -Recurse $legacyDir\* $packageDir -Force
# Copy COM Components and their manifests over
- $comComponentsDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia\$testPlatformExternalsVersion\tools\net451"
+ $comComponentsDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia\$testPlatformMsDiaVersion\tools\net451"
Copy-Item -Recurse $comComponentsDirectory\* $packageDir -Force
# Copy Microsoft.Internal.Dia.Interop
- $internalDiaInterop = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia.Interop\$testPlatformExternalsVersion\tools\net451"
+ $internalDiaInterop = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia.Interop\$testPlatformMsDiaVersion\tools\net451"
Copy-Item -Recurse $internalDiaInterop\* $packageDir -Force
# Copy VsWebSite.Interop
@@ -819,7 +820,7 @@ function Create-VsixPackage
Copy-Item -Recurse $vsWebSiteInterop\* $packageDir -Force
# Copy COM Components and their manifests over to Extensions Test Impact directory
- $comComponentsDirectoryTIA = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia\$testPlatformExternalsVersion\tools\net451"
+ $comComponentsDirectoryTIA = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia\$testPlatformMsDiaVersion\tools\net451"
if (-not (Test-Path $testImpactComComponentsDir)) {
New-Item $testImpactComComponentsDir -Type Directory -Force | Out-Null
}
diff --git a/scripts/build/TestPlatform.Dependencies.props b/scripts/build/TestPlatform.Dependencies.props
index a2bb797811..ac49c3940f 100644
--- a/scripts/build/TestPlatform.Dependencies.props
+++ b/scripts/build/TestPlatform.Dependencies.props
@@ -11,7 +11,7 @@
- 16.10.0-dev
+ 16.11.0-dev
2.1.0
2.1.0
@@ -33,7 +33,8 @@
9.0.1
4.7.63
- 16.11.31329.17
+ 16.11.31527.49
+ 16.11.31523.174
16.10.0-beta.21270.2
16.11.230815
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj
index 942c53be2b..8561c96e3f 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj
@@ -30,7 +30,7 @@
-
+
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj
index bb20c31224..ee79835438 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj
@@ -38,7 +38,7 @@
-
+
diff --git a/src/package/external/external.csproj b/src/package/external/external.csproj
index 4c96df0957..a25f7cb5a4 100644
--- a/src/package/external/external.csproj
+++ b/src/package/external/external.csproj
@@ -90,11 +90,11 @@
All
- $(TestPlatformExternalsVersion)
+ $(TestPlatformMSDiaVersion)
All
- $(TestPlatformExternalsVersion)
+ $(TestPlatformMSDiaVersion)
All
diff --git a/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj b/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj
index 4ac01e4c4b..08e4f9a03a 100644
--- a/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj
+++ b/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj
@@ -18,10 +18,10 @@
-
+
-
+