Skip to content

Add netcoreapp1.0 support to Microsoft.TestPlatform.TestHost NuGet #2569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
6 commits merged into from
Sep 17, 2020
Merged

Add netcoreapp1.0 support to Microsoft.TestPlatform.TestHost NuGet #2569

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
07d3c8e
Restore netcoreapp1.0 support for testhost
sharwell Sep 3, 2020
a28dbd6
Updated nuspec files to include netstandard13 and netcoreapp10.
Haplois Sep 15, 2020
8dcbe2c
Merge remote-tracking branch 'origin/master' into fix-netstandard1
Haplois Sep 16, 2020
a0ce726
Merge branch 'master' into fix-netstandard1
Haplois Sep 16, 2020
bb8b094
PR fixes
Haplois Sep 16, 2020
e13d28c
Merge branch 'fix-netstandard1' of https://github.com/Haplois/vstest …
Haplois Sep 16, 2020
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
Prev Previous commit
Next Next commit
PR fixes
  • Loading branch information
@Haplois
Haplois committed Sep 16, 2020
commit bb8b09417c37c48fa11dc5de4a7c9ba6c05567e9
83 changes: 39 additions & 44 deletions scripts/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,6 @@ function Publish-Package
$dataCollectorProject = Join-Path $env:TP_ROOT_DIR "src\datacollector\datacollector.csproj"

Write-Log "Package: Publish src\package\package\package.csproj"

Publish-PackageInternal $packageProject $TPB_TargetFramework $fullCLRPackageDir
Publish-PackageInternal $packageProject $TPB_TargetFrameworkCore20 $coreCLR20PackageDir

Expand Down Expand Up @@ -373,12 +372,11 @@ function Publish-Package
Copy-Item $testhostCore20PackageTempX64Dir\testhost* $testhostCore20PackageX64Dir -Force -recurse
New-Item -ItemType directory -Path $testhostCore20PackageX86Dir -Force | Out-Null
Copy-Item $testhostCore20PackageTempX86Dir\testhost.x86* $testhostCore20PackageX86Dir -Force -recurse

New-Item -ItemType directory -Path $testhostCore10PackageX64Dir -Force | Out-Null
Copy-Item $testhostCore10PackageTempX64Dir\testhost* $testhostCore10PackageX64Dir -Force -recurse
New-Item -ItemType directory -Path $testhostCore10PackageX86Dir -Force | Out-Null
Copy-Item $testhostCore10PackageTempX86Dir\testhost.x86* $testhostCore10PackageX86Dir -Force -recurse


# Copy over the Full CLR built testhost package assemblies to the Core CLR and Full CLR package folder.
$coreCLRFull_Dir = "TestHost"
Expand All @@ -398,53 +396,35 @@ function Publish-Package

################################################################################
# Publish Microsoft.TestPlatform.PlatformAbstractions
$platformAbstraction = Join-Path $env:TP_ROOT_DIR "src\Microsoft.TestPlatform.PlatformAbstractions\bin\$TPB_Configuration"
& {
($TPB_TargetFramework, $fullCLRPackageDir), # net451
($TPB_TargetFrameworkCore20, $coreCLR20PackageDir), # netcoreapp2.1
($TPB_TargetFrameworkNS1_0, $netstandard10PackageDir), # netstandard1_0
# ($TPB_TargetFrameworkNS1_3, $netstandard13PackageDir), # netstandard1_3
($TPB_TargetFrameworkNS2_0, $netstandard20PackageDir), # netstandard2_0
($TPB_TargetFrameworkUap, $testhostUapPackageDir) # uap
} |ForEach-Object {
$from = Join-Path $platformAbstraction $_[0];
$to = $_[1];

New-Item -ItemType directory -Path "$to\" -Force | Out-Null
Copy-Item "$from\*" $to -Force -Recurse;
}
Copy-Bulk -root (Join-Path $env:TP_ROOT_DIR "src\Microsoft.TestPlatform.PlatformAbstractions\bin\$TPB_Configuration") `
-files @{
$TPB_TargetFramework = $fullCLRPackageDir # net451
$TPB_TargetFrameworkCore20 = $coreCLR20PackageDir # netcoreapp2.1
$TPB_TargetFrameworkNS1_0 = $netstandard10PackageDir # netstandard1_0
# $TPB_TargetFrameworkNS1_3 = $netstandard13PackageDir # netstandard1_3
$TPB_TargetFrameworkNS2_0 = $netstandard20PackageDir # netstandard2_0
$TPB_TargetFrameworkUap = $testhostUapPackageDir # uap
}

################################################################################
# Publish Microsoft.TestPlatform.CoreUtilities
$coreUtilities = Join-Path $env:TP_ROOT_DIR "src\Microsoft.TestPlatform.CoreUtilities\bin\$TPB_Configuration"
& {
($TPB_TargetFramework, $fullCLRPackageDir), # net451
# ($TPB_TargetFrameworkNS1_0, $netstandard10PackageDir), # netstandard1_0
($TPB_TargetFrameworkNS1_3, $netstandard13PackageDir), # netstandard1_3
($TPB_TargetFrameworkNS2_0, $netstandard20PackageDir) # netstandard2_0
} |ForEach-Object {
$from = Join-Path $coreUtilities $_[0];
$to = $_[1];

New-Item -ItemType directory -Path "$to\" -Force | Out-Null
Copy-Item "$from\*" $to -Force -Recurse;
};
Copy-Bulk -root (Join-Path $env:TP_ROOT_DIR "src\Microsoft.TestPlatform.CoreUtilities\bin\$TPB_Configuration") `
-files @{
$TPB_TargetFramework = $fullCLRPackageDir # net451
# $TPB_TargetFrameworkNS1_0 = $netstandard10PackageDir # netstandard1_0
$TPB_TargetFrameworkNS1_3 = $netstandard13PackageDir # netstandard1_3
$TPB_TargetFrameworkNS2_0 = $netstandard20PackageDir # netstandard2_0
}

################################################################################
# Publish Microsoft.TestPlatform.ObjectModel
$objectModel = Join-Path $env:TP_ROOT_DIR "src\Microsoft.TestPlatform.ObjectModel\bin\$TPB_Configuration"
& {
($TPB_TargetFramework, $fullCLRPackageDir), # net451
# ($TPB_TargetFrameworkNS1_0, $netstandard10PackageDir), # netstandard1_0
($TPB_TargetFrameworkNS1_3, $netstandard13PackageDir), # netstandard1_3
($TPB_TargetFrameworkNS2_0, $netstandard20PackageDir) # netstandard2_0
} |ForEach-Object {
$from = Join-Path $objectModel $_[0];
$to = $_[1];

New-Item -ItemType directory -Path "$to\" -Force | Out-Null
Copy-Item "$from\*" $to -Force -Recurse;
};
Copy-Bulk -root (Join-Path $env:TP_ROOT_DIR "src\Microsoft.TestPlatform.ObjectModel\bin\$TPB_Configuration") `
-files @{
$TPB_TargetFramework = $fullCLRPackageDir # net451
# $TPB_TargetFrameworkNS1_0 = $netstandard10PackageDir # netstandard1_0
$TPB_TargetFrameworkNS1_3 = $netstandard13PackageDir # netstandard1_3
$TPB_TargetFrameworkNS2_0 = $netstandard20PackageDir # netstandard2_0
}

################################################################################
# Publish msdia
Expand Down Expand Up @@ -586,6 +566,21 @@ function Publish-Package
Write-Log "Publish-Package: Complete. {$(Get-ElapsedTime($timer))}"
}

function Copy-Bulk {
param (
[string]$root,
[hashtable]$files
)

$files.GetEnumerator() | ForEach-Object {
$from = Join-Path $root $_.Name
$to = $_.Value

New-Item -ItemType directory -Path "$to\" -Force | Out-Null
Copy-Item "$from\*" $to -Force -Recurse
}
}

function Publish-Tests
{
if($TPB_PublishTests)
Expand Down