diff --git a/.gitignore b/.gitignore index 31b60081b0f..5287cc1493f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,12 @@ # User-specific files *.suo *.user +*.userosscache *.sln.docstates +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + # Build results [Dd]ebug/ [Dd]ebugPublic/ @@ -18,14 +22,16 @@ bld/ [Bb]in/ [Oo]bj/ -# Roslyn cache directories -*.ide/ +# Visual Studio 2015 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ # MSTest test Results [Tt]est[Rr]esult*/ [Bb]uild[Ll]og.* -#NUNIT +# NUNIT *.VisualState.xml TestResult.xml @@ -34,9 +40,16 @@ TestResult.xml [Rr]eleasePS/ dlldata.c +# DNX +project.lock.json +*.project.lock.json +artifacts/ + # Nuget v3 +*.nuget.props *.nuget.targets + *_i.c *_p.c *_i.h @@ -89,7 +102,7 @@ _ReSharper*/ *.[Rr]e[Ss]harper *.DotSettings.user -# JustCode is a .NET coding addin-in +# JustCode is a .NET coding add-in .JustCode # TeamCity is a build add-in @@ -101,6 +114,7 @@ _TeamCity* # NCrunch _NCrunch_* .*crunch*.local.xml +nCrunchTemp_* # MightyMoose *.mm.* @@ -139,7 +153,7 @@ publish/ **/packages/* # except build/, which is used as an MSBuild target. !**/packages/build/ -# If using the old MSBuild-Integrated Package Restore, uncomment this: +# Uncomment if necessary however generally it will be regenerated when needed #!**/packages/repositories.config # Windows Azure Build Output @@ -149,9 +163,13 @@ csx/ # Windows Store app package directory AppPackages/ +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + # Others -sql/ -*.Cache ClientBin/ [Ss]tyle[Cc]op.* ~$* @@ -161,6 +179,7 @@ ClientBin/ *.pfx *.publishsettings node_modules/ +orleans.codegen.cs # RIA/Silverlight projects Generated_Code/ @@ -184,3 +203,27 @@ UpgradeLog*.htm # Microsoft Fakes FakesAssemblies/ + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Project-specific +ApiPort/ +*.xlsx +ref/ +Differences.txt +Tools/ diff --git a/README.md b/README.md index b4e80056dc3..59423f4b1d5 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,13 @@ -# Microsoft.Build (MSBuild) +# Microsoft.Build (MSBuild) The Microsoft Build Engine is a platform for building applications. This engine, which is also known as MSBuild, provides an XML schema for a project file that controls how the build platform processes and builds software. Visual Studio uses MSBuild, but MSBuild *does not* depend on Visual Studio. By invoking msbuild.exe on your project or solution file, you can orchestrate and build products in environments where Visual Studio isn't installed. For more information on MSBuild, see the [MSDN documentation](https://msdn.microsoft.com/en-us/library/dd393574(v=vs.120).aspx). -[![Build Status](http://dotnet-ci.cloudapp.net/job/Microsoft_msbuild/job/innerloop_master_Windows_NT/badge/icon)](http://dotnet-ci.cloudapp.net/job/Microsoft_msbuild/job/innerloop_master_Windows_NT/) +### Build Status +| Configuration | Windows | Ubuntu |Mac OS X| +|:------|:------:|:------:|:------:| +| **Full Framework (master)** | [![Build Status](http://dotnet-ci.cloudapp.net/job/Microsoft_msbuild/job/innerloop_master_Windows_NT/badge/icon)](http://dotnet-ci.cloudapp.net/job/Microsoft_msbuild/job/innerloop_master_Windows_NT/) | N/A | N/A | +|**.NET Core (xplat)**|[![Build Status](http://dotnet-ci.cloudapp.net/job/Microsoft_msbuild/job/innerloop_xplat_Windows_NT/badge/icon)](http://dotnet-ci.cloudapp.net/job/Microsoft_msbuild/job/innerloop_xplat_Windows_NT/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/Microsoft_msbuild/job/innerloop_xplat_Ubuntu/badge/icon)](http://dotnet-ci.cloudapp.net/job/Microsoft_msbuild/job/innerloop_xplat_Ubuntu/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/Microsoft_msbuild/job/innerloop_xplat_OSX/badge/icon)](http://dotnet-ci.cloudapp.net/job/Microsoft_msbuild/job/innerloop_xplat_OSX/)| ### Source code @@ -14,13 +18,14 @@ For the full supported experience, you will need to have Visual Studio 2015. You To get started on **Visual Studio 2015**: -1. Set up a box with Visual Studio 2015. Either -[install Visual Studio 2015](http://www.visualstudio.com/en-us/downloads/visual-studio-2015-downloads-vs), -or grab a [prebuilt Azure VM image](http://blogs.msdn.com/b/visualstudioalm/archive/2014/06/04/visual-studio-14-ctp-now-available-in-the-virtual-machine-azure-gallery.aspx). +1. [Install Visual Studio 2015](http://www.visualstudio.com/en-us/downloads/visual-studio-2015-downloads-vs). Select the following optional components: + - _Microsoft Web Developer Tools_ + - _Universal Windows App Development Tools_ + - _Tools and Windows SDK 10.0.10240_ 2. Clone the source code (see above). 3. Restore NuGet packages: `msbuild /t:BulkRestoreNugetPackages build.proj` 4. Open src/MSBuild.sln solution in Visual Studio 2015. - + ## How to Engage, Contribute and Provide Feedback Before you contribute, please read through the contributing and developer guides to get an idea of what kinds of pull requests we will or won't accept. diff --git a/build.proj b/build.proj index f20ae66708d..7fbcda31175 100644 --- a/build.proj +++ b/build.proj @@ -4,16 +4,21 @@ - + - + + + + + DependsOnTargets="_RestoreBuildToolsPackagesConfig"> diff --git a/dir.props b/dir.props index ca6cc35e5cb..57ba36ad87c 100644 --- a/dir.props +++ b/dir.props @@ -22,9 +22,10 @@ - 1.0.25-prerelease-00080 + 1.0.25-prerelease-00199 1.0.0 2.1.0-rc1-build3168 + 0.2.0 $(MSBuildThisFileDirectory) $(ProjectDir)src\ @@ -36,9 +37,10 @@ $(ProjectDir)packages\ $(PackagesDir)Microsoft.DotNet.BuildTools.$(BuildToolsVersion)\lib\ + $(ToolsDir)net45\ $(PackagesDir)Microsoft.Net.Compilers.$(CompilerToolsVersion)\tools - $(BinDir)Bootstrap\ + $(PackagesDir)\MicroBuild.Core.$(MicroBuildVersion)\build\ @@ -58,6 +60,8 @@ $(SourceDir).nuget\NuGet.Config @(NuGetSourceList -> '-source %(Identity)', ' ') $(NuGetPackageSource) -ConfigFile "$(NuGetConfigFile)" + $([System.IO.Path]::Combine($(SourceDir),".nuget")) + $(PackagesDir) "$(NuGetToolPath)" $(NugetRestoreCommand) install @@ -66,6 +70,7 @@ $(NugetRestoreCommand) $(NuGetConfigCommandLine) $(NugetRestoreCommand) -Verbosity detailed mono $(NuGetRestoreCommand) + <_RestoreBuildToolsCommand>$(NugetRestoreCommand) "$(SourceDir).nuget/packages.config" diff --git a/dir.targets b/dir.targets index 3950ad096f9..506a554f891 100644 --- a/dir.targets +++ b/dir.targets @@ -1,139 +1,5 @@ - - - - - -
- - - - - - - maxTries) - { - throw; - } - else - { - Log.LogMessage(MessageImportance.High, "Download failed, retrying: {0}", e.Message); - } - } - } - - try - { - if (!File.Exists(FileName)) - File.Move(tempFile, FileName); - } - finally - { - if (File.Exists(tempFile)) - File.Delete(tempFile); - } - ]]> - - - - - - - $(ToolsDir)BuildTools.semaphore - - - - - - - - - - - - - - - - - - - - - - - - - - - <_RestoreBuildToolsCommand>$(NugetRestoreCommand) "$(SourceDir).nuget/packages.config" - - - - - - - - - - - - - - - - - - - - - + @@ -151,14 +17,16 @@ (due to open source signing). --> + + BeforeTargets="_RestoreBuildToolsPackagesConfig" > - + + diff --git a/src/.nuget/packageLoad.targets b/src/.nuget/packageLoad.targets new file mode 100644 index 00000000000..b1072831907 --- /dev/null +++ b/src/.nuget/packageLoad.targets @@ -0,0 +1,83 @@ + + + + + + + + $([System.IO.Path]::Combine($(NuGetDir), "NuGet.exe")) + $([System.IO.Path]::Combine($(NuGetConfigDir),"packages.config")) + $([System.IO.Path]::Combine($(NuGetConfigDir),"project.json")) + v3.3.0 + https://dist.nuget.org/win-x86-commandline/$(NugetVersion)/nuget.exe + $(NuGetDir)NuGet.$(NugetVersion).semaphore + powershell -noprofile -nologo -command "(new-object System.Net.WebClient).DownloadFile('$(NugetDownloadURL)', '$(NuGetToolPath)')" + curl -sSL --create-dirs -o "$(NuGetToolPath)" $(NugetDownloadURL) + $(NuGetDir)BuildTools.semaphore + + + + $(GlobalPropertiesFile);$(NuGetPackagesFile);$(NuGetProjectJsonFile) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/.nuget/packages.config b/src/.nuget/packages.config index ff892bf885e..07702a89d12 100644 --- a/src/.nuget/packages.config +++ b/src/.nuget/packages.config @@ -1,6 +1,7 @@ - + + diff --git a/src/Framework/UnitTests/project.json b/src/Framework/UnitTests/project.json index 349c2b16445..98e4badf801 100644 --- a/src/Framework/UnitTests/project.json +++ b/src/Framework/UnitTests/project.json @@ -1,11 +1,10 @@ { "dependencies": { - "xunit": "2.1.0-rc1-build3168", - "xunit.runner.visualstudio": "2.1.0-rc1-build1124" + "xunit": "2.1.0", + "xunit.runner.visualstudio": "2.1.0" }, "frameworks": { "net451": {}, - "net46": {} }, "runtimes": { "win-": {}, diff --git a/src/Framework/UnitTests/project.lock.json b/src/Framework/UnitTests/project.lock.json deleted file mode 100644 index 1422a791b72..00000000000 --- a/src/Framework/UnitTests/project.lock.json +++ /dev/null @@ -1,490 +0,0 @@ -{ - "locked": false, - "version": 1, - "targets": { - ".NETFramework,Version=v4.5.1": { - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.5.1/win": { - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.5.1/win-": { - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.6": { - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.6/win": { - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.6/win-": { - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - } - }, - "libraries": { - "xunit/2.1.0-rc1-build3168": { - "sha512": "dVnDKBCIpLE5GaxLALnbnobqtDyTTDKJSRbqhLGrx0Ptc/n3VQRUby/CDx6v+y7xNVPqtqj0XMeDO1DVT8E3tA==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "package/services/metadata/core-properties/c7931b7f3887423dbf4970aaa1c1dc7b.psmdcp", - "xunit.nuspec" - ] - }, - "xunit.abstractions/2.0.0": { - "sha512": "NAdxKQRzuLnCZ0g++x6i87/8rMBpQoRiRlRNLAqfODm2zJPbteHRoSER3DXfxnqrHXyBJT8rFaZ8uveBeQyaMA==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/net35/xunit.abstractions.dll", - "lib/net35/xunit.abstractions.xml", - "lib/portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS/xunit.abstractions.dll", - "lib/portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS/xunit.abstractions.xml", - "package/services/metadata/core-properties/24083640fee244bf9de77f4c35d40a72.psmdcp", - "xunit.abstractions.nuspec" - ] - }, - "xunit.assert/2.1.0-rc1-build3168": { - "sha512": "lsTK4OaNGt5IOoKO3ZQ0gSFngjWSHZ5xNurNtLd0MxZv5onv66xlNmWBYCVNt4sZLknQ+RfiqYm1EZ9ZrA0SDw==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/dotnet/xunit.assert.dll", - "lib/dotnet/xunit.assert.pdb", - "lib/dotnet/xunit.assert.xml", - "lib/portable-net45+win8+wp8+wpa81/xunit.assert.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.assert.pdb", - "lib/portable-net45+win8+wp8+wpa81/xunit.assert.xml", - "package/services/metadata/core-properties/25b1754808374eeb82f38a86833d4d61.psmdcp", - "xunit.assert.nuspec" - ] - }, - "xunit.core/2.1.0-rc1-build3168": { - "sha512": "IcQo+pNEDYBC9HJfzY08k0NhLZMX8WXudrlhcrIAzkT2szhrLbGhUi1k6vU5n9crsVv+IxosvIH28kYf6/Z32w==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "build/_desktop/xunit.execution.desktop.dll", - "build/dnx451/_._", - "build/monoandroid/_._", - "build/monotouch/_._", - "build/net45/_._", - "build/portable-net45+win8+wp8+wpa81/xunit.core.props", - "build/win8/_._", - "build/win81/xunit.core.props", - "build/wp8/_._", - "build/wpa81/xunit.core.props", - "build/xamarinios/_._", - "package/services/metadata/core-properties/c4f15e74cde14a09b99e736e49571ec0.psmdcp", - "xunit.core.nuspec" - ] - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "sha512": "8KZaq1mdeaiZxo1ScsGzhkeQRwLLS6+WIno+9gtnYccWmTjCJ/XSYz2fAAlB5mUeyw0vqqrFc+TfNZELs5QiZQ==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/dotnet/xunit.core.dll", - "lib/dotnet/xunit.core.dll.tdnet", - "lib/dotnet/xunit.core.pdb", - "lib/dotnet/xunit.core.xml", - "lib/dotnet/xunit.runner.tdnet.dll", - "lib/dotnet/xunit.runner.utility.desktop.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.core.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.core.dll.tdnet", - "lib/portable-net45+win8+wp8+wpa81/xunit.core.pdb", - "lib/portable-net45+win8+wp8+wpa81/xunit.core.xml", - "lib/portable-net45+win8+wp8+wpa81/xunit.runner.tdnet.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.runner.utility.desktop.dll", - "package/services/metadata/core-properties/f5b0a8a6af3a41e7abbb1c4e08ab5e31.psmdcp", - "xunit.extensibility.core.nuspec" - ] - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "sha512": "1w0u3eB7i25hca60r/53oSVb0blMOEm2eVqvwTg9jhMSe/A9raj6UZAVzUnFtA3xLssP4K1udOGTC1qrZ9/VoA==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/dnx451/xunit.execution.dotnet.dll", - "lib/dnx451/xunit.execution.dotnet.pdb", - "lib/dnx451/xunit.execution.dotnet.xml", - "lib/dotnet/xunit.execution.dotnet.dll", - "lib/dotnet/xunit.execution.dotnet.pdb", - "lib/dotnet/xunit.execution.dotnet.xml", - "lib/monoandroid/xunit.execution.dotnet.dll", - "lib/monoandroid/xunit.execution.dotnet.pdb", - "lib/monoandroid/xunit.execution.dotnet.xml", - "lib/monotouch/xunit.execution.dotnet.dll", - "lib/monotouch/xunit.execution.dotnet.pdb", - "lib/monotouch/xunit.execution.dotnet.xml", - "lib/net35/xunit.execution.desktop.dll", - "lib/net35/xunit.execution.desktop.pdb", - "lib/net35/xunit.execution.desktop.xml", - "lib/portable-net45+win8+wp8+wpa81/xunit.execution.dotnet.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.execution.dotnet.pdb", - "lib/portable-net45+win8+wp8+wpa81/xunit.execution.dotnet.xml", - "lib/win8/xunit.execution.dotnet.dll", - "lib/win8/xunit.execution.dotnet.pdb", - "lib/win8/xunit.execution.dotnet.xml", - "lib/wp8/xunit.execution.dotnet.dll", - "lib/wp8/xunit.execution.dotnet.pdb", - "lib/wp8/xunit.execution.dotnet.xml", - "lib/wpa81/xunit.execution.dotnet.dll", - "lib/wpa81/xunit.execution.dotnet.pdb", - "lib/wpa81/xunit.execution.dotnet.xml", - "lib/xamarinios/xunit.execution.dotnet.dll", - "lib/xamarinios/xunit.execution.dotnet.pdb", - "lib/xamarinios/xunit.execution.dotnet.xml", - "package/services/metadata/core-properties/3ba0c9def4ed43d782df6b4b2c8fef45.psmdcp", - "xunit.extensibility.execution.nuspec" - ] - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": { - "sha512": "4m6iGj99F92STIfhg/h+t3sWL42JE29UfCAQShdxQxSz7CpTxZScoxlDpanmroYaMD0riTFTZ7fr9Brsd0ABig==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "build/_common/xunit.abstractions.dll", - "build/_common/xunit.runner.utility.desktop.dll", - "build/_common/xunit.runner.utility.dotnet.dll", - "build/_common/xunit.runner.visualstudio.testadapter.dll", - "build/monoandroid/_._", - "build/monotouch/_._", - "build/net20/xunit.runner.visualstudio.props", - "build/portable-net45+win8+wp8+wpa81/xunit.runner.visualstudio.props", - "build/uap10.0/xunit.runner.visualstudio.props", - "build/uap10.0/xunit.runner.visualstudio.targets", - "build/uap10.0/xunit.runner.visualstudio.uwp.dll", - "build/uap10.0/xunit.runner.visualstudio.uwp.pri", - "build/win8/_._", - "build/win81/xunit.runner.visualstudio.props", - "build/win81/xunit.runner.visualstudio.targets", - "build/win81/xunit.runner.visualstudio.win81.dll", - "build/win81/xunit.runner.visualstudio.win81.pri", - "build/wp8/_._", - "build/wpa81/xunit.runner.visualstudio.props", - "build/wpa81/xunit.runner.visualstudio.targets", - "build/wpa81/xunit.runner.visualstudio.wpa81.dll", - "build/wpa81/xunit.runner.visualstudio.wpa81.pri", - "build/xamarinios/_._", - "package/services/metadata/core-properties/b0a423d21f7f45688579fd6544753269.psmdcp", - "xunit.runner.visualstudio.nuspec" - ] - } - }, - "projectFileDependencyGroups": { - "": [ - "xunit >= 2.1.0-rc1-build3168", - "xunit.runner.visualstudio >= 2.1.0-rc1-build1124" - ], - ".NETFramework,Version=v4.5.1": [], - ".NETFramework,Version=v4.6": [] - } -} \ No newline at end of file diff --git a/src/Utilities/PlatformManifest.cs b/src/Utilities/PlatformManifest.cs index c867a6880a7..87020e44cef 100644 --- a/src/Utilities/PlatformManifest.cs +++ b/src/Utilities/PlatformManifest.cs @@ -145,31 +145,31 @@ private void LoadManifestFile() } } + DependentPlatforms = new List(); + ApiContracts = new List(); + if (rootElement != null) { Name = rootElement.GetAttribute(Attributes.Name); FriendlyName = rootElement.GetAttribute(Attributes.FriendlyName); PlatformVersion = rootElement.GetAttribute(Attributes.Version); - } - - DependentPlatforms = new List(); - ApiContracts = new List(); - foreach (XmlNode childNode in rootElement.ChildNodes) - { - XmlElement childElement = childNode as XmlElement; - if (childElement == null) + foreach (XmlNode childNode in rootElement.ChildNodes) { - continue; - } + XmlElement childElement = childNode as XmlElement; + if (childElement == null) + { + continue; + } - if (ApiContract.IsContainedApiContractsElement(childElement.Name)) - { - ApiContract.ReadContractsElement(childElement, ApiContracts); - } - else if (String.Equals(childElement.Name, Elements.DependentPlatform, StringComparison.Ordinal)) - { - DependentPlatforms.Add(new DependentPlatform(childElement.GetAttribute(Attributes.Name), childElement.GetAttribute(Attributes.Version))); + if (ApiContract.IsContainedApiContractsElement(childElement.Name)) + { + ApiContract.ReadContractsElement(childElement, ApiContracts); + } + else if (String.Equals(childElement.Name, Elements.DependentPlatform, StringComparison.Ordinal)) + { + DependentPlatforms.Add(new DependentPlatform(childElement.GetAttribute(Attributes.Name), childElement.GetAttribute(Attributes.Version))); + } } } } diff --git a/src/Utilities/UnitTests/project.json b/src/Utilities/UnitTests/project.json index 349c2b16445..98e4badf801 100644 --- a/src/Utilities/UnitTests/project.json +++ b/src/Utilities/UnitTests/project.json @@ -1,11 +1,10 @@ { "dependencies": { - "xunit": "2.1.0-rc1-build3168", - "xunit.runner.visualstudio": "2.1.0-rc1-build1124" + "xunit": "2.1.0", + "xunit.runner.visualstudio": "2.1.0" }, "frameworks": { "net451": {}, - "net46": {} }, "runtimes": { "win-": {}, diff --git a/src/Utilities/UnitTests/project.lock.json b/src/Utilities/UnitTests/project.lock.json deleted file mode 100644 index 8e23c150e88..00000000000 --- a/src/Utilities/UnitTests/project.lock.json +++ /dev/null @@ -1,553 +0,0 @@ -{ - "locked": false, - "version": 1, - "targets": { - ".NETFramework,Version=v4.5.1": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.5.1/win": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.5.1/win-": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.6": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.6/win": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.6/win-": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - } - }, - "libraries": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "sha512": "6BE4Vu74+dkv5AkJd+UxW1sFMepMZOVlUoMZDUKqhc4Bf7pe7yySzCj6QrowUZbCqcDPwOiQsAgz3nXiLQSyMw==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/portable-net45+win8+wp8+wpa81/System.Threading.Tasks.Dataflow.dll", - "lib/portable-net45+win8+wp8+wpa81/system.threading.tasks.dataflow.xml", - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll", - "lib/portable-net45+win8+wpa81/system.threading.tasks.dataflow.xml", - "License-Stable.rtf", - "Microsoft.Tpl.Dataflow.nuspec", - "package/services/metadata/core-properties/3dd86853af3a4ae392f3331459714ce0.psmdcp" - ] - }, - "xunit/2.1.0-rc1-build3168": { - "sha512": "dVnDKBCIpLE5GaxLALnbnobqtDyTTDKJSRbqhLGrx0Ptc/n3VQRUby/CDx6v+y7xNVPqtqj0XMeDO1DVT8E3tA==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "package/services/metadata/core-properties/c7931b7f3887423dbf4970aaa1c1dc7b.psmdcp", - "xunit.nuspec" - ] - }, - "xunit.abstractions/2.0.0": { - "sha512": "NAdxKQRzuLnCZ0g++x6i87/8rMBpQoRiRlRNLAqfODm2zJPbteHRoSER3DXfxnqrHXyBJT8rFaZ8uveBeQyaMA==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/net35/xunit.abstractions.dll", - "lib/net35/xunit.abstractions.xml", - "lib/portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS/xunit.abstractions.dll", - "lib/portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS/xunit.abstractions.xml", - "package/services/metadata/core-properties/24083640fee244bf9de77f4c35d40a72.psmdcp", - "xunit.abstractions.nuspec" - ] - }, - "xunit.assert/2.1.0-rc1-build3168": { - "sha512": "lsTK4OaNGt5IOoKO3ZQ0gSFngjWSHZ5xNurNtLd0MxZv5onv66xlNmWBYCVNt4sZLknQ+RfiqYm1EZ9ZrA0SDw==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/dotnet/xunit.assert.dll", - "lib/dotnet/xunit.assert.pdb", - "lib/dotnet/xunit.assert.xml", - "lib/portable-net45+win8+wp8+wpa81/xunit.assert.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.assert.pdb", - "lib/portable-net45+win8+wp8+wpa81/xunit.assert.xml", - "package/services/metadata/core-properties/25b1754808374eeb82f38a86833d4d61.psmdcp", - "xunit.assert.nuspec" - ] - }, - "xunit.core/2.1.0-rc1-build3168": { - "sha512": "IcQo+pNEDYBC9HJfzY08k0NhLZMX8WXudrlhcrIAzkT2szhrLbGhUi1k6vU5n9crsVv+IxosvIH28kYf6/Z32w==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "build/_desktop/xunit.execution.desktop.dll", - "build/dnx451/_._", - "build/monoandroid/_._", - "build/monotouch/_._", - "build/net45/_._", - "build/portable-net45+win8+wp8+wpa81/xunit.core.props", - "build/win8/_._", - "build/win81/xunit.core.props", - "build/wp8/_._", - "build/wpa81/xunit.core.props", - "build/xamarinios/_._", - "package/services/metadata/core-properties/c4f15e74cde14a09b99e736e49571ec0.psmdcp", - "xunit.core.nuspec" - ] - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "sha512": "8KZaq1mdeaiZxo1ScsGzhkeQRwLLS6+WIno+9gtnYccWmTjCJ/XSYz2fAAlB5mUeyw0vqqrFc+TfNZELs5QiZQ==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/dotnet/xunit.core.dll", - "lib/dotnet/xunit.core.dll.tdnet", - "lib/dotnet/xunit.core.pdb", - "lib/dotnet/xunit.core.xml", - "lib/dotnet/xunit.runner.tdnet.dll", - "lib/dotnet/xunit.runner.utility.desktop.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.core.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.core.dll.tdnet", - "lib/portable-net45+win8+wp8+wpa81/xunit.core.pdb", - "lib/portable-net45+win8+wp8+wpa81/xunit.core.xml", - "lib/portable-net45+win8+wp8+wpa81/xunit.runner.tdnet.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.runner.utility.desktop.dll", - "package/services/metadata/core-properties/f5b0a8a6af3a41e7abbb1c4e08ab5e31.psmdcp", - "xunit.extensibility.core.nuspec" - ] - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "sha512": "1w0u3eB7i25hca60r/53oSVb0blMOEm2eVqvwTg9jhMSe/A9raj6UZAVzUnFtA3xLssP4K1udOGTC1qrZ9/VoA==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/dnx451/xunit.execution.dotnet.dll", - "lib/dnx451/xunit.execution.dotnet.pdb", - "lib/dnx451/xunit.execution.dotnet.xml", - "lib/dotnet/xunit.execution.dotnet.dll", - "lib/dotnet/xunit.execution.dotnet.pdb", - "lib/dotnet/xunit.execution.dotnet.xml", - "lib/monoandroid/xunit.execution.dotnet.dll", - "lib/monoandroid/xunit.execution.dotnet.pdb", - "lib/monoandroid/xunit.execution.dotnet.xml", - "lib/monotouch/xunit.execution.dotnet.dll", - "lib/monotouch/xunit.execution.dotnet.pdb", - "lib/monotouch/xunit.execution.dotnet.xml", - "lib/net35/xunit.execution.desktop.dll", - "lib/net35/xunit.execution.desktop.pdb", - "lib/net35/xunit.execution.desktop.xml", - "lib/portable-net45+win8+wp8+wpa81/xunit.execution.dotnet.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.execution.dotnet.pdb", - "lib/portable-net45+win8+wp8+wpa81/xunit.execution.dotnet.xml", - "lib/win8/xunit.execution.dotnet.dll", - "lib/win8/xunit.execution.dotnet.pdb", - "lib/win8/xunit.execution.dotnet.xml", - "lib/wp8/xunit.execution.dotnet.dll", - "lib/wp8/xunit.execution.dotnet.pdb", - "lib/wp8/xunit.execution.dotnet.xml", - "lib/wpa81/xunit.execution.dotnet.dll", - "lib/wpa81/xunit.execution.dotnet.pdb", - "lib/wpa81/xunit.execution.dotnet.xml", - "lib/xamarinios/xunit.execution.dotnet.dll", - "lib/xamarinios/xunit.execution.dotnet.pdb", - "lib/xamarinios/xunit.execution.dotnet.xml", - "package/services/metadata/core-properties/3ba0c9def4ed43d782df6b4b2c8fef45.psmdcp", - "xunit.extensibility.execution.nuspec" - ] - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": { - "sha512": "4m6iGj99F92STIfhg/h+t3sWL42JE29UfCAQShdxQxSz7CpTxZScoxlDpanmroYaMD0riTFTZ7fr9Brsd0ABig==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "build/_common/xunit.abstractions.dll", - "build/_common/xunit.runner.utility.desktop.dll", - "build/_common/xunit.runner.utility.dotnet.dll", - "build/_common/xunit.runner.visualstudio.testadapter.dll", - "build/monoandroid/_._", - "build/monotouch/_._", - "build/net20/xunit.runner.visualstudio.props", - "build/portable-net45+win8+wp8+wpa81/xunit.runner.visualstudio.props", - "build/uap10.0/xunit.runner.visualstudio.props", - "build/uap10.0/xunit.runner.visualstudio.targets", - "build/uap10.0/xunit.runner.visualstudio.uwp.dll", - "build/uap10.0/xunit.runner.visualstudio.uwp.pri", - "build/win8/_._", - "build/win81/xunit.runner.visualstudio.props", - "build/win81/xunit.runner.visualstudio.targets", - "build/win81/xunit.runner.visualstudio.win81.dll", - "build/win81/xunit.runner.visualstudio.win81.pri", - "build/wp8/_._", - "build/wpa81/xunit.runner.visualstudio.props", - "build/wpa81/xunit.runner.visualstudio.targets", - "build/wpa81/xunit.runner.visualstudio.wpa81.dll", - "build/wpa81/xunit.runner.visualstudio.wpa81.pri", - "build/xamarinios/_._", - "package/services/metadata/core-properties/b0a423d21f7f45688579fd6544753269.psmdcp", - "xunit.runner.visualstudio.nuspec" - ] - } - }, - "projectFileDependencyGroups": { - "": [ - "xunit >= 2.1.0-rc1-build3168", - "xunit.runner.visualstudio >= 2.1.0-rc1-build1124" - ], - ".NETFramework,Version=v4.5.1": [], - ".NETFramework,Version=v4.6": [] - } -} \ No newline at end of file diff --git a/src/XMakeBuildEngine/Evaluation/Preprocessor.cs b/src/XMakeBuildEngine/Evaluation/Preprocessor.cs index 44b6c11a35b..9cc61894af4 100644 --- a/src/XMakeBuildEngine/Evaluation/Preprocessor.cs +++ b/src/XMakeBuildEngine/Evaluation/Preprocessor.cs @@ -97,7 +97,7 @@ private XmlDocument Preprocess() if (!String.IsNullOrEmpty(_project.FullPath)) // Ignore in-memory projects { - destinationDocument.AppendChild(destinationDocument.CreateComment("\r\n" + new String('=', 140) + "\r\n" + _project.FullPath + "\r\n" + new String('=', 140) + "\r\n")); + destinationDocument.AppendChild(destinationDocument.CreateComment("\r\n" + new String('=', 140) + "\r\n" + _project.FullPath.Replace("--", "__") + "\r\n" + new String('=', 140) + "\r\n")); } CloneChildrenResolvingImports(outerDocument, destinationDocument); @@ -184,7 +184,7 @@ private void CloneChildrenResolvingImports(XmlNode source, XmlNode destination) XmlDocument innerDocument = resolved.XmlDocument; string importTag = " 0) ? " Condition=\"" + importCondition + "\"" : String.Empty) + ">"; - destination.AppendChild(destinationDocument.CreateComment("\r\n" + new String('=', 140) + "\r\n" + importTag + "\r\n\r\n" + resolved.FullPath + "\r\n" + new String('=', 140) + "\r\n")); + destination.AppendChild(destinationDocument.CreateComment("\r\n" + new String('=', 140) + "\r\n" + importTag + "\r\n\r\n" + resolved.FullPath.Replace("--", "__") + "\r\n" + new String('=', 140) + "\r\n")); _filePaths.Push(resolved.FullPath); CloneChildrenResolvingImports(innerDocument, destination); @@ -196,7 +196,7 @@ private void CloneChildrenResolvingImports(XmlNode source, XmlNode destination) } else { - destination.AppendChild(destinationDocument.CreateComment("\r\n" + new String('=', 140) + "\r\n \r\n\r\n" + _filePaths.Peek() + "\r\n" + new String('=', 140) + "\r\n")); + destination.AppendChild(destinationDocument.CreateComment("\r\n" + new String('=', 140) + "\r\n \r\n\r\n" + _filePaths.Peek()?.Replace("--", "__") + "\r\n" + new String('=', 140) + "\r\n")); } } @@ -227,4 +227,4 @@ private void CloneChildrenResolvingImports(XmlNode source, XmlNode destination) } } } -} \ No newline at end of file +} diff --git a/src/XMakeBuildEngine/Logging/BaseConsoleLogger.cs b/src/XMakeBuildEngine/Logging/BaseConsoleLogger.cs index 34187689126..d625b4e4bf6 100644 --- a/src/XMakeBuildEngine/Logging/BaseConsoleLogger.cs +++ b/src/XMakeBuildEngine/Logging/BaseConsoleLogger.cs @@ -398,6 +398,48 @@ internal static void ResetColor() } } + /// + /// Sets foreground color to color specified using ANSI escape codes + /// + /// foreground color + internal static void SetColorANSI(ConsoleColor c) + { + string colorString = "\x1b["; + switch (c) + { + case ConsoleColor.Black: colorString += "30"; break; + case ConsoleColor.DarkBlue: colorString += "34"; break; + case ConsoleColor.DarkGreen: colorString += "32"; break; + case ConsoleColor.DarkCyan: colorString += "36"; break; + case ConsoleColor.DarkRed: colorString += "31"; break; + case ConsoleColor.DarkMagenta: colorString += "35"; break; + case ConsoleColor.DarkYellow: colorString += "33"; break; + case ConsoleColor.Gray: colorString += "37"; break; + case ConsoleColor.DarkGray: colorString += "30;1"; break; + case ConsoleColor.Blue: colorString += "34;1"; break; + case ConsoleColor.Green: colorString += "32;1"; break; + case ConsoleColor.Cyan: colorString += "36;1"; break; + case ConsoleColor.Red: colorString += "31;1"; break; + case ConsoleColor.Magenta: colorString += "35;1"; break; + case ConsoleColor.Yellow: colorString += "33;1"; break; + case ConsoleColor.White: colorString += "37;1"; break; + default: colorString = ""; break; + } + if ("" != colorString) + { + colorString += "m"; + Console.Out.Write(colorString); + } + } + + /// + /// Resets the color using ANSI escape codes + /// + internal static void ResetColorANSI() + { + Console.Out.Write("\x1b[m"); + } + /// /// Changes the foreground color to black if the foreground is the /// same as the background. Changes the foreground to white if the diff --git a/src/XMakeBuildEngine/Logging/ConsoleLogger.cs b/src/XMakeBuildEngine/Logging/ConsoleLogger.cs index adcce71b9e7..dcab0c0412e 100644 --- a/src/XMakeBuildEngine/Logging/ConsoleLogger.cs +++ b/src/XMakeBuildEngine/Logging/ConsoleLogger.cs @@ -81,8 +81,8 @@ public ConsoleLogger(LoggerVerbosity verbosity) ( verbosity, new WriteHandler(Console.Out.Write), - new ColorSetter(SetColor), - new ColorResetter(ResetColor) + new ColorSetter(BaseConsoleLogger.SetColor), + new ColorResetter(BaseConsoleLogger.ResetColor) ) { // do nothing @@ -120,6 +120,7 @@ private void InitializeBaseConsoleLogger() { bool useMPLogger = false; bool disableConsoleColor = false; + bool forceConsoleColor = false; if (!string.IsNullOrEmpty(_parameters)) { string[] parameterComponents = _parameters.Split(BaseConsoleLogger.parameterDelimiters); @@ -139,11 +140,20 @@ private void InitializeBaseConsoleLogger() { disableConsoleColor = true; } + if (0 == String.Compare(parameterComponents[param], "FORCECONSOLECOLOR", StringComparison.OrdinalIgnoreCase)) + { + forceConsoleColor = true; + } } } } - if (disableConsoleColor) + if (forceConsoleColor) + { + _colorSet = new ColorSetter(BaseConsoleLogger.SetColorANSI); + _colorReset = new ColorResetter(BaseConsoleLogger.ResetColorANSI); + } + else if (disableConsoleColor) { _colorSet = new ColorSetter(BaseConsoleLogger.DontSetColor); _colorReset = new ColorResetter(BaseConsoleLogger.DontResetColor); @@ -477,66 +487,6 @@ public void CustomEventHandler(object sender, CustomBuildEventArgs e) _consoleLogger.CustomEventHandler(sender, e); } - /// - /// Sets foreground color to color specified - /// - /// foreground color - internal static void SetColor(ConsoleColor c) - { - try - { - Console.ForegroundColor = - TransformColor(c, Console.BackgroundColor); - } - catch (IOException) - { - // The color could not be set, no reason to crash - } - } - - /// - /// Resets the color - /// - internal static void ResetColor() - { - try - { - Console.ResetColor(); - } - catch (IOException) - { - // The color could not be reset, no reason to crash - } - } - - - /// - /// Changes the foreground color to black if the foreground is the - /// same as the background. Changes the foreground to white if the - /// background is black. - /// - /// foreground color for black - /// current background - private static ConsoleColor TransformColor(ConsoleColor foreground, - ConsoleColor background) - { - ConsoleColor result = foreground; //typically do nothing ... - - if (foreground == background) - { - if (background != ConsoleColor.Black) - { - result = ConsoleColor.Black; - } - else - { - result = ConsoleColor.Gray; - } - } - - return result; - } - #endregion } } diff --git a/src/XMakeBuildEngine/UnitTests/Evaluation/Preprocessor_Tests.cs b/src/XMakeBuildEngine/UnitTests/Evaluation/Preprocessor_Tests.cs index b77aceedc26..d9c9c8672ed 100644 --- a/src/XMakeBuildEngine/UnitTests/Evaluation/Preprocessor_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Evaluation/Preprocessor_Tests.cs @@ -24,6 +24,8 @@ namespace Microsoft.Build.UnitTests.Preprocessor /// public class Preprocessor_Tests : IDisposable { + private static string CurrentDirectoryXmlCommentFriendly => Directory.GetCurrentDirectory().Replace("--", "__"); + public Preprocessor_Tests() { Setup(); @@ -91,7 +93,7 @@ public void InitialTargetsOuterAndInner() @" @@ -99,14 +101,14 @@ public void InitialTargetsOuterAndInner() ============================================================================================================================================ -" + Directory.GetCurrentDirectory() + @"\p2 +" + CurrentDirectoryXmlCommentFriendly + Path.DirectorySeparatorChar + @"p2 ============================================================================================================================================ --> "); @@ -135,7 +137,7 @@ public void InitialTargetsInnerOnly() @" @@ -143,14 +145,14 @@ public void InitialTargetsInnerOnly() ============================================================================================================================================ -" + Directory.GetCurrentDirectory() + @"\p2 +" + CurrentDirectoryXmlCommentFriendly + Path.DirectorySeparatorChar + @"p2 ============================================================================================================================================ --> "); @@ -179,7 +181,7 @@ public void InitialTargetsOuterOnly() @" @@ -187,14 +189,14 @@ public void InitialTargetsOuterOnly() ============================================================================================================================================ -" + Directory.GetCurrentDirectory() + @"\p2 +" + CurrentDirectoryXmlCommentFriendly + Path.DirectorySeparatorChar + @"p2 ============================================================================================================================================ --> "); @@ -223,7 +225,7 @@ public void TwoFirstEmpty() @" @@ -231,7 +233,7 @@ public void TwoFirstEmpty() ============================================================================================================================================ -" + Directory.GetCurrentDirectory() + @"\p2 +" + CurrentDirectoryXmlCommentFriendly + Path.DirectorySeparatorChar + @"p2 ============================================================================================================================================ --> @@ -241,7 +243,7 @@ public void TwoFirstEmpty() ============================================================================================================================================ -" + Directory.GetCurrentDirectory() + @"\p1 +" + CurrentDirectoryXmlCommentFriendly + Path.DirectorySeparatorChar + @"p1 ============================================================================================================================================ --> "); @@ -271,7 +273,7 @@ public void FalseImport() @" @@ -305,7 +307,7 @@ public void TwoSecondEmpty() @" @@ -316,14 +318,14 @@ public void TwoSecondEmpty() ============================================================================================================================================ -" + Directory.GetCurrentDirectory() + @"\p2 +" + CurrentDirectoryXmlCommentFriendly + Path.DirectorySeparatorChar + @"p2 ============================================================================================================================================ --> "); @@ -375,7 +377,7 @@ public void TwoWithContent() ============================================================================================================================================ -" + Directory.GetCurrentDirectory() + @"\p2 +" + CurrentDirectoryXmlCommentFriendly + Path.DirectorySeparatorChar + @"p2 ============================================================================================================================================ --> @@ -418,7 +420,7 @@ public void ImportGroup() @" @@ -430,7 +432,7 @@ public void ImportGroup() ============================================================================================================================================ -" + Directory.GetCurrentDirectory() + @"\p2 +" + CurrentDirectoryXmlCommentFriendly + Path.DirectorySeparatorChar + @"p2 ============================================================================================================================================ --> @@ -440,7 +442,7 @@ public void ImportGroup() ============================================================================================================================================ -" + Directory.GetCurrentDirectory() + @"\p1 +" + CurrentDirectoryXmlCommentFriendly + Path.DirectorySeparatorChar + @"p1 ============================================================================================================================================ --> @@ -476,7 +478,7 @@ public void ImportGroupDoubleChildPlusCondition() @" @@ -488,7 +490,7 @@ public void ImportGroupDoubleChildPlusCondition() ============================================================================================================================================ -" + Directory.GetCurrentDirectory() + @"\p2 +" + CurrentDirectoryXmlCommentFriendly + Path.DirectorySeparatorChar + @"p2 ============================================================================================================================================ --> @@ -498,14 +500,14 @@ public void ImportGroupDoubleChildPlusCondition() ============================================================================================================================================ -" + Directory.GetCurrentDirectory() + @"\p1 +" + CurrentDirectoryXmlCommentFriendly + Path.DirectorySeparatorChar + @"p1 ============================================================================================================================================ --> @@ -515,7 +517,7 @@ public void ImportGroupDoubleChildPlusCondition() ============================================================================================================================================ -" + Directory.GetCurrentDirectory() + @"\p1 +" + CurrentDirectoryXmlCommentFriendly + Path.DirectorySeparatorChar + @"p1 ============================================================================================================================================ --> @@ -549,7 +551,7 @@ public void DefaultTargetsOuterAndInner() @" @@ -557,28 +559,28 @@ public void DefaultTargetsOuterAndInner() ============================================================================================================================================ -" + Directory.GetCurrentDirectory() + @"\p2 +" + CurrentDirectoryXmlCommentFriendly + Path.DirectorySeparatorChar + @"p2 ============================================================================================================================================ --> "); @@ -610,7 +612,7 @@ public void DefaultTargetsInnerOnly() @" @@ -618,28 +620,28 @@ public void DefaultTargetsInnerOnly() ============================================================================================================================================ -" + Directory.GetCurrentDirectory() + @"\p2 +" + CurrentDirectoryXmlCommentFriendly + Path.DirectorySeparatorChar + @"p2 ============================================================================================================================================ --> "); @@ -670,7 +672,7 @@ public void ImportGroupFalseCondition() @" @@ -724,7 +726,7 @@ public void ImportWildcard() @" @@ -757,7 +759,7 @@ public void ImportWildcard() ============================================================================================================================================ -" + Directory.GetCurrentDirectory() + @"\p1 +" + CurrentDirectoryXmlCommentFriendly + Path.DirectorySeparatorChar + @"p1 ============================================================================================================================================ --> "); @@ -831,4 +833,4 @@ public void ProjectMetadata() Helpers.VerifyAssertLineByLine(expected, writer.ToString()); } } -} \ No newline at end of file +} diff --git a/src/XMakeBuildEngine/UnitTests/project.json b/src/XMakeBuildEngine/UnitTests/project.json index 349c2b16445..98e4badf801 100644 --- a/src/XMakeBuildEngine/UnitTests/project.json +++ b/src/XMakeBuildEngine/UnitTests/project.json @@ -1,11 +1,10 @@ { "dependencies": { - "xunit": "2.1.0-rc1-build3168", - "xunit.runner.visualstudio": "2.1.0-rc1-build1124" + "xunit": "2.1.0", + "xunit.runner.visualstudio": "2.1.0" }, "frameworks": { "net451": {}, - "net46": {} }, "runtimes": { "win-": {}, diff --git a/src/XMakeBuildEngine/UnitTests/project.lock.json b/src/XMakeBuildEngine/UnitTests/project.lock.json deleted file mode 100644 index 8e23c150e88..00000000000 --- a/src/XMakeBuildEngine/UnitTests/project.lock.json +++ /dev/null @@ -1,553 +0,0 @@ -{ - "locked": false, - "version": 1, - "targets": { - ".NETFramework,Version=v4.5.1": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.5.1/win": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.5.1/win-": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.6": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.6/win": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.6/win-": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - } - }, - "libraries": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "sha512": "6BE4Vu74+dkv5AkJd+UxW1sFMepMZOVlUoMZDUKqhc4Bf7pe7yySzCj6QrowUZbCqcDPwOiQsAgz3nXiLQSyMw==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/portable-net45+win8+wp8+wpa81/System.Threading.Tasks.Dataflow.dll", - "lib/portable-net45+win8+wp8+wpa81/system.threading.tasks.dataflow.xml", - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll", - "lib/portable-net45+win8+wpa81/system.threading.tasks.dataflow.xml", - "License-Stable.rtf", - "Microsoft.Tpl.Dataflow.nuspec", - "package/services/metadata/core-properties/3dd86853af3a4ae392f3331459714ce0.psmdcp" - ] - }, - "xunit/2.1.0-rc1-build3168": { - "sha512": "dVnDKBCIpLE5GaxLALnbnobqtDyTTDKJSRbqhLGrx0Ptc/n3VQRUby/CDx6v+y7xNVPqtqj0XMeDO1DVT8E3tA==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "package/services/metadata/core-properties/c7931b7f3887423dbf4970aaa1c1dc7b.psmdcp", - "xunit.nuspec" - ] - }, - "xunit.abstractions/2.0.0": { - "sha512": "NAdxKQRzuLnCZ0g++x6i87/8rMBpQoRiRlRNLAqfODm2zJPbteHRoSER3DXfxnqrHXyBJT8rFaZ8uveBeQyaMA==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/net35/xunit.abstractions.dll", - "lib/net35/xunit.abstractions.xml", - "lib/portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS/xunit.abstractions.dll", - "lib/portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS/xunit.abstractions.xml", - "package/services/metadata/core-properties/24083640fee244bf9de77f4c35d40a72.psmdcp", - "xunit.abstractions.nuspec" - ] - }, - "xunit.assert/2.1.0-rc1-build3168": { - "sha512": "lsTK4OaNGt5IOoKO3ZQ0gSFngjWSHZ5xNurNtLd0MxZv5onv66xlNmWBYCVNt4sZLknQ+RfiqYm1EZ9ZrA0SDw==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/dotnet/xunit.assert.dll", - "lib/dotnet/xunit.assert.pdb", - "lib/dotnet/xunit.assert.xml", - "lib/portable-net45+win8+wp8+wpa81/xunit.assert.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.assert.pdb", - "lib/portable-net45+win8+wp8+wpa81/xunit.assert.xml", - "package/services/metadata/core-properties/25b1754808374eeb82f38a86833d4d61.psmdcp", - "xunit.assert.nuspec" - ] - }, - "xunit.core/2.1.0-rc1-build3168": { - "sha512": "IcQo+pNEDYBC9HJfzY08k0NhLZMX8WXudrlhcrIAzkT2szhrLbGhUi1k6vU5n9crsVv+IxosvIH28kYf6/Z32w==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "build/_desktop/xunit.execution.desktop.dll", - "build/dnx451/_._", - "build/monoandroid/_._", - "build/monotouch/_._", - "build/net45/_._", - "build/portable-net45+win8+wp8+wpa81/xunit.core.props", - "build/win8/_._", - "build/win81/xunit.core.props", - "build/wp8/_._", - "build/wpa81/xunit.core.props", - "build/xamarinios/_._", - "package/services/metadata/core-properties/c4f15e74cde14a09b99e736e49571ec0.psmdcp", - "xunit.core.nuspec" - ] - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "sha512": "8KZaq1mdeaiZxo1ScsGzhkeQRwLLS6+WIno+9gtnYccWmTjCJ/XSYz2fAAlB5mUeyw0vqqrFc+TfNZELs5QiZQ==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/dotnet/xunit.core.dll", - "lib/dotnet/xunit.core.dll.tdnet", - "lib/dotnet/xunit.core.pdb", - "lib/dotnet/xunit.core.xml", - "lib/dotnet/xunit.runner.tdnet.dll", - "lib/dotnet/xunit.runner.utility.desktop.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.core.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.core.dll.tdnet", - "lib/portable-net45+win8+wp8+wpa81/xunit.core.pdb", - "lib/portable-net45+win8+wp8+wpa81/xunit.core.xml", - "lib/portable-net45+win8+wp8+wpa81/xunit.runner.tdnet.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.runner.utility.desktop.dll", - "package/services/metadata/core-properties/f5b0a8a6af3a41e7abbb1c4e08ab5e31.psmdcp", - "xunit.extensibility.core.nuspec" - ] - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "sha512": "1w0u3eB7i25hca60r/53oSVb0blMOEm2eVqvwTg9jhMSe/A9raj6UZAVzUnFtA3xLssP4K1udOGTC1qrZ9/VoA==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/dnx451/xunit.execution.dotnet.dll", - "lib/dnx451/xunit.execution.dotnet.pdb", - "lib/dnx451/xunit.execution.dotnet.xml", - "lib/dotnet/xunit.execution.dotnet.dll", - "lib/dotnet/xunit.execution.dotnet.pdb", - "lib/dotnet/xunit.execution.dotnet.xml", - "lib/monoandroid/xunit.execution.dotnet.dll", - "lib/monoandroid/xunit.execution.dotnet.pdb", - "lib/monoandroid/xunit.execution.dotnet.xml", - "lib/monotouch/xunit.execution.dotnet.dll", - "lib/monotouch/xunit.execution.dotnet.pdb", - "lib/monotouch/xunit.execution.dotnet.xml", - "lib/net35/xunit.execution.desktop.dll", - "lib/net35/xunit.execution.desktop.pdb", - "lib/net35/xunit.execution.desktop.xml", - "lib/portable-net45+win8+wp8+wpa81/xunit.execution.dotnet.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.execution.dotnet.pdb", - "lib/portable-net45+win8+wp8+wpa81/xunit.execution.dotnet.xml", - "lib/win8/xunit.execution.dotnet.dll", - "lib/win8/xunit.execution.dotnet.pdb", - "lib/win8/xunit.execution.dotnet.xml", - "lib/wp8/xunit.execution.dotnet.dll", - "lib/wp8/xunit.execution.dotnet.pdb", - "lib/wp8/xunit.execution.dotnet.xml", - "lib/wpa81/xunit.execution.dotnet.dll", - "lib/wpa81/xunit.execution.dotnet.pdb", - "lib/wpa81/xunit.execution.dotnet.xml", - "lib/xamarinios/xunit.execution.dotnet.dll", - "lib/xamarinios/xunit.execution.dotnet.pdb", - "lib/xamarinios/xunit.execution.dotnet.xml", - "package/services/metadata/core-properties/3ba0c9def4ed43d782df6b4b2c8fef45.psmdcp", - "xunit.extensibility.execution.nuspec" - ] - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": { - "sha512": "4m6iGj99F92STIfhg/h+t3sWL42JE29UfCAQShdxQxSz7CpTxZScoxlDpanmroYaMD0riTFTZ7fr9Brsd0ABig==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "build/_common/xunit.abstractions.dll", - "build/_common/xunit.runner.utility.desktop.dll", - "build/_common/xunit.runner.utility.dotnet.dll", - "build/_common/xunit.runner.visualstudio.testadapter.dll", - "build/monoandroid/_._", - "build/monotouch/_._", - "build/net20/xunit.runner.visualstudio.props", - "build/portable-net45+win8+wp8+wpa81/xunit.runner.visualstudio.props", - "build/uap10.0/xunit.runner.visualstudio.props", - "build/uap10.0/xunit.runner.visualstudio.targets", - "build/uap10.0/xunit.runner.visualstudio.uwp.dll", - "build/uap10.0/xunit.runner.visualstudio.uwp.pri", - "build/win8/_._", - "build/win81/xunit.runner.visualstudio.props", - "build/win81/xunit.runner.visualstudio.targets", - "build/win81/xunit.runner.visualstudio.win81.dll", - "build/win81/xunit.runner.visualstudio.win81.pri", - "build/wp8/_._", - "build/wpa81/xunit.runner.visualstudio.props", - "build/wpa81/xunit.runner.visualstudio.targets", - "build/wpa81/xunit.runner.visualstudio.wpa81.dll", - "build/wpa81/xunit.runner.visualstudio.wpa81.pri", - "build/xamarinios/_._", - "package/services/metadata/core-properties/b0a423d21f7f45688579fd6544753269.psmdcp", - "xunit.runner.visualstudio.nuspec" - ] - } - }, - "projectFileDependencyGroups": { - "": [ - "xunit >= 2.1.0-rc1-build3168", - "xunit.runner.visualstudio >= 2.1.0-rc1-build1124" - ], - ".NETFramework,Version=v4.5.1": [], - ".NETFramework,Version=v4.6": [] - } -} \ No newline at end of file diff --git a/src/XMakeBuildEngine/UnitTestsPublicOM/project.json b/src/XMakeBuildEngine/UnitTestsPublicOM/project.json index 349c2b16445..98e4badf801 100644 --- a/src/XMakeBuildEngine/UnitTestsPublicOM/project.json +++ b/src/XMakeBuildEngine/UnitTestsPublicOM/project.json @@ -1,11 +1,10 @@ { "dependencies": { - "xunit": "2.1.0-rc1-build3168", - "xunit.runner.visualstudio": "2.1.0-rc1-build1124" + "xunit": "2.1.0", + "xunit.runner.visualstudio": "2.1.0" }, "frameworks": { "net451": {}, - "net46": {} }, "runtimes": { "win-": {}, diff --git a/src/XMakeBuildEngine/UnitTestsPublicOM/project.lock.json b/src/XMakeBuildEngine/UnitTestsPublicOM/project.lock.json deleted file mode 100644 index 8e23c150e88..00000000000 --- a/src/XMakeBuildEngine/UnitTestsPublicOM/project.lock.json +++ /dev/null @@ -1,553 +0,0 @@ -{ - "locked": false, - "version": 1, - "targets": { - ".NETFramework,Version=v4.5.1": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.5.1/win": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.5.1/win-": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.6": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.6/win": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.6/win-": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - } - }, - "libraries": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "sha512": "6BE4Vu74+dkv5AkJd+UxW1sFMepMZOVlUoMZDUKqhc4Bf7pe7yySzCj6QrowUZbCqcDPwOiQsAgz3nXiLQSyMw==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/portable-net45+win8+wp8+wpa81/System.Threading.Tasks.Dataflow.dll", - "lib/portable-net45+win8+wp8+wpa81/system.threading.tasks.dataflow.xml", - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll", - "lib/portable-net45+win8+wpa81/system.threading.tasks.dataflow.xml", - "License-Stable.rtf", - "Microsoft.Tpl.Dataflow.nuspec", - "package/services/metadata/core-properties/3dd86853af3a4ae392f3331459714ce0.psmdcp" - ] - }, - "xunit/2.1.0-rc1-build3168": { - "sha512": "dVnDKBCIpLE5GaxLALnbnobqtDyTTDKJSRbqhLGrx0Ptc/n3VQRUby/CDx6v+y7xNVPqtqj0XMeDO1DVT8E3tA==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "package/services/metadata/core-properties/c7931b7f3887423dbf4970aaa1c1dc7b.psmdcp", - "xunit.nuspec" - ] - }, - "xunit.abstractions/2.0.0": { - "sha512": "NAdxKQRzuLnCZ0g++x6i87/8rMBpQoRiRlRNLAqfODm2zJPbteHRoSER3DXfxnqrHXyBJT8rFaZ8uveBeQyaMA==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/net35/xunit.abstractions.dll", - "lib/net35/xunit.abstractions.xml", - "lib/portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS/xunit.abstractions.dll", - "lib/portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS/xunit.abstractions.xml", - "package/services/metadata/core-properties/24083640fee244bf9de77f4c35d40a72.psmdcp", - "xunit.abstractions.nuspec" - ] - }, - "xunit.assert/2.1.0-rc1-build3168": { - "sha512": "lsTK4OaNGt5IOoKO3ZQ0gSFngjWSHZ5xNurNtLd0MxZv5onv66xlNmWBYCVNt4sZLknQ+RfiqYm1EZ9ZrA0SDw==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/dotnet/xunit.assert.dll", - "lib/dotnet/xunit.assert.pdb", - "lib/dotnet/xunit.assert.xml", - "lib/portable-net45+win8+wp8+wpa81/xunit.assert.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.assert.pdb", - "lib/portable-net45+win8+wp8+wpa81/xunit.assert.xml", - "package/services/metadata/core-properties/25b1754808374eeb82f38a86833d4d61.psmdcp", - "xunit.assert.nuspec" - ] - }, - "xunit.core/2.1.0-rc1-build3168": { - "sha512": "IcQo+pNEDYBC9HJfzY08k0NhLZMX8WXudrlhcrIAzkT2szhrLbGhUi1k6vU5n9crsVv+IxosvIH28kYf6/Z32w==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "build/_desktop/xunit.execution.desktop.dll", - "build/dnx451/_._", - "build/monoandroid/_._", - "build/monotouch/_._", - "build/net45/_._", - "build/portable-net45+win8+wp8+wpa81/xunit.core.props", - "build/win8/_._", - "build/win81/xunit.core.props", - "build/wp8/_._", - "build/wpa81/xunit.core.props", - "build/xamarinios/_._", - "package/services/metadata/core-properties/c4f15e74cde14a09b99e736e49571ec0.psmdcp", - "xunit.core.nuspec" - ] - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "sha512": "8KZaq1mdeaiZxo1ScsGzhkeQRwLLS6+WIno+9gtnYccWmTjCJ/XSYz2fAAlB5mUeyw0vqqrFc+TfNZELs5QiZQ==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/dotnet/xunit.core.dll", - "lib/dotnet/xunit.core.dll.tdnet", - "lib/dotnet/xunit.core.pdb", - "lib/dotnet/xunit.core.xml", - "lib/dotnet/xunit.runner.tdnet.dll", - "lib/dotnet/xunit.runner.utility.desktop.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.core.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.core.dll.tdnet", - "lib/portable-net45+win8+wp8+wpa81/xunit.core.pdb", - "lib/portable-net45+win8+wp8+wpa81/xunit.core.xml", - "lib/portable-net45+win8+wp8+wpa81/xunit.runner.tdnet.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.runner.utility.desktop.dll", - "package/services/metadata/core-properties/f5b0a8a6af3a41e7abbb1c4e08ab5e31.psmdcp", - "xunit.extensibility.core.nuspec" - ] - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "sha512": "1w0u3eB7i25hca60r/53oSVb0blMOEm2eVqvwTg9jhMSe/A9raj6UZAVzUnFtA3xLssP4K1udOGTC1qrZ9/VoA==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/dnx451/xunit.execution.dotnet.dll", - "lib/dnx451/xunit.execution.dotnet.pdb", - "lib/dnx451/xunit.execution.dotnet.xml", - "lib/dotnet/xunit.execution.dotnet.dll", - "lib/dotnet/xunit.execution.dotnet.pdb", - "lib/dotnet/xunit.execution.dotnet.xml", - "lib/monoandroid/xunit.execution.dotnet.dll", - "lib/monoandroid/xunit.execution.dotnet.pdb", - "lib/monoandroid/xunit.execution.dotnet.xml", - "lib/monotouch/xunit.execution.dotnet.dll", - "lib/monotouch/xunit.execution.dotnet.pdb", - "lib/monotouch/xunit.execution.dotnet.xml", - "lib/net35/xunit.execution.desktop.dll", - "lib/net35/xunit.execution.desktop.pdb", - "lib/net35/xunit.execution.desktop.xml", - "lib/portable-net45+win8+wp8+wpa81/xunit.execution.dotnet.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.execution.dotnet.pdb", - "lib/portable-net45+win8+wp8+wpa81/xunit.execution.dotnet.xml", - "lib/win8/xunit.execution.dotnet.dll", - "lib/win8/xunit.execution.dotnet.pdb", - "lib/win8/xunit.execution.dotnet.xml", - "lib/wp8/xunit.execution.dotnet.dll", - "lib/wp8/xunit.execution.dotnet.pdb", - "lib/wp8/xunit.execution.dotnet.xml", - "lib/wpa81/xunit.execution.dotnet.dll", - "lib/wpa81/xunit.execution.dotnet.pdb", - "lib/wpa81/xunit.execution.dotnet.xml", - "lib/xamarinios/xunit.execution.dotnet.dll", - "lib/xamarinios/xunit.execution.dotnet.pdb", - "lib/xamarinios/xunit.execution.dotnet.xml", - "package/services/metadata/core-properties/3ba0c9def4ed43d782df6b4b2c8fef45.psmdcp", - "xunit.extensibility.execution.nuspec" - ] - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": { - "sha512": "4m6iGj99F92STIfhg/h+t3sWL42JE29UfCAQShdxQxSz7CpTxZScoxlDpanmroYaMD0riTFTZ7fr9Brsd0ABig==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "build/_common/xunit.abstractions.dll", - "build/_common/xunit.runner.utility.desktop.dll", - "build/_common/xunit.runner.utility.dotnet.dll", - "build/_common/xunit.runner.visualstudio.testadapter.dll", - "build/monoandroid/_._", - "build/monotouch/_._", - "build/net20/xunit.runner.visualstudio.props", - "build/portable-net45+win8+wp8+wpa81/xunit.runner.visualstudio.props", - "build/uap10.0/xunit.runner.visualstudio.props", - "build/uap10.0/xunit.runner.visualstudio.targets", - "build/uap10.0/xunit.runner.visualstudio.uwp.dll", - "build/uap10.0/xunit.runner.visualstudio.uwp.pri", - "build/win8/_._", - "build/win81/xunit.runner.visualstudio.props", - "build/win81/xunit.runner.visualstudio.targets", - "build/win81/xunit.runner.visualstudio.win81.dll", - "build/win81/xunit.runner.visualstudio.win81.pri", - "build/wp8/_._", - "build/wpa81/xunit.runner.visualstudio.props", - "build/wpa81/xunit.runner.visualstudio.targets", - "build/wpa81/xunit.runner.visualstudio.wpa81.dll", - "build/wpa81/xunit.runner.visualstudio.wpa81.pri", - "build/xamarinios/_._", - "package/services/metadata/core-properties/b0a423d21f7f45688579fd6544753269.psmdcp", - "xunit.runner.visualstudio.nuspec" - ] - } - }, - "projectFileDependencyGroups": { - "": [ - "xunit >= 2.1.0-rc1-build3168", - "xunit.runner.visualstudio >= 2.1.0-rc1-build1124" - ], - ".NETFramework,Version=v4.5.1": [], - ".NETFramework,Version=v4.6": [] - } -} \ No newline at end of file diff --git a/src/XMakeBuildEngine/project.json b/src/XMakeBuildEngine/project.json index cd38c24b0f0..c7cbea5afd1 100644 --- a/src/XMakeBuildEngine/project.json +++ b/src/XMakeBuildEngine/project.json @@ -4,7 +4,6 @@ }, "frameworks": { "net451": { }, - "net46": { } }, "runtimes": { "win-": { }, diff --git a/src/XMakeBuildEngine/project.lock.json b/src/XMakeBuildEngine/project.lock.json deleted file mode 100644 index 29088f5b5ea..00000000000 --- a/src/XMakeBuildEngine/project.lock.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "locked": false, - "version": 1, - "targets": { - ".NETFramework,Version=v4.5.1": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - } - }, - ".NETFramework,Version=v4.5.1/win": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - } - }, - ".NETFramework,Version=v4.5.1/win-": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - } - }, - ".NETFramework,Version=v4.6": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - } - }, - ".NETFramework,Version=v4.6/win": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - } - }, - ".NETFramework,Version=v4.6/win-": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - } - } - }, - "libraries": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "sha512": "6BE4Vu74+dkv5AkJd+UxW1sFMepMZOVlUoMZDUKqhc4Bf7pe7yySzCj6QrowUZbCqcDPwOiQsAgz3nXiLQSyMw==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/portable-net45+win8+wp8+wpa81/System.Threading.Tasks.Dataflow.dll", - "lib/portable-net45+win8+wp8+wpa81/system.threading.tasks.dataflow.xml", - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll", - "lib/portable-net45+win8+wpa81/system.threading.tasks.dataflow.xml", - "License-Stable.rtf", - "Microsoft.Tpl.Dataflow.nuspec", - "package/services/metadata/core-properties/3dd86853af3a4ae392f3331459714ce0.psmdcp" - ] - } - }, - "projectFileDependencyGroups": { - "": [ - "Microsoft.Tpl.Dataflow >= 4.5.24" - ], - ".NETFramework,Version=v4.5.1": [], - ".NETFramework,Version=v4.6": [] - } -} \ No newline at end of file diff --git a/src/XMakeCommandLine/CommandLineSwitches.cs b/src/XMakeCommandLine/CommandLineSwitches.cs index 0a5476676c9..73c954aef8c 100644 --- a/src/XMakeCommandLine/CommandLineSwitches.cs +++ b/src/XMakeCommandLine/CommandLineSwitches.cs @@ -442,10 +442,19 @@ bool unquoteParameters { // initialize its parameter storage _parameterizedSwitches[(int)parameterizedSwitch].parameters = new ArrayList(); - } - // save the switch text - _parameterizedSwitches[(int)parameterizedSwitch].commandLineArg = commandLineArg; + // save the switch text + _parameterizedSwitches[(int)parameterizedSwitch].commandLineArg = commandLineArg; + } + else + { + // append the switch text + _parameterizedSwitches[(int)parameterizedSwitch].commandLineArg = string.Concat( + _parameterizedSwitches[(int)parameterizedSwitch].commandLineArg, + " ", + commandLineArg + ); + } // check if the switch has multiple parameters if (multipleParametersAllowed) diff --git a/src/XMakeCommandLine/Strings.resx b/src/XMakeCommandLine/Strings.resx index a816ca326b0..e0e792b8955 100644 --- a/src/XMakeCommandLine/Strings.resx +++ b/src/XMakeCommandLine/Strings.resx @@ -303,6 +303,8 @@ Copyright (C) Microsoft Corporation. All rights reserved. EnableMPLogging--Enable the multiprocessor logging style even when running in non-multiprocessor mode. This logging style is on by default. + ForceConsoleColor--Use ANSI console colors even if + console does not support it Verbosity--overrides the /verbosity setting for this logger. Example: diff --git a/src/XMakeCommandLine/UnitTests/CommandLineSwitches_Tests.cs b/src/XMakeCommandLine/UnitTests/CommandLineSwitches_Tests.cs index c3e1fd92f9e..2a684c637e5 100644 --- a/src/XMakeCommandLine/UnitTests/CommandLineSwitches_Tests.cs +++ b/src/XMakeCommandLine/UnitTests/CommandLineSwitches_Tests.cs @@ -757,7 +757,7 @@ public void SetParameterizedSwitchTests1() // purposes of testing the SetParameterizedSwitch() method, it doesn't matter Assert.True(switches.SetParameterizedSwitch(CommandLineSwitches.ParameterizedSwitch.Verbosity, "/verbosity:\"diag\";minimal", "\"diag\";minimal", true, true)); - Assert.Equal("/verbosity:\"diag\";minimal", switches.GetParameterizedSwitchCommandLineArg(CommandLineSwitches.ParameterizedSwitch.Verbosity)); + Assert.Equal("/v:q /verbosity:\"diag\";minimal", switches.GetParameterizedSwitchCommandLineArg(CommandLineSwitches.ParameterizedSwitch.Verbosity)); Assert.True(switches.IsParameterizedSwitchSet(CommandLineSwitches.ParameterizedSwitch.Verbosity)); parameters = switches[CommandLineSwitches.ParameterizedSwitch.Verbosity]; @@ -800,7 +800,7 @@ public void SetParameterizedSwitchTests2() // more fake/missing parameters Assert.False(switches.SetParameterizedSwitch(CommandLineSwitches.ParameterizedSwitch.Target, "/t:A,\"\";B", "A,\"\";B", true, true)); - Assert.Equal("/t:A,\"\";B", switches.GetParameterizedSwitchCommandLineArg(CommandLineSwitches.ParameterizedSwitch.Target)); + Assert.Equal("/t:\" /t:A,\"\";B", switches.GetParameterizedSwitchCommandLineArg(CommandLineSwitches.ParameterizedSwitch.Target)); Assert.True(switches.IsParameterizedSwitchSet(CommandLineSwitches.ParameterizedSwitch.Target)); parameters = switches[CommandLineSwitches.ParameterizedSwitch.Target]; @@ -842,7 +842,7 @@ public void SetParameterizedSwitchTests3() // parameters, but for testing purposes this is fine Assert.True(switches.SetParameterizedSwitch(CommandLineSwitches.ParameterizedSwitch.Logger, "/LOGGER:\"\",asm;\"p,a;r\"", "\"\",asm;\"p,a;r\"", true, false)); - Assert.Equal("/LOGGER:\"\",asm;\"p,a;r\"", switches.GetParameterizedSwitchCommandLineArg(CommandLineSwitches.ParameterizedSwitch.Logger)); + Assert.Equal("/l:\" /LOGGER:\"\",asm;\"p,a;r\"", switches.GetParameterizedSwitchCommandLineArg(CommandLineSwitches.ParameterizedSwitch.Logger)); Assert.True(switches.IsParameterizedSwitchSet(CommandLineSwitches.ParameterizedSwitch.Logger)); parameters = switches[CommandLineSwitches.ParameterizedSwitch.Logger]; diff --git a/src/XMakeCommandLine/UnitTests/project.json b/src/XMakeCommandLine/UnitTests/project.json index 349c2b16445..98e4badf801 100644 --- a/src/XMakeCommandLine/UnitTests/project.json +++ b/src/XMakeCommandLine/UnitTests/project.json @@ -1,11 +1,10 @@ { "dependencies": { - "xunit": "2.1.0-rc1-build3168", - "xunit.runner.visualstudio": "2.1.0-rc1-build1124" + "xunit": "2.1.0", + "xunit.runner.visualstudio": "2.1.0" }, "frameworks": { "net451": {}, - "net46": {} }, "runtimes": { "win-": {}, diff --git a/src/XMakeCommandLine/UnitTests/project.lock.json b/src/XMakeCommandLine/UnitTests/project.lock.json deleted file mode 100644 index 8e23c150e88..00000000000 --- a/src/XMakeCommandLine/UnitTests/project.lock.json +++ /dev/null @@ -1,553 +0,0 @@ -{ - "locked": false, - "version": 1, - "targets": { - ".NETFramework,Version=v4.5.1": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.5.1/win": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.5.1/win-": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.6": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.6/win": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.6/win-": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - } - }, - "libraries": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "sha512": "6BE4Vu74+dkv5AkJd+UxW1sFMepMZOVlUoMZDUKqhc4Bf7pe7yySzCj6QrowUZbCqcDPwOiQsAgz3nXiLQSyMw==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/portable-net45+win8+wp8+wpa81/System.Threading.Tasks.Dataflow.dll", - "lib/portable-net45+win8+wp8+wpa81/system.threading.tasks.dataflow.xml", - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll", - "lib/portable-net45+win8+wpa81/system.threading.tasks.dataflow.xml", - "License-Stable.rtf", - "Microsoft.Tpl.Dataflow.nuspec", - "package/services/metadata/core-properties/3dd86853af3a4ae392f3331459714ce0.psmdcp" - ] - }, - "xunit/2.1.0-rc1-build3168": { - "sha512": "dVnDKBCIpLE5GaxLALnbnobqtDyTTDKJSRbqhLGrx0Ptc/n3VQRUby/CDx6v+y7xNVPqtqj0XMeDO1DVT8E3tA==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "package/services/metadata/core-properties/c7931b7f3887423dbf4970aaa1c1dc7b.psmdcp", - "xunit.nuspec" - ] - }, - "xunit.abstractions/2.0.0": { - "sha512": "NAdxKQRzuLnCZ0g++x6i87/8rMBpQoRiRlRNLAqfODm2zJPbteHRoSER3DXfxnqrHXyBJT8rFaZ8uveBeQyaMA==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/net35/xunit.abstractions.dll", - "lib/net35/xunit.abstractions.xml", - "lib/portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS/xunit.abstractions.dll", - "lib/portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS/xunit.abstractions.xml", - "package/services/metadata/core-properties/24083640fee244bf9de77f4c35d40a72.psmdcp", - "xunit.abstractions.nuspec" - ] - }, - "xunit.assert/2.1.0-rc1-build3168": { - "sha512": "lsTK4OaNGt5IOoKO3ZQ0gSFngjWSHZ5xNurNtLd0MxZv5onv66xlNmWBYCVNt4sZLknQ+RfiqYm1EZ9ZrA0SDw==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/dotnet/xunit.assert.dll", - "lib/dotnet/xunit.assert.pdb", - "lib/dotnet/xunit.assert.xml", - "lib/portable-net45+win8+wp8+wpa81/xunit.assert.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.assert.pdb", - "lib/portable-net45+win8+wp8+wpa81/xunit.assert.xml", - "package/services/metadata/core-properties/25b1754808374eeb82f38a86833d4d61.psmdcp", - "xunit.assert.nuspec" - ] - }, - "xunit.core/2.1.0-rc1-build3168": { - "sha512": "IcQo+pNEDYBC9HJfzY08k0NhLZMX8WXudrlhcrIAzkT2szhrLbGhUi1k6vU5n9crsVv+IxosvIH28kYf6/Z32w==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "build/_desktop/xunit.execution.desktop.dll", - "build/dnx451/_._", - "build/monoandroid/_._", - "build/monotouch/_._", - "build/net45/_._", - "build/portable-net45+win8+wp8+wpa81/xunit.core.props", - "build/win8/_._", - "build/win81/xunit.core.props", - "build/wp8/_._", - "build/wpa81/xunit.core.props", - "build/xamarinios/_._", - "package/services/metadata/core-properties/c4f15e74cde14a09b99e736e49571ec0.psmdcp", - "xunit.core.nuspec" - ] - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "sha512": "8KZaq1mdeaiZxo1ScsGzhkeQRwLLS6+WIno+9gtnYccWmTjCJ/XSYz2fAAlB5mUeyw0vqqrFc+TfNZELs5QiZQ==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/dotnet/xunit.core.dll", - "lib/dotnet/xunit.core.dll.tdnet", - "lib/dotnet/xunit.core.pdb", - "lib/dotnet/xunit.core.xml", - "lib/dotnet/xunit.runner.tdnet.dll", - "lib/dotnet/xunit.runner.utility.desktop.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.core.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.core.dll.tdnet", - "lib/portable-net45+win8+wp8+wpa81/xunit.core.pdb", - "lib/portable-net45+win8+wp8+wpa81/xunit.core.xml", - "lib/portable-net45+win8+wp8+wpa81/xunit.runner.tdnet.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.runner.utility.desktop.dll", - "package/services/metadata/core-properties/f5b0a8a6af3a41e7abbb1c4e08ab5e31.psmdcp", - "xunit.extensibility.core.nuspec" - ] - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "sha512": "1w0u3eB7i25hca60r/53oSVb0blMOEm2eVqvwTg9jhMSe/A9raj6UZAVzUnFtA3xLssP4K1udOGTC1qrZ9/VoA==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/dnx451/xunit.execution.dotnet.dll", - "lib/dnx451/xunit.execution.dotnet.pdb", - "lib/dnx451/xunit.execution.dotnet.xml", - "lib/dotnet/xunit.execution.dotnet.dll", - "lib/dotnet/xunit.execution.dotnet.pdb", - "lib/dotnet/xunit.execution.dotnet.xml", - "lib/monoandroid/xunit.execution.dotnet.dll", - "lib/monoandroid/xunit.execution.dotnet.pdb", - "lib/monoandroid/xunit.execution.dotnet.xml", - "lib/monotouch/xunit.execution.dotnet.dll", - "lib/monotouch/xunit.execution.dotnet.pdb", - "lib/monotouch/xunit.execution.dotnet.xml", - "lib/net35/xunit.execution.desktop.dll", - "lib/net35/xunit.execution.desktop.pdb", - "lib/net35/xunit.execution.desktop.xml", - "lib/portable-net45+win8+wp8+wpa81/xunit.execution.dotnet.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.execution.dotnet.pdb", - "lib/portable-net45+win8+wp8+wpa81/xunit.execution.dotnet.xml", - "lib/win8/xunit.execution.dotnet.dll", - "lib/win8/xunit.execution.dotnet.pdb", - "lib/win8/xunit.execution.dotnet.xml", - "lib/wp8/xunit.execution.dotnet.dll", - "lib/wp8/xunit.execution.dotnet.pdb", - "lib/wp8/xunit.execution.dotnet.xml", - "lib/wpa81/xunit.execution.dotnet.dll", - "lib/wpa81/xunit.execution.dotnet.pdb", - "lib/wpa81/xunit.execution.dotnet.xml", - "lib/xamarinios/xunit.execution.dotnet.dll", - "lib/xamarinios/xunit.execution.dotnet.pdb", - "lib/xamarinios/xunit.execution.dotnet.xml", - "package/services/metadata/core-properties/3ba0c9def4ed43d782df6b4b2c8fef45.psmdcp", - "xunit.extensibility.execution.nuspec" - ] - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": { - "sha512": "4m6iGj99F92STIfhg/h+t3sWL42JE29UfCAQShdxQxSz7CpTxZScoxlDpanmroYaMD0riTFTZ7fr9Brsd0ABig==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "build/_common/xunit.abstractions.dll", - "build/_common/xunit.runner.utility.desktop.dll", - "build/_common/xunit.runner.utility.dotnet.dll", - "build/_common/xunit.runner.visualstudio.testadapter.dll", - "build/monoandroid/_._", - "build/monotouch/_._", - "build/net20/xunit.runner.visualstudio.props", - "build/portable-net45+win8+wp8+wpa81/xunit.runner.visualstudio.props", - "build/uap10.0/xunit.runner.visualstudio.props", - "build/uap10.0/xunit.runner.visualstudio.targets", - "build/uap10.0/xunit.runner.visualstudio.uwp.dll", - "build/uap10.0/xunit.runner.visualstudio.uwp.pri", - "build/win8/_._", - "build/win81/xunit.runner.visualstudio.props", - "build/win81/xunit.runner.visualstudio.targets", - "build/win81/xunit.runner.visualstudio.win81.dll", - "build/win81/xunit.runner.visualstudio.win81.pri", - "build/wp8/_._", - "build/wpa81/xunit.runner.visualstudio.props", - "build/wpa81/xunit.runner.visualstudio.targets", - "build/wpa81/xunit.runner.visualstudio.wpa81.dll", - "build/wpa81/xunit.runner.visualstudio.wpa81.pri", - "build/xamarinios/_._", - "package/services/metadata/core-properties/b0a423d21f7f45688579fd6544753269.psmdcp", - "xunit.runner.visualstudio.nuspec" - ] - } - }, - "projectFileDependencyGroups": { - "": [ - "xunit >= 2.1.0-rc1-build3168", - "xunit.runner.visualstudio >= 2.1.0-rc1-build1124" - ], - ".NETFramework,Version=v4.5.1": [], - ".NETFramework,Version=v4.6": [] - } -} \ No newline at end of file diff --git a/src/XMakeTasks/UnitTests/project.json b/src/XMakeTasks/UnitTests/project.json index 349c2b16445..98e4badf801 100644 --- a/src/XMakeTasks/UnitTests/project.json +++ b/src/XMakeTasks/UnitTests/project.json @@ -1,11 +1,10 @@ { "dependencies": { - "xunit": "2.1.0-rc1-build3168", - "xunit.runner.visualstudio": "2.1.0-rc1-build1124" + "xunit": "2.1.0", + "xunit.runner.visualstudio": "2.1.0" }, "frameworks": { "net451": {}, - "net46": {} }, "runtimes": { "win-": {}, diff --git a/src/XMakeTasks/UnitTests/project.lock.json b/src/XMakeTasks/UnitTests/project.lock.json deleted file mode 100644 index 8e23c150e88..00000000000 --- a/src/XMakeTasks/UnitTests/project.lock.json +++ /dev/null @@ -1,553 +0,0 @@ -{ - "locked": false, - "version": 1, - "targets": { - ".NETFramework,Version=v4.5.1": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.5.1/win": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.5.1/win-": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.6": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.6/win": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - }, - ".NETFramework,Version=v4.6/win-": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "compile": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {} - } - }, - "xunit/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.assert": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.abstractions/2.0.0": { - "compile": { - "lib/net35/xunit.abstractions.dll": {} - }, - "runtime": { - "lib/net35/xunit.abstractions.dll": {} - } - }, - "xunit.assert/2.1.0-rc1-build3168": { - "compile": { - "lib/dotnet/xunit.assert.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.assert.dll": {} - } - }, - "xunit.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]", - "xunit.extensibility.execution": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - } - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.abstractions": "[2.0.0, 2.0.0]" - }, - "compile": { - "lib/dotnet/xunit.core.dll": {} - }, - "runtime": { - "lib/dotnet/xunit.core.dll": {} - } - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "dependencies": { - "xunit.extensibility.core": "[2.1.0-rc1-build3168, 2.1.0-rc1-build3168]" - }, - "compile": { - "lib/net35/xunit.execution.desktop.dll": {} - }, - "runtime": { - "lib/net35/xunit.execution.desktop.dll": {} - } - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": {} - } - }, - "libraries": { - "Microsoft.Tpl.Dataflow/4.5.24": { - "sha512": "6BE4Vu74+dkv5AkJd+UxW1sFMepMZOVlUoMZDUKqhc4Bf7pe7yySzCj6QrowUZbCqcDPwOiQsAgz3nXiLQSyMw==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/portable-net45+win8+wp8+wpa81/System.Threading.Tasks.Dataflow.dll", - "lib/portable-net45+win8+wp8+wpa81/system.threading.tasks.dataflow.xml", - "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll", - "lib/portable-net45+win8+wpa81/system.threading.tasks.dataflow.xml", - "License-Stable.rtf", - "Microsoft.Tpl.Dataflow.nuspec", - "package/services/metadata/core-properties/3dd86853af3a4ae392f3331459714ce0.psmdcp" - ] - }, - "xunit/2.1.0-rc1-build3168": { - "sha512": "dVnDKBCIpLE5GaxLALnbnobqtDyTTDKJSRbqhLGrx0Ptc/n3VQRUby/CDx6v+y7xNVPqtqj0XMeDO1DVT8E3tA==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "package/services/metadata/core-properties/c7931b7f3887423dbf4970aaa1c1dc7b.psmdcp", - "xunit.nuspec" - ] - }, - "xunit.abstractions/2.0.0": { - "sha512": "NAdxKQRzuLnCZ0g++x6i87/8rMBpQoRiRlRNLAqfODm2zJPbteHRoSER3DXfxnqrHXyBJT8rFaZ8uveBeQyaMA==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/net35/xunit.abstractions.dll", - "lib/net35/xunit.abstractions.xml", - "lib/portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS/xunit.abstractions.dll", - "lib/portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS/xunit.abstractions.xml", - "package/services/metadata/core-properties/24083640fee244bf9de77f4c35d40a72.psmdcp", - "xunit.abstractions.nuspec" - ] - }, - "xunit.assert/2.1.0-rc1-build3168": { - "sha512": "lsTK4OaNGt5IOoKO3ZQ0gSFngjWSHZ5xNurNtLd0MxZv5onv66xlNmWBYCVNt4sZLknQ+RfiqYm1EZ9ZrA0SDw==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/dotnet/xunit.assert.dll", - "lib/dotnet/xunit.assert.pdb", - "lib/dotnet/xunit.assert.xml", - "lib/portable-net45+win8+wp8+wpa81/xunit.assert.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.assert.pdb", - "lib/portable-net45+win8+wp8+wpa81/xunit.assert.xml", - "package/services/metadata/core-properties/25b1754808374eeb82f38a86833d4d61.psmdcp", - "xunit.assert.nuspec" - ] - }, - "xunit.core/2.1.0-rc1-build3168": { - "sha512": "IcQo+pNEDYBC9HJfzY08k0NhLZMX8WXudrlhcrIAzkT2szhrLbGhUi1k6vU5n9crsVv+IxosvIH28kYf6/Z32w==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "build/_desktop/xunit.execution.desktop.dll", - "build/dnx451/_._", - "build/monoandroid/_._", - "build/monotouch/_._", - "build/net45/_._", - "build/portable-net45+win8+wp8+wpa81/xunit.core.props", - "build/win8/_._", - "build/win81/xunit.core.props", - "build/wp8/_._", - "build/wpa81/xunit.core.props", - "build/xamarinios/_._", - "package/services/metadata/core-properties/c4f15e74cde14a09b99e736e49571ec0.psmdcp", - "xunit.core.nuspec" - ] - }, - "xunit.extensibility.core/2.1.0-rc1-build3168": { - "sha512": "8KZaq1mdeaiZxo1ScsGzhkeQRwLLS6+WIno+9gtnYccWmTjCJ/XSYz2fAAlB5mUeyw0vqqrFc+TfNZELs5QiZQ==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/dotnet/xunit.core.dll", - "lib/dotnet/xunit.core.dll.tdnet", - "lib/dotnet/xunit.core.pdb", - "lib/dotnet/xunit.core.xml", - "lib/dotnet/xunit.runner.tdnet.dll", - "lib/dotnet/xunit.runner.utility.desktop.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.core.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.core.dll.tdnet", - "lib/portable-net45+win8+wp8+wpa81/xunit.core.pdb", - "lib/portable-net45+win8+wp8+wpa81/xunit.core.xml", - "lib/portable-net45+win8+wp8+wpa81/xunit.runner.tdnet.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.runner.utility.desktop.dll", - "package/services/metadata/core-properties/f5b0a8a6af3a41e7abbb1c4e08ab5e31.psmdcp", - "xunit.extensibility.core.nuspec" - ] - }, - "xunit.extensibility.execution/2.1.0-rc1-build3168": { - "sha512": "1w0u3eB7i25hca60r/53oSVb0blMOEm2eVqvwTg9jhMSe/A9raj6UZAVzUnFtA3xLssP4K1udOGTC1qrZ9/VoA==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/dnx451/xunit.execution.dotnet.dll", - "lib/dnx451/xunit.execution.dotnet.pdb", - "lib/dnx451/xunit.execution.dotnet.xml", - "lib/dotnet/xunit.execution.dotnet.dll", - "lib/dotnet/xunit.execution.dotnet.pdb", - "lib/dotnet/xunit.execution.dotnet.xml", - "lib/monoandroid/xunit.execution.dotnet.dll", - "lib/monoandroid/xunit.execution.dotnet.pdb", - "lib/monoandroid/xunit.execution.dotnet.xml", - "lib/monotouch/xunit.execution.dotnet.dll", - "lib/monotouch/xunit.execution.dotnet.pdb", - "lib/monotouch/xunit.execution.dotnet.xml", - "lib/net35/xunit.execution.desktop.dll", - "lib/net35/xunit.execution.desktop.pdb", - "lib/net35/xunit.execution.desktop.xml", - "lib/portable-net45+win8+wp8+wpa81/xunit.execution.dotnet.dll", - "lib/portable-net45+win8+wp8+wpa81/xunit.execution.dotnet.pdb", - "lib/portable-net45+win8+wp8+wpa81/xunit.execution.dotnet.xml", - "lib/win8/xunit.execution.dotnet.dll", - "lib/win8/xunit.execution.dotnet.pdb", - "lib/win8/xunit.execution.dotnet.xml", - "lib/wp8/xunit.execution.dotnet.dll", - "lib/wp8/xunit.execution.dotnet.pdb", - "lib/wp8/xunit.execution.dotnet.xml", - "lib/wpa81/xunit.execution.dotnet.dll", - "lib/wpa81/xunit.execution.dotnet.pdb", - "lib/wpa81/xunit.execution.dotnet.xml", - "lib/xamarinios/xunit.execution.dotnet.dll", - "lib/xamarinios/xunit.execution.dotnet.pdb", - "lib/xamarinios/xunit.execution.dotnet.xml", - "package/services/metadata/core-properties/3ba0c9def4ed43d782df6b4b2c8fef45.psmdcp", - "xunit.extensibility.execution.nuspec" - ] - }, - "xunit.runner.visualstudio/2.1.0-rc1-build1124": { - "sha512": "4m6iGj99F92STIfhg/h+t3sWL42JE29UfCAQShdxQxSz7CpTxZScoxlDpanmroYaMD0riTFTZ7fr9Brsd0ABig==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "build/_common/xunit.abstractions.dll", - "build/_common/xunit.runner.utility.desktop.dll", - "build/_common/xunit.runner.utility.dotnet.dll", - "build/_common/xunit.runner.visualstudio.testadapter.dll", - "build/monoandroid/_._", - "build/monotouch/_._", - "build/net20/xunit.runner.visualstudio.props", - "build/portable-net45+win8+wp8+wpa81/xunit.runner.visualstudio.props", - "build/uap10.0/xunit.runner.visualstudio.props", - "build/uap10.0/xunit.runner.visualstudio.targets", - "build/uap10.0/xunit.runner.visualstudio.uwp.dll", - "build/uap10.0/xunit.runner.visualstudio.uwp.pri", - "build/win8/_._", - "build/win81/xunit.runner.visualstudio.props", - "build/win81/xunit.runner.visualstudio.targets", - "build/win81/xunit.runner.visualstudio.win81.dll", - "build/win81/xunit.runner.visualstudio.win81.pri", - "build/wp8/_._", - "build/wpa81/xunit.runner.visualstudio.props", - "build/wpa81/xunit.runner.visualstudio.targets", - "build/wpa81/xunit.runner.visualstudio.wpa81.dll", - "build/wpa81/xunit.runner.visualstudio.wpa81.pri", - "build/xamarinios/_._", - "package/services/metadata/core-properties/b0a423d21f7f45688579fd6544753269.psmdcp", - "xunit.runner.visualstudio.nuspec" - ] - } - }, - "projectFileDependencyGroups": { - "": [ - "xunit >= 2.1.0-rc1-build3168", - "xunit.runner.visualstudio >= 2.1.0-rc1-build1124" - ], - ".NETFramework,Version=v4.5.1": [], - ".NETFramework,Version=v4.6": [] - } -} \ No newline at end of file diff --git a/src/dir.props b/src/dir.props index 4c4916a8b1c..810ef0a8b35 100644 --- a/src/dir.props +++ b/src/dir.props @@ -1,3 +1,4 @@  + diff --git a/src/dir.targets b/src/dir.targets index 343034bd2ea..1296e0e5b49 100644 --- a/src/dir.targets +++ b/src/dir.targets @@ -3,7 +3,9 @@ - + + + diff --git a/src/xunit.runner.json b/src/xunit.runner.json index 498389f3ffd..becfdf1ea72 100644 --- a/src/xunit.runner.json +++ b/src/xunit.runner.json @@ -2,5 +2,5 @@ "shadowCopy": false, "maxParallelThreads": 1, "parallelizeAssembly": false, - "methodDisplay": "method" -} \ No newline at end of file + "methodDisplay": "classAndMethod" +}