From a05e2701b6572b72c8e65bcaef748c0eb1a595a2 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Sat, 25 Mar 2017 09:38:04 -0700 Subject: [PATCH] Migrate to .NET SDK projects And target xunit 2.2.0 --- .appveyor.yml | 18 +++ release.cmd | 13 -- src/Directory.Build.props | 12 ++ .../Properties/AssemblyInfo.cs | 8 -- .../Xunit.SkippableFact.Desktop.csproj | 104 ---------------- .../Xunit.SkippableFact.Desktop.ruleset | 79 ------------ .../packages.config | 10 -- .../Properties/AssemblyInfo.cs | 10 -- .../Xunit.SkippableFact.Dotnet.csproj | 99 ---------------- .../packages.config | 10 -- .../Xunit.SkippableFact.NuGet.nuproj | 72 ----------- .../build/_Xunit.SkippableFact.props | 12 -- .../build/net45/Xunit.SkippableFact.props | 4 - .../Xunit.SkippableFact.props | 4 - .../AssemblyInfo.cs | 6 - .../Xunit.SkippableFact.Shared.projitems | 17 --- .../Xunit.SkippableFact.Shared.shproj | 13 -- .../App.config | 6 - .../Properties/AssemblyInfo.cs | 10 -- .../Xunit.SkippableFact.Tests.dotnet.csproj | 112 ------------------ .../Xunit.SkippableFact.Tests.ruleset | 77 ------------ .../packages.config | 12 -- ...Xunit.SkippableFact.Tests.Shared.projitems | 15 --- .../Xunit.SkippableFact.Tests.Shared.shproj | 13 -- .../App.config | 9 -- .../Properties/AssemblyInfo.cs | 8 -- .../Xunit.SkippableFact.Tests.desktop.csproj | 106 ----------------- .../packages.config | 12 -- .../SampleTests.cs | 0 .../SkipTests.cs | 0 .../Xunit.SkippableFact.Tests.csproj | 23 ++++ .../xunit.runner.json | 3 + src/Xunit.SkippableFact.sln | 77 +++++------- .../Properties/AssemblyInfo.cs | 10 -- .../Sdk/SkippableFactDiscoverer.cs | 0 .../Sdk/SkippableTestMessageBus.cs | 0 .../Sdk/SkippableTheoryDiscoverer.cs | 0 .../SkippableFactAttribute.cs | 2 +- .../SkippableTheoryAttribute.cs | 2 +- .../Xunit.SkippableFact.csproj | 100 +++------------- .../Xunit.SkippableFact.ruleset | 1 + .../opensourcekey.snk | Bin src/Xunit.SkippableFact/packages.config | 10 -- nuget.config => src/nuget.config | 0 src/version.json | 12 ++ version.json | 6 - 46 files changed, 118 insertions(+), 999 deletions(-) create mode 100644 .appveyor.yml delete mode 100644 release.cmd create mode 100644 src/Directory.Build.props delete mode 100644 src/Xunit.SkippableFact.Desktop/Properties/AssemblyInfo.cs delete mode 100644 src/Xunit.SkippableFact.Desktop/Xunit.SkippableFact.Desktop.csproj delete mode 100644 src/Xunit.SkippableFact.Desktop/Xunit.SkippableFact.Desktop.ruleset delete mode 100644 src/Xunit.SkippableFact.Desktop/packages.config delete mode 100644 src/Xunit.SkippableFact.Dotnet/Properties/AssemblyInfo.cs delete mode 100644 src/Xunit.SkippableFact.Dotnet/Xunit.SkippableFact.Dotnet.csproj delete mode 100644 src/Xunit.SkippableFact.Dotnet/packages.config delete mode 100644 src/Xunit.SkippableFact.NuGet/Xunit.SkippableFact.NuGet.nuproj delete mode 100644 src/Xunit.SkippableFact.NuGet/build/_Xunit.SkippableFact.props delete mode 100644 src/Xunit.SkippableFact.NuGet/build/net45/Xunit.SkippableFact.props delete mode 100644 src/Xunit.SkippableFact.NuGet/build/portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10/Xunit.SkippableFact.props delete mode 100644 src/Xunit.SkippableFact.Shared/AssemblyInfo.cs delete mode 100644 src/Xunit.SkippableFact.Shared/Xunit.SkippableFact.Shared.projitems delete mode 100644 src/Xunit.SkippableFact.Shared/Xunit.SkippableFact.Shared.shproj delete mode 100644 src/Xunit.SkippableFact.Tests.Dotnet/App.config delete mode 100644 src/Xunit.SkippableFact.Tests.Dotnet/Properties/AssemblyInfo.cs delete mode 100644 src/Xunit.SkippableFact.Tests.Dotnet/Xunit.SkippableFact.Tests.dotnet.csproj delete mode 100644 src/Xunit.SkippableFact.Tests.Dotnet/Xunit.SkippableFact.Tests.ruleset delete mode 100644 src/Xunit.SkippableFact.Tests.Dotnet/packages.config delete mode 100644 src/Xunit.SkippableFact.Tests.Shared/Xunit.SkippableFact.Tests.Shared.projitems delete mode 100644 src/Xunit.SkippableFact.Tests.Shared/Xunit.SkippableFact.Tests.Shared.shproj delete mode 100644 src/Xunit.SkippableFact.Tests.desktop/App.config delete mode 100644 src/Xunit.SkippableFact.Tests.desktop/Properties/AssemblyInfo.cs delete mode 100644 src/Xunit.SkippableFact.Tests.desktop/Xunit.SkippableFact.Tests.desktop.csproj delete mode 100644 src/Xunit.SkippableFact.Tests.desktop/packages.config rename src/{Xunit.SkippableFact.Tests.Shared => Xunit.SkippableFact.Tests}/SampleTests.cs (100%) rename src/{Xunit.SkippableFact.Tests.Shared => Xunit.SkippableFact.Tests}/SkipTests.cs (100%) create mode 100644 src/Xunit.SkippableFact.Tests/Xunit.SkippableFact.Tests.csproj create mode 100644 src/Xunit.SkippableFact.Tests/xunit.runner.json delete mode 100644 src/Xunit.SkippableFact/Properties/AssemblyInfo.cs rename src/{Xunit.SkippableFact.Shared => Xunit.SkippableFact}/Sdk/SkippableFactDiscoverer.cs (100%) rename src/{Xunit.SkippableFact.Shared => Xunit.SkippableFact}/Sdk/SkippableTestMessageBus.cs (100%) rename src/{Xunit.SkippableFact.Shared => Xunit.SkippableFact}/Sdk/SkippableTheoryDiscoverer.cs (100%) rename src/{ => Xunit.SkippableFact}/opensourcekey.snk (100%) delete mode 100644 src/Xunit.SkippableFact/packages.config rename nuget.config => src/nuget.config (100%) create mode 100644 src/version.json delete mode 100644 version.json diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 0000000..5ca5f4f --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,18 @@ +version: '{build}' +skip_tags: true +os: Visual Studio 2017 +configuration: Release +environment: + VisualStudioVersion: 15.0 +before_build: +- ps: dotnet restore src +build_script: +- ps: >- + dotnet build src /nologo + + dotnet pack src --no-build /nologo +test_script: +- ps: dotnet test .\src\Xunit.SkippableFact.Tests\Xunit.SkippableFact.Tests.csproj --no-build +artifacts: +- path: 'bin\**\*.nupkg' + name: NuGet package diff --git a/release.cmd b/release.cmd deleted file mode 100644 index 8eca78d..0000000 --- a/release.cmd +++ /dev/null @@ -1,13 +0,0 @@ -@pushd "%~dp0" - -git clean -fdx src -nuget restore src -msbuild /nologo /v:minimal /m /fl src\Xunit.SkippableFact.sln /p:configuration=release,UseNonZeroBuildNumber=true -vstest.console.exe src\Xunit.SkippableFact.Tests\bin\release\Xunit.SkippableFact.Tests.dll /TestAdapterPath:packages - -@echo Last steps to release: -@echo git tag v1.0.****** -@echo git push origin v1.0.****** -@echo nuget push src\Xunit.SkippableFact.NuGet\bin\release\Xunit.SkippableFact.*.nupkg - -@popd diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 0000000..8fb9710 --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,12 @@ + + + $(MSBuildThisFileDirectory)..\obj\$(MSBuildProjectName)\ + $(MSBuildThisFileDirectory)..\bin\$(MSBuildProjectName)\$(Configuration)\ + + + + + + + + diff --git a/src/Xunit.SkippableFact.Desktop/Properties/AssemblyInfo.cs b/src/Xunit.SkippableFact.Desktop/Properties/AssemblyInfo.cs deleted file mode 100644 index aefd023..0000000 --- a/src/Xunit.SkippableFact.Desktop/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) Andrew Arnott. All rights reserved. -// Licensed under the Microsoft Public License (Ms-PL). See LICENSE.txt file in the project root for full license information. - -using System.Reflection; - -[assembly: AssemblyTitle("Xunit.SkippableFact.Desktop")] -[assembly: AssemblyProduct("Xunit.SkippableFact")] -[assembly: AssemblyCopyright("Copyright © 2015")] diff --git a/src/Xunit.SkippableFact.Desktop/Xunit.SkippableFact.Desktop.csproj b/src/Xunit.SkippableFact.Desktop/Xunit.SkippableFact.Desktop.csproj deleted file mode 100644 index 3bbf1c1..0000000 --- a/src/Xunit.SkippableFact.Desktop/Xunit.SkippableFact.Desktop.csproj +++ /dev/null @@ -1,104 +0,0 @@ - - - - - Debug - AnyCPU - {F12DD7E3-22D5-4EC4-AA9B-A42A03D0798E} - Library - Properties - Xunit - Xunit.SkippableFact.desktop - v4.5 - 512 - Xunit.SkippableFact.Desktop.ruleset - - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - true - - - ..\opensourcekey.snk - - - - - - - ..\..\packages\Validation.2.2.8\lib\dotnet\Validation.dll - True - - - ..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - True - - - ..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll - True - - - ..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll - True - - - - - - - - {ea6330cc-b135-405d-af9b-bd802b508985} - Xunit.SkippableFact - - - - - stylecop.json - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - - \ No newline at end of file diff --git a/src/Xunit.SkippableFact.Desktop/Xunit.SkippableFact.Desktop.ruleset b/src/Xunit.SkippableFact.Desktop/Xunit.SkippableFact.Desktop.ruleset deleted file mode 100644 index 5727d05..0000000 --- a/src/Xunit.SkippableFact.Desktop/Xunit.SkippableFact.Desktop.ruleset +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Xunit.SkippableFact.Desktop/packages.config b/src/Xunit.SkippableFact.Desktop/packages.config deleted file mode 100644 index 65378b7..0000000 --- a/src/Xunit.SkippableFact.Desktop/packages.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/Xunit.SkippableFact.Dotnet/Properties/AssemblyInfo.cs b/src/Xunit.SkippableFact.Dotnet/Properties/AssemblyInfo.cs deleted file mode 100644 index 9876162..0000000 --- a/src/Xunit.SkippableFact.Dotnet/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) Andrew Arnott. All rights reserved. -// Licensed under the Microsoft Public License (Ms-PL). See LICENSE.txt file in the project root for full license information. - -using System.Reflection; -using System.Resources; - -[assembly: AssemblyTitle("Xunit.SkippableFact.Dotnet")] -[assembly: AssemblyProduct("Xunit.SkippableFact")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[assembly: NeutralResourcesLanguage("en")] diff --git a/src/Xunit.SkippableFact.Dotnet/Xunit.SkippableFact.Dotnet.csproj b/src/Xunit.SkippableFact.Dotnet/Xunit.SkippableFact.Dotnet.csproj deleted file mode 100644 index 0a0c6f3..0000000 --- a/src/Xunit.SkippableFact.Dotnet/Xunit.SkippableFact.Dotnet.csproj +++ /dev/null @@ -1,99 +0,0 @@ - - - - - 10.0 - Debug - AnyCPU - {DC7DC3B8-FB6B-424B-A302-B0F090D014B5} - Library - Properties - Xunit - Xunit.SkippableFact.dotnet - en-US - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Profile259 - v4.5 - ..\opensourcekey.snk - ..\Xunit.SkippableFact.Desktop\Xunit.SkippableFact.Desktop.ruleset - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - stylecop.json - - - - - - - - - {ea6330cc-b135-405d-af9b-bd802b508985} - Xunit.SkippableFact - - - - - ..\..\packages\Validation.2.2.8\lib\portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\Validation.dll - True - - - ..\..\packages\xunit.abstractions.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll - True - - - ..\..\packages\xunit.extensibility.core.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll - True - - - ..\..\packages\xunit.extensibility.execution.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.execution.dotnet.dll - True - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - \ No newline at end of file diff --git a/src/Xunit.SkippableFact.Dotnet/packages.config b/src/Xunit.SkippableFact.Dotnet/packages.config deleted file mode 100644 index 3de1eb7..0000000 --- a/src/Xunit.SkippableFact.Dotnet/packages.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/Xunit.SkippableFact.NuGet/Xunit.SkippableFact.NuGet.nuproj b/src/Xunit.SkippableFact.NuGet/Xunit.SkippableFact.NuGet.nuproj deleted file mode 100644 index 1c92ca2..0000000 --- a/src/Xunit.SkippableFact.NuGet/Xunit.SkippableFact.NuGet.nuproj +++ /dev/null @@ -1,72 +0,0 @@ - - - - - Debug - AnyCPU - - - Release - AnyCPU - - - - - - - - - - - - - f4735a6d-589a-4a18-8238-e5ff0764f417 - $(VersionDependsOn);GetNuPkgVersion - - - ..\..\packages\NuProj.0.10.18-beta-gcd398090a4\tools\ - - - - Xunit.SkippableFact - Dynamic test skipping for Xunit - Andrew Arnott - andarno - Dynamically skippable [Fact] and [Theory] methods. - Make your Xunit test methods self-determine to report a "skipped" result. Useful for such cases as "not supported on this platform" results or other environmental inputs. - - - https://github.com/AArnott/Xunit.SkippableFact - https://raw.githubusercontent.com/AArnott/Xunit.SkippableFact/master/LICENSE.txt - Copyright © Andrew Arnott - xunit testing skipping - true - true - true - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - $(NuGetPackageVersion) - - - - - - - build\%(FileName)%(Extension) - - - - build\%(FileName)%(Extension) - - - - \ No newline at end of file diff --git a/src/Xunit.SkippableFact.NuGet/build/_Xunit.SkippableFact.props b/src/Xunit.SkippableFact.NuGet/build/_Xunit.SkippableFact.props deleted file mode 100644 index f0921e9..0000000 --- a/src/Xunit.SkippableFact.NuGet/build/_Xunit.SkippableFact.props +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - %(Filename)%(Extension) - PreserveNewest - False - - - diff --git a/src/Xunit.SkippableFact.NuGet/build/net45/Xunit.SkippableFact.props b/src/Xunit.SkippableFact.NuGet/build/net45/Xunit.SkippableFact.props deleted file mode 100644 index eca9e91..0000000 --- a/src/Xunit.SkippableFact.NuGet/build/net45/Xunit.SkippableFact.props +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/Xunit.SkippableFact.NuGet/build/portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10/Xunit.SkippableFact.props b/src/Xunit.SkippableFact.NuGet/build/portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10/Xunit.SkippableFact.props deleted file mode 100644 index eca9e91..0000000 --- a/src/Xunit.SkippableFact.NuGet/build/portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10/Xunit.SkippableFact.props +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/Xunit.SkippableFact.Shared/AssemblyInfo.cs b/src/Xunit.SkippableFact.Shared/AssemblyInfo.cs deleted file mode 100644 index 31f89e4..0000000 --- a/src/Xunit.SkippableFact.Shared/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (c) Andrew Arnott. All rights reserved. -// Licensed under the Microsoft Public License (Ms-PL). See LICENSE.txt file in the project root for full license information. - -using Xunit.Sdk; - -[assembly: PlatformSpecificAssembly] \ No newline at end of file diff --git a/src/Xunit.SkippableFact.Shared/Xunit.SkippableFact.Shared.projitems b/src/Xunit.SkippableFact.Shared/Xunit.SkippableFact.Shared.projitems deleted file mode 100644 index bfe11de..0000000 --- a/src/Xunit.SkippableFact.Shared/Xunit.SkippableFact.Shared.projitems +++ /dev/null @@ -1,17 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - a10e1858-3dc7-4767-8070-7e43e70abade - - - Xunit.SkippableFact.Shared - - - - - - - - \ No newline at end of file diff --git a/src/Xunit.SkippableFact.Shared/Xunit.SkippableFact.Shared.shproj b/src/Xunit.SkippableFact.Shared/Xunit.SkippableFact.Shared.shproj deleted file mode 100644 index 9c2659e..0000000 --- a/src/Xunit.SkippableFact.Shared/Xunit.SkippableFact.Shared.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - a10e1858-3dc7-4767-8070-7e43e70abade - 14.0 - - - - - - - - diff --git a/src/Xunit.SkippableFact.Tests.Dotnet/App.config b/src/Xunit.SkippableFact.Tests.Dotnet/App.config deleted file mode 100644 index 1004883..0000000 --- a/src/Xunit.SkippableFact.Tests.Dotnet/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/Xunit.SkippableFact.Tests.Dotnet/Properties/AssemblyInfo.cs b/src/Xunit.SkippableFact.Tests.Dotnet/Properties/AssemblyInfo.cs deleted file mode 100644 index 3a43963..0000000 --- a/src/Xunit.SkippableFact.Tests.Dotnet/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) Andrew Arnott. All rights reserved. -// Licensed under the Microsoft Public License (Ms-PL). See LICENSE.txt file in the project root for full license information. - -using System.Resources; -using System.Reflection; - -[assembly: AssemblyTitle("Xunit.Combinatorial.Tests")] -[assembly: AssemblyProduct("Xunit.Combinatorial.Tests")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[assembly: NeutralResourcesLanguage("en")] diff --git a/src/Xunit.SkippableFact.Tests.Dotnet/Xunit.SkippableFact.Tests.dotnet.csproj b/src/Xunit.SkippableFact.Tests.Dotnet/Xunit.SkippableFact.Tests.dotnet.csproj deleted file mode 100644 index 7e5ee5c..0000000 --- a/src/Xunit.SkippableFact.Tests.Dotnet/Xunit.SkippableFact.Tests.dotnet.csproj +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - 11.0 - Debug - AnyCPU - {81D4F7CC-A88A-40E4-A1D2-A34BDE0BC2DF} - Library - Properties - Xunit - Xunit.SkippableFact.Tests.dotnet - en-US - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Profile259 - v4.5 - Xunit.SkippableFact.Tests.ruleset - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - {dc7dc3b8-fb6b-424b-a302-b0f090d014b5} - Xunit.SkippableFact.Dotnet - - false - - - {F12DD7E3-22D5-4EC4-AA9B-A42A03D0798E} - Xunit.SkippableFact.Desktop - - false - - - {ea6330cc-b135-405d-af9b-bd802b508985} - Xunit.SkippableFact - - - - - - - - ..\..\packages\Validation.2.2.8\lib\portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\Validation.dll - True - - - ..\..\Packages\xunit.abstractions.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll - True - - - ..\..\packages\xunit.assert.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll - True - - - ..\..\packages\xunit.extensibility.core.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll - True - - - ..\..\packages\xunit.extensibility.execution.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.execution.dotnet.dll - True - - - - - stylecop.json - - - - - - %(Filename)%(Extension) - PreserveNewest - False - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - \ No newline at end of file diff --git a/src/Xunit.SkippableFact.Tests.Dotnet/Xunit.SkippableFact.Tests.ruleset b/src/Xunit.SkippableFact.Tests.Dotnet/Xunit.SkippableFact.Tests.ruleset deleted file mode 100644 index a79e7d4..0000000 --- a/src/Xunit.SkippableFact.Tests.Dotnet/Xunit.SkippableFact.Tests.ruleset +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Xunit.SkippableFact.Tests.Dotnet/packages.config b/src/Xunit.SkippableFact.Tests.Dotnet/packages.config deleted file mode 100644 index 3c316d9..0000000 --- a/src/Xunit.SkippableFact.Tests.Dotnet/packages.config +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Xunit.SkippableFact.Tests.Shared/Xunit.SkippableFact.Tests.Shared.projitems b/src/Xunit.SkippableFact.Tests.Shared/Xunit.SkippableFact.Tests.Shared.projitems deleted file mode 100644 index 740b879..0000000 --- a/src/Xunit.SkippableFact.Tests.Shared/Xunit.SkippableFact.Tests.Shared.projitems +++ /dev/null @@ -1,15 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - 432fc0e6-0b31-4f2d-a2ce-d8ca86e15399 - - - Xunit.SkippableFact.Tests - - - - - - \ No newline at end of file diff --git a/src/Xunit.SkippableFact.Tests.Shared/Xunit.SkippableFact.Tests.Shared.shproj b/src/Xunit.SkippableFact.Tests.Shared/Xunit.SkippableFact.Tests.Shared.shproj deleted file mode 100644 index c4f3775..0000000 --- a/src/Xunit.SkippableFact.Tests.Shared/Xunit.SkippableFact.Tests.Shared.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - 432fc0e6-0b31-4f2d-a2ce-d8ca86e15399 - 14.0 - - - - - - - - diff --git a/src/Xunit.SkippableFact.Tests.desktop/App.config b/src/Xunit.SkippableFact.Tests.desktop/App.config deleted file mode 100644 index c11c8d0..0000000 --- a/src/Xunit.SkippableFact.Tests.desktop/App.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/Xunit.SkippableFact.Tests.desktop/Properties/AssemblyInfo.cs b/src/Xunit.SkippableFact.Tests.desktop/Properties/AssemblyInfo.cs deleted file mode 100644 index 8dba64d..0000000 --- a/src/Xunit.SkippableFact.Tests.desktop/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) Andrew Arnott. All rights reserved. -// Licensed under the Microsoft Public License (Ms-PL). See LICENSE.txt file in the project root for full license information. - -using System.Reflection; - -[assembly: AssemblyTitle("Xunit.SkippableFact.Tests.desktop")] -[assembly: AssemblyProduct("Xunit.SkippableFact.Tests.desktop")] -[assembly: AssemblyCopyright("Copyright © 2015")] diff --git a/src/Xunit.SkippableFact.Tests.desktop/Xunit.SkippableFact.Tests.desktop.csproj b/src/Xunit.SkippableFact.Tests.desktop/Xunit.SkippableFact.Tests.desktop.csproj deleted file mode 100644 index d6c6286..0000000 --- a/src/Xunit.SkippableFact.Tests.desktop/Xunit.SkippableFact.Tests.desktop.csproj +++ /dev/null @@ -1,106 +0,0 @@ - - - - - Debug - AnyCPU - {CE5F06BC-8553-42A1-A7F0-3FEEE1B9373F} - Library - Properties - Xunit.SkippableFact.Tests.desktop - Xunit.SkippableFact.Tests.desktop - v4.5.2 - 512 - - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - ..\..\packages\Validation.2.2.8\lib\dotnet\Validation.dll - True - - - ..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - True - - - ..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll - True - - - ..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll - True - - - ..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll - True - - - - - - - - - - %(Filename)%(Extension) - PreserveNewest - False - - - - - {ea6330cc-b135-405d-af9b-bd802b508985} - Xunit.SkippableFact - - - {F12DD7E3-22D5-4EC4-AA9B-A42A03D0798E} - Xunit.SkippableFact.Desktop - - false - - - - - - - - - Program - $(MSBuildProjectDirectory)\..\..\packages\xunit.runner.console.2.2.0-beta1-build3217\tools\xunit.console.exe - "$(TargetPath)" -serialize - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/Xunit.SkippableFact.Tests.desktop/packages.config b/src/Xunit.SkippableFact.Tests.desktop/packages.config deleted file mode 100644 index fc6b297..0000000 --- a/src/Xunit.SkippableFact.Tests.desktop/packages.config +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Xunit.SkippableFact.Tests.Shared/SampleTests.cs b/src/Xunit.SkippableFact.Tests/SampleTests.cs similarity index 100% rename from src/Xunit.SkippableFact.Tests.Shared/SampleTests.cs rename to src/Xunit.SkippableFact.Tests/SampleTests.cs diff --git a/src/Xunit.SkippableFact.Tests.Shared/SkipTests.cs b/src/Xunit.SkippableFact.Tests/SkipTests.cs similarity index 100% rename from src/Xunit.SkippableFact.Tests.Shared/SkipTests.cs rename to src/Xunit.SkippableFact.Tests/SkipTests.cs diff --git a/src/Xunit.SkippableFact.Tests/Xunit.SkippableFact.Tests.csproj b/src/Xunit.SkippableFact.Tests/Xunit.SkippableFact.Tests.csproj new file mode 100644 index 0000000..f3a7a22 --- /dev/null +++ b/src/Xunit.SkippableFact.Tests/Xunit.SkippableFact.Tests.csproj @@ -0,0 +1,23 @@ + + + net461;netcoreapp1.0 + false + + + + PreserveNewest + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Xunit.SkippableFact.Tests/xunit.runner.json b/src/Xunit.SkippableFact.Tests/xunit.runner.json new file mode 100644 index 0000000..df1c3d5 --- /dev/null +++ b/src/Xunit.SkippableFact.Tests/xunit.runner.json @@ -0,0 +1,3 @@ +{ + "methodDisplay": "method" +} \ No newline at end of file diff --git a/src/Xunit.SkippableFact.sln b/src/Xunit.SkippableFact.sln index 5d4eff5..2191f30 100644 --- a/src/Xunit.SkippableFact.sln +++ b/src/Xunit.SkippableFact.sln @@ -1,74 +1,57 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.26228.9 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xunit.SkippableFact", "Xunit.SkippableFact\Xunit.SkippableFact.csproj", "{EA6330CC-B135-405D-AF9B-BD802B508985}" -EndProject -Project("{FF286327-C783-4F7A-AB73-9BCBAD0D4460}") = "Xunit.SkippableFact.NuGet", "Xunit.SkippableFact.NuGet\Xunit.SkippableFact.NuGet.nuproj", "{F4735A6D-589A-4A18-8238-E5FF0764F417}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xunit.SkippableFact", "Xunit.SkippableFact\Xunit.SkippableFact.csproj", "{EA6330CC-B135-405D-AF9B-BD802B508985}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F1DC7855-CCA5-43C7-B1AB-D8D547E28A85}" ProjectSection(SolutionItems) = preProject ..\LICENSE.txt = ..\LICENSE.txt - ..\nuget.config = ..\nuget.config + nuget.config = nuget.config ..\README.md = ..\README.md ..\release.cmd = ..\release.cmd - ..\version.json = ..\version.json + version.json = version.json EndProjectSection ProjectSection(FolderGlobals) = preProject __JSONSchema = ..\..\.nuget\packages\Nerdbank.GitVersioning\1.2.1\tools\version.schema.json EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xunit.SkippableFact.Desktop", "Xunit.SkippableFact.Desktop\Xunit.SkippableFact.Desktop.csproj", "{F12DD7E3-22D5-4EC4-AA9B-A42A03D0798E}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xunit.SkippableFact.Dotnet", "Xunit.SkippableFact.Dotnet\Xunit.SkippableFact.Dotnet.csproj", "{DC7DC3B8-FB6B-424B-A302-B0F090D014B5}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Xunit.SkippableFact.Shared", "Xunit.SkippableFact.Shared\Xunit.SkippableFact.Shared.shproj", "{A10E1858-3DC7-4767-8070-7E43E70ABADE}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Xunit.SkippableFact.Tests.Shared", "Xunit.SkippableFact.Tests.Shared\Xunit.SkippableFact.Tests.Shared.shproj", "{432FC0E6-0B31-4F2D-A2CE-D8CA86E15399}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xunit.SkippableFact.Tests.Dotnet", "Xunit.SkippableFact.Tests.Dotnet\Xunit.SkippableFact.Tests.Dotnet.csproj", "{81D4F7CC-A88A-40E4-A1D2-A34BDE0BC2DF}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xunit.SkippableFact.Tests.Desktop", "Xunit.SkippableFact.Tests.Desktop\Xunit.SkippableFact.Tests.Desktop.csproj", "{CE5F06BC-8553-42A1-A7F0-3FEEE1B9373F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xunit.SkippableFact.Tests", "Xunit.SkippableFact.Tests\Xunit.SkippableFact.Tests.csproj", "{B6E55EBE-4D2D-48DE-97AF-6058169B517D}" EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - Xunit.SkippableFact.Tests.Shared\Xunit.SkippableFact.Tests.Shared.projitems*{81d4f7cc-a88a-40e4-a1d2-a34bde0bc2df}*SharedItemsImports = 4 - Xunit.SkippableFact.Tests.Shared\Xunit.SkippableFact.Tests.Shared.projitems*{432fc0e6-0b31-4f2d-a2ce-d8ca86e15399}*SharedItemsImports = 13 - Xunit.SkippableFact.Shared\Xunit.SkippableFact.Shared.projitems*{dc7dc3b8-fb6b-424b-a302-b0f090d014b5}*SharedItemsImports = 4 - Xunit.SkippableFact.Shared\Xunit.SkippableFact.Shared.projitems*{a10e1858-3dc7-4767-8070-7e43e70abade}*SharedItemsImports = 13 - Xunit.SkippableFact.Tests.Shared\Xunit.SkippableFact.Tests.Shared.projitems*{ce5f06bc-8553-42a1-a7f0-3feee1b9373f}*SharedItemsImports = 4 - Xunit.SkippableFact.Shared\Xunit.SkippableFact.Shared.projitems*{f12dd7e3-22d5-4ec4-aa9b-a42a03d0798e}*SharedItemsImports = 4 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {EA6330CC-B135-405D-AF9B-BD802B508985}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EA6330CC-B135-405D-AF9B-BD802B508985}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EA6330CC-B135-405D-AF9B-BD802B508985}.Debug|x64.ActiveCfg = Debug|Any CPU + {EA6330CC-B135-405D-AF9B-BD802B508985}.Debug|x64.Build.0 = Debug|Any CPU + {EA6330CC-B135-405D-AF9B-BD802B508985}.Debug|x86.ActiveCfg = Debug|Any CPU + {EA6330CC-B135-405D-AF9B-BD802B508985}.Debug|x86.Build.0 = Debug|Any CPU {EA6330CC-B135-405D-AF9B-BD802B508985}.Release|Any CPU.ActiveCfg = Release|Any CPU {EA6330CC-B135-405D-AF9B-BD802B508985}.Release|Any CPU.Build.0 = Release|Any CPU - {F4735A6D-589A-4A18-8238-E5FF0764F417}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F4735A6D-589A-4A18-8238-E5FF0764F417}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F4735A6D-589A-4A18-8238-E5FF0764F417}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F4735A6D-589A-4A18-8238-E5FF0764F417}.Release|Any CPU.Build.0 = Release|Any CPU - {F12DD7E3-22D5-4EC4-AA9B-A42A03D0798E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F12DD7E3-22D5-4EC4-AA9B-A42A03D0798E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F12DD7E3-22D5-4EC4-AA9B-A42A03D0798E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F12DD7E3-22D5-4EC4-AA9B-A42A03D0798E}.Release|Any CPU.Build.0 = Release|Any CPU - {DC7DC3B8-FB6B-424B-A302-B0F090D014B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC7DC3B8-FB6B-424B-A302-B0F090D014B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC7DC3B8-FB6B-424B-A302-B0F090D014B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC7DC3B8-FB6B-424B-A302-B0F090D014B5}.Release|Any CPU.Build.0 = Release|Any CPU - {81D4F7CC-A88A-40E4-A1D2-A34BDE0BC2DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {81D4F7CC-A88A-40E4-A1D2-A34BDE0BC2DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {81D4F7CC-A88A-40E4-A1D2-A34BDE0BC2DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {81D4F7CC-A88A-40E4-A1D2-A34BDE0BC2DF}.Release|Any CPU.Build.0 = Release|Any CPU - {CE5F06BC-8553-42A1-A7F0-3FEEE1B9373F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE5F06BC-8553-42A1-A7F0-3FEEE1B9373F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE5F06BC-8553-42A1-A7F0-3FEEE1B9373F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE5F06BC-8553-42A1-A7F0-3FEEE1B9373F}.Release|Any CPU.Build.0 = Release|Any CPU + {EA6330CC-B135-405D-AF9B-BD802B508985}.Release|x64.ActiveCfg = Release|Any CPU + {EA6330CC-B135-405D-AF9B-BD802B508985}.Release|x64.Build.0 = Release|Any CPU + {EA6330CC-B135-405D-AF9B-BD802B508985}.Release|x86.ActiveCfg = Release|Any CPU + {EA6330CC-B135-405D-AF9B-BD802B508985}.Release|x86.Build.0 = Release|Any CPU + {B6E55EBE-4D2D-48DE-97AF-6058169B517D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B6E55EBE-4D2D-48DE-97AF-6058169B517D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B6E55EBE-4D2D-48DE-97AF-6058169B517D}.Debug|x64.ActiveCfg = Debug|Any CPU + {B6E55EBE-4D2D-48DE-97AF-6058169B517D}.Debug|x64.Build.0 = Debug|Any CPU + {B6E55EBE-4D2D-48DE-97AF-6058169B517D}.Debug|x86.ActiveCfg = Debug|Any CPU + {B6E55EBE-4D2D-48DE-97AF-6058169B517D}.Debug|x86.Build.0 = Debug|Any CPU + {B6E55EBE-4D2D-48DE-97AF-6058169B517D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B6E55EBE-4D2D-48DE-97AF-6058169B517D}.Release|Any CPU.Build.0 = Release|Any CPU + {B6E55EBE-4D2D-48DE-97AF-6058169B517D}.Release|x64.ActiveCfg = Release|Any CPU + {B6E55EBE-4D2D-48DE-97AF-6058169B517D}.Release|x64.Build.0 = Release|Any CPU + {B6E55EBE-4D2D-48DE-97AF-6058169B517D}.Release|x86.ActiveCfg = Release|Any CPU + {B6E55EBE-4D2D-48DE-97AF-6058169B517D}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/Xunit.SkippableFact/Properties/AssemblyInfo.cs b/src/Xunit.SkippableFact/Properties/AssemblyInfo.cs deleted file mode 100644 index 84b93ec..0000000 --- a/src/Xunit.SkippableFact/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) Andrew Arnott. All rights reserved. -// Licensed under the Microsoft Public License (Ms-PL). See LICENSE.txt file in the project root for full license information. - -using System.Reflection; -using System.Resources; - -[assembly: AssemblyTitle("Xunit.SkippableFact")] -[assembly: AssemblyProduct("Xunit.SkippableFact")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[assembly: NeutralResourcesLanguage("en")] diff --git a/src/Xunit.SkippableFact.Shared/Sdk/SkippableFactDiscoverer.cs b/src/Xunit.SkippableFact/Sdk/SkippableFactDiscoverer.cs similarity index 100% rename from src/Xunit.SkippableFact.Shared/Sdk/SkippableFactDiscoverer.cs rename to src/Xunit.SkippableFact/Sdk/SkippableFactDiscoverer.cs diff --git a/src/Xunit.SkippableFact.Shared/Sdk/SkippableTestMessageBus.cs b/src/Xunit.SkippableFact/Sdk/SkippableTestMessageBus.cs similarity index 100% rename from src/Xunit.SkippableFact.Shared/Sdk/SkippableTestMessageBus.cs rename to src/Xunit.SkippableFact/Sdk/SkippableTestMessageBus.cs diff --git a/src/Xunit.SkippableFact.Shared/Sdk/SkippableTheoryDiscoverer.cs b/src/Xunit.SkippableFact/Sdk/SkippableTheoryDiscoverer.cs similarity index 100% rename from src/Xunit.SkippableFact.Shared/Sdk/SkippableTheoryDiscoverer.cs rename to src/Xunit.SkippableFact/Sdk/SkippableTheoryDiscoverer.cs diff --git a/src/Xunit.SkippableFact/SkippableFactAttribute.cs b/src/Xunit.SkippableFact/SkippableFactAttribute.cs index 71a985d..5c71729 100644 --- a/src/Xunit.SkippableFact/SkippableFactAttribute.cs +++ b/src/Xunit.SkippableFact/SkippableFactAttribute.cs @@ -13,7 +13,7 @@ namespace Xunit /// or otherwise throwing a . /// [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)] - [XunitTestCaseDiscoverer("Xunit.Sdk.SkippableFactDiscoverer", "Xunit.SkippableFact.{Platform}")] + [XunitTestCaseDiscoverer("Xunit.Sdk.SkippableFactDiscoverer", ThisAssembly.AssemblyName)] public class SkippableFactAttribute : FactAttribute { /// diff --git a/src/Xunit.SkippableFact/SkippableTheoryAttribute.cs b/src/Xunit.SkippableFact/SkippableTheoryAttribute.cs index dbdaade..601df6d 100644 --- a/src/Xunit.SkippableFact/SkippableTheoryAttribute.cs +++ b/src/Xunit.SkippableFact/SkippableTheoryAttribute.cs @@ -16,7 +16,7 @@ namespace Xunit /// or otherwise throwing a . /// [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)] - [XunitTestCaseDiscoverer("Xunit.Sdk.SkippableTheoryDiscoverer", "Xunit.SkippableFact.{Platform}")] + [XunitTestCaseDiscoverer("Xunit.Sdk.SkippableTheoryDiscoverer", ThisAssembly.AssemblyName)] public class SkippableTheoryAttribute : TheoryAttribute { /// diff --git a/src/Xunit.SkippableFact/Xunit.SkippableFact.csproj b/src/Xunit.SkippableFact/Xunit.SkippableFact.csproj index 4883719..6537025 100644 --- a/src/Xunit.SkippableFact/Xunit.SkippableFact.csproj +++ b/src/Xunit.SkippableFact/Xunit.SkippableFact.csproj @@ -1,94 +1,28 @@ - - - + - 11.0 - Debug - AnyCPU - {EA6330CC-B135-405D-AF9B-BD802B508985} - Library - Properties + netstandard1.1;net452 Xunit - Xunit.SkippableFact - en-US - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Profile259 - v4.5 Xunit.SkippableFact.ruleset - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\Xunit.SkippableFact.xml - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Xunit.SkippableFact.xml - - true + opensourcekey.snk + true + + Dynamic test skipping for Xunit + Andrew Arnott + andarno + Make your Xunit test methods self-determine to report a "skipped" result. Useful for such cases as "not supported on this platform" results or other environmental inputs. + https://github.com/AArnott/Xunit.SkippableFact + Copyright © Andrew Arnott + xunit testing skipping - - ..\opensourcekey.snk - - - - - - - - - - - ..\..\packages\Validation.2.2.8\lib\portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\Validation.dll - True - - - ..\..\Packages\xunit.abstractions.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll - True - - - ..\..\packages\xunit.extensibility.core.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll - True - - - - - Designer - - - stylecop.json - - - - - - + + + - - + - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + https://raw.githubusercontent.com/AArnott/Xunit.SkippableFact/$(GitCommitIdShort)/LICENSE.txt - - - - - - \ No newline at end of file diff --git a/src/Xunit.SkippableFact/Xunit.SkippableFact.ruleset b/src/Xunit.SkippableFact/Xunit.SkippableFact.ruleset index a79e7d4..024befa 100644 --- a/src/Xunit.SkippableFact/Xunit.SkippableFact.ruleset +++ b/src/Xunit.SkippableFact/Xunit.SkippableFact.ruleset @@ -69,6 +69,7 @@ + diff --git a/src/opensourcekey.snk b/src/Xunit.SkippableFact/opensourcekey.snk similarity index 100% rename from src/opensourcekey.snk rename to src/Xunit.SkippableFact/opensourcekey.snk diff --git a/src/Xunit.SkippableFact/packages.config b/src/Xunit.SkippableFact/packages.config deleted file mode 100644 index 5ee4752..0000000 --- a/src/Xunit.SkippableFact/packages.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/nuget.config b/src/nuget.config similarity index 100% rename from nuget.config rename to src/nuget.config diff --git a/src/version.json b/src/version.json new file mode 100644 index 0000000..f40db5f --- /dev/null +++ b/src/version.json @@ -0,0 +1,12 @@ +{ + "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", + "version": "1.3", + "publicReleaseRefSpec": [ + "^refs/heads/master$" // we release straight out of master + ], + "cloudBuild": { + "buildNumber": { + "enabled": true + } + } +} diff --git a/version.json b/version.json deleted file mode 100644 index 0f38605..0000000 --- a/version.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "version": "1.2", - "publicReleaseRefSpec": [ - "^refs/heads/master$" // we release straight out of master - ] -}