From 6cbe2c88f69b05ff1f6a71f190a24f00e6d78e4d Mon Sep 17 00:00:00 2001
From: Medeni Baykal <433724+Haplois@users.noreply.github.com>
Date: Mon, 25 Jan 2021 16:27:17 +0100
Subject: [PATCH] Added git branch and commit NuGet packages

---
 scripts/build.ps1                             |  32 +++++++++++++++---
 scripts/build.sh                              |   2 +-
 scripts/verify-nupkgs.ps1                     |  22 ++++++------
 src/package/Icon.png                          | Bin 0 -> 7006 bytes
 src/package/external/external.csproj          |   2 +-
 .../nuspec/Microsoft.CodeCoverage.nuspec      |  13 ++++++-
 .../nuspec/Microsoft.NET.Test.Sdk.nuspec      |  17 +++++++++-
 .../Microsoft.TestPlatform.Portable.nuspec    |   9 ++++-
 .../nuspec/Microsoft.TestPlatform.nuspec      |   9 ++++-
 src/package/nuspec/TestPlatform.Build.nuspec  |  13 ++++++-
 src/package/nuspec/TestPlatform.CLI.nuspec    |  10 +++++-
 .../TestPlatform.Extensions.TrxLogger.nuspec  |  10 +++++-
 .../nuspec/TestPlatform.ObjectModel.nuspec    |  10 +++++-
 .../nuspec/TestPlatform.TestHost.nuspec       |  15 ++++++--
 .../TestPlatform.TranslationLayer.nuspec      |  10 +++++-
 .../TestPlatformNugetPackageTests.cs          |  19 +++++++++--
 .../IntegrationTestEnvironment.cs             |   3 +-
 17 files changed, 165 insertions(+), 31 deletions(-)
 create mode 100644 src/package/Icon.png

diff --git a/scripts/build.ps1 b/scripts/build.ps1
index 98158a6594..fb6ced6651 100644
--- a/scripts/build.ps1
+++ b/scripts/build.ps1
@@ -56,6 +56,29 @@ Param(
 
 $ErrorActionPreference = "Stop"
 
+#
+# Git Branch
+#
+$TPB_BRANCH = "LOCALBRANCH"
+$TPB_COMMIT = "LOCALBUILD"
+
+try {
+    $TPB_BRANCH = $env:BUILD_SOURCEBRANCH -replace "^refs/heads/"  
+    if ([string]::IsNullOrWhiteSpace($TPB_BRANCH)) { 
+        $TPB_BRANCH = git -C "." rev-parse --abbrev-ref HEAD
+    }
+}
+catch { }
+
+try {
+    $TPB_COMMIT = $env:BUILD_SOURCEVERSION
+    if ([string]::IsNullOrWhiteSpace($TPB_COMMIT)) { 
+        $TPB_COMMIT = git -C "." rev-parse HEAD
+    }
+}
+catch { }
+
+
 #
 # Variables
 #
@@ -87,7 +110,7 @@ Write-Verbose "Setup dotnet configuration."
 $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1 
 # Dotnet build doesn't support --packages yet. See https://github.com/dotnet/cli/issues/2712
 $env:NUGET_PACKAGES = $env:TP_PACKAGES_DIR
-$env:NUGET_EXE_Version = "3.4.3"
+$env:NUGET_EXE_Version = "5.8.1"
 $env:DOTNET_CLI_VERSION = "6.0.100-alpha.1.21067.8"
 # $env:DOTNET_RUNTIME_VERSION = "LATEST"
 $env:VSWHERE_VERSION = "2.0.2"
@@ -738,8 +761,7 @@ function Create-VsixPackage
     }
     Copy-Item -Recurse $comComponentsDirectoryTIA\* $legacyTestImpactComComponentsDir -Force
     
-    $fileToCopy = Join-Path $env:TP_PACKAGE_PROJ_DIR "ThirdPartyNotices.txt"
-    Copy-Item $fileToCopy $packageDir -Force
+    Copy-Item (Join-Path $env:TP_PACKAGE_PROJ_DIR "ThirdPartyNotices.txt") $packageDir -Force
 
     Write-Verbose "Locating MSBuild install path..."
     $msbuildPath = Locate-MSBuildPath
@@ -773,6 +795,8 @@ function Create-NugetPackages
     Write-Log "Create-NugetPackages: Started."
     $stagingDir = Join-Path $env:TP_OUT_DIR $TPB_Configuration
     $packageOutputDir = $TPB_PackageOutDir
+    
+    Copy-Item (Join-Path $env:TP_PACKAGE_PROJ_DIR "Icon.png") $stagingDir -Force
 
     if (-not (Test-Path $packageOutputDir)) {
         New-Item $packageOutputDir -type directory -Force
@@ -835,7 +859,7 @@ function Create-NugetPackages
         }
 
         Write-Verbose "$nugetExe pack $stagingDir\$file -OutputDirectory $packageOutputDir -Version $TPB_Version -Properties Version=$TPB_Version $additionalArgs"
-        & $nugetExe pack $stagingDir\$file -OutputDirectory $packageOutputDir -Version $TPB_Version -Properties Version=$TPB_Version`;JsonNetVersion=$JsonNetVersion`;Runtime=$TPB_TargetRuntime`;NetCoreTargetFramework=$TPB_TargetFrameworkCore20`;FakesPackageDir=$FakesPackageDir`;NetStandard10Framework=$TPB_TargetFrameworkNS10`;NetStandard13Framework=$TPB_TargetFrameworkNS13`;NetStandard20Framework=$TPB_TargetFrameworkNS20`;Uap10Framework=$testhostUapPackageDir $additionalArgs
+        & $nugetExe pack $stagingDir\$file -OutputDirectory $packageOutputDir -Version $TPB_Version -Properties Version=$TPB_Version`;JsonNetVersion=$JsonNetVersion`;Runtime=$TPB_TargetRuntime`;NetCoreTargetFramework=$TPB_TargetFrameworkCore20`;FakesPackageDir=$FakesPackageDir`;NetStandard10Framework=$TPB_TargetFrameworkNS10`;NetStandard13Framework=$TPB_TargetFrameworkNS13`;NetStandard20Framework=$TPB_TargetFrameworkNS20`;Uap10Framework=$testhostUapPackageDir`;BranchName=$TPB_BRANCH`;CommitId=$TPB_COMMIT $additionalArgs
 
         Set-ScriptFailedOnError
     }
diff --git a/scripts/build.sh b/scripts/build.sh
index bbf8b1efa0..6325f174ac 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -388,7 +388,7 @@ function create_package()
     # Copy over empty and third patry notice file
     cp "$TP_PACKAGE_NUSPEC_DIR/_._" $stagingDir
     cp "$TP_PACKAGE_NUSPEC_DIR/../ThirdPartyNotices.txt" $stagingDir
-
+    cp "$TP_PACKAGE_NUSPEC_DIR/../Icon.png" $stagingDir
 
     for i in ${projectFiles[@]}; do
         log "$dotnet pack --no-build $stagingDir/${i} -o $packageOutputDir -p:Version=$TPB_Version" \
diff --git a/scripts/verify-nupkgs.ps1 b/scripts/verify-nupkgs.ps1
index 3b9b983a74..0d0509c070 100644
--- a/scripts/verify-nupkgs.ps1
+++ b/scripts/verify-nupkgs.ps1
@@ -8,21 +8,21 @@ function Unzip
     [System.IO.Compression.ZipFile]::ExtractToDirectory($zipfile, $outpath)
 }
 
-
 function Verify-Nuget-Packages($packageDirectory, $version)
 {
     Write-Log "Starting Verify-Nuget-Packages."
     $expectedNumOfFiles = @{
-                     "Microsoft.CodeCoverage" = 59;
-                     "Microsoft.NET.Test.Sdk" = 18;
-                     "Microsoft.TestPlatform" = 513;
-                     "Microsoft.TestPlatform.Build" = 19;
-                     "Microsoft.TestPlatform.CLI" = 379;
-                     "Microsoft.TestPlatform.Extensions.TrxLogger" = 33;
-                     "Microsoft.TestPlatform.ObjectModel" = 178;
-                     "Microsoft.TestPlatform.Portable" = 568;
-                     "Microsoft.TestPlatform.TestHost" = 212;
-                     "Microsoft.TestPlatform.TranslationLayer" = 121}
+        "Microsoft.CodeCoverage" = 60;
+        "Microsoft.NET.Test.Sdk" = 26;
+        "Microsoft.TestPlatform" = 514;
+        "Microsoft.TestPlatform.Build" = 20;
+        "Microsoft.TestPlatform.CLI" = 380;
+        "Microsoft.TestPlatform.Extensions.TrxLogger" = 34;
+        "Microsoft.TestPlatform.ObjectModel" = 179;
+        "Microsoft.TestPlatform.Portable" = 569;
+        "Microsoft.TestPlatform.TestHost" = 213;
+        "Microsoft.TestPlatform.TranslationLayer" = 122;
+    }
 
     $nugetPackages = Get-ChildItem -Filter "*$version*.nupkg" $packageDirectory | % { $_.FullName }
 
diff --git a/src/package/Icon.png b/src/package/Icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0f1fdbf4d5eae0e561018cccee74f6a454cdb9c
GIT binary patch
literal 7006
zcmeHMXH-+`n%)#eMU;C)kZw7O2nvFLpcE@A^-u+AN(mh$U<e@z>H*JD5Jjm{4}uUR
zs5C<higZGxM5G3g1PPFU^n@hy#dFuXGizquId}fdTC?UyR`$yN_P5{qJkR^(cWX;i
ziEVP*APADUeCfOm1POynVQ9-{@U;}t#|B?pZ(eeOL(q<of{##=+75XLl9#-E{)}D3
z;M|Dc&EZuvb%D&B_}SzqQLFi%Se&0!pClgaHVEv6Wt@cdn)g)qrj<W6&GgHjyq=w}
zjZ8MR(C&>(zdURn*zrcHqdVxK)P)7322TAMVbNR4HRzo3_~zdgjvf?Ot98@H{LHdy
zK*)TM=g&B<al^4!w?djlQt=QZ3PF2;aY7KZ1%gb#6);>9f}+9IKfm=aF5e3_{PQJ$
zY4?9DHvtd+Y14o8TQs=)&+P<HnSe!q)h)36AHj%*G==|KH2%Y5|BLqig=qZ4y?+;!
ze?9+y_gJ`L%l|OGdyBO1w&jL5KkIbWQnQ6sV$^3wh(p-{uwb9ph}N6@GiY11bje(6
z`4OMfS|<~SQdsnr{F?0VtJW!xyx~1Y#2_1D%DvV5q0F)TxE%@T7yU_$2Y%Vq<W0r&
z^*d|7W*SH7*SVsLo~gy|gVr>)Wjb3|LIT@*NDqyYm#gu^q*EFSow<%yKVx`_Ka)!0
z2YAaQr%LYyQ%n$Rjx)e%JeM5_ov70FUMveJTS(J+%C4(L)~h*MQ8!wJtf_X{`Ol?k
z;{27%#**2uiR&R6-eaR<rkDgt=&7ZrnWv9NF!>K1Mdgl2xHQ=uS(~VqsTVrsUnQhc
zRIK5>@(05w3gHYdsI0;;sOO66pUEl)DGyD(D4>$7drUDFZ|uxx;-nWj7d|rj=u+D@
z-HU+mLOInrsXdSL<z?tkN`uW^^B##xLgsQoiv`|8cnPQ4+x6E$7at<se|fcYwn=+&
zmUTL-Ir*Z95LhK`aWvj(p*1mZsKV%$!44Bh6KNh4(w0(RSB4v+f+Fu@+%L52jC(Y_
z{u#@A@MEK=?B?n~%x#O$#uYt9pe-7_emN}F^T{sTech_2=X6Dz3Fy72s>1Z6nVB&D
z@>f4!yq=_B+16+qw5k=4o#*tf;6Oe*F;`&L!)bT{U7Wc3YmG2;NRxb%woCt~*Yr2E
zfwiUdS=7SK&5>df-aqY8lp~SEUG*ziXGvHMLp_#vgvVMQ*&{+d<y7euWeQ=Hlil*-
z4Pjq4=W`{_&A87v!_!zl301{8)Q1Y=^kl{*ByisEg3M2lY@dH8ganZ&wtAuCtx0hS
z>@(a>v4;7p_%Jte0Ga5zNbUI28WAgY5f?FX^;q`1WTw2~t|P54N&e^@=nFqDj}W#o
z_-kZBWDQ%($YJH43Y7YrbjfsUrAEjla>?j0;YLdXxjK}P@xDGc%r&c)6`t?XW=*{r
z%Z^p)?6*7obKU_;NZK_ejh9n&?qzO0#(}Uo+KSm|e}q1+f$wM!G8>lLvKK1UK^uz5
zDk&5(DuUnzQy{aQ8%b~*_4Ri`TOj}Dd{0OCls}^VD<w1JS_RtavmxO~FU(5E91=1q
zd3TF>8=qDC%Q9tSSt5LZoxd!|ai3oGtf&cOy(`^W9zMNR;bII|OS+Pe(-9=f!m6}w
zV>f(mH^BYE-=Wl=)Q2s2TF*j&tRkN0KOu3-(VN?4?-v|?W^Xj)@u4^bNB%bN+f|D=
z?r1ey$UbahYv!qISaxV8>+1Mnz!M&S1o+~titx|65MA`iQMjscL!+LOGjZ?p>}x6d
z4`FiZV9i-E6F8c|Fq37-TTTtJOdIZ9<*YrJU86UuQr6dipNC%AxT?lXa9U=`iq+2=
zOT!CFUlJM1&INj~InR!=@x@{Z8BnvgL~_>nN)y@!r<0$uGCJ<0B-q!v<z8*QOIiHh
z>Zn@~#5^Ig8B}}g&dYBee=x50Wv$R^^f%aTE~g_a7&<fZGj9VsCQh%A?z>8Y(5L>!
zkYgCl@1ZVqFSwkH(ns-EtYbOFLrarf#r6W9#x8rO<<_6h33faYV{<&_gBahO#ga9j
z$|}=ea)vEm|Hb`E%L9Gn#<d|WZ|AZzBEXUAEBT4|4n!HNsgZ!JFJ^?NUrT=*I+PeV
zQt{qeNEE8@@bWz&^T@3&OJ;}Ht9EX)c+=SeQdYVmvHYN-8hy`^XedW|39)l>Osxg(
z&sxXz7lsse+_i@<_LUl@8$916h*m6!R?~zr_ZQU^H3F(aC1is#I$VP$GO(s!pT&Y#
z85JYcwQqu6Ja6sje&x*)nOdx;bt1hNMTSwSikFeKE)+MRrW?mg=8mp^AR_kz{C%e*
z32H_>c600^d$9)ob+$yzpyxHa+k0Sz7GG41I0A59bKJf?X}E6mX$pU~Wc%_?$2w1s
zZEbk$svZ4U+WH;XPEb^-IqhGQX1U|z8KWp8&jVlWFPP+7Um6;oMy?>TFU`cMT5bYx
z;7_~MfZ(sumPQHg++U)9PT=+=zxu+qmP=<y>=xJ&oI%Xg<J}0^%#?6Y6l$_L?#@jh
z7u4mEOawukpiEJ_nmiprB{(e0i92+Wb`jaXDT)a0-G~Z1jpeA67R<Ddh#BmjpDYdP
z=&^Wc!?FYAnxpGtggMG_Gf2<6wsSr@C%HL_=RViEK~vhb9W+FI9^^@z<uOr&h@~qR
zV=opv=UE^2nx<a>D8=YZo%*rGq2U_J^D4d%7H`}jau-;<_^n?THcf9*rKD^J#%p%l
zA8DILPr+wPY^MpxQbxGXG2f0xcjxSw;wjl53EsXe0poYHgfc(T;v5J;H$neUhElxe
zrX0NdQ4e#4L4e-JmsN$%C+#BKX8TYA1YlhN`|Q<JdEY1uz8?VZu8(V1^;K3gNDJ9n
zZQL5PeQB8or8aP5BfZnrVCYAw<x~}Gm{PxWrg3Gojda~8auOEHP8DcBU8YNB!RL$T
zHUZebYo>yqnlH{Igil*i0?NrD9qi2Fw_&~eMSk3UGyWzcay4oPaWE~nJ{R}-u+%oE
z^4pk7G%~M66x6$a(@21!KD)Us1JG?!Xn4Zb;NYOn2SGc%JK!@mQv*PGMGxMb{#a4F
z_#t<gXv^Jnr%a{_HiKWDo=^1v7#6fgR)I7iB2%{7)M)Q6c~xCn8%wL5-6)y!d+j7C
zNLZNbbQelPv8|%F3O9QEwRa@kVeV?O1^Jckr>!~GhhJR9)$w;fi20azFx86@7j4yB
zp<VSo&lr7x%FCl(%5A^T>C7-bK<17<ogRiCLyw5Wvi-O%FY1qJ%T&U?_6GPf1C*8a
zbj_I|0MI7r{Uihtw;Z^4K);NCV|1gq4#}=kF7}VVQS?~f%!f9Eop<4VC-NGsjSt2j
zl^B@s!@a_WdXvy|RmVo#)UdqUnD0dD^2Pnom`pwhe+YVN<P|E^o35U<{>0rK@aOPg
zDv69Iy;oMY0yq-ORy`~=Y8>ZQ_}+6m=ElBFD(BO@q9)h-K%)s9-^rh(;7T`vu={0p
zCzf*G!~Iex?wWwWS?rOOYx{i!_Lh~OXJ7gYPR(bWfke`)l(GCjjtT06t7+0hHGHhh
zA9y}JSM5#_xw|dqtlV?PVqZwGRm*pM)dvDj|LAzkF?4x}RLkCA#>G3V21ZLIt^gG<
zQI&0O8}Rf;Def0;ZbweV+|x(R-?(Vnj5F9~eOT)4!nDr7Yq-5!y1bz1t;HjQSLn-A
zt1qf%FzvKZ`+#!ufUYj;;FE!eL$>Pcse)qp0BW@>*U{2zo_CWHpgvHpnGofD&KYKY
z+!}avbdRD^hZQf<UBJ+QbnFA3U1<vBvy;_FY7fWTW^5D4lwW6H!L$)&r7NrPC{;($
zIw;d?x1&7GfZjp`0Lsd7s9i;vhB8LPWowP?mgVGc<J$*Y98d0s<`W{MG<OYJ^Do`T
zBCtLh{^ai^JM;1NOHTmAz9K&Y;xK-(3O?}?h9fpT-f6GusAZs){N(+Ubk3kyq!@r2
zy2W{@;k-a_Dj@T;=M;Oj1AgIf$Qk_Kq+eyFfUH{dCouurc32w=<sI-OU{)L~KaaU>
zU#$@f{W=^JvL7g)bcEZ<)O9tw4?Dxp&lksZ;$I_{?{l;o=>&}=tF-5MU&27^*rhJT
zcd0DiLPxBSPJ<5cx}JGQAd<S2>s^*(&j4-nHoTwx>dVUGJHkMM7w*nPb<tX9RC?jX
zRSX@6K-WYPxul~rMti%IBuLGXq${JG?k5VE5^dT-C}k!vGSWhc_rbtwi>N5n_W)JJ
zoSF~F)URWm1xS-QkhpAB(#}xq`0?;AQ=#^xj8iv{-*?l`8a;)kpuatAQXeVT+=;#A
zT0rvGu`_`{>KMvxzgLkb$EeCy`RyvAx+nC!D381cssru;3nBjt{S>AGvQAs(kxLO{
zIp*xXImIAQJ>kiL&b~R(P_(nAu2z<~Dc*-_c3=C`sjCz@AZVOwgE5s@G#uy{iQNJ}
z*pY1bjnx4K<X10%Rpl0K=`G2y-rj&e4Lx!hgkKOPO2Vz9(&B0Q#G?rqG@O3=M6bD!
z5MbUgz`O}=Bmwh!`Ih5!K<R$}#9kj*FuP{cZ>{yik#93ftw2}MI#Dt>w>)q5vp~-G
zX7!=BUrYpB<k%Fw;Lz)8S2maezO7dN)#kW1-GZ!5T#RrYD%f*mFJSMu9r3hI-a{ln
zG+AZ&Qvb%B*aG$|bQDsF*TcqDDgZq(ueyh++@{7~d`Up&7Bh4h&lzPiRF*laW$C;K
zn9B~;0~s+ow7S@6j68baUY@<;ro++?{j&R$H87l_6S{hTzUf&<(kyn}*RmFU$TN?U
zx$V+EBtuV$lo&5=i$gd9GS2bYSXQn}<sjHL6c+#NKER_ywtIczXW65%Tem=kyAk-6
zNfwVIKh2shjf@BUL@T03oG8&A-VI2)P!?5>-3#04(mvmC$-Y!WY8${8gcraWB}q}i
z(|PAS*SoXp)9`8tTYTuy7`=#uWFoR#J2(AVcxr-9uF+7kB$GxNkA$Vfoz}l40*Ydo
zXReR;i`X4$Te~{&2?RE~^39WlS?>E>my@CS3|paiTe-zGjS$iwI*YbAHOwW*PD@wI
z=Nl-L-*Y(4b+hX{-tb98arKb!Q^EK+RA0Lfp4`cv&x7o<`~ghNZ#@Z$`B6O*2R6%R
z+kg>9tGG(TtYgVXWD_X)ySeq_3Tq2*GEPMlF@o;BBxfbxC%!xOuwUa+?wXac%Dce>
z+d&$P_VsrSw*$bMY#z8~U%K$AIc8vOosw2D4`XdBe5NKVuc+s10x-cw)v;&2Yd`@#
z6UL-Y1G;FY$G$?{@cwL6zaRL5p_lTzugeI5PB@eSk^x^LJ=N!qHsScr*=1fnx>1;L
zY5eqB8dlecz6GSs<7{=<tp5&T<bKx_mcugpZ0=*)PK~bQsm~aX(&#IM#O@=d8b92W
zS5}+qtC<QNYiZFsq3J@Avn|kpQC7U2I3FKKnXv$&7TKNNvPBZod=gImMtW0a3FM8L
zYDzID-w;b14nzhA`Gl1pL}Jw@a_g@*g4mdQr95))06p@e6qSSP@28}^_4@kZG`qq=
zHTeOUre$YkfR2jZ8Wa|xKDEQ8J&UDS$mVfZ9#sYo6AZ-rJI#=_8M(ZD_XK-|Axf9M
zKug2N=aX>#sl?FWEY66Ejk>f}1odw~P?}i0yH&4d%vKKZ@hTi7-IW8%;{(vI`&L;i
z@`wN4O!SHFV&u%JzXt*g%E%4J$^z@6FOtA7Yc(*Rz2%_90Exxp+}r^Vb|pF?C;F8w
zu&f+_Jsvg^Wp?I6!+uV$Bi#fzohClm^T{PdQzz%Nn}GENT0zaz{xqo+NWJ!QdLYKf
zBHdX|LMnBh5jXZ;>OoAWv*rOX&O8Sbzjyl*y-%<2V2oE_*lEG(1GlpzBZ6aoOp%y8
ze&=uJp63A7*h}C9j-sY70bc4bHQr`@q#!@&!5LxUu`)c;-&WVK?$9+vP%D`7v^_`5
zrOcY7w(+sWUl!hkCI>q|qg_*OZ$os^0Fsg`di5ki_Tzr$8gh}#WNKHtX|hlAupfW6
zk_ZWVB&Hjb9ZbLk!Ie1lMyGd?qhgq8>{#iC>Kg^*taLx^YuW+VQG;}IK{6+Y@0i7&
z6iRAQBlI8*LwK}P>x0;cL*en^{8^OvUg%KTXIa~~>xA%u_2)y{h_+YQ?tpDgX9rIe
zOo3t5%oVK)PzXFaqN#F2^qJbgB3HzT`{nJcFO`#ATLWNBXfYU5CYHs&PnH^f*Wl6k
z?<0KM*e@M?auAvtBi}A#6V#ej{y<f+rk42?DrM4@F#1NNlo>vSOE8v?4^Jb8y4~i{
zSIC{Kc9#!&HhK<l>qJI9L>s*NbwiwWXI+w-X6TM}&3$PlPOE+G8HP8Hi(#UMtyKy=
zLo(ZOb7qTQ^r{NHBg^h=C`gbboZigk0*;z5+XW@P;EzUwQZv5|SZ6W0tBbATVDt$&
z4th!!{t_tBc>V9qZE^8&@=VbaMh;!ivCF~IC28PzN2Z{@`)H;y3+{?j%eQl6gP|I9
z-agi;Y>P($m>0yG48Z>=AC0W_h5((46THSuk)X||?u=A_N-{J)`M9Q^WnUMh84VTQ
zIvQlF<vF^PF!%X2pn@><?4Z}XhU;Y#COhlJWf^7NJ3#`b{uW)pK2e2<vO=m+c57GE
zQ9M-Mb?0{1E@vX(gvH3_7KKfaXu}JDhXwfYucwGkhox<(-?ZYKZ!UbHC`8iEGhOB^
z^KX<X17Gn((fci0ef$N(_NvovmRMHw`_I3PP=~U6Imh1l?gD32BoC@JyV|&(JKA!w
zxfh<-?-B6PnmTWMz5&??UgOo%Z}|9{3^Phy=3Y`u$Mg)7-1N17du42fahSg8=t%+O
zONfAdE`URixei3A4?jlCt$5Ya{SkLE?BeW>tG4Z5X~3!o0K!K+^E@{TZ;5W3XkNzy
z*j?DZB4J<G{N-B&KAVtKhedrd39u%YaP&8vVV0~Kk3G>)s(LK@K0K1T4u&xvPHDTX
zs$=NfQalJo9RXF+0@j1~t~aK@*DAWgsI@Sl{8AP8%T`P`Vu~Tv_%ZmbJz<J#B&5Iv
z!v{}>^#V>NJZl-TbST^RMK5DlNOs$kegkbICLYRJk-}g{l-Wn^Vya`SL3T1tiIw^Z
zm~h)cx+UimpKrqQ=$a*_BCrvMGi%5Nr5qU)hq|P1Tjp!gLgpIqRRIs`qsDGj<HJy2
z`3ta|`ey_)n0H%q%+8Il)^Xkw7elmmza@3Uj`*@!6`a&z&VYG&TB3{dTqr(1j+QCo
z&k1uq2S*FUPIxxy&XX{v{&T<+=)Iy4-w~Vz4rTZ`aR|Ge>cel*OH-c~&6W812bsUI
z>umkx8_8Ottu&n?L`^t@;63h8!Nb19V4*G1<Oa!yF#>v2?3e;$WrvvX7%#JaxH?R)
zN@KLmgq3q$NONDrj=7c`8~kK5VTf>xS$Q2C8@T{(7ygTX1N^6hZ&3*F7Z@!5FaMz+
n@b3Qu^xx$8Uk}h2jH{d|uJ4jrSC|P(2)ca1@;v^m$K8JeR7TPQ

literal 0
HcmV?d00001

diff --git a/src/package/external/external.csproj b/src/package/external/external.csproj
index b1197a9b2b..effc47856a 100644
--- a/src/package/external/external.csproj
+++ b/src/package/external/external.csproj
@@ -26,7 +26,7 @@
   <ItemGroup Condition=" '$(DotNetBuildFromSource)' != 'true' ">
     <!-- This csproj restore external tools required for build process -->
     <PackageReference Include="NuGet.CommandLine">
-      <Version>3.4.3</Version>
+      <Version>5.8.1</Version>
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
     <PackageReference Include="fmdev.xlftool">
diff --git a/src/package/nuspec/Microsoft.CodeCoverage.nuspec b/src/package/nuspec/Microsoft.CodeCoverage.nuspec
index 64e6ff9af3..ac1e347e9c 100644
--- a/src/package/nuspec/Microsoft.CodeCoverage.nuspec
+++ b/src/package/nuspec/Microsoft.CodeCoverage.nuspec
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package >
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Microsoft.CodeCoverage</id>
     <version>$Version$</version>
@@ -10,12 +10,23 @@
     <description>Microsoft.CodeCoverage package brings infra for collecting code coverage from vstest.console.exe and "dotnet test".</description>
     <licenseUrl>http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm</licenseUrl>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
+    <icon>Icon.png</icon>
     <projectUrl>https://github.com/microsoft/vstest/</projectUrl>
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <tags>vstest visual-studio unittest testplatform mstest microsoft test testing codecoverage code-coverage</tags>
+    <repository type="git" 
+                url="https://github.com/microsoft/vstest" 
+                branch="$BranchName$" 
+                commit="$CommitId$" />
+                
+    <dependencies>
+      <group targetFramework="net45"></group>
+      <group targetFramework="netcoreapp1.0"></group>
+    </dependencies>
   </metadata>
 
   <files>
+    <file src="Icon.png" target="" />
 
     <file src="Microsoft.CodeCoverage.props" target="build\netstandard1.0\" />
     <file src="Microsoft.CodeCoverage.targets" target="build\netstandard1.0\" />
diff --git a/src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec b/src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec
index ba59062cb5..a98d7a64eb 100644
--- a/src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec
+++ b/src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package >
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Microsoft.NET.Test.Sdk</id>
     <version>$Version$</version>
@@ -9,10 +9,15 @@
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <licenseUrl>http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm</licenseUrl>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
+    <icon>Icon.png</icon>
     <description>The MSbuild targets and properties for building .NET test projects.</description>
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <projectUrl>https://github.com/microsoft/vstest/</projectUrl>
     <tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
+    <repository type="git" 
+                url="https://github.com/microsoft/vstest" 
+                branch="$BranchName$" 
+                commit="$CommitId$" />
     <dependencies>
       <group targetFramework="uap10.0">
         <dependency id="System.ComponentModel.Primitives" version="[4.1.0, )" />
@@ -30,6 +35,7 @@
         <dependency id="Microsoft.TestPlatform.TestHost" version="$Version$" />
         <dependency id="Microsoft.CodeCoverage" version="$Version$" />
       </group>
+      <group targetFramework="net40"></group>
       <group targetFramework="net45">
         <!-- TestHost gets shipped with vstest.console -->
         <dependency id="Microsoft.CodeCoverage" version="$Version$" />
@@ -37,15 +43,24 @@
     </dependencies>
   </metadata>
   <files>
+    <file src="Icon.png" target="" />
+    
     <file src="netcoreapp\*" target="build\netcoreapp1.0\" />
     <file src="netcoreapp\*" target="build\netcoreapp2.1\" />
     <file src="netfx\*" target="build\net40\" />
+    <file src="netfx\*" target="build\net45\" />
 
     <file src="Microsoft.NET.Test.Sdk.props" target="buildMultiTargeting\" />
     <file src="Microsoft.NET.Test.Sdk.props" target="build\netcoreapp1.0\" />
     <file src="Microsoft.NET.Test.Sdk.props" target="build\netcoreapp2.1\" />
     <file src="Microsoft.NET.Test.Sdk.props" target="build\net40\" />
+    <file src="Microsoft.NET.Test.Sdk.props" target="build\net45\" />
     <file src="Microsoft.NET.Test.Sdk.props" target="build\uap10.0\" />
 
+    <file src="_._" target="lib/netcoreapp1.0" />
+    <file src="_._" target="lib/netcoreapp2.1" />
+    <file src="_._" target="lib/net40" />
+    <file src="_._" target="lib/net45" />
+    <file src="_._" target="lib/uap10.0" />
   </files>
 </package>
diff --git a/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec b/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec
index 579a948c62..5daced586d 100644
--- a/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec
+++ b/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package >
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Microsoft.TestPlatform.Portable</id>
     <version>15.0.0</version>
@@ -11,11 +11,18 @@
     <summary>This package contains a subset of binaries for the Visual Studio Test Platform (vstest). vstest provides a modern, cross platform testing engine that also powers the testing on .NET Core. Supports the following popular test frameworks - MSTest v2, xUnit and Nunit with support for extensibility.</summary>
     <licenseUrl>https://www.visualstudio.com/microsoft-visual-studio-test-platform</licenseUrl>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
+    <icon>Icon.png</icon>
     <projectUrl>https://github.com/microsoft/vstest/</projectUrl>
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
+    <repository type="git" 
+                url="https://github.com/microsoft/vstest" 
+                branch="$BranchName$" 
+                commit="$CommitId$" />
   </metadata>
   <files>
+    <file src="Icon.png" target="" />
+    
     <!-- Add a third party notice file -->
     <file src="ThirdPartyNotices.txt" target="" />
     
diff --git a/src/package/nuspec/Microsoft.TestPlatform.nuspec b/src/package/nuspec/Microsoft.TestPlatform.nuspec
index 21306928ca..1e0e3b6103 100644
--- a/src/package/nuspec/Microsoft.TestPlatform.nuspec
+++ b/src/package/nuspec/Microsoft.TestPlatform.nuspec
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package >
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Microsoft.TestPlatform</id>
     <version>15.0.0</version>
@@ -11,11 +11,18 @@
     <summary>This package contains the full set of binaries for the Visual Studio Test Platform (vstest). It provides a modern, cross platform testing engine that powers the testing on .NET Core as well. It integrates with popular test frameworks like MSTest(v1 and v2), xUnit and Nunit with support for extensibility. </summary>
     <licenseUrl>https://www.visualstudio.com/microsoft-visual-studio-test-platform</licenseUrl>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
+    <icon>Icon.png</icon>
     <projectUrl>https://github.com/microsoft/vstest/</projectUrl>
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
+    <repository type="git" 
+                url="https://github.com/microsoft/vstest" 
+                branch="$BranchName$" 
+                commit="$CommitId$" />
   </metadata>
   <files>
+    <file src="Icon.png" target="" />
+    
     <!-- Add a third party notice file -->
     <file src="ThirdPartyNotices.txt" target="" />
     
diff --git a/src/package/nuspec/TestPlatform.Build.nuspec b/src/package/nuspec/TestPlatform.Build.nuspec
index 92c0d9d73b..79dc3c3341 100644
--- a/src/package/nuspec/TestPlatform.Build.nuspec
+++ b/src/package/nuspec/TestPlatform.Build.nuspec
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package >
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Microsoft.TestPlatform.Build</id>
     <version>15.0.0</version>
@@ -10,11 +10,22 @@
     <description>Build tasks and targets for running tests with Test Platform</description>
     <licenseUrl>http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm</licenseUrl>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
+    <icon>Icon.png</icon>
     <projectUrl>https://github.com/microsoft/vstest/</projectUrl>
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
+    <repository type="git" 
+                url="https://github.com/microsoft/vstest" 
+                branch="$BranchName$" 
+                commit="$CommitId$" />
+                
+    <dependencies>
+      <group targetFramework="netstandard2.0"></group>
+    </dependencies>
   </metadata>
   <files>
+    <file src="Icon.png" target="" />
+    
     <file src="Microsoft.TestPlatform.Build\netstandard2.0\Microsoft.TestPlatform.targets" target="runtimes\any\native" />
 
     <!-- Add localized resources -->
diff --git a/src/package/nuspec/TestPlatform.CLI.nuspec b/src/package/nuspec/TestPlatform.CLI.nuspec
index ce0da80674..57a9d36ade 100644
--- a/src/package/nuspec/TestPlatform.CLI.nuspec
+++ b/src/package/nuspec/TestPlatform.CLI.nuspec
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package >
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Microsoft.TestPlatform.CLI</id>
     <version>15.0.0</version>
@@ -10,14 +10,22 @@
     <description>The cross platform Microsoft Test Platform.</description>
     <licenseUrl>http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm</licenseUrl>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
+    <icon>Icon.png</icon>
     <projectUrl>https://github.com/microsoft/vstest/</projectUrl>
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
+    <repository type="git" 
+                url="https://github.com/microsoft/vstest" 
+                branch="$BranchName$" 
+                commit="$CommitId$" />
+                
     <contentFiles>
       <files include="**/*.*" copyToOutput="true" flatten="false" buildAction="None" />
     </contentFiles>
   </metadata>
   <files>
+    <file src="Icon.png" target="" />
+    
     <!-- Add a third party notice file -->
     <file src="ThirdPartyNotices.txt" target="" />
     
diff --git a/src/package/nuspec/TestPlatform.Extensions.TrxLogger.nuspec b/src/package/nuspec/TestPlatform.Extensions.TrxLogger.nuspec
index 4ff5a3cbbf..94d86b5633 100644
--- a/src/package/nuspec/TestPlatform.Extensions.TrxLogger.nuspec
+++ b/src/package/nuspec/TestPlatform.Extensions.TrxLogger.nuspec
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package >
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Microsoft.TestPlatform.Extensions.TrxLogger</id>
     <version>15.0.0</version>
@@ -10,9 +10,15 @@
     <description>C# SDK for the test platform protocol. This SDK can be used in IDE or Editors to use test platform for discovery and execution of tests.</description>
     <licenseUrl>http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm</licenseUrl>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
+    <icon>Icon.png</icon>
     <projectUrl>https://github.com/microsoft/vstest/</projectUrl>
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
+    <repository type="git" 
+                url="https://github.com/microsoft/vstest" 
+                branch="$BranchName$" 
+                commit="$CommitId$" />
+                
     <dependencies>
       <group targetFramework="net451">
         <dependency id="Newtonsoft.Json" version="$JsonNetVersion$"/>
@@ -33,6 +39,8 @@
     </frameworkAssemblies>
   </metadata>
   <files>
+    <file src="Icon.png" target="" />
+    
     <!-- Add a third party notice file -->
     <file src="ThirdPartyNotices.txt" target="" />
     <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" target="lib\net451\" />
diff --git a/src/package/nuspec/TestPlatform.ObjectModel.nuspec b/src/package/nuspec/TestPlatform.ObjectModel.nuspec
index f1b881146b..e76d1096e8 100644
--- a/src/package/nuspec/TestPlatform.ObjectModel.nuspec
+++ b/src/package/nuspec/TestPlatform.ObjectModel.nuspec
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package >
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Microsoft.TestPlatform.ObjectModel</id>
     <version>15.0.0</version>
@@ -10,9 +10,15 @@
     <description>The Microsoft Test Platform Object Model.</description>
     <licenseUrl>http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm</licenseUrl>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
+    <icon>Icon.png</icon>
     <projectUrl>https://github.com/microsoft/vstest/</projectUrl>
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
+    <repository type="git" 
+                url="https://github.com/microsoft/vstest" 
+                branch="$BranchName$" 
+                commit="$CommitId$" />
+                
     <dependencies>
       <group targetFramework="net45">
         <dependency id="System.Reflection.Metadata" version="[1.6.0, )" />
@@ -76,6 +82,8 @@
     </frameworkAssemblies>
   </metadata>
   <files>	
+    <file src="Icon.png" target="" />
+    
     <!-- net45 -->
       <file src="net45\$Runtime$\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="lib\net45\" />
       <file src="net45\$Runtime$\Microsoft.TestPlatform.CoreUtilities.dll"            target="lib\net45\" />
diff --git a/src/package/nuspec/TestPlatform.TestHost.nuspec b/src/package/nuspec/TestPlatform.TestHost.nuspec
index a3896fc778..15839c44cc 100644
--- a/src/package/nuspec/TestPlatform.TestHost.nuspec
+++ b/src/package/nuspec/TestPlatform.TestHost.nuspec
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package >
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Microsoft.TestPlatform.TestHost</id>
     <version>$Version$</version>
@@ -10,9 +10,15 @@
     <description>Testplatform host executes the test using specified adapter.</description>
     <licenseUrl>http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm</licenseUrl>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
+    <icon>Icon.png</icon>
     <projectUrl>https://github.com/microsoft/vstest/</projectUrl>
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
+    <repository type="git" 
+                url="https://github.com/microsoft/vstest" 
+                branch="$BranchName$" 
+                commit="$CommitId$" />
+                
     <dependencies>
       <group targetFramework="netcoreapp1.0">
         <dependency id="Microsoft.TestPlatform.ObjectModel" version="$Version$"/>
@@ -25,7 +31,6 @@
         <dependency id="System.Diagnostics.TextWriterTraceListener" version="[4.0.0, )" />
         <dependency id="System.Runtime.InteropServices.RuntimeInformation" version="[4.0.0, )" />
         <dependency id="System.Runtime.Loader" version="[4.0.0, )" />
-
       </group>
 
       <group targetFramework="netcoreapp2.1">
@@ -38,12 +43,18 @@
         <dependency id="Newtonsoft.Json" version="$JsonNetVersion$"/>
         <dependency id="System.Xml.ReaderWriter" version="4.0.11" />
       </group>
+      
+      <group targetFramework="net45"></group>
     </dependencies>
   </metadata>
 
   <files>
+    <file src="Icon.png" target="" />
+    
     <!-- Add a third party notice file -->
     <file src="ThirdPartyNotices.txt" target="" />
+
+    <!-- net45 -->
     <file src="_._" target="lib\net45\" />
 
     <!-- netcoreapp1.0 -->
diff --git a/src/package/nuspec/TestPlatform.TranslationLayer.nuspec b/src/package/nuspec/TestPlatform.TranslationLayer.nuspec
index ad12872f4f..62d30c85e4 100644
--- a/src/package/nuspec/TestPlatform.TranslationLayer.nuspec
+++ b/src/package/nuspec/TestPlatform.TranslationLayer.nuspec
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package >
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Microsoft.TestPlatform.TranslationLayer</id>
     <version>15.0.0</version>
@@ -10,9 +10,15 @@
     <description>C# SDK for the test platform protocol. This SDK can be used in IDE or Editors to use test platform for discovery and execution of tests.</description>
     <licenseUrl>http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm</licenseUrl>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
+    <icon>Icon.png</icon>
     <projectUrl>https://github.com/microsoft/vstest/</projectUrl>
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
+    <repository type="git" 
+                url="https://github.com/microsoft/vstest" 
+                branch="$BranchName$" 
+                commit="$CommitId$" />
+
     <dependencies>
       <group targetFramework="net451">
         <dependency id="Newtonsoft.Json" version="$JsonNetVersion$"/>
@@ -30,6 +36,8 @@
     </frameworkAssemblies>
   </metadata>
   <files>
+    <file src="Icon.png" target="" />
+    
     <!-- Add a third party notice file -->
     <file src="ThirdPartyNotices.txt" target="" />
     
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TestPlatformNugetPackageTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/TestPlatformNugetPackageTests.cs
index 57ce0f7d8f..384215d185 100644
--- a/test/Microsoft.TestPlatform.AcceptanceTests/TestPlatformNugetPackageTests.cs
+++ b/test/Microsoft.TestPlatform.AcceptanceTests/TestPlatformNugetPackageTests.cs
@@ -25,8 +25,15 @@ public static void ClassInit(TestContext testContext)
             nugetPackageFolder = Path.Combine(packageLocation, Path.GetFileNameWithoutExtension(nugetPackage));
             ZipFile.ExtractToDirectory(nugetPackage, nugetPackageFolder);
 
-            Directory.Move(Path.Combine(nugetPackageFolder, "tools", "net451", "Team%20Tools"), Path.Combine(nugetPackageFolder, "tools", "net451", "Team Tools"));
-            Directory.Move(Path.Combine(nugetPackageFolder, "tools", "net451", "Team Tools", "Dynamic%20Code%20Coverage%20Tools"), Path.Combine(nugetPackageFolder, "tools", "net451", "Team Tools", "Dynamic Code Coverage Tools"));
+            TryMoveDirectory(
+                sourceDirName: Path.Combine(nugetPackageFolder, "tools", "net451", "Team%20Tools"),
+                destDirName: Path.Combine(nugetPackageFolder, "tools", "net451", "Team Tools")
+            );
+
+            TryMoveDirectory(
+                sourceDirName: Path.Combine(nugetPackageFolder, "tools", "net451", "Team Tools", "Dynamic%20Code%20Coverage%20Tools"),
+                destDirName: Path.Combine(nugetPackageFolder, "tools", "net451", "Team Tools", "Dynamic Code Coverage Tools")
+            );
         }
 
         [ClassCleanup]
@@ -97,5 +104,13 @@ private string CreateCodeCoverageArguments(
 
             return arguments;
         }
+
+        private static void TryMoveDirectory(string sourceDirName, string destDirName)
+        {
+            if (Directory.Exists(sourceDirName))
+            {
+                Directory.Move(sourceDirName, destDirName);
+            }
+        }
     }
 }
diff --git a/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestEnvironment.cs b/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestEnvironment.cs
index 947ad4b53d..62e8031dd0 100644
--- a/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestEnvironment.cs
+++ b/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestEnvironment.cs
@@ -17,7 +17,8 @@ namespace Microsoft.TestPlatform.TestUtilities
     /// </summary>
     public class IntegrationTestEnvironment
     {
-        public static string TestPlatformRootDirectory = Environment.GetEnvironmentVariable("TP_ROOT_DIR");
+        public static string TestPlatformRootDirectory = Environment.GetEnvironmentVariable("TP_ROOT_DIR")
+                                                      ?? Path.GetFullPath(@"..\..\..\..\..".Replace('\\', Path.DirectorySeparatorChar));
 
         private static Dictionary<string, string> dependencyVersions;