From 112c46deb63d5c1084cd7c9a6ed727036a4d8346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Chalet?= Date: Wed, 22 Mar 2017 05:28:51 +0100 Subject: [PATCH] Migrate to the new .csproj project system --- .gitignore | 1 - .travis.yml | 18 +++-- OpenIddict.sln | 30 +++---- build.cmd | 2 +- build.ps1 | 45 +++++++++-- build.sh | 35 ++++++--- build/common.props | 22 ++++++ build/dependencies.props | 16 ++++ build/version.props | 8 ++ global.json | 6 -- samples/Mvc.Client/Mvc.Client.csproj | 26 +++++++ samples/Mvc.Client/Mvc.Client.xproj | 18 ----- samples/Mvc.Client/project.json | 65 ---------------- samples/Mvc.Server/Mvc.Server.csproj | 49 ++++++++++++ samples/Mvc.Server/Mvc.Server.xproj | 18 ----- samples/Mvc.Server/gulpfile.js | 5 +- samples/Mvc.Server/project.json | 78 ------------------- src/OpenIddict.Core/OpenIddict.Core.csproj | 33 ++++++++ src/OpenIddict.Core/OpenIddict.Core.xproj | 18 ----- src/OpenIddict.Core/project.json | 55 ------------- .../OpenIddict.EntityFrameworkCore.csproj | 28 +++++++ .../OpenIddict.EntityFrameworkCore.xproj | 18 ----- .../project.json | 50 ------------ .../OpenIddict.Models.csproj | 15 ++++ src/OpenIddict.Models/OpenIddict.Models.xproj | 21 ----- src/OpenIddict.Models/project.json | 43 ---------- src/OpenIddict.Mvc/OpenIddict.Mvc.csproj | 25 ++++++ src/OpenIddict.Mvc/OpenIddict.Mvc.xproj | 21 ----- src/OpenIddict.Mvc/project.json | 46 ----------- src/OpenIddict/OpenIddict.csproj | 26 +++++++ src/OpenIddict/OpenIddict.xproj | 19 ----- src/OpenIddict/project.json | 47 ----------- .../OpenIddict.Core.Tests.csproj | 26 +++++++ .../OpenIddict.Core.Tests.xproj | 21 ----- test/OpenIddict.Core.Tests/project.json | 29 ------- ...penIddict.EntityFrameworkCore.Tests.csproj | 25 ++++++ ...OpenIddict.EntityFrameworkCore.Tests.xproj | 22 ------ .../OpenIddictExtensionsTests.cs | 24 ++++-- .../project.json | 29 ------- .../OpenIddict.Mvc.Tests.csproj | 26 +++++++ .../OpenIddict.Mvc.Tests.xproj | 22 ------ test/OpenIddict.Mvc.Tests/project.json | 29 ------- test/OpenIddict.Tests/OpenIddict.Tests.csproj | 41 ++++++++++ test/OpenIddict.Tests/OpenIddict.Tests.xproj | 22 ------ test/OpenIddict.Tests/project.json | 44 ----------- 45 files changed, 474 insertions(+), 793 deletions(-) create mode 100644 build/common.props create mode 100644 build/dependencies.props create mode 100644 build/version.props delete mode 100644 global.json create mode 100644 samples/Mvc.Client/Mvc.Client.csproj delete mode 100644 samples/Mvc.Client/Mvc.Client.xproj delete mode 100644 samples/Mvc.Client/project.json create mode 100644 samples/Mvc.Server/Mvc.Server.csproj delete mode 100644 samples/Mvc.Server/Mvc.Server.xproj delete mode 100644 samples/Mvc.Server/project.json create mode 100644 src/OpenIddict.Core/OpenIddict.Core.csproj delete mode 100644 src/OpenIddict.Core/OpenIddict.Core.xproj delete mode 100644 src/OpenIddict.Core/project.json create mode 100644 src/OpenIddict.EntityFrameworkCore/OpenIddict.EntityFrameworkCore.csproj delete mode 100644 src/OpenIddict.EntityFrameworkCore/OpenIddict.EntityFrameworkCore.xproj delete mode 100644 src/OpenIddict.EntityFrameworkCore/project.json create mode 100644 src/OpenIddict.Models/OpenIddict.Models.csproj delete mode 100644 src/OpenIddict.Models/OpenIddict.Models.xproj delete mode 100644 src/OpenIddict.Models/project.json create mode 100644 src/OpenIddict.Mvc/OpenIddict.Mvc.csproj delete mode 100644 src/OpenIddict.Mvc/OpenIddict.Mvc.xproj delete mode 100644 src/OpenIddict.Mvc/project.json create mode 100644 src/OpenIddict/OpenIddict.csproj delete mode 100644 src/OpenIddict/OpenIddict.xproj delete mode 100644 src/OpenIddict/project.json create mode 100644 test/OpenIddict.Core.Tests/OpenIddict.Core.Tests.csproj delete mode 100644 test/OpenIddict.Core.Tests/OpenIddict.Core.Tests.xproj delete mode 100644 test/OpenIddict.Core.Tests/project.json create mode 100644 test/OpenIddict.EntityFrameworkCore.Tests/OpenIddict.EntityFrameworkCore.Tests.csproj delete mode 100644 test/OpenIddict.EntityFrameworkCore.Tests/OpenIddict.EntityFrameworkCore.Tests.xproj delete mode 100644 test/OpenIddict.EntityFrameworkCore.Tests/project.json create mode 100644 test/OpenIddict.Mvc.Tests/OpenIddict.Mvc.Tests.csproj delete mode 100644 test/OpenIddict.Mvc.Tests/OpenIddict.Mvc.Tests.xproj delete mode 100644 test/OpenIddict.Mvc.Tests/project.json create mode 100644 test/OpenIddict.Tests/OpenIddict.Tests.csproj delete mode 100644 test/OpenIddict.Tests/OpenIddict.Tests.xproj delete mode 100644 test/OpenIddict.Tests/project.json diff --git a/.gitignore b/.gitignore index 93bf86114..fc55166c2 100644 --- a/.gitignore +++ b/.gitignore @@ -20,7 +20,6 @@ _references.js [Dd]ebug/ [Rr]elease/ x64/ -build/ [Bb]in/ [Oo]bj/ diff --git a/.travis.yml b/.travis.yml index 21ebbf22e..7f87ae830 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: csharp -sudo: required +sudo: false dist: trusty addons: apt: @@ -10,8 +10,16 @@ addons: - libssl-dev - libunwind8 - zlib1g -mono: - - alpha - - latest +env: + global: + - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true + - DOTNET_CLI_TELEMETRY_OPTOUT: 1 +mono: none +os: + - linux + - osx +osx_image: xcode8.2 +before_install: + - if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/; fi script: - - ./build.sh verify \ No newline at end of file + - ./build.sh \ No newline at end of file diff --git a/OpenIddict.sln b/OpenIddict.sln index 17e24544c..786458c76 100644 --- a/OpenIddict.sln +++ b/OpenIddict.sln @@ -1,35 +1,35 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26228.4 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OpenIddict", "src\OpenIddict\OpenIddict.xproj", "{80A8D6CE-C29A-4602-9844-D51FEF9C33C8}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D544447C-D701-46BB-9A5B-C76C612A596B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{F47D1283-0EE9-4728-8026-58405C29B786}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Mvc.Client", "samples\Mvc.Client\Mvc.Client.xproj", "{96B22EB9-771A-4DCA-B828-E6EA2774CF1B}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{5FC71D6A-A994-4F62-977F-88A7D25379D7}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenIddict", "src\OpenIddict\OpenIddict.csproj", "{80A8D6CE-C29A-4602-9844-D51FEF9C33C8}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Mvc.Server", "samples\Mvc.Server\Mvc.Server.xproj", "{7CBEAFD2-E3D0-4424-9B78-E87AB52327A6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvc.Client", "samples\Mvc.Client\Mvc.Client.csproj", "{96B22EB9-771A-4DCA-B828-E6EA2774CF1B}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OpenIddict.EntityFrameworkCore", "src\OpenIddict.EntityFrameworkCore\OpenIddict.EntityFrameworkCore.xproj", "{D2450929-ED0E-420D-B475-327924F9701C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvc.Server", "samples\Mvc.Server\Mvc.Server.csproj", "{7CBEAFD2-E3D0-4424-9B78-E87AB52327A6}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OpenIddict.Core", "src\OpenIddict.Core\OpenIddict.Core.xproj", "{E60CF8CA-6313-4359-BE43-AFCBB927EA30}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenIddict.EntityFrameworkCore", "src\OpenIddict.EntityFrameworkCore\OpenIddict.EntityFrameworkCore.csproj", "{D2450929-ED0E-420D-B475-327924F9701C}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OpenIddict.Mvc", "src\OpenIddict.Mvc\OpenIddict.Mvc.xproj", "{6EB5B6A9-4ED8-401D-A673-FD513F256AAE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenIddict.Core", "src\OpenIddict.Core\OpenIddict.Core.csproj", "{E60CF8CA-6313-4359-BE43-AFCBB927EA30}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{5FC71D6A-A994-4F62-977F-88A7D25379D7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenIddict.Mvc", "src\OpenIddict.Mvc\OpenIddict.Mvc.csproj", "{6EB5B6A9-4ED8-401D-A673-FD513F256AAE}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OpenIddict.Core.Tests", "test\OpenIddict.Core.Tests\OpenIddict.Core.Tests.xproj", "{A892B3DE-1A02-48D6-993B-DD3DFCAC84C7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenIddict.Core.Tests", "test\OpenIddict.Core.Tests\OpenIddict.Core.Tests.csproj", "{A892B3DE-1A02-48D6-993B-DD3DFCAC84C7}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OpenIddict.EntityFrameworkCore.Tests", "test\OpenIddict.EntityFrameworkCore.Tests\OpenIddict.EntityFrameworkCore.Tests.xproj", "{7831F17A-DF0B-42EC-841B-065A9B5BD786}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenIddict.EntityFrameworkCore.Tests", "test\OpenIddict.EntityFrameworkCore.Tests\OpenIddict.EntityFrameworkCore.Tests.csproj", "{7831F17A-DF0B-42EC-841B-065A9B5BD786}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OpenIddict.Mvc.Tests", "test\OpenIddict.Mvc.Tests\OpenIddict.Mvc.Tests.xproj", "{8B4B0CCC-711B-4F9D-9DE6-DD32BDD3BCCA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenIddict.Mvc.Tests", "test\OpenIddict.Mvc.Tests\OpenIddict.Mvc.Tests.csproj", "{8B4B0CCC-711B-4F9D-9DE6-DD32BDD3BCCA}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OpenIddict.Tests", "test\OpenIddict.Tests\OpenIddict.Tests.xproj", "{3E2FBDB3-DC82-4E97-8EBC-CC8B279110FF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenIddict.Tests", "test\OpenIddict.Tests\OpenIddict.Tests.csproj", "{3E2FBDB3-DC82-4E97-8EBC-CC8B279110FF}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OpenIddict.Models", "src\OpenIddict.Models\OpenIddict.Models.xproj", "{0102A6CC-41A6-4B34-B49E-65AFE95882BB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenIddict.Models", "src\OpenIddict.Models\OpenIddict.Models.csproj", "{0102A6CC-41A6-4B34-B49E-65AFE95882BB}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/build.cmd b/build.cmd index b6c8d2486..7d4894cb4 100644 --- a/build.cmd +++ b/build.cmd @@ -1,2 +1,2 @@ @ECHO OFF -PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0build.ps1' %*; exit $LASTEXITCODE" +PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0build.ps1' %*; exit $LASTEXITCODE" \ No newline at end of file diff --git a/build.ps1 b/build.ps1 index 84321b2fa..5bf0e2c11 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,9 +1,39 @@ +$ErrorActionPreference = "Stop" + +function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $retries) +{ + while($true) + { + try + { + Invoke-WebRequest $url -OutFile $downloadLocation + break + } + catch + { + $exceptionMessage = $_.Exception.Message + Write-Host "Failed to download '$url': $exceptionMessage" + if ($retries -gt 0) { + $retries-- + Write-Host "Waiting 10 seconds before retrying. Retries left: $retries" + Start-Sleep -Seconds 10 + + } + else + { + $exception = $_.Exception + throw $exception + } + } + } +} + cd $PSScriptRoot $repoFolder = $PSScriptRoot $env:REPO_FOLDER = $repoFolder -$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/1.0.0.zip" +$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip" if ($env:KOREBUILD_ZIP) { $koreBuildZip=$env:KOREBUILD_ZIP @@ -13,17 +43,18 @@ $buildFolder = ".build" $buildFile="$buildFolder\KoreBuild.ps1" if (!(Test-Path $buildFolder)) { - Write-Host "Downloading KoreBuild from $koreBuildZip" - + Write-Host "Downloading KoreBuild from $koreBuildZip" + $tempFolder=$env:TEMP + "\KoreBuild-" + [guid]::NewGuid() New-Item -Path "$tempFolder" -Type directory | Out-Null $localZipFile="$tempFolder\korebuild.zip" - - Invoke-WebRequest $koreBuildZip -OutFile $localZipFile + + DownloadWithRetry -url $koreBuildZip -downloadLocation $localZipFile -retries 6 + Add-Type -AssemblyName System.IO.Compression.FileSystem [System.IO.Compression.ZipFile]::ExtractToDirectory($localZipFile, $tempFolder) - + New-Item -Path "$buildFolder" -Type directory | Out-Null copy-item "$tempFolder\**\build\*" $buildFolder -Recurse @@ -33,4 +64,4 @@ if (!(Test-Path $buildFolder)) { } } -&"$buildFile" $args \ No newline at end of file +&"$buildFile" @args diff --git a/build.sh b/build.sh index 8bd7bf2ae..b0bcadb57 100755 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $repoFolder -koreBuildZip="https://github.com/aspnet/KoreBuild/archive/1.0.0.zip" +koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip" if [ ! -z $KOREBUILD_ZIP ]; then koreBuildZip=$KOREBUILD_ZIP fi @@ -12,24 +12,35 @@ buildFile="$buildFolder/KoreBuild.sh" if test ! -d $buildFolder; then echo "Downloading KoreBuild from $koreBuildZip" - - tempFolder="/tmp/KoreBuild-$(uuidgen)" + + tempFolder="/tmp/KoreBuild-$(uuidgen)" mkdir $tempFolder - + localZipFile="$tempFolder/korebuild.zip" - - wget -O $localZipFile $koreBuildZip 2>/dev/null || curl -o $localZipFile --location $koreBuildZip /dev/null + + retries=6 + until (wget -O $localZipFile $koreBuildZip 2>/dev/null || curl -o $localZipFile --location $koreBuildZip 2>/dev/null) + do + echo "Failed to download '$koreBuildZip'" + if [ "$retries" -le 0 ]; then + exit 1 + fi + retries=$((retries - 1)) + echo "Waiting 10 seconds before retrying. Retries left: $retries" + sleep 10s + done + unzip -q -d $tempFolder $localZipFile - + mkdir $buildFolder cp -r $tempFolder/**/build/** $buildFolder - + chmod +x $buildFile - + # Cleanup - if test ! -d $tempFolder; then - rm -rf $tempFolder + if test -d $tempFolder; then + rm -rf $tempFolder fi fi -$buildFile -r $repoFolder "$@" \ No newline at end of file +$buildFile -r $repoFolder "$@" diff --git a/build/common.props b/build/common.props new file mode 100644 index 000000000..ced89b76c --- /dev/null +++ b/build/common.props @@ -0,0 +1,22 @@ + + + + + + + $(NoWarn);CS1591 + true + true + + + + OpenIddict + https://avatars3.githubusercontent.com/u/13908567?s=64 + https://github.com/openiddict/openiddict-core + http://www.apache.org/licenses/LICENSE-2.0.html + git + git://github.com/openiddict/openiddict-core + $(VersionSuffix)-$(BuildNumber) + + + diff --git a/build/dependencies.props b/build/dependencies.props new file mode 100644 index 000000000..e7c7a1cd0 --- /dev/null +++ b/build/dependencies.props @@ -0,0 +1,16 @@ + + + + 1.0.0 + 1.0.0-beta1-final + 1.0.0-rc1-final + 2.0.0 + 10.3.0 + 1.6.0 + 4.6.38-alpha + 1.0.0 + 15.0.0 + 2.2.0 + + + diff --git a/build/version.props b/build/version.props new file mode 100644 index 000000000..ca17a100a --- /dev/null +++ b/build/version.props @@ -0,0 +1,8 @@ + + + + 1.0.0 + beta2 + + + diff --git a/global.json b/global.json deleted file mode 100644 index d5427d449..000000000 --- a/global.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "projects": [ "src" ], - "sdk": { - "version": "1.0.0-preview2-003121" - } -} \ No newline at end of file diff --git a/samples/Mvc.Client/Mvc.Client.csproj b/samples/Mvc.Client/Mvc.Client.csproj new file mode 100644 index 000000000..fa6ddc68d --- /dev/null +++ b/samples/Mvc.Client/Mvc.Client.csproj @@ -0,0 +1,26 @@ + + + + + + net451;netcoreapp1.0 + true + Exe + + + + + + + + + + + + + + + + + + diff --git a/samples/Mvc.Client/Mvc.Client.xproj b/samples/Mvc.Client/Mvc.Client.xproj deleted file mode 100644 index 91dd3958e..000000000 --- a/samples/Mvc.Client/Mvc.Client.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 96b22eb9-771a-4dca-b828-e6ea2774cf1b - Mvc.Client - .\obj - .\bin\ - - - 2.0 - - - diff --git a/samples/Mvc.Client/project.json b/samples/Mvc.Client/project.json deleted file mode 100644 index 480295296..000000000 --- a/samples/Mvc.Client/project.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "buildOptions": { - "emitEntryPoint": true, - "warningsAsErrors": true, - "preserveCompilationContext": true, - - "copyToOutput": { - "include": [ - "wwwroot", - "Views", - "web.config" - ] - } - }, - - "dependencies": { - "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "1.0.0", - "Microsoft.AspNetCore.Diagnostics": "1.0.0", - "Microsoft.AspNetCore.Hosting": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.0", - "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", - "Microsoft.AspNetCore.StaticFiles": "1.0.0", - "Microsoft.Extensions.Configuration.CommandLine": "1.0.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0", - "Microsoft.Extensions.Logging.Console": "1.0.0", - "Microsoft.Extensions.Logging.Debug": "1.0.0" - }, - - "frameworks": { - "net451": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1" - } - }, - - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { "type": "platform", "version": "1.0.0" } - }, - - "imports": [ - "dnxcore50", - "portable-net451+win8" - ] - } - }, - - "tools": { - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final" - }, - - "scripts": { - "postpublish": "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" - }, - - "publishOptions": { - "include": [ - "wwwroot", - "Views", - "web.config" - ] - } -} \ No newline at end of file diff --git a/samples/Mvc.Server/Mvc.Server.csproj b/samples/Mvc.Server/Mvc.Server.csproj new file mode 100644 index 000000000..47413ea91 --- /dev/null +++ b/samples/Mvc.Server/Mvc.Server.csproj @@ -0,0 +1,49 @@ + + + + + + net451;netcoreapp1.0 + true + Exe + + + + false + + + + + + + PreserveNewest + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/Mvc.Server/Mvc.Server.xproj b/samples/Mvc.Server/Mvc.Server.xproj deleted file mode 100644 index dd59f1824..000000000 --- a/samples/Mvc.Server/Mvc.Server.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 7cbeafd2-e3d0-4424-9b78-e87ab52327a6 - Mvc.Server - .\obj - .\bin\ - - - 2.0 - - - diff --git a/samples/Mvc.Server/gulpfile.js b/samples/Mvc.Server/gulpfile.js index 684c5ac2c..72a3dbad1 100644 --- a/samples/Mvc.Server/gulpfile.js +++ b/samples/Mvc.Server/gulpfile.js @@ -4,11 +4,10 @@ var gulp = require("gulp"), rimraf = require("rimraf"), concat = require("gulp-concat"), cssmin = require("gulp-cssmin"), - uglify = require("gulp-uglify"), - project = require("./project.json"); + uglify = require("gulp-uglify"); var paths = { - webroot: "./" + project.webroot + "/" + webroot: "./wwwroot/" }; paths.js = paths.webroot + "js/**/*.js"; diff --git a/samples/Mvc.Server/project.json b/samples/Mvc.Server/project.json deleted file mode 100644 index 1cce906cb..000000000 --- a/samples/Mvc.Server/project.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "buildOptions": { - "emitEntryPoint": true, - "warningsAsErrors": true, - "preserveCompilationContext": true, - - "embed": { - "include": [ "Certificate.pfx" ] - }, - - "copyToOutput": { - "include": [ - "wwwroot", - "Views", - "config.json", - "web.config" - ] - } - }, - - "dependencies": { - "AspNet.Security.OAuth.Introspection": "1.0.0-beta1-final", - "AspNet.Security.OAuth.Validation": "1.0.0-beta1-final", - "Microsoft.AspNetCore.Authentication.Google": "1.0.0", - "Microsoft.AspNetCore.Authentication.Twitter": "1.0.0", - "Microsoft.AspNetCore.Diagnostics": "1.0.0", - "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.0", - "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", - "Microsoft.AspNetCore.StaticFiles": "1.0.0", - "Microsoft.EntityFrameworkCore.SqlServer": "1.0.0", - "Microsoft.Extensions.Configuration.CommandLine": "1.0.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0", - "Microsoft.Extensions.Configuration.Json": "1.0.0", - "Microsoft.Extensions.Logging.Console": "1.0.0", - "Microsoft.Extensions.Logging.Debug": "1.0.0", - "OpenIddict": { "target": "project" }, - "OpenIddict.EntityFrameworkCore": { "target": "project" }, - "OpenIddict.Mvc": { "target": "project" } - }, - - "frameworks": { - "net451": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1" - } - }, - - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { "type": "platform", "version": "1.0.0" } - }, - - "imports": [ - "dnxcore50", - "portable-net451+win8" - ] - } - }, - - "tools": { - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final" - }, - - "scripts": { - "postpublish": "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" - }, - - "publishOptions": { - "include": [ - "wwwroot", - "Views", - "config.json", - "web.config" - ] - } -} \ No newline at end of file diff --git a/src/OpenIddict.Core/OpenIddict.Core.csproj b/src/OpenIddict.Core/OpenIddict.Core.csproj new file mode 100644 index 000000000..04a845de1 --- /dev/null +++ b/src/OpenIddict.Core/OpenIddict.Core.csproj @@ -0,0 +1,33 @@ + + + + + + net451;netstandard1.3 + + + + Core components of OpenIddict. + Kévin Chalet + aspnetcore;authentication;jwt;openidconnect;openiddict;security + + + + + + + + + + + + + + + + + + + + + diff --git a/src/OpenIddict.Core/OpenIddict.Core.xproj b/src/OpenIddict.Core/OpenIddict.Core.xproj deleted file mode 100644 index c97172bb4..000000000 --- a/src/OpenIddict.Core/OpenIddict.Core.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - e60cf8ca-6313-4359-be43-afcbb927ea30 - OpenIddict.Core - .\obj - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/OpenIddict.Core/project.json b/src/OpenIddict.Core/project.json deleted file mode 100644 index 8ba3a3e89..000000000 --- a/src/OpenIddict.Core/project.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "version": "1.0.0-beta2-*", - - "description": "Core components of OpenIddict.", - "authors": [ "Kévin Chalet" ], - - "packOptions": { - "owners": [ "Kévin Chalet" ], - - "projectUrl": "https://github.com/openiddict/openiddict-core", - "iconUrl": "https://avatars3.githubusercontent.com/u/13908567?s=64", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.html", - - "repository": { - "type": "git", - "url": "git://github.com/openiddict/openiddict-core" - }, - - "tags": [ - "aspnetcore", - "authentication", - "jwt", - "openidconnect", - "openiddict", - "security" - ] - }, - - "buildOptions": { - "warningsAsErrors": true, - "nowarn": [ "CS1591" ], - "xmlDoc": true - }, - - "dependencies": { - "AspNet.Security.OpenIdConnect.Primitives": "1.0.0-rc1-final", - "CryptoHelper": "2.0.0", - "JetBrains.Annotations": { "type": "build", "version": "10.3.0" }, - "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0", - "Microsoft.Extensions.Logging.Abstractions": "1.0.0", - "Microsoft.Extensions.Options": "1.0.0", - "OpenIddict.Models": { "target": "project" } - }, - - "frameworks": { - "net451": { }, - - "netstandard1.3": { - "dependencies": { - "System.Reflection.TypeExtensions": "4.1.0", - "System.Security.Claims": "4.0.1" - } - } - } -} diff --git a/src/OpenIddict.EntityFrameworkCore/OpenIddict.EntityFrameworkCore.csproj b/src/OpenIddict.EntityFrameworkCore/OpenIddict.EntityFrameworkCore.csproj new file mode 100644 index 000000000..5da7b200b --- /dev/null +++ b/src/OpenIddict.EntityFrameworkCore/OpenIddict.EntityFrameworkCore.csproj @@ -0,0 +1,28 @@ + + + + + + net451;netstandard1.3 + + + + Entity Framework Core stores for OpenIddict. + Kévin Chalet + aspnetcore;authentication;jwt;openidconnect;openiddict;security + + + + + + + + + + + + + + + + diff --git a/src/OpenIddict.EntityFrameworkCore/OpenIddict.EntityFrameworkCore.xproj b/src/OpenIddict.EntityFrameworkCore/OpenIddict.EntityFrameworkCore.xproj deleted file mode 100644 index dc2d5b846..000000000 --- a/src/OpenIddict.EntityFrameworkCore/OpenIddict.EntityFrameworkCore.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - d2450929-ed0e-420d-b475-327924f9701c - OpenIddict.EntityFrameworkCore - .\obj - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/OpenIddict.EntityFrameworkCore/project.json b/src/OpenIddict.EntityFrameworkCore/project.json deleted file mode 100644 index 6003cf311..000000000 --- a/src/OpenIddict.EntityFrameworkCore/project.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": "1.0.0-beta2-*", - - "description": "Entity Framework Core stores for OpenIddict.", - "authors": [ "Kévin Chalet" ], - - "packOptions": { - "owners": [ "Kévin Chalet" ], - - "projectUrl": "https://github.com/openiddict/openiddict-core", - "iconUrl": "https://avatars3.githubusercontent.com/u/13908567?s=64", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.html", - - "repository": { - "type": "git", - "url": "git://github.com/openiddict/openiddict-core" - }, - - "tags": [ - "aspnetcore", - "authentication", - "jwt", - "openidconnect", - "openiddict", - "security" - ] - }, - - "buildOptions": { - "warningsAsErrors": true, - "nowarn": [ "CS1591" ], - "xmlDoc": true - }, - - "dependencies": { - "JetBrains.Annotations": { "type": "build", "version": "10.3.0" }, - "Microsoft.EntityFrameworkCore.Relational": "1.0.0", - "OpenIddict.Core": { "target": "project" } - }, - - "frameworks": { - "net451": { }, - - "netstandard1.3": { - "dependencies": { - "System.ComponentModel.TypeConverter": "4.1.0" - } - } - } -} \ No newline at end of file diff --git a/src/OpenIddict.Models/OpenIddict.Models.csproj b/src/OpenIddict.Models/OpenIddict.Models.csproj new file mode 100644 index 000000000..2a1364943 --- /dev/null +++ b/src/OpenIddict.Models/OpenIddict.Models.csproj @@ -0,0 +1,15 @@ + + + + + + netstandard1.0 + + + + Provides default entities for OpenIddict, that can be used by the EntityFramework stores. + Kévin Chalet + aspnetcore;authentication;jwt;openidconnect;openiddict;security + + + diff --git a/src/OpenIddict.Models/OpenIddict.Models.xproj b/src/OpenIddict.Models/OpenIddict.Models.xproj deleted file mode 100644 index 6ac7b33f0..000000000 --- a/src/OpenIddict.Models/OpenIddict.Models.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - 0102a6cc-41a6-4b34-b49e-65afe95882bb - OpenIddict.Models - .\obj - .\bin\ - v4.5.1 - - - - 2.0 - - - diff --git a/src/OpenIddict.Models/project.json b/src/OpenIddict.Models/project.json deleted file mode 100644 index fac1675be..000000000 --- a/src/OpenIddict.Models/project.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "version": "1.0.0-beta2-*", - - "description": "Provides default entities for OpenIddict, that can be used by the EntityFramework stores.", - "authors": [ "Kévin Chalet" ], - - "packOptions": { - "owners": [ "Kévin Chalet" ], - - "projectUrl": "https://github.com/openiddict/openiddict-core", - "iconUrl": "https://avatars3.githubusercontent.com/u/13908567?s=64", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.html", - - "repository": { - "type": "git", - "url": "git://github.com/openiddict/openiddict-core" - }, - - "tags": [ - "aspnetcore", - "authentication", - "jwt", - "openidconnect", - "openiddict", - "security" - ] - }, - - "buildOptions": { - "warningsAsErrors": true, - "nowarn": [ "CS1591" ], - "xmlDoc": true - }, - - "dependencies": { - "System.Collections": "4.0.11", - "System.Runtime": "4.1.0" - }, - - "frameworks": { - "netstandard1.0": { } - } -} diff --git a/src/OpenIddict.Mvc/OpenIddict.Mvc.csproj b/src/OpenIddict.Mvc/OpenIddict.Mvc.csproj new file mode 100644 index 000000000..006faa2c9 --- /dev/null +++ b/src/OpenIddict.Mvc/OpenIddict.Mvc.csproj @@ -0,0 +1,25 @@ + + + + + + net451;netstandard1.6 + + + + OpenIddict binders for ASP.NET Core MVC. + Kévin Chalet + aspnetcore;authentication;jwt;openidconnect;openiddict;security + + + + + + + + + + + + + diff --git a/src/OpenIddict.Mvc/OpenIddict.Mvc.xproj b/src/OpenIddict.Mvc/OpenIddict.Mvc.xproj deleted file mode 100644 index bc48738bd..000000000 --- a/src/OpenIddict.Mvc/OpenIddict.Mvc.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - 6eb5b6a9-4ed8-401d-a673-fd513f256aae - OpenIddict.Mvc - .\obj - .\bin\ - v4.6.1 - - - - 2.0 - - - diff --git a/src/OpenIddict.Mvc/project.json b/src/OpenIddict.Mvc/project.json deleted file mode 100644 index 0f21337f6..000000000 --- a/src/OpenIddict.Mvc/project.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "version": "1.0.0-beta2-*", - - "description": "OpenIddict binders for ASP.NET Core MVC.", - "authors": [ "Kévin Chalet" ], - - "packOptions": { - "owners": [ "Kévin Chalet" ], - - "projectUrl": "https://github.com/openiddict/openiddict-core", - "iconUrl": "https://avatars3.githubusercontent.com/u/13908567?s=64", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.html", - - "repository": { - "type": "git", - "url": "git://github.com/openiddict/openiddict-core" - }, - - "tags": [ - "aspnetcore", - "authentication", - "jwt", - "openidconnect", - "openiddict", - "security" - ] - }, - - "buildOptions": { - "warningsAsErrors": true, - "nowarn": [ "CS1591" ], - "xmlDoc": true - }, - - "dependencies": { - "AspNet.Security.OpenIdConnect.Server": "1.0.0-rc1-final", - "JetBrains.Annotations": { "type": "build", "version": "10.3.0" }, - "Microsoft.AspNetCore.Mvc.Core": "1.0.0", - "OpenIddict.Core": { "target": "project" } - }, - - "frameworks": { - "net451": { }, - "netstandard1.6": { } - } -} \ No newline at end of file diff --git a/src/OpenIddict/OpenIddict.csproj b/src/OpenIddict/OpenIddict.csproj new file mode 100644 index 000000000..1460995eb --- /dev/null +++ b/src/OpenIddict/OpenIddict.csproj @@ -0,0 +1,26 @@ + + + + + + net451;netstandard1.4 + + + + Easy-to-use OpenID Connect server for ASP.NET Core. + Kévin Chalet + aspnetcore;authentication;jwt;openidconnect;openiddict;security + + + + + + + + + + + + + + diff --git a/src/OpenIddict/OpenIddict.xproj b/src/OpenIddict/OpenIddict.xproj deleted file mode 100644 index 1eb1d931a..000000000 --- a/src/OpenIddict/OpenIddict.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 80a8d6ce-c29a-4602-9844-d51fef9c33c8 - OpenIddict - .\obj - .\bin\ - - - 2.0 - 14023 - - - \ No newline at end of file diff --git a/src/OpenIddict/project.json b/src/OpenIddict/project.json deleted file mode 100644 index 265349c5b..000000000 --- a/src/OpenIddict/project.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "version": "1.0.0-beta2-*", - - "description": "Easy-to-use OpenID Connect server for ASP.NET Core.", - "authors": [ "Kévin Chalet" ], - - "packOptions": { - "owners": [ "Kévin Chalet" ], - - "projectUrl": "https://github.com/openiddict/openiddict-core", - "iconUrl": "https://avatars3.githubusercontent.com/u/13908567?s=64", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.html", - - "repository": { - "type": "git", - "url": "git://github.com/openiddict/openiddict-core" - }, - - "tags": [ - "aspnetcore", - "authentication", - "jwt", - "openidconnect", - "openiddict", - "security" - ] - }, - - "buildOptions": { - "warningsAsErrors": true, - "nowarn": [ "CS1591" ], - "xmlDoc": true - }, - - "dependencies": { - "AspNet.Security.OpenIdConnect.Server": "1.0.0-rc1-final", - "JetBrains.Annotations": { "type": "build", "version": "10.3.0" }, - "Microsoft.AspNetCore.Diagnostics.Abstractions": "1.0.0", - "Microsoft.Extensions.Caching.Abstractions": "1.0.0", - "OpenIddict.Core": { "target": "project" } - }, - - "frameworks": { - "net451": { }, - "netstandard1.4": { } - } -} \ No newline at end of file diff --git a/test/OpenIddict.Core.Tests/OpenIddict.Core.Tests.csproj b/test/OpenIddict.Core.Tests/OpenIddict.Core.Tests.csproj new file mode 100644 index 000000000..a3854d208 --- /dev/null +++ b/test/OpenIddict.Core.Tests/OpenIddict.Core.Tests.csproj @@ -0,0 +1,26 @@ + + + + + + netcoreapp1.0;net451 + netcoreapp1.0 + + + + + + + + + + + + + + + + + + + diff --git a/test/OpenIddict.Core.Tests/OpenIddict.Core.Tests.xproj b/test/OpenIddict.Core.Tests/OpenIddict.Core.Tests.xproj deleted file mode 100644 index a5d1a1f98..000000000 --- a/test/OpenIddict.Core.Tests/OpenIddict.Core.Tests.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - a892b3de-1a02-48d6-993b-dd3dfcac84c7 - OpenIddict.Core.Tests - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/OpenIddict.Core.Tests/project.json b/test/OpenIddict.Core.Tests/project.json deleted file mode 100644 index ff0f66d91..000000000 --- a/test/OpenIddict.Core.Tests/project.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "buildOptions": { - "warningsAsErrors": true - }, - - "dependencies": { - "dotnet-test-xunit": "2.2.0-preview2-build1029", - "Microsoft.AspNetCore.TestHost": "1.0.0", - "Moq": "4.6.38-alpha", - "OpenIddict.Core": { "target": "project" }, - "xunit": "2.2.0-beta2-build3300" - }, - - "frameworks": { - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { "type": "platform", "version": "1.0.0" } - } - }, - - "net451": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1" - } - } - }, - - "testRunner": "xunit" -} diff --git a/test/OpenIddict.EntityFrameworkCore.Tests/OpenIddict.EntityFrameworkCore.Tests.csproj b/test/OpenIddict.EntityFrameworkCore.Tests/OpenIddict.EntityFrameworkCore.Tests.csproj new file mode 100644 index 000000000..20ec560bd --- /dev/null +++ b/test/OpenIddict.EntityFrameworkCore.Tests/OpenIddict.EntityFrameworkCore.Tests.csproj @@ -0,0 +1,25 @@ + + + + + + netcoreapp1.0;net451 + netcoreapp1.0 + + + + + + + + + + + + + + + + + + diff --git a/test/OpenIddict.EntityFrameworkCore.Tests/OpenIddict.EntityFrameworkCore.Tests.xproj b/test/OpenIddict.EntityFrameworkCore.Tests/OpenIddict.EntityFrameworkCore.Tests.xproj deleted file mode 100644 index 90d578444..000000000 --- a/test/OpenIddict.EntityFrameworkCore.Tests/OpenIddict.EntityFrameworkCore.Tests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 7831f17a-df0b-42ec-841b-065a9b5bd786 - OpenIddict.EntityFrameworkCore.Tests - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/OpenIddict.EntityFrameworkCore.Tests/OpenIddictExtensionsTests.cs b/test/OpenIddict.EntityFrameworkCore.Tests/OpenIddictExtensionsTests.cs index afc777581..7a59825f0 100644 --- a/test/OpenIddict.EntityFrameworkCore.Tests/OpenIddictExtensionsTests.cs +++ b/test/OpenIddict.EntityFrameworkCore.Tests/OpenIddictExtensionsTests.cs @@ -12,8 +12,10 @@ public class OpenIddictExtensionsTests public void AddEntityFrameworkCoreStores_ThrowsAnExceptionForInvalidApplicationEntity() { // Arrange - var builder = new OpenIddictBuilder(new ServiceCollection()); - builder.ApplicationType = typeof(object); + var builder = new OpenIddictBuilder(new ServiceCollection()) + { + ApplicationType = typeof(object) + }; // Act and assert var exception = Assert.Throws(delegate @@ -29,8 +31,10 @@ public void AddEntityFrameworkCoreStores_ThrowsAnExceptionForInvalidApplicationE public void AddEntityFrameworkCoreStores_ThrowsAnExceptionForInvalidAuthorizationEntity() { // Arrange - var builder = new OpenIddictBuilder(new ServiceCollection()); - builder.AuthorizationType = typeof(object); + var builder = new OpenIddictBuilder(new ServiceCollection()) + { + AuthorizationType = typeof(object) + }; // Act and assert var exception = Assert.Throws(delegate @@ -46,8 +50,10 @@ public void AddEntityFrameworkCoreStores_ThrowsAnExceptionForInvalidAuthorizatio public void AddEntityFrameworkCoreStores_ThrowsAnExceptionForInvalidScopeEntity() { // Arrange - var builder = new OpenIddictBuilder(new ServiceCollection()); - builder.ScopeType = typeof(object); + var builder = new OpenIddictBuilder(new ServiceCollection()) + { + ScopeType = typeof(object) + }; // Act and assert var exception = Assert.Throws(delegate @@ -63,8 +69,10 @@ public void AddEntityFrameworkCoreStores_ThrowsAnExceptionForInvalidScopeEntity( public void AddEntityFrameworkCoreStores_ThrowsAnExceptionForInvalidTokenEntity() { // Arrange - var builder = new OpenIddictBuilder(new ServiceCollection()); - builder.TokenType = typeof(object); + var builder = new OpenIddictBuilder(new ServiceCollection()) + { + TokenType = typeof(object) + }; // Act and assert var exception = Assert.Throws(delegate diff --git a/test/OpenIddict.EntityFrameworkCore.Tests/project.json b/test/OpenIddict.EntityFrameworkCore.Tests/project.json deleted file mode 100644 index b07ab4718..000000000 --- a/test/OpenIddict.EntityFrameworkCore.Tests/project.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "buildOptions": { - "warningsAsErrors": true - }, - - "dependencies": { - "dotnet-test-xunit": "2.2.0-preview2-build1029", - "Microsoft.AspNetCore.TestHost": "1.0.0", - "Moq": "4.6.38-alpha", - "OpenIddict.EntityFrameworkCore": { "target": "project" }, - "xunit": "2.2.0-beta2-build3300" - }, - - "frameworks": { - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { "type": "platform", "version": "1.0.0" } - } - }, - - "net451": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1" - } - } - }, - - "testRunner": "xunit" -} diff --git a/test/OpenIddict.Mvc.Tests/OpenIddict.Mvc.Tests.csproj b/test/OpenIddict.Mvc.Tests/OpenIddict.Mvc.Tests.csproj new file mode 100644 index 000000000..8a76eb124 --- /dev/null +++ b/test/OpenIddict.Mvc.Tests/OpenIddict.Mvc.Tests.csproj @@ -0,0 +1,26 @@ + + + + + + netcoreapp1.0;net451 + netcoreapp1.0 + + + + + + + + + + + + + + + + + + + diff --git a/test/OpenIddict.Mvc.Tests/OpenIddict.Mvc.Tests.xproj b/test/OpenIddict.Mvc.Tests/OpenIddict.Mvc.Tests.xproj deleted file mode 100644 index fd1ee1625..000000000 --- a/test/OpenIddict.Mvc.Tests/OpenIddict.Mvc.Tests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 8b4b0ccc-711b-4f9d-9de6-dd32bdd3bcca - OpenIddict.Mvc.Tests - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/OpenIddict.Mvc.Tests/project.json b/test/OpenIddict.Mvc.Tests/project.json deleted file mode 100644 index 49b9bfc5e..000000000 --- a/test/OpenIddict.Mvc.Tests/project.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "buildOptions": { - "warningsAsErrors": true - }, - - "dependencies": { - "dotnet-test-xunit": "2.2.0-preview2-build1029", - "Microsoft.AspNetCore.TestHost": "1.0.0", - "Moq": "4.6.38-alpha", - "OpenIddict.Mvc": { "target": "project" }, - "xunit": "2.2.0-beta2-build3300" - }, - - "frameworks": { - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { "type": "platform", "version": "1.0.0" } - } - }, - - "net451": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1" - } - } - }, - - "testRunner": "xunit" -} diff --git a/test/OpenIddict.Tests/OpenIddict.Tests.csproj b/test/OpenIddict.Tests/OpenIddict.Tests.csproj new file mode 100644 index 000000000..d4bf0fba7 --- /dev/null +++ b/test/OpenIddict.Tests/OpenIddict.Tests.csproj @@ -0,0 +1,41 @@ + + + + + + netcoreapp1.0;net451 + netcoreapp1.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(DefineConstants);SUPPORTS_ECDSA + + + diff --git a/test/OpenIddict.Tests/OpenIddict.Tests.xproj b/test/OpenIddict.Tests/OpenIddict.Tests.xproj deleted file mode 100644 index 1eec51683..000000000 --- a/test/OpenIddict.Tests/OpenIddict.Tests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 3e2fbdb3-dc82-4e97-8ebc-cc8b279110ff - OpenIddict.Tests - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/OpenIddict.Tests/project.json b/test/OpenIddict.Tests/project.json deleted file mode 100644 index c44b58a38..000000000 --- a/test/OpenIddict.Tests/project.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "buildOptions": { - "warningsAsErrors": true, - - "embed": { - "include": [ "Certificate.pfx" ] - } - }, - - "dependencies": { - "AspNet.Security.OpenIdConnect.Client": "1.0.0-rc1-final", - "dotnet-test-xunit": "2.2.0-preview2-build1029", - "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0", - "Microsoft.AspNetCore.Authentication.Facebook": "1.0.0", - "Microsoft.AspNetCore.Authentication.Google": "1.0.0", - "Microsoft.AspNetCore.Diagnostics": "1.0.0", - "Microsoft.AspNetCore.TestHost": "1.0.0", - "Microsoft.Extensions.Caching.Memory": "1.0.0", - "Microsoft.Extensions.Logging.Debug": "1.0.0", - "Moq": "4.6.38-alpha", - "OpenIddict": { "target": "project" }, - "xunit": "2.2.0-beta2-build3300" - }, - - "frameworks": { - "netcoreapp1.0": { - "buildOptions": { - "define": [ "SUPPORTS_ECDSA" ] - }, - - "dependencies": { - "Microsoft.NETCore.App": { "type": "platform", "version": "1.0.0" } - } - }, - - "net451": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1" - } - } - }, - - "testRunner": "xunit" -}