Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions scripts/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -519,9 +519,6 @@ function Publish-Package {
Copy-Item -Recurse $comComponentsDirectory\* $testhostUapPackageDir -Force
Copy-Item -Recurse $comComponentsDirectory\* $coreCLR20TestHostPackageDir -Force

$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.
$extensions_Dir = "Extensions"
$fullCLRExtensionsDir = Join-Path $fullCLRPackage451Dir $extensions_Dir
Expand Down Expand Up @@ -817,10 +814,6 @@ function Publish-VsixPackage {
$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\$testPlatformMsDiaVersion\tools\net451"
Copy-Item -Recurse $internalDiaInterop\* $packageDir -Force

# Copy COM Components and their manifests over to Extensions Test Impact directory
$comComponentsDirectoryTIA = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia\$testPlatformMsDiaVersion\tools\net451"
if (-not (Test-Path $testImpactComComponentsDir)) {
Expand Down
6 changes: 3 additions & 3 deletions scripts/verify-nupkgs.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ function Verify-Nuget-Packages($packageDirectory, $version)
$expectedNumOfFiles = @{
"Microsoft.CodeCoverage" = 57;
"Microsoft.NET.Test.Sdk" = 27;
"Microsoft.TestPlatform" = 624;
"Microsoft.TestPlatform" = 623;
"Microsoft.TestPlatform.Build" = 21;
"Microsoft.TestPlatform.CLI" = 427;
"Microsoft.TestPlatform.CLI" = 426;
"Microsoft.TestPlatform.Extensions.TrxLogger" = 35;
"Microsoft.TestPlatform.ObjectModel" = 238;
"Microsoft.TestPlatform.AdapterUtilities" = 62;
"Microsoft.TestPlatform.Portable" = 648;
"Microsoft.TestPlatform.Portable" = 646;
"Microsoft.TestPlatform.TestHost" = 208;
"Microsoft.TestPlatform.TranslationLayer" = 123;
"Microsoft.TestPlatform.Internal.Uwp" = 86;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net451' OR '$(TargetFramework)' == 'net45' ">
<PackageReference Include="Microsoft.Internal.Dia.Interop" Version="$(TestPlatformMSDiaVersion)" />

<Reference Include="System.Configuration" />
<Reference Include="System" />
<Reference Include="System.IO" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net451' OR '$(TargetFramework)' == 'net45' ">
<PackageReference Include="Microsoft.Internal.Dia.Interop" Version="$(TestPlatformMSDiaVersion)" />

<Reference Include="System.Configuration" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
Expand Down
1 change: 0 additions & 1 deletion src/package/external/external.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
<PackageReference Include="Microsoft.VisualStudio.CUIT" Version="$(TestPlatformExternalsVersion)" PrivateAssets="All" />
<PackageReference Include="Microsoft.Internal.Intellitrace" Version="$(TestPlatformExternalsVersion)" PrivateAssets="All" />
<PackageReference Include="Microsoft.Internal.Dia" Version="$(TestPlatformMSDiaVersion)" PrivateAssets="All" />
<PackageReference Include="Microsoft.Internal.Dia.Interop" Version="$(TestPlatformMSDiaVersion)" PrivateAssets="All" />
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="$(VSSdkBuildToolsVersion)" PrivateAssets="All" />
<PackageReference Include="Microsoft.VisualStudio.Interop" Version="$(InteropExternalsVersion)" PrivateAssets="All" />
<PackageReference Include="Microsoft.VisualStudio.Telemetry" Version="16.3.58" PrivateAssets="All" />
Expand Down
2 changes: 0 additions & 2 deletions src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
<file src="net451\$Runtime$\tr\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net451\tr\Microsoft.CodeCoverage.IO.dll" />
<file src="net451\$Runtime$\zh-Hans\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net451\zh-Hans\Microsoft.CodeCoverage.IO.dll" />
<file src="net451\$Runtime$\zh-Hant\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net451\zh-Hant\Microsoft.CodeCoverage.IO.dll" />
<file src="net451\$Runtime$\msdia140typelib_clr0200.dll" target="tools\net451\msdia140typelib_clr0200.dll" />
<file src="net451\$Runtime$\Newtonsoft.Json.dll" target="tools\net451\Newtonsoft.Json.dll" />
<file src="net451\$Runtime$\System.Collections.Immutable.dll" target="tools\net451\System.Collections.Immutable.dll" />
<file src="net451\$Runtime$\System.Reflection.Metadata.dll" target="tools\net451\System.Reflection.Metadata.dll" />
Expand Down Expand Up @@ -500,7 +499,6 @@
<file src="netcoreapp2.1\TestHost\Microsoft.VisualStudio.TestPlatform.Common.dll" target="tools\netcoreapp2.1\TestHost\Microsoft.VisualStudio.TestPlatform.Common.dll" />
<file src="netcoreapp2.1\TestHost\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="tools\netcoreapp2.1\TestHost\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
<file src="netcoreapp2.1\TestHost\NuGet.Frameworks.dll" target="tools\netcoreapp2.1\TestHost\NuGet.Frameworks.dll" />
<file src="netcoreapp2.1\TestHost\msdia140typelib_clr0200.dll" target="tools\netcoreapp2.1\TestHost\msdia140typelib_clr0200.dll" />
<file src="netcoreapp2.1\TestHost\Newtonsoft.Json.dll" target="tools\netcoreapp2.1\TestHost\Newtonsoft.Json.dll" />
<file src="netcoreapp2.1\TestHost\System.Collections.Immutable.dll" target="tools\netcoreapp2.1\TestHost\System.Collections.Immutable.dll" />
<file src="netcoreapp2.1\TestHost\System.Reflection.Metadata.dll" target="tools\netcoreapp2.1\TestHost\System.Reflection.Metadata.dll" />
Expand Down
1 change: 0 additions & 1 deletion src/package/nuspec/Microsoft.TestPlatform.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@
<file src="net451\$Runtime$\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
<file src="net451\$Runtime$\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.sxs.manifest" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.sxs.manifest" />
<file src="net451\$Runtime$\Microsoft.VisualStudio.TestTools.UITest.Playback.Engine.sxs.manifest" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Playback.Engine.sxs.manifest" />
<file src="net451\$Runtime$\msdia140typelib_clr0200.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\msdia140typelib_clr0200.dll" />
<file src="net451\$Runtime$\Newtonsoft.Json.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Newtonsoft.Json.dll" />
<file src="net451\$Runtime$\QTAgent.exe" target="tools\net451\Common7\IDE\Extensions\TestPlatform\QTAgent.exe" />
<file src="net451\$Runtime$\QTAgent.exe.Config" target="tools\net451\Common7\IDE\Extensions\TestPlatform\QTAgent.exe.Config" />
Expand Down