diff --git a/DiagnosticsPages.sln b/DiagnosticsPages.sln index a21cb53511..dbfb6b3902 100644 --- a/DiagnosticsPages.sln +++ b/DiagnosticsPages.sln @@ -1,53 +1,48 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26127.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{509A6F36-AD80-4A18-B5B1-717D38DFF29D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{ACAA0157-A8C4-4152-93DE-90CCDF304087}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WelcomePageSample", "samples\WelcomePageSample\WelcomePageSample.xproj", "{C5F59CBA-DF2D-4983-8CBB-11B6AF21B416}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WelcomePageSample", "samples\WelcomePageSample\WelcomePageSample.csproj", "{C5F59CBA-DF2D-4983-8CBB-11B6AF21B416}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Diagnostics", "src\Microsoft.AspNetCore.Diagnostics\Microsoft.AspNetCore.Diagnostics.xproj", "{68A1F0E1-ECCE-46D1-B20F-C43EE5B097DE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Diagnostics", "src\Microsoft.AspNetCore.Diagnostics\Microsoft.AspNetCore.Diagnostics.csproj", "{68A1F0E1-ECCE-46D1-B20F-C43EE5B097DE}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "DeveloperExceptionPageSample", "samples\DeveloperExceptionPageSample\DeveloperExceptionPageSample.xproj", "{589AC17F-9455-4764-8F82-FCD2AE58DA14}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F0557697-8D86-4DF3-A385-B0BFA9596189}" - ProjectSection(SolutionItems) = preProject - global.json = global.json - EndProjectSection +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeveloperExceptionPageSample", "samples\DeveloperExceptionPageSample\DeveloperExceptionPageSample.csproj", "{589AC17F-9455-4764-8F82-FCD2AE58DA14}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{2AF90579-B118-4583-AE88-672EFACB5BC4}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Diagnostics.Tests", "test\Microsoft.AspNetCore.Diagnostics.Tests\Microsoft.AspNetCore.Diagnostics.Tests.xproj", "{994351B4-7B2A-4139-8B72-72C5BB5CC618}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Diagnostics.Tests", "test\Microsoft.AspNetCore.Diagnostics.Tests\Microsoft.AspNetCore.Diagnostics.Tests.csproj", "{994351B4-7B2A-4139-8B72-72C5BB5CC618}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ExceptionHandlerSample", "samples\ExceptionHandlerSample\ExceptionHandlerSample.xproj", "{427CDB36-78B0-4583-9EBC-7F283DE60355}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExceptionHandlerSample", "samples\ExceptionHandlerSample\ExceptionHandlerSample.csproj", "{427CDB36-78B0-4583-9EBC-7F283DE60355}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore", "src\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.xproj", "{4F5A6A72-FFE4-49C4-B4C6-58132CFCB9FE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore", "src\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj", "{4F5A6A72-FFE4-49C4-B4C6-58132CFCB9FE}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests", "test\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.xproj", "{5486117B-A742-49E0-94FC-12B76F061803}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests", "test\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj", "{5486117B-A742-49E0-94FC-12B76F061803}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests", "test\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests.xproj", "{2F9B479D-8247-4210-804B-78E6DD5C3E98}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests", "test\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests.csproj", "{2F9B479D-8247-4210-804B-78E6DD5C3E98}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Diagnostics.Elm", "src\Microsoft.AspNetCore.Diagnostics.Elm\Microsoft.AspNetCore.Diagnostics.Elm.xproj", "{624B0019-956A-4157-B008-270C5B229553}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Diagnostics.Elm", "src\Microsoft.AspNetCore.Diagnostics.Elm\Microsoft.AspNetCore.Diagnostics.Elm.csproj", "{624B0019-956A-4157-B008-270C5B229553}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "StatusCodePagesSample", "samples\StatusCodePagesSample\StatusCodePagesSample.xproj", "{CC1F5841-FE10-4DDB-8477-C4DE92BA759F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StatusCodePagesSample", "samples\StatusCodePagesSample\StatusCodePagesSample.csproj", "{CC1F5841-FE10-4DDB-8477-C4DE92BA759F}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Diagnostics.Abstractions", "src\Microsoft.AspNetCore.Diagnostics.Abstractions\Microsoft.AspNetCore.Diagnostics.Abstractions.xproj", "{83FFB65A-97B1-45AA-BCB8-3F43966BC8A3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Diagnostics.Abstractions", "src\Microsoft.AspNetCore.Diagnostics.Abstractions\Microsoft.AspNetCore.Diagnostics.Abstractions.csproj", "{83FFB65A-97B1-45AA-BCB8-3F43966BC8A3}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ElmPageSample", "samples\ElmPageSample\ElmPageSample.xproj", "{FFD28DCF-C24F-4C59-9B6B-F3B74CE13129}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ElmPageSample", "samples\ElmPageSample\ElmPageSample.csproj", "{FFD28DCF-C24F-4C59-9B6B-F3B74CE13129}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "DatabaseErrorPageSample", "samples\DatabaseErrorPageSample\DatabaseErrorPageSample.xproj", "{FF7F11A1-14E7-4948-A853-2487D99DE0C6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DatabaseErrorPageSample", "samples\DatabaseErrorPageSample\DatabaseErrorPageSample.csproj", "{FF7F11A1-14E7-4948-A853-2487D99DE0C6}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.MiddlewareAnalysis", "src\Microsoft.AspNetCore.MiddlewareAnalysis\Microsoft.AspNetCore.MiddlewareAnalysis.xproj", "{C2DEDD37-D1EB-4819-9A9C-475E37A52358}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.MiddlewareAnalysis", "src\Microsoft.AspNetCore.MiddlewareAnalysis\Microsoft.AspNetCore.MiddlewareAnalysis.csproj", "{C2DEDD37-D1EB-4819-9A9C-475E37A52358}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MiddlewareAnalysisSample", "samples\MiddlewareAnalysisSample\MiddlewareAnalysisSample.xproj", "{95981429-F212-44E1-83AA-32DA9E2A517C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MiddlewareAnalysisSample", "samples\MiddlewareAnalysisSample\MiddlewareAnalysisSample.csproj", "{95981429-F212-44E1-83AA-32DA9E2A517C}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.MiddlewareAnalysis.Tests", "test\Microsoft.AspNetCore.MiddlewareAnalysis.Tests\Microsoft.AspNetCore.MiddlewareAnalysis.Tests.xproj", "{B0166AED-738F-42EE-AF4D-C487C8B21521}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.MiddlewareAnalysis.Tests", "test\Microsoft.AspNetCore.MiddlewareAnalysis.Tests\Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj", "{B0166AED-738F-42EE-AF4D-C487C8B21521}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Diagnostics.FunctionalTests", "test\Microsoft.AspNetCore.Diagnostics.FunctionalTests\Microsoft.AspNetCore.Diagnostics.FunctionalTests.xproj", "{BFDFE1E3-A6A9-4DAB-8939-1DA306FC69C8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Diagnostics.FunctionalTests", "test\Microsoft.AspNetCore.Diagnostics.FunctionalTests\Microsoft.AspNetCore.Diagnostics.FunctionalTests.csproj", "{BFDFE1E3-A6A9-4DAB-8939-1DA306FC69C8}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClassLibraryWithPortablePdbs", "test\ClassLibraryWithPortablePdbs\ClassLibraryWithPortablePdbs.xproj", "{AA3661A1-CE8D-4597-ADFD-A5A30834E5D0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassLibraryWithPortablePdbs", "test\ClassLibraryWithPortablePdbs\ClassLibraryWithPortablePdbs.csproj", "{AA3661A1-CE8D-4597-ADFD-A5A30834E5D0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/NuGet.config b/NuGet.config index 826a1f9035..8e65695611 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,7 +1,8 @@ - + + - \ No newline at end of file + diff --git a/appveyor.yml b/appveyor.yml index b9a9bcd1e6..741873cbe5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,4 +10,5 @@ build_script: - build.cmd verify clone_depth: 1 test: off -deploy: off \ No newline at end of file +deploy: off +os: Visual Studio 2015 diff --git a/build.ps1 b/build.ps1 index 8f2f99691a..0605b59c01 100644 --- a/build.ps1 +++ b/build.ps1 @@ -33,7 +33,7 @@ cd $PSScriptRoot $repoFolder = $PSScriptRoot $env:REPO_FOLDER = $repoFolder -$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip" +$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/feature/msbuild.zip" if ($env:KOREBUILD_ZIP) { $koreBuildZip=$env:KOREBUILD_ZIP diff --git a/build.sh b/build.sh index 4fd7ede788..07997d6c83 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/dev.zip" +koreBuildZip="https://github.com/aspnet/KoreBuild/archive/feature/msbuild.zip" if [ ! -z $KOREBUILD_ZIP ]; then koreBuildZip=$KOREBUILD_ZIP fi diff --git a/tools/Key.snk b/build/Key.snk similarity index 100% rename from tools/Key.snk rename to build/Key.snk diff --git a/build/common.props b/build/common.props new file mode 100644 index 0000000000..2a4d78c7b1 --- /dev/null +++ b/build/common.props @@ -0,0 +1,24 @@ + + + + + Microsoft ASP.NET Core + https://github.com/aspnet/Diagnostics + git + $(MSBuildThisFileDirectory)Key.snk + true + true + 1.2.0-* + 1.6.2-* + $(VersionSuffix)-$(BuildNumber) + + + + + + + + + + + diff --git a/global.json b/global.json deleted file mode 100644 index 9ecb1c6efa..0000000000 --- a/global.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "projects": [ - "src", - "samples" - ], - "sdk": { - "version": "1.0.0-preview2-1-003180" - } -} \ No newline at end of file diff --git a/samples/DatabaseErrorPageSample/DatabaseErrorPageSample.csproj b/samples/DatabaseErrorPageSample/DatabaseErrorPageSample.csproj new file mode 100644 index 0000000000..3c1dde2196 --- /dev/null +++ b/samples/DatabaseErrorPageSample/DatabaseErrorPageSample.csproj @@ -0,0 +1,18 @@ + + + + net451;netcoreapp1.1 + win7-x64 + Exe + 1.2.0-* + + + + + + + + + + + diff --git a/samples/DatabaseErrorPageSample/DatabaseErrorPageSample.xproj b/samples/DatabaseErrorPageSample/DatabaseErrorPageSample.xproj deleted file mode 100644 index 34d1af1f6a..0000000000 --- a/samples/DatabaseErrorPageSample/DatabaseErrorPageSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - ff7f11a1-14e7-4948-a853-2487d99de0c6 - .\obj - .\bin\ - - - 2.0 - 10233 - - - \ No newline at end of file diff --git a/samples/DatabaseErrorPageSample/project.json b/samples/DatabaseErrorPageSample/project.json deleted file mode 100644 index fe4e08248b..0000000000 --- a/samples/DatabaseErrorPageSample/project.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "dependencies": { - "Microsoft.AspNetCore.Diagnostics": "1.2.0-*", - "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.2.0-*", - "Microsoft.AspNetCore.Server.IISIntegration": "1.2.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*", - "Microsoft.EntityFrameworkCore.SqlServer": "1.2.0-*", - "Microsoft.EntityFrameworkCore.Tools": { - "version": "1.0.0-*", - "type": "build" - } - }, - "buildOptions": { - "emitEntryPoint": true - }, - "frameworks": { - "net451": {}, - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.2.0-*", - "type": "platform" - } - } - } - }, - "publishOptions": { - "include": [ - "web.config" - ] - }, - "tools": { - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-*", - "Microsoft.EntityFrameworkCore.Tools.DotNet": "1.0.0-*" - }, - "scripts": { - "postpublish": "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" - } -} \ No newline at end of file diff --git a/samples/DeveloperExceptionPageSample/DeveloperExceptionPageSample.csproj b/samples/DeveloperExceptionPageSample/DeveloperExceptionPageSample.csproj new file mode 100644 index 0000000000..efcb235944 --- /dev/null +++ b/samples/DeveloperExceptionPageSample/DeveloperExceptionPageSample.csproj @@ -0,0 +1,16 @@ + + + + net451;netcoreapp1.1 + win7-x64 + Exe + 1.2.0-* + + + + + + + + + diff --git a/samples/DeveloperExceptionPageSample/DeveloperExceptionPageSample.xproj b/samples/DeveloperExceptionPageSample/DeveloperExceptionPageSample.xproj deleted file mode 100644 index 390b9dc9ca..0000000000 --- a/samples/DeveloperExceptionPageSample/DeveloperExceptionPageSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 589ac17f-9455-4764-8f82-fcd2ae58da14 - .\obj - .\bin\ - - - 2.0 - 36690 - - - \ No newline at end of file diff --git a/samples/DeveloperExceptionPageSample/project.json b/samples/DeveloperExceptionPageSample/project.json deleted file mode 100644 index adfb0b53b9..0000000000 --- a/samples/DeveloperExceptionPageSample/project.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "dependencies": { - "Microsoft.AspNetCore.Diagnostics": "1.2.0-*", - "Microsoft.AspNetCore.Server.IISIntegration": "1.2.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*" - }, - "buildOptions": { - "emitEntryPoint": true - }, - "frameworks": { - "net451": {}, - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.2.0-*", - "type": "platform" - } - } - } - }, - "publishOptions": { - "include": [ - "web.config" - ] - }, - "tools": { - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-*" - }, - "scripts": { - "postpublish": "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" - } -} \ No newline at end of file diff --git a/samples/ElmPageSample/ElmPageSample.csproj b/samples/ElmPageSample/ElmPageSample.csproj new file mode 100644 index 0000000000..51b02ec454 --- /dev/null +++ b/samples/ElmPageSample/ElmPageSample.csproj @@ -0,0 +1,16 @@ + + + + net451;netcoreapp1.1 + win7-x64 + Exe + 1.2.0-* + + + + + + + + + diff --git a/samples/ElmPageSample/ElmPageSample.xproj b/samples/ElmPageSample/ElmPageSample.xproj deleted file mode 100644 index f05537d1a5..0000000000 --- a/samples/ElmPageSample/ElmPageSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - ffd28dcf-c24f-4c59-9b6b-f3b74ce13129 - .\obj - .\bin\ - - - 2.0 - 42364 - - - \ No newline at end of file diff --git a/samples/ElmPageSample/project.json b/samples/ElmPageSample/project.json deleted file mode 100644 index 8217165293..0000000000 --- a/samples/ElmPageSample/project.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "dependencies": { - "Microsoft.AspNetCore.Diagnostics.Elm": "0.3.0-*", - "Microsoft.AspNetCore.Server.IISIntegration": "1.2.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*" - }, - "buildOptions": { - "emitEntryPoint": true - }, - "frameworks": { - "net451": {}, - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.2.0-*", - "type": "platform" - } - } - } - }, - "publishOptions": { - "include": [ - "web.config" - ] - }, - "tools": { - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-*" - }, - "scripts": { - "postpublish": "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" - } -} \ No newline at end of file diff --git a/samples/ExceptionHandlerSample/ExceptionHandlerSample.csproj b/samples/ExceptionHandlerSample/ExceptionHandlerSample.csproj new file mode 100644 index 0000000000..af5935ae41 --- /dev/null +++ b/samples/ExceptionHandlerSample/ExceptionHandlerSample.csproj @@ -0,0 +1,17 @@ + + + + net451;netcoreapp1.1 + win7-x64 + Exe + 1.2.0-* + + + + + + + + + + diff --git a/samples/ExceptionHandlerSample/ExceptionHandlerSample.xproj b/samples/ExceptionHandlerSample/ExceptionHandlerSample.xproj deleted file mode 100644 index 3858f86b31..0000000000 --- a/samples/ExceptionHandlerSample/ExceptionHandlerSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 427cdb36-78b0-4583-9ebc-7f283de60355 - .\obj - .\bin\ - - - 2.0 - 62671 - - - \ No newline at end of file diff --git a/samples/ExceptionHandlerSample/project.json b/samples/ExceptionHandlerSample/project.json deleted file mode 100644 index 92795a8243..0000000000 --- a/samples/ExceptionHandlerSample/project.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "dependencies": { - "Microsoft.AspNetCore.Diagnostics": "1.2.0-*", - "Microsoft.AspNetCore.Server.IISIntegration": "1.2.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*", - "Microsoft.AspNetCore.StaticFiles": "1.2.0-*" - }, - "buildOptions": { - "emitEntryPoint": true - }, - "frameworks": { - "net451": {}, - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.2.0-*", - "type": "platform" - } - } - } - }, - "publishOptions": { - "include": [ - "wwwroot", - "web.config" - ] - }, - "tools": { - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-*" - }, - "scripts": { - "postpublish": "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" - } -} \ No newline at end of file diff --git a/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.csproj b/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.csproj new file mode 100644 index 0000000000..20e8b2b914 --- /dev/null +++ b/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.csproj @@ -0,0 +1,19 @@ + + + + net451;netcoreapp1.1 + win7-x64 + Exe + 1.2.0-* + + + + + + + + + + + + diff --git a/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.xproj b/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.xproj deleted file mode 100644 index 07c825fbe6..0000000000 --- a/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 95981429-f212-44e1-83aa-32da9e2a517c - .\obj - .\bin\ - - - 2.0 - 2764 - - - \ No newline at end of file diff --git a/samples/MiddlewareAnalysisSample/project.json b/samples/MiddlewareAnalysisSample/project.json deleted file mode 100644 index 420558fd20..0000000000 --- a/samples/MiddlewareAnalysisSample/project.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "dependencies": { - "Microsoft.AspNetCore.Diagnostics": "1.2.0-*", - "Microsoft.AspNetCore.MiddlewareAnalysis": "1.2.0-*", - "Microsoft.AspNetCore.Server.IISIntegration": "1.2.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*", - "Microsoft.Extensions.DiagnosticAdapter": "1.2.0-*", - "Microsoft.Extensions.Logging.Console": "1.2.0-*" - }, - "buildOptions": { - "emitEntryPoint": true - }, - "frameworks": { - "net451": {}, - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.2.0-*", - "type": "platform" - } - } - } - }, - "publishOptions": { - "include": [ - "web.config" - ] - }, - "tools": { - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-*" - }, - "scripts": { - "postpublish": "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" - } -} \ No newline at end of file diff --git a/samples/StatusCodePagesSample/StatusCodePagesSample.csproj b/samples/StatusCodePagesSample/StatusCodePagesSample.csproj new file mode 100644 index 0000000000..efcb235944 --- /dev/null +++ b/samples/StatusCodePagesSample/StatusCodePagesSample.csproj @@ -0,0 +1,16 @@ + + + + net451;netcoreapp1.1 + win7-x64 + Exe + 1.2.0-* + + + + + + + + + diff --git a/samples/StatusCodePagesSample/StatusCodePagesSample.xproj b/samples/StatusCodePagesSample/StatusCodePagesSample.xproj deleted file mode 100644 index 65db127940..0000000000 --- a/samples/StatusCodePagesSample/StatusCodePagesSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - cc1f5841-fe10-4ddb-8477-c4de92ba759f - .\obj - .\bin\ - - - 2.0 - 21211 - - - \ No newline at end of file diff --git a/samples/StatusCodePagesSample/project.json b/samples/StatusCodePagesSample/project.json deleted file mode 100644 index 0523b30da0..0000000000 --- a/samples/StatusCodePagesSample/project.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "buildOptions": { - "emitEntryPoint": true - }, - "dependencies": { - "Microsoft.AspNetCore.Diagnostics": "1.2.0-*", - "Microsoft.AspNetCore.Server.IISIntegration": "1.2.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*" - }, - "frameworks": { - "net451": {}, - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.2.0-*", - "type": "platform" - } - } - } - }, - "publishOptions": { - "include": [ - "web.config" - ] - }, - "tools": { - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-*" - }, - "scripts": { - "postpublish": "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" - } -} \ No newline at end of file diff --git a/samples/WelcomePageSample/WelcomePageSample.csproj b/samples/WelcomePageSample/WelcomePageSample.csproj new file mode 100644 index 0000000000..efcb235944 --- /dev/null +++ b/samples/WelcomePageSample/WelcomePageSample.csproj @@ -0,0 +1,16 @@ + + + + net451;netcoreapp1.1 + win7-x64 + Exe + 1.2.0-* + + + + + + + + + diff --git a/samples/WelcomePageSample/WelcomePageSample.xproj b/samples/WelcomePageSample/WelcomePageSample.xproj deleted file mode 100644 index 2f665e0579..0000000000 --- a/samples/WelcomePageSample/WelcomePageSample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - c5f59cba-df2d-4983-8cbb-11b6af21b416 - .\obj - .\bin\ - - - 2.0 - 36451 - - - \ No newline at end of file diff --git a/samples/WelcomePageSample/project.json b/samples/WelcomePageSample/project.json deleted file mode 100644 index adfb0b53b9..0000000000 --- a/samples/WelcomePageSample/project.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "dependencies": { - "Microsoft.AspNetCore.Diagnostics": "1.2.0-*", - "Microsoft.AspNetCore.Server.IISIntegration": "1.2.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*" - }, - "buildOptions": { - "emitEntryPoint": true - }, - "frameworks": { - "net451": {}, - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.2.0-*", - "type": "platform" - } - } - } - }, - "publishOptions": { - "include": [ - "web.config" - ] - }, - "tools": { - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-*" - }, - "scripts": { - "postpublish": "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj new file mode 100644 index 0000000000..f17e62ec93 --- /dev/null +++ b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj @@ -0,0 +1,13 @@ + + + + + + ASP.NET Core diagnostics middleware abstractions and feature interface definitions. + netstandard1.0 + $(NoWarn);CS1591 + true + aspnetcore;diagnostics + + + diff --git a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/Microsoft.AspNetCore.Diagnostics.Abstractions.xproj b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/Microsoft.AspNetCore.Diagnostics.Abstractions.xproj deleted file mode 100644 index 60eeab5258..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/Microsoft.AspNetCore.Diagnostics.Abstractions.xproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 83ffb65a-97b1-45aa-bcb8-3f43966bc8a3 - .\obj - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/Properties/AssemblyInfo.cs deleted file mode 100644 index e3ae91c58b..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Reflection; -using System.Resources; - -[assembly: AssemblyMetadata("Serviceable", "True")] -[assembly: NeutralResourcesLanguage("en-US")] -[assembly: AssemblyCompany("Microsoft Corporation.")] -[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")] -[assembly: AssemblyProduct("Microsoft ASP.NET Core")] diff --git a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/project.json b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/project.json deleted file mode 100644 index 0efc2b4d58..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/project.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "version": "1.2.0-*", - "description": "ASP.NET Core diagnostics middleware abstractions and feature interface definitions.", - "packOptions": { - "repository": { - "type": "git", - "url": "git://github.com/aspnet/diagnostics" - }, - "tags": [ - "aspnetcore", - "diagnostics" - ] - }, - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - "nowarn": [ - "CS1591" - ], - "xmlDoc": true - }, - "frameworks": { - "netstandard1.0": { - "dependencies": { - "NETStandard.Library": "1.6.2-*" - } - } - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.csproj b/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.csproj new file mode 100644 index 0000000000..b16cff15df --- /dev/null +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.csproj @@ -0,0 +1,26 @@ + + + + + + ASP.NET Core Error Logging Middleware (ELM) to capture and display request logs. + 0.3.0 + net451;netstandard1.3 + $(NoWarn);CS1591 + true + aspnetcore;diagnostics + + + + + + + + + + + + + + + diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.xproj b/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.xproj deleted file mode 100644 index a838466270..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.xproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 624b0019-956a-4157-b008-270c5b229553 - .\obj - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/Properties/AssemblyInfo.cs deleted file mode 100644 index e3ae91c58b..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Reflection; -using System.Resources; - -[assembly: AssemblyMetadata("Serviceable", "True")] -[assembly: NeutralResourcesLanguage("en-US")] -[assembly: AssemblyCompany("Microsoft Corporation.")] -[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")] -[assembly: AssemblyProduct("Microsoft ASP.NET Core")] diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/project.json b/src/Microsoft.AspNetCore.Diagnostics.Elm/project.json deleted file mode 100644 index 12bb10415a..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/project.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "version": "0.3.0-*", - "description": "ASP.NET Core Error Logging Middleware (ELM) to capture and display request logs.", - "buildOptions": { - "compile": "../shared/**/*.cs", - "keyFile": "../../tools/Key.snk", - "nowarn": [ - "CS1591" - ], - "warningsAsErrors": true, - "xmlDoc": true - }, - "packOptions": { - "repository": { - "type": "git", - "url": "git://github.com/aspnet/diagnostics" - }, - "tags": [ - "aspnetcore", - "diagnostics" - ] - }, - "dependencies": { - "Microsoft.AspNetCore.Http.Abstractions": "1.2.0-*", - "Microsoft.Extensions.Logging.Abstractions": "1.2.0-*", - "Microsoft.Extensions.Options": "1.2.0-*", - "Microsoft.Extensions.RazorViews.Sources": { - "type": "build", - "version": "1.2.0-*" - }, - "NETStandard.Library": "1.6.2-*" - }, - "tools": { - "RazorPageGenerator": "1.1.0-*" - }, - "frameworks": { - "net451": { - "frameworkAssemblies": { - "System.IO": "" - } - }, - "netstandard1.3": {} - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj new file mode 100644 index 0000000000..aac0a388de --- /dev/null +++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj @@ -0,0 +1,28 @@ + + + + + + ASP.NET Core middleware for Entity Framework Core error pages. Use this middleware to detect and diagnose errors with Entity Framework Core migrations. + net451;netstandard1.3 + $(NoWarn);CS1591 + true + aspnetcore;diagnostics;entityframeworkcore + + + + + + + + + + + + + + + + + + diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.xproj b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.xproj deleted file mode 100644 index 7c90c6cb0e..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.xproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 4f5a6a72-ffe4-49c4-b4c6-58132cfcb9fe - .\obj - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Properties/AssemblyInfo.cs index cc2655f392..019e858be0 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Properties/AssemblyInfo.cs @@ -6,8 +6,3 @@ using System.Resources; using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: AssemblyMetadata("Serviceable", "True")] -[assembly: NeutralResourcesLanguage("en-US")] -[assembly: AssemblyCompany("Microsoft Corporation.")] -[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")] -[assembly: AssemblyProduct("Microsoft ASP.NET Core")] diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json deleted file mode 100644 index 9b10029e76..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "version": "1.2.0-*", - "description": "ASP.NET Core middleware for Entity Framework Core error pages. Use this middleware to detect and diagnose errors with Entity Framework Core migrations.", - "packOptions": { - "repository": { - "type": "git", - "url": "git://github.com/aspnet/diagnostics" - }, - "tags": [ - "aspnetcore", - "diagnostics", - "entityframeworkcore" - ] - }, - "buildOptions": { - "compile": "../shared/**/*.cs", - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - "nowarn": [ - "CS1591" - ], - "xmlDoc": true - }, - "dependencies": { - "Microsoft.AspNetCore.Http.Abstractions": "1.2.0-*", - "Microsoft.EntityFrameworkCore.Relational": "1.2.0-*", - "Microsoft.Extensions.RazorViews.Sources": { - "type": "build", - "version": "1.2.0-*" - }, - "NETStandard.Library": "1.6.2-*" - }, - "tools": { - "RazorPageGenerator": "1.1.0-*" - }, - "frameworks": { - "net451": { - "frameworkAssemblies": { - "System.Configuration": "", - "System.IO": "" - } - }, - "netstandard1.3": {} - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics/Microsoft.AspNetCore.Diagnostics.csproj b/src/Microsoft.AspNetCore.Diagnostics/Microsoft.AspNetCore.Diagnostics.csproj new file mode 100644 index 0000000000..7f430e5f07 --- /dev/null +++ b/src/Microsoft.AspNetCore.Diagnostics/Microsoft.AspNetCore.Diagnostics.csproj @@ -0,0 +1,38 @@ + + + + + + ASP.NET Core middleware for exception handling, exception display pages, and diagnostics information. Includes developer exception page middleware, exception handler middleware, runtime info middleware, status code page middleware, and welcome page middleware + net451;netstandard1.3 + $(NoWarn);CS1591 + true + aspnetcore;diagnostics + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Microsoft.AspNetCore.Diagnostics/Microsoft.AspNetCore.Diagnostics.xproj b/src/Microsoft.AspNetCore.Diagnostics/Microsoft.AspNetCore.Diagnostics.xproj deleted file mode 100644 index cb71cb99df..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics/Microsoft.AspNetCore.Diagnostics.xproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 68a1f0e1-ecce-46d1-b20f-c43ee5b097de - .\obj - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Diagnostics/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Diagnostics/Properties/AssemblyInfo.cs index 13b0850b17..7aa636c259 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/Properties/AssemblyInfo.cs @@ -7,8 +7,3 @@ using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Diagnostics.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] -[assembly: AssemblyMetadata("Serviceable", "True")] -[assembly: NeutralResourcesLanguage("en-US")] -[assembly: AssemblyCompany("Microsoft Corporation.")] -[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")] -[assembly: AssemblyProduct("Microsoft ASP.NET Core")] diff --git a/src/Microsoft.AspNetCore.Diagnostics/project.json b/src/Microsoft.AspNetCore.Diagnostics/project.json deleted file mode 100644 index a4bf8f567d..0000000000 --- a/src/Microsoft.AspNetCore.Diagnostics/project.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "version": "1.2.0-*", - "description": "ASP.NET Core middleware for exception handling, exception display pages, and diagnostics information. Includes developer exception page middleware, exception handler middleware, runtime info middleware, status code page middleware, and welcome page middleware", - "buildOptions": { - "compile": "../shared/**/*.cs", - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - "nowarn": [ - "CS1591" - ], - "xmlDoc": true - }, - "packOptions": { - "repository": { - "type": "git", - "url": "git://github.com/aspnet/diagnostics" - }, - "tags": [ - "aspnetcore", - "diagnostics" - ] - }, - "dependencies": { - "Microsoft.AspNetCore.Diagnostics.Abstractions": { - "target": "project" - }, - "Microsoft.AspNetCore.Hosting.Abstractions": "1.2.0-*", - "Microsoft.AspNetCore.Http.Extensions": "1.2.0-*", - "Microsoft.AspNetCore.WebUtilities": "1.2.0-*", - "Microsoft.Extensions.FileProviders.Physical": "1.2.0-*", - "Microsoft.Extensions.Logging.Abstractions": "1.2.0-*", - "Microsoft.Extensions.Options": "1.2.0-*", - "Microsoft.Extensions.RazorViews.Sources": { - "type": "build", - "version": "1.2.0-*" - }, - "Microsoft.Extensions.StackTrace.Sources": { - "type": "build", - "version": "1.2.0-*" - }, - "Microsoft.Extensions.TaskCache.Sources": { - "version": "1.2.0-*", - "type": "build" - }, - "Microsoft.Extensions.TypeNameHelper.Sources": { - "type": "build", - "version": "1.2.0-*" - }, - "NETStandard.Library": "1.6.2-*", - "System.Diagnostics.DiagnosticSource": "4.4.0-*", - "System.Reflection.Metadata": "1.5.0-*" - }, - "tools": { - "RazorPageGenerator": "1.1.0-*" - }, - "frameworks": { - "net451": {}, - "netstandard1.3": { - "dependencies": { - "System.Diagnostics.StackTrace": "4.4.0-*" - } - } - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.MiddlewareAnalysis/Microsoft.AspNetCore.MiddlewareAnalysis.csproj b/src/Microsoft.AspNetCore.MiddlewareAnalysis/Microsoft.AspNetCore.MiddlewareAnalysis.csproj new file mode 100644 index 0000000000..67f38ac7ff --- /dev/null +++ b/src/Microsoft.AspNetCore.MiddlewareAnalysis/Microsoft.AspNetCore.MiddlewareAnalysis.csproj @@ -0,0 +1,19 @@ + + + + + + ASP.NET Core middleware for analyzing middleware in the request pipeline with System.Diagnostics.DiagnosticSource. + net451;netstandard1.3 + $(NoWarn);CS1591 + true + aspnetcore;diagnostics + + + + + + + + + diff --git a/src/Microsoft.AspNetCore.MiddlewareAnalysis/Microsoft.AspNetCore.MiddlewareAnalysis.xproj b/src/Microsoft.AspNetCore.MiddlewareAnalysis/Microsoft.AspNetCore.MiddlewareAnalysis.xproj deleted file mode 100644 index b2b37686de..0000000000 --- a/src/Microsoft.AspNetCore.MiddlewareAnalysis/Microsoft.AspNetCore.MiddlewareAnalysis.xproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - c2dedd37-d1eb-4819-9a9c-475e37a52358 - .\obj - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.MiddlewareAnalysis/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.MiddlewareAnalysis/Properties/AssemblyInfo.cs deleted file mode 100644 index e3ae91c58b..0000000000 --- a/src/Microsoft.AspNetCore.MiddlewareAnalysis/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Reflection; -using System.Resources; - -[assembly: AssemblyMetadata("Serviceable", "True")] -[assembly: NeutralResourcesLanguage("en-US")] -[assembly: AssemblyCompany("Microsoft Corporation.")] -[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")] -[assembly: AssemblyProduct("Microsoft ASP.NET Core")] diff --git a/src/Microsoft.AspNetCore.MiddlewareAnalysis/project.json b/src/Microsoft.AspNetCore.MiddlewareAnalysis/project.json deleted file mode 100644 index 32f0e209ac..0000000000 --- a/src/Microsoft.AspNetCore.MiddlewareAnalysis/project.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "version": "1.2.0-*", - "description": "ASP.NET Core middleware for analyzing middleware in the request pipeline with System.Diagnostics.DiagnosticSource.", - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - "nowarn": [ - "CS1591" - ], - "xmlDoc": true - }, - "packOptions": { - "repository": { - "type": "git", - "url": "git://github.com/aspnet/diagnostics" - }, - "tags": [ - "aspnetcore", - "diagnostics" - ] - }, - "dependencies": { - "Microsoft.AspNetCore.Hosting.Abstractions": "1.2.0-*", - "Microsoft.Extensions.DependencyInjection.Abstractions": "1.2.0-*", - "NETStandard.Library": "1.6.2-*", - "System.Diagnostics.DiagnosticSource": "4.4.0-*" - }, - "frameworks": { - "net451": {}, - "netstandard1.3": {} - } -} \ No newline at end of file diff --git a/src/PageGenerator/baseline.netcore.json b/src/PageGenerator/baseline.netcore.json deleted file mode 100644 index efcbc78cc6..0000000000 --- a/src/PageGenerator/baseline.netcore.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "AssemblyIdentity": "PageGenerator, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", - "Types": [ - { - "Name": "PageGenerator.Program", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "Main", - "Parameters": [ - { - "Name": "args", - "Type": "System.String[]" - } - ], - "ReturnType": "System.Void", - "Static": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - } - ] -} \ No newline at end of file diff --git a/test/ClassLibraryWithPortablePdbs/.notest b/test/ClassLibraryWithPortablePdbs/.notest new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/ClassLibraryWithPortablePdbs/ClassLibraryWithPortablePdbs.csproj b/test/ClassLibraryWithPortablePdbs/ClassLibraryWithPortablePdbs.csproj new file mode 100644 index 0000000000..20b2d68fad --- /dev/null +++ b/test/ClassLibraryWithPortablePdbs/ClassLibraryWithPortablePdbs.csproj @@ -0,0 +1,10 @@ + + + + + + netstandard1.0 + portable + + + diff --git a/test/ClassLibraryWithPortablePdbs/ClassLibraryWithPortablePdbs.xproj b/test/ClassLibraryWithPortablePdbs/ClassLibraryWithPortablePdbs.xproj deleted file mode 100644 index 5acd090053..0000000000 --- a/test/ClassLibraryWithPortablePdbs/ClassLibraryWithPortablePdbs.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0.25420 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - aa3661a1-ce8d-4597-adfd-a5a30834e5d0 - ClassLibraryWithPortablePdbs - .\obj - .\bin\ - - - - 2.0 - - - \ No newline at end of file diff --git a/test/ClassLibraryWithPortablePdbs/project.json b/test/ClassLibraryWithPortablePdbs/project.json deleted file mode 100644 index 8416564714..0000000000 --- a/test/ClassLibraryWithPortablePdbs/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "version": "1.1.0-*", - "buildOptions": { - "debugType": "portable", - "keyFile": "../../tools/Key.snk" - }, - "dependencies": { - "NETStandard.Library": "1.6.2-*" - }, - "frameworks": { - "netstandard1.0": {} - } -} \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests.csproj new file mode 100644 index 0000000000..ef476b9dcc --- /dev/null +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests.csproj @@ -0,0 +1,18 @@ + + + + + + netcoreapp1.1;net451 + + + + + + + + + + + + diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests.xproj b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests.xproj deleted file mode 100644 index 739e82bfa2..0000000000 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 2f9b479d-8247-4210-804b-78e6dd5c3e98 - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json deleted file mode 100644 index cead1017c1..0000000000 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "dependencies": { - "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests": "1.0.0", - "Microsoft.AspNetCore.TestHost": "1.2.0-*", - "Microsoft.EntityFrameworkCore.SqlServer": "1.2.0-*" - }, - "testRunner": "xunit", - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.2.0-*", - "type": "platform" - } - }, - "imports": "dotnet5.4" - }, - "net451": {} - }, - "buildOptions": { - "warningsAsErrors": true - } -} \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/DataStoreErrorLoggerTest.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/DataStoreErrorLoggerTest.cs index b78a41b498..0360cb23ae 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/DataStoreErrorLoggerTest.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/DataStoreErrorLoggerTest.cs @@ -30,7 +30,11 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests { // Arrange var logger = SetUp(); - var domain = AppDomain.CreateDomain("newDomain"); + var setupInfo = new AppDomainSetup + { + ApplicationBase = AppDomain.CurrentDomain.BaseDirectory + }; + var domain = AppDomain.CreateDomain("newDomain", null, setupInfo); // Act logger.StartLoggingForCurrentCallContext(); diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj new file mode 100644 index 0000000000..1e4c3b898d --- /dev/null +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj @@ -0,0 +1,19 @@ + + + + + + netcoreapp1.1;net451 + + + + + + + + + + + + + diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.xproj b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.xproj deleted file mode 100644 index 454b428ea4..0000000000 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 5486117b-a742-49e0-94fc-12b76f061803 - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json deleted file mode 100644 index 1ae4e79a4e..0000000000 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "buildOptions": { - "compile": { - "include": [ - "../Shared/ApiConsistencyTestBase.cs", - "../Shared/TestHelpers.cs" - ] - }, - "keyFile": "../../tools/Key.snk", - "warningsAsErrors": true - }, - "dependencies": { - "dotnet-test-xunit": "2.2.0-*", - "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.2.0-*", - "Microsoft.AspNetCore.Testing": "1.2.0-*", - "Microsoft.EntityFrameworkCore.InMemory": "1.2.0-*", - "Moq": "4.6.36-*", - "xunit": "2.2.0-*" - }, - "testRunner": "xunit", - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.2.0-*", - "type": "platform" - }, - "System.Diagnostics.TraceSource": "4.4.0-*" - } - }, - "net451": {} - } -} \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/Microsoft.AspNetCore.Diagnostics.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/Microsoft.AspNetCore.Diagnostics.FunctionalTests.csproj new file mode 100644 index 0000000000..04c6a1fd39 --- /dev/null +++ b/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/Microsoft.AspNetCore.Diagnostics.FunctionalTests.csproj @@ -0,0 +1,28 @@ + + + + + + netcoreapp1.1;net451 + win7-x64 + false + false + + + + + + + + + + + + + + + + + + + diff --git a/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/Microsoft.AspNetCore.Diagnostics.FunctionalTests.xproj b/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/Microsoft.AspNetCore.Diagnostics.FunctionalTests.xproj deleted file mode 100644 index 11583dbc89..0000000000 --- a/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/Microsoft.AspNetCore.Diagnostics.FunctionalTests.xproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - bfdfe1e3-a6a9-4dab-8939-1da306fc69c8 - .\obj - .\bin\ - - - 2.0 - - - - - - - - - - - \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/project.json deleted file mode 100644 index 1a8fe51fe2..0000000000 --- a/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/project.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "dependencies": { - "DatabaseErrorPageSample": "1.0.0", - "DeveloperExceptionPageSample": "1.0.0", - "dotnet-test-xunit": "2.2.0-*", - "ElmPageSample": "1.0.0", - "ExceptionHandlerSample": "1.0.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*", - "Microsoft.AspNetCore.TestHost": "1.2.0-*", - "Microsoft.AspNetCore.Testing": "1.2.0-*", - "MiddlewareAnalysisSample": "1.0.0", - "StatusCodePagesSample": "1.0.0", - "WelcomePageSample": "1.0.0", - "xunit": "2.2.0-*" - }, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.2.0-*", - "type": "platform" - } - } - }, - "net451": {} - }, - "testRunner": "xunit", - "version": "1.1.0-*" -} \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmLoggerTest.cs b/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmLoggerTest.cs index 6c22e325b6..2e42e09e4a 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmLoggerTest.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmLoggerTest.cs @@ -323,7 +323,11 @@ namespace Microsoft.AspNetCore.Diagnostics.Tests var t = SetUp(); var logger = t.Item1; var store = t.Item2; - var domain = AppDomain.CreateDomain("newDomain"); + var setupInfo = new AppDomainSetup + { + ApplicationBase = AppDomain.CurrentDomain.BaseDirectory + }; + var domain = AppDomain.CreateDomain("newDomain", null, setupInfo); // Act domain.DoCallBack(DomainFunc); diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.csproj b/test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.csproj new file mode 100644 index 0000000000..ec00ab5dca --- /dev/null +++ b/test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.csproj @@ -0,0 +1,29 @@ + + + + + + netcoreapp1.1;net451 + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.xproj b/test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.xproj deleted file mode 100644 index d8d9afb0e6..0000000000 --- a/test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 994351b4-7b2a-4139-8b72-72c5bb5cc618 - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/project.json b/test/Microsoft.AspNetCore.Diagnostics.Tests/project.json deleted file mode 100644 index 6d1ee5159e..0000000000 --- a/test/Microsoft.AspNetCore.Diagnostics.Tests/project.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - "embed": { - "include": [ - "Resources/**" - ] - }, - "copyToOutput": { - "include": [ - "TestFiles/**/*" - ] - } - }, - "dependencies": { - "ClassLibraryWithPortablePdbs": { - "target": "project" - }, - "dotnet-test-xunit": "2.2.0-*", - "Microsoft.AspNetCore.Diagnostics": "1.2.0-*", - "Microsoft.AspNetCore.Diagnostics.Elm": "0.3.0-*", - "Microsoft.AspNetCore.TestHost": "1.2.0-*", - "Microsoft.AspNetCore.Testing": "1.2.0-*", - "Microsoft.Extensions.DependencyInjection": "1.2.0-*", - "Microsoft.Extensions.DiagnosticAdapter": "1.2.0-*", - "Microsoft.Extensions.FileProviders.Embedded": "1.2.0-*", - "Moq": "4.6.36-*", - "xunit": "2.2.0-*" - }, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.2.0-*", - "type": "platform" - }, - "System.Diagnostics.TraceSource": "4.4.0-*" - } - }, - "net451": {} - }, - "testRunner": "xunit" -} \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj new file mode 100644 index 0000000000..df77b5a374 --- /dev/null +++ b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj @@ -0,0 +1,21 @@ + + + + + + netcoreapp1.1;net451 + + + + + + + + + + + + + + + diff --git a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.xproj b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.xproj deleted file mode 100644 index 304d78ae98..0000000000 --- a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - b0166aed-738f-42ee-af4d-c487c8b21521 - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/project.json b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/project.json deleted file mode 100644 index 9ba3def546..0000000000 --- a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/project.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "buildOptions": { - "warningsAsErrors": false - }, - "dependencies": { - "dotnet-test-xunit": "2.2.0-*", - "Microsoft.AspNetCore.Diagnostics": "1.2.0-*", - "Microsoft.AspNetCore.MiddlewareAnalysis": "1.2.0-*", - "Microsoft.AspNetCore.TestHost": "1.2.0-*", - "Microsoft.AspNetCore.Testing": "1.2.0-*", - "Microsoft.Extensions.DependencyInjection": "1.2.0-*", - "Microsoft.Extensions.DiagnosticAdapter": "1.2.0-*", - "xunit": "2.2.0-*" - }, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.2.0-*", - "type": "platform" - } - } - }, - "net451": {} - }, - "testRunner": "xunit" -} \ No newline at end of file diff --git a/version.props b/version.props new file mode 100644 index 0000000000..17fd5ac36d --- /dev/null +++ b/version.props @@ -0,0 +1,7 @@ + + + + 1.2.0 + preview1 + +