From 68bd10d3aee862a9fbb0bac8b3d474bc323024f3 Mon Sep 17 00:00:00 2001
From: Medeni Baykal <433724+Haplois@users.noreply.github.com>
Date: Thu, 23 Sep 2021 10:17:41 +0300
Subject: [PATCH] Removed ProfilerProxy.dll (#3069)
---
NuGet.config | 2 +-
scripts/build.ps1 | 14 +++++++++-----
scripts/verify-nupkgs.ps1 | 2 +-
src/package/external/external.csproj | 2 +-
src/package/nuspec/Microsoft.TestPlatform.nuspec | 10 ----------
test/TestAssets/NuGet.config | 1 -
6 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index dfb8c305c0..4607522dfe 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -14,7 +14,7 @@
-
+
diff --git a/scripts/build.ps1 b/scripts/build.ps1
index d69c552b71..726d07c52d 100644
--- a/scripts/build.ps1
+++ b/scripts/build.ps1
@@ -73,8 +73,9 @@ if([string]::IsNullOrWhiteSpace($Version))
#
Write-Verbose "Setup build configuration."
$TPB_Solution = "TestPlatform.sln"
-$TPB_TestAssets_Solution = Join-Path $env:TP_ROOT_DIR "test\TestAssets\TestAssets.sln"
-$TPB_TestAssets_CILAssets = Join-Path $env:TP_ROOT_DIR "test\TestAssets\CILProject\CILProject.proj"
+$TPB_TestAssets = Join-Path $env:TP_ROOT_DIR "test\TestAssets\"
+$TPB_TestAssets_Solution = Join-Path $TPB_TestAssets "TestAssets.sln"
+$TPB_TestAssets_CILAssets = Join-Path $TPB_TestAssets "CILProject\CILProject.proj"
$TPB_TargetFramework45 = "net45"
$TPB_TargetFramework451 = "net451"
$TPB_TargetFramework472 = "net472"
@@ -138,10 +139,16 @@ function Invoke-TestAssetsBuild
$timer = Start-Timer
Write-Log "Invoke-TestAssetsBuild: Start test assets build."
$dotnetExe = Get-DotNetPath
+ $nugetExe = Join-Path $env:TP_PACKAGES_DIR -ChildPath "Nuget.CommandLine" | Join-Path -ChildPath $env:NUGET_EXE_Version | Join-Path -ChildPath "tools\NuGet.exe"
+ $nugetConfig = Join-Path $TPB_TestAssets "NuGet.config"
Write-Log ".. .. Build: Source: $TPB_TestAssets_Solution"
+ Write-Log ".. .. Build: Source: $TPB_TestAssets_Solution -- add NuGet source"
+ & $nugetExe sources add -Name "locally-built-testplatform-packages" -Source "$env:TP_TESTARTIFACTS\packages\" -ConfigFile "$nugetConfig"
Write-Verbose "$dotnetExe build $TPB_TestAssets_Solution --configuration $TPB_Configuration -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild"
& $dotnetExe build $TPB_TestAssets_Solution --configuration $TPB_Configuration -v:minimal -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild -bl:"$($env:TP_ROOT_DIR)\TestAssets.binlog"
+ Write-Log ".. .. Build: Source: $TPB_TestAssets_Solution -- remove NuGet source"
+ & $nugetExe sources remove -Name "locally-built-testplatform-packages" -ConfigFile "$nugetConfig"
Write-Log ".. .. Build: Complete."
Set-ScriptFailedOnError
@@ -892,9 +899,6 @@ function Get-CoreCLR20TestHostPackageDirectory
return $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\$TPB_TargetFrameworkCore20\TestHost")
}
-
-
-
function Locate-MSBuildPath
{
$vsInstallPath = Locate-VsInstallPath
diff --git a/scripts/verify-nupkgs.ps1 b/scripts/verify-nupkgs.ps1
index 4b887182c3..17d012e2b2 100644
--- a/scripts/verify-nupkgs.ps1
+++ b/scripts/verify-nupkgs.ps1
@@ -14,7 +14,7 @@ function Verify-Nuget-Packages($packageDirectory, $version)
$expectedNumOfFiles = @{
"Microsoft.CodeCoverage" = 59;
"Microsoft.NET.Test.Sdk" = 27;
- "Microsoft.TestPlatform" = 484;
+ "Microsoft.TestPlatform" = 474;
"Microsoft.TestPlatform.Build" = 21;
"Microsoft.TestPlatform.CLI" = 367;
"Microsoft.TestPlatform.Extensions.TrxLogger" = 35;
diff --git a/src/package/external/external.csproj b/src/package/external/external.csproj
index 7090a8ef38..beb8496e4c 100644
--- a/src/package/external/external.csproj
+++ b/src/package/external/external.csproj
@@ -29,7 +29,7 @@
-
+
diff --git a/src/package/nuspec/Microsoft.TestPlatform.nuspec b/src/package/nuspec/Microsoft.TestPlatform.nuspec
index e001d5a950..c16f22fb33 100644
--- a/src/package/nuspec/Microsoft.TestPlatform.nuspec
+++ b/src/package/nuspec/Microsoft.TestPlatform.nuspec
@@ -62,16 +62,6 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/test/TestAssets/NuGet.config b/test/TestAssets/NuGet.config
index 988da9789e..6f8bd3e5a2 100644
--- a/test/TestAssets/NuGet.config
+++ b/test/TestAssets/NuGet.config
@@ -5,7 +5,6 @@
-