Skip to content

Commit

Permalink
Migration to netstandard 1.4 (microsoft#406)
Browse files Browse the repository at this point in the history
* Migration to netstandard 1.4

1. Migrating CoreUtilites to netstandard1.4
2. Adding a platform abstraction layer, to implement platform specific requirements

* removing additional IEqtTrace.cs

* Throw exception if file name empty

* Modifying Sln to stop build break

* Missed changes

* Making EqtTrace.TraceLevel available as public, & Test error fixes

* adding test for EqtTrace
  • Loading branch information
mayankbansal018 authored Feb 7, 2017
1 parent 4f19865 commit 92b930d
Show file tree
Hide file tree
Showing 20 changed files with 900 additions and 400 deletions.
20 changes: 19 additions & 1 deletion TestPlatform.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26124.0
VisualStudioVersion = 15.0.26127.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED0C35EB-7F31-4841-A24F-8EB708FFA959}"
EndProject
Expand Down Expand Up @@ -124,8 +124,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleTestProject3", "test\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "datacollector.UnitTests", "test\datacollector.UnitTests\datacollector.UnitTests.csproj", "{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.PlatformAbstractions", "src\Microsoft.TestPlatform.PlatformAbstractions\Microsoft.TestPlatform.PlatformAbstractions.csproj", "{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "datacollector.PlatformTests", "test\datacollector.PlatformTests\datacollector.PlatformTests.csproj", "{FF80D706-8309-4E02-BAC0-D28B4CBCF600}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platform", "Platform", "{7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OutOfProcDataCollector", "test\TestAssets\OutOfProcDataCollector\OutOfProcDataCollector.csproj", "{CB6FA3C6-38E2-4DD1-AAB7-A705EFE114BC}"
EndProject
Global
Expand Down Expand Up @@ -690,6 +694,18 @@ Global
{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C}.Release|x64.Build.0 = Release|x64
{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C}.Release|x86.ActiveCfg = Release|x86
{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C}.Release|x86.Build.0 = Release|x86
{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Debug|x64.ActiveCfg = Debug|x64
{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Debug|x64.Build.0 = Debug|x64
{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Debug|x86.ActiveCfg = Debug|x86
{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Debug|x86.Build.0 = Debug|x86
{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Release|Any CPU.Build.0 = Release|Any CPU
{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Release|x64.ActiveCfg = Release|x64
{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Release|x64.Build.0 = Release|x64
{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Release|x86.ActiveCfg = Release|x86
{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Release|x86.Build.0 = Release|x86
{FF80D706-8309-4E02-BAC0-D28B4CBCF600}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FF80D706-8309-4E02-BAC0-D28B4CBCF600}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FF80D706-8309-4E02-BAC0-D28B4CBCF600}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -771,6 +787,8 @@ Global
{0D85D957-6FF2-4620-B766-B708801D97F3} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A}
{9549C1A4-CB57-4689-B3EB-F752F65F863F} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A}
{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
{CAE652AF-6801-425E-AAF3-AB20DE7DF88E} = {7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3}
{7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
{FF80D706-8309-4E02-BAC0-D28B4CBCF600} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
{CB6FA3C6-38E2-4DD1-AAB7-A705EFE114BC} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A}
EndGlobalSection
Expand Down
23 changes: 22 additions & 1 deletion scripts/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ function Publish-Package
$dataCollectorProject = Join-Path $env:TP_ROOT_DIR "src\datacollector\datacollector.csproj"

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


Publish-Package-Internal $packageProject $TPB_TargetFramework $fullCLRPackageDir
Publish-Package-Internal $packageProject $TPB_TargetFrameworkCore $coreCLRPackageDir
Expand Down Expand Up @@ -245,7 +246,7 @@ function Publish-Package
foreach($file in $loggers) {
Write-Verbose "Move-Item $fullCLRPackageDir\$file $fullCLRExtensionsDir -Force"
Move-Item $fullCLRPackageDir\$file $fullCLRExtensionsDir -Force
Write-Verbose "Move-Item $coreCLRPackageDir\$file $coreCLRExtensionsDir -Force"
Move-Item $coreCLRPackageDir\$file $coreCLRExtensionsDir -Force
}
Expand All @@ -254,6 +255,26 @@ function Publish-Package
Copy-PackageItems "Microsoft.TestPlatform.Build"

Write-Log "Publish-Package: Complete. {$(Get-ElapsedTime($timer))}"

Publish-PlatfromAbstractions-Internal
}

function Publish-PlatfromAbstractions-Internal
{
Write-Log "Publish-PlatfromAbstractions-Internal: Started."

$timer = Start-Timer
$fullCLRPackageDir = Get-FullCLRPackageDirectory
$coreCLRPackageDir = Get-CoreCLRPackageDirectory

$platformAbstraction = Join-Path $env:TP_ROOT_DIR "src\Microsoft.TestPlatform.PlatformAbstractions\bin\$TPB_Configuration"
$platformAbstractionNet46 = Join-Path $platformAbstraction $TPB_TargetFramework
$platformAbstractionNetCore = Join-Path $platformAbstraction $TPB_TargetFrameworkCore

Copy-Item $platformAbstractionNet46\* $fullCLRPackageDir -Force
Copy-Item $platformAbstractionNetCore\* $coreCLRPackageDir -Force

Write-Log "Publish-PlatfromAbstractions-Internal:: Complete. {$(Get-ElapsedTime($timer))}"
}


Expand Down
Binary file not shown.
Loading

0 comments on commit 92b930d

Please sign in to comment.