diff --git a/TestPlatform.sln b/TestPlatform.sln index 08d4335458..ea75c897e5 100644 --- a/TestPlatform.sln +++ b/TestPlatform.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26127.0 +VisualStudioVersion = 15.0.26205.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED0C35EB-7F31-4841-A24F-8EB708FFA959}" EndProject @@ -86,7 +86,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Nuget.config = Nuget.config EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "package", "src\package\package.csproj", "{D496D1A0-BC41-48C2-808B-34D8935BE96D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "package", "src\package\package\package.csproj", "{56FFCC75-400B-4258-B414-AED7AC7DA20B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.AcceptanceTests", "test\Microsoft.TestPlatform.AcceptanceTests\Microsoft.TestPlatform.AcceptanceTests.csproj", "{DD9382B5-5EC4-4B3D-BEB7-95423731AE29}" EndProject @@ -116,7 +116,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Prot EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Build.UnitTests", "test\Microsoft.TestPlatform.Build.UnitTests\Microsoft.TestPlatform.Build.UnitTests.csproj", "{EFA38DEF-C2BB-42AE-8B68-B31D79F3107E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleClassLibrary", "test\TestAssets\SimpleClassLibrary\SimpleClassLibrary.csproj", "{0D85D957-6FF2-4620-B766-B708801D97F3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleClassLibrary", "test\TestAssets\SimpleClassLibrary\SimpleClassLibrary.csproj", "{0D85D957-6FF2-4620-B766-B708801D97F3}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleTestProject3", "test\TestAssets\SimpleTestProject3\SimpleTestProject3.csproj", "{9549C1A4-CB57-4689-B3EB-F752F65F863F}" EndProject @@ -488,18 +488,18 @@ Global {4514113D-07C0-4062-A673-04F188A79B7D}.Release|x64.Build.0 = Release|x64 {4514113D-07C0-4062-A673-04F188A79B7D}.Release|x86.ActiveCfg = Release|x86 {4514113D-07C0-4062-A673-04F188A79B7D}.Release|x86.Build.0 = Release|x86 - {D496D1A0-BC41-48C2-808B-34D8935BE96D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D496D1A0-BC41-48C2-808B-34D8935BE96D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D496D1A0-BC41-48C2-808B-34D8935BE96D}.Debug|x64.ActiveCfg = Debug|x64 - {D496D1A0-BC41-48C2-808B-34D8935BE96D}.Debug|x64.Build.0 = Debug|x64 - {D496D1A0-BC41-48C2-808B-34D8935BE96D}.Debug|x86.ActiveCfg = Debug|x86 - {D496D1A0-BC41-48C2-808B-34D8935BE96D}.Debug|x86.Build.0 = Debug|x86 - {D496D1A0-BC41-48C2-808B-34D8935BE96D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D496D1A0-BC41-48C2-808B-34D8935BE96D}.Release|Any CPU.Build.0 = Release|Any CPU - {D496D1A0-BC41-48C2-808B-34D8935BE96D}.Release|x64.ActiveCfg = Release|x64 - {D496D1A0-BC41-48C2-808B-34D8935BE96D}.Release|x64.Build.0 = Release|x64 - {D496D1A0-BC41-48C2-808B-34D8935BE96D}.Release|x86.ActiveCfg = Release|x86 - {D496D1A0-BC41-48C2-808B-34D8935BE96D}.Release|x86.Build.0 = Release|x86 + {56FFCC75-400B-4258-B414-AED7AC7DA20B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {56FFCC75-400B-4258-B414-AED7AC7DA20B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {56FFCC75-400B-4258-B414-AED7AC7DA20B}.Debug|x64.ActiveCfg = Debug|x64 + {56FFCC75-400B-4258-B414-AED7AC7DA20B}.Debug|x64.Build.0 = Debug|x64 + {56FFCC75-400B-4258-B414-AED7AC7DA20B}.Debug|x86.ActiveCfg = Debug|x86 + {56FFCC75-400B-4258-B414-AED7AC7DA20B}.Debug|x86.Build.0 = Debug|x86 + {56FFCC75-400B-4258-B414-AED7AC7DA20B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {56FFCC75-400B-4258-B414-AED7AC7DA20B}.Release|Any CPU.Build.0 = Release|Any CPU + {56FFCC75-400B-4258-B414-AED7AC7DA20B}.Release|x64.ActiveCfg = Release|x64 + {56FFCC75-400B-4258-B414-AED7AC7DA20B}.Release|x64.Build.0 = Release|x64 + {56FFCC75-400B-4258-B414-AED7AC7DA20B}.Release|x86.ActiveCfg = Release|x86 + {56FFCC75-400B-4258-B414-AED7AC7DA20B}.Release|x86.Build.0 = Release|x86 {DD9382B5-5EC4-4B3D-BEB7-95423731AE29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DD9382B5-5EC4-4B3D-BEB7-95423731AE29}.Debug|Any CPU.Build.0 = Debug|Any CPU {DD9382B5-5EC4-4B3D-BEB7-95423731AE29}.Debug|x64.ActiveCfg = Debug|x64 @@ -754,7 +754,7 @@ Global {B2C2FFD5-3C7D-42A3-B9B6-DEF63DE969AD} = {B9AB7A3D-4F63-48D2-86C0-70F52F6509AB} {0DD55440-38DC-4580-879C-70B043F77B1C} = {B9AB7A3D-4F63-48D2-86C0-70F52F6509AB} {4514113D-07C0-4062-A673-04F188A79B7D} = {B9AB7A3D-4F63-48D2-86C0-70F52F6509AB} - {D496D1A0-BC41-48C2-808B-34D8935BE96D} = {D27E1CB4-C641-4C6C-A140-EF5F6215AE29} + {56FFCC75-400B-4258-B414-AED7AC7DA20B} = {D27E1CB4-C641-4C6C-A140-EF5F6215AE29} {DD9382B5-5EC4-4B3D-BEB7-95423731AE29} = {46250E12-4CF1-4051-B4A7-80C8C06E0068} {156F8811-28BB-4EC7-87D9-434F10FB7DBE} = {46250E12-4CF1-4051-B4A7-80C8C06E0068} {A5B167ED-873A-4762-9326-5F43B8D3AFF6} = {595BE9C1-E10F-4E50-938A-E6C248D3F950} diff --git a/scripts/build.ps1 b/scripts/build.ps1 index d0016155c5..200aba3929 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -84,7 +84,7 @@ $TPB_Version = $Version $TPB_VersionSuffix = $VersionSuffix $TPB_CIBuild = $CIBuild $TPB_LocalizedBuild = !$DisableLocalizedBuild -$TPB_VSIX_DIR = Join-Path $env:TP_ROOT_DIR "src\VSIXProject" +$TPB_VSIX_DIR = Join-Path $env:TP_ROOT_DIR "src\package\VSIXProject" # Capture error state in any step globally to modify return code $Script:ScriptFailed = $false @@ -188,7 +188,7 @@ function Publish-Package $dotnetExe = Get-DotNetPath $fullCLRPackageDir = Get-FullCLRPackageDirectory $coreCLRPackageDir = Get-CoreCLRPackageDirectory - $packageProject = Join-Path $env:TP_PACKAGE_PROJ_DIR "package.csproj" + $packageProject = Join-Path $env:TP_PACKAGE_PROJ_DIR "package\package.csproj" $testHostProject = Join-Path $env:TP_ROOT_DIR "src\testhost\testhost.csproj" $testHostx86Project = Join-Path $env:TP_ROOT_DIR "src\testhost.x86\testhost.x86.csproj" $testhostFullPackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFramework\$TPB_TargetRuntime") @@ -196,7 +196,7 @@ function Publish-Package $vstestConsoleProject = Join-Path $env:TP_ROOT_DIR "src\vstest.console\vstest.console.csproj" $dataCollectorProject = Join-Path $env:TP_ROOT_DIR "src\datacollector\datacollector.csproj" - Write-Log "Package: Publish package\*.csproj" + Write-Log "Package: Publish src\package\package\package.csproj" Publish-PackageInternal $packageProject $TPB_TargetFramework $fullCLRPackageDir @@ -317,7 +317,7 @@ function Create-NugetPackages Write-Log "Create-NugetPackages: Started." $stagingDir = Join-Path $env:TP_OUT_DIR $TPB_Configuration - $tpSrcDir = Join-Path $env:TP_ROOT_DIR "src" + $tpNuspecDir = Join-Path $env:TP_PACKAGE_PROJ_DIR "nuspec" # Copy over the nuspecs to the staging directory $nuspecFiles = @("TestPlatform.TranslationLayer.nuspec", "TestPlatform.ObjectModel.nuspec", "TestPlatform.TestHost.nuspec", "TestPlatform.nuspec", "TestPlatform.CLI.nuspec", "TestPlatform.Build.nuspec", "Microsoft.Net.Test.Sdk.nuspec") @@ -325,15 +325,13 @@ function Create-NugetPackages # Nuget pack analysis emits warnings if binaries are packaged as content. It is intentional for the below packages. $skipAnalysis = @("TestPlatform.CLI.nuspec") foreach ($file in $nuspecFiles + $targetFiles) { - Copy-Item $tpSrcDir\$file $stagingDir -Force + Copy-Item $tpNuspecDir\$file $stagingDir -Force } - # Copy props file. - Copy-Item $tpSrcDir\"Microsoft.Net.Test.Sdk.props" $stagingDir\"Microsoft.Net.Test.Sdk.props" -Force - - # Copy over empty and third patry notice file. - Copy-Item $tpSrcDir\package\"_._" $stagingDir -Force - Copy-Item $tpSrcDir\package\"ThirdPartyNotices.txt" $stagingDir -Force + # Copy over props, empty and third patry notice file + Copy-Item $tpNuspecDir\"Microsoft.Net.Test.Sdk.props" $stagingDir -Force + Copy-Item $tpNuspecDir\"_._" $stagingDir -Force + Copy-Item $tpNuspecDir\..\"ThirdPartyNotices.txt" $stagingDir -Force # Call nuget pack on these components. $nugetExe = Join-Path $env:TP_PACKAGES_DIR -ChildPath "Nuget.CommandLine" | Join-Path -ChildPath $env:NUGET_EXE_Version | Join-Path -ChildPath "tools\NuGet.exe" diff --git a/src/VSIXProject/License.rtf b/src/package/VSIXProject/License.rtf similarity index 100% rename from src/VSIXProject/License.rtf rename to src/package/VSIXProject/License.rtf diff --git a/src/VSIXProject/TestPlatform.csproj b/src/package/VSIXProject/TestPlatform.csproj similarity index 96% rename from src/VSIXProject/TestPlatform.csproj rename to src/package/VSIXProject/TestPlatform.csproj index dbdfd7c989..48e74d2daa 100644 --- a/src/VSIXProject/TestPlatform.csproj +++ b/src/package/VSIXProject/TestPlatform.csproj @@ -1,7 +1,7 @@  - ..\..\ + ..\..\..\ 15.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -26,8 +26,8 @@ false False true - $(TestPlatformRoot)\artifacts\$(Configuration)\net46\win7-x64 - $(TestPlatformRoot)\artifacts\$(Configuration)\VSIX + $(TestPlatformRoot)artifacts\$(Configuration)\net46\win7-x64 + $(TestPlatformRoot)artifacts\$(Configuration)\VSIX TestPlatform diff --git a/src/VSIXProject/source.extension.vsixmanifest b/src/package/VSIXProject/source.extension.vsixmanifest similarity index 100% rename from src/VSIXProject/source.extension.vsixmanifest rename to src/package/VSIXProject/source.extension.vsixmanifest diff --git a/src/VSmanproj/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.vsmanproj b/src/package/VSmanproj/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.vsmanproj similarity index 100% rename from src/VSmanproj/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.vsmanproj rename to src/package/VSmanproj/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.vsmanproj diff --git a/src/Microsoft.NET.Test.Sdk.nuspec b/src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec similarity index 100% rename from src/Microsoft.NET.Test.Sdk.nuspec rename to src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec diff --git a/src/Microsoft.NET.Test.Sdk.props b/src/package/nuspec/Microsoft.NET.Test.Sdk.props similarity index 100% rename from src/Microsoft.NET.Test.Sdk.props rename to src/package/nuspec/Microsoft.NET.Test.Sdk.props diff --git a/src/Microsoft.NET.Test.Sdk.targets b/src/package/nuspec/Microsoft.NET.Test.Sdk.targets similarity index 100% rename from src/Microsoft.NET.Test.Sdk.targets rename to src/package/nuspec/Microsoft.NET.Test.Sdk.targets diff --git a/src/TestPlatform.Build.nuspec b/src/package/nuspec/TestPlatform.Build.nuspec similarity index 100% rename from src/TestPlatform.Build.nuspec rename to src/package/nuspec/TestPlatform.Build.nuspec diff --git a/src/TestPlatform.CLI.nuspec b/src/package/nuspec/TestPlatform.CLI.nuspec similarity index 100% rename from src/TestPlatform.CLI.nuspec rename to src/package/nuspec/TestPlatform.CLI.nuspec diff --git a/src/TestPlatform.ObjectModel.nuspec b/src/package/nuspec/TestPlatform.ObjectModel.nuspec similarity index 100% rename from src/TestPlatform.ObjectModel.nuspec rename to src/package/nuspec/TestPlatform.ObjectModel.nuspec diff --git a/src/TestPlatform.TestHost.nuspec b/src/package/nuspec/TestPlatform.TestHost.nuspec similarity index 100% rename from src/TestPlatform.TestHost.nuspec rename to src/package/nuspec/TestPlatform.TestHost.nuspec diff --git a/src/TestPlatform.TranslationLayer.nuspec b/src/package/nuspec/TestPlatform.TranslationLayer.nuspec similarity index 100% rename from src/TestPlatform.TranslationLayer.nuspec rename to src/package/nuspec/TestPlatform.TranslationLayer.nuspec diff --git a/src/TestPlatform.nuspec b/src/package/nuspec/TestPlatform.nuspec similarity index 100% rename from src/TestPlatform.nuspec rename to src/package/nuspec/TestPlatform.nuspec diff --git a/src/package/_._ b/src/package/nuspec/_._ similarity index 100% rename from src/package/_._ rename to src/package/nuspec/_._ diff --git a/src/package/TestPlatform.ObjectModel.manifest b/src/package/package/TestPlatform.ObjectModel.manifest similarity index 100% rename from src/package/TestPlatform.ObjectModel.manifest rename to src/package/package/TestPlatform.ObjectModel.manifest diff --git a/src/package/TestPlatform.ObjectModel.x86.manifest b/src/package/package/TestPlatform.ObjectModel.x86.manifest similarity index 100% rename from src/package/TestPlatform.ObjectModel.x86.manifest rename to src/package/package/TestPlatform.ObjectModel.x86.manifest diff --git a/src/package/package.csproj b/src/package/package/package.csproj similarity index 67% rename from src/package/package.csproj rename to src/package/package/package.csproj index 02c066f058..e82efcfd6d 100644 --- a/src/package/package.csproj +++ b/src/package/package/package.csproj @@ -1,7 +1,7 @@ - ..\..\ + ..\..\..\ @@ -32,16 +32,16 @@ - - - - - - - - - - + + + + + + + + + + true diff --git a/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj b/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj index 97bd911169..58ab61816f 100644 --- a/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj +++ b/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj @@ -27,10 +27,10 @@ - + PreserveNewest - + PreserveNewest