From aeab73f9f6b39714cbc1c817e495ef0f71588821 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 30 Jan 2017 14:05:08 -0800 Subject: [PATCH] Upgrade to VS 2017 --- Antiforgery.sln | 13 +++--- NuGet.config | 3 +- appveyor.yml | 3 +- build.ps1 | 2 +- build.sh | 2 +- {tools => build}/Key.snk | Bin build/common.props | 19 +++++++++ global.json | 9 ---- .../AntiforgerySample.csproj | 24 +++++++++++ .../AntiforgerySample/AntiforgerySample.xproj | 18 -------- samples/AntiforgerySample/project.json | 38 ----------------- .../Microsoft.AspNetCore.Antiforgery.csproj | 25 +++++++++++ .../Microsoft.AspNetCore.Antiforgery.xproj | 17 -------- .../Properties/AssemblyInfo.cs | 7 --- .../project.json | 40 ------------------ ...NetCore.Antiforgery.FunctionalTests.csproj | 21 +++++++++ ...pNetCore.Antiforgery.FunctionalTests.xproj | 20 --------- .../project.json | 25 ----------- ...crosoft.AspNetCore.Antiforgery.Test.csproj | 27 ++++++++++++ ...icrosoft.AspNetCore.Antiforgery.Test.xproj | 20 --------- .../project.json | 35 --------------- version.props | 7 +++ 22 files changed, 135 insertions(+), 240 deletions(-) rename {tools => build}/Key.snk (100%) create mode 100644 build/common.props delete mode 100644 global.json create mode 100644 samples/AntiforgerySample/AntiforgerySample.csproj delete mode 100644 samples/AntiforgerySample/AntiforgerySample.xproj delete mode 100644 samples/AntiforgerySample/project.json create mode 100644 src/Microsoft.AspNetCore.Antiforgery/Microsoft.AspNetCore.Antiforgery.csproj delete mode 100644 src/Microsoft.AspNetCore.Antiforgery/Microsoft.AspNetCore.Antiforgery.xproj delete mode 100644 src/Microsoft.AspNetCore.Antiforgery/project.json create mode 100644 test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/Microsoft.AspNetCore.Antiforgery.FunctionalTests.csproj delete mode 100644 test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/Microsoft.AspNetCore.Antiforgery.FunctionalTests.xproj delete mode 100644 test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/project.json create mode 100644 test/Microsoft.AspNetCore.Antiforgery.Test/Microsoft.AspNetCore.Antiforgery.Test.csproj delete mode 100644 test/Microsoft.AspNetCore.Antiforgery.Test/Microsoft.AspNetCore.Antiforgery.Test.xproj delete mode 100644 test/Microsoft.AspNetCore.Antiforgery.Test/project.json create mode 100644 version.props diff --git a/Antiforgery.sln b/Antiforgery.sln index b25af44097..04e95ee7f6 100644 --- a/Antiforgery.sln +++ b/Antiforgery.sln @@ -1,21 +1,20 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.26127.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{71D070C4-B325-48F7-9F25-DD4E91C2BBCA}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6EDD8B57-4DE8-4246-A6A3-47ECD92740B4}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Antiforgery", "src\Microsoft.AspNetCore.Antiforgery\Microsoft.AspNetCore.Antiforgery.xproj", "{46FB03FB-7A44-4106-BDDE-D6F5417544AB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Antiforgery", "src\Microsoft.AspNetCore.Antiforgery\Microsoft.AspNetCore.Antiforgery.csproj", "{46FB03FB-7A44-4106-BDDE-D6F5417544AB}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Antiforgery.Test", "test\Microsoft.AspNetCore.Antiforgery.Test\Microsoft.AspNetCore.Antiforgery.Test.xproj", "{415E83F8-6002-47E4-AA8E-CD5169C06F28}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Antiforgery.Test", "test\Microsoft.AspNetCore.Antiforgery.Test\Microsoft.AspNetCore.Antiforgery.Test.csproj", "{415E83F8-6002-47E4-AA8E-CD5169C06F28}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{D8C46ADF-E40A-4B48-ADE9-E1FA80466FE3}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AntiforgerySample", "samples\AntiforgerySample\AntiforgerySample.xproj", "{AF9E0784-5EDB-494F-B46C-1A8DA785C49C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AntiforgerySample", "samples\AntiforgerySample\AntiforgerySample.csproj", "{AF9E0784-5EDB-494F-B46C-1A8DA785C49C}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Antiforgery.FunctionalTests", "test\Microsoft.AspNetCore.Antiforgery.FunctionalTests\Microsoft.AspNetCore.Antiforgery.FunctionalTests.xproj", "{8B288810-5A96-4AF5-9836-8BA2D2953203}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Antiforgery.FunctionalTests", "test\Microsoft.AspNetCore.Antiforgery.FunctionalTests\Microsoft.AspNetCore.Antiforgery.FunctionalTests.csproj", "{8B288810-5A96-4AF5-9836-8BA2D2953203}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/NuGet.config b/NuGet.config index 0fd623ffdd..8e65695611 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,7 +1,8 @@ - + + diff --git a/appveyor.yml b/appveyor.yml index be95b88d6f..773bfa8425 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,4 +10,5 @@ build_script: - build.cmd --quiet 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..363c7862da --- /dev/null +++ b/build/common.props @@ -0,0 +1,19 @@ + + + + + Microsoft ASP.NET Core + https://github.com/aspnet/Antiforgery + git + $(MSBuildThisFileDirectory)Key.snk + true + true + 1.2.0-* + 1.6.2-* + $(VersionSuffix)-$(BuildNumber) + + + + + + \ No newline at end of file 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/AntiforgerySample/AntiforgerySample.csproj b/samples/AntiforgerySample/AntiforgerySample.csproj new file mode 100644 index 0000000000..44c1f381db --- /dev/null +++ b/samples/AntiforgerySample/AntiforgerySample.csproj @@ -0,0 +1,24 @@ + + + + net451;netcoreapp1.1 + win7-x64 + Exe + 1.2.0-* + + + + + + + + + + + + + + + + + diff --git a/samples/AntiforgerySample/AntiforgerySample.xproj b/samples/AntiforgerySample/AntiforgerySample.xproj deleted file mode 100644 index df07bd9b50..0000000000 --- a/samples/AntiforgerySample/AntiforgerySample.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - af9e0784-5edb-494f-b46c-1a8da785c49c - .\obj - .\bin\ - - - 2.0 - 48542 - - - \ No newline at end of file diff --git a/samples/AntiforgerySample/project.json b/samples/AntiforgerySample/project.json deleted file mode 100644 index 328f7f8940..0000000000 --- a/samples/AntiforgerySample/project.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "version": "1.2.0-*", - "dependencies": { - "Microsoft.AspNetCore.Antiforgery": "1.2.0-*", - "Microsoft.AspNetCore.Http.Abstractions": "1.2.0-*", - "Microsoft.AspNetCore.Http.Extensions": "1.2.0-*", - "Microsoft.AspNetCore.Server.IISIntegration": "1.2.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*", - "Microsoft.AspNetCore.StaticFiles": "1.2.0-*", - "Newtonsoft.Json": "9.0.1" - }, - "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/src/Microsoft.AspNetCore.Antiforgery/Microsoft.AspNetCore.Antiforgery.csproj b/src/Microsoft.AspNetCore.Antiforgery/Microsoft.AspNetCore.Antiforgery.csproj new file mode 100644 index 0000000000..8f5c0e3ff2 --- /dev/null +++ b/src/Microsoft.AspNetCore.Antiforgery/Microsoft.AspNetCore.Antiforgery.csproj @@ -0,0 +1,25 @@ + + + + + + An antiforgery system for ASP.NET Core designed to generate and validate tokens to prevent Cross-Site Request Forgery attacks. + netstandard1.3;net451 + $(NoWarn);CS1591 + true + aspnetcore;antiforgery + + + + + + + + + + + + + + + diff --git a/src/Microsoft.AspNetCore.Antiforgery/Microsoft.AspNetCore.Antiforgery.xproj b/src/Microsoft.AspNetCore.Antiforgery/Microsoft.AspNetCore.Antiforgery.xproj deleted file mode 100644 index 3799efa7b6..0000000000 --- a/src/Microsoft.AspNetCore.Antiforgery/Microsoft.AspNetCore.Antiforgery.xproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 46fb03fb-7a44-4106-bdde-d6f5417544ab - .\obj - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Antiforgery/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Antiforgery/Properties/AssemblyInfo.cs index 5b79e64ce4..490fb19533 100644 --- a/src/Microsoft.AspNetCore.Antiforgery/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNetCore.Antiforgery/Properties/AssemblyInfo.cs @@ -1,14 +1,7 @@ // 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; using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Antiforgery.Test, 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.Antiforgery/project.json b/src/Microsoft.AspNetCore.Antiforgery/project.json deleted file mode 100644 index 963c586691..0000000000 --- a/src/Microsoft.AspNetCore.Antiforgery/project.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "description": "An antiforgery system for ASP.NET Core designed to generate and validate tokens to prevent Cross-Site Request Forgery attacks.", - "version": "1.2.0-*", - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - "nowarn": [ - "CS1591" - ], - "xmlDoc": true - }, - "packOptions": { - "repository": { - "type": "git", - "url": "git://github.com/aspnet/antiforgery" - }, - "tags": [ - "aspnetcore", - "antiforgery" - ] - }, - "dependencies": { - "Microsoft.AspNetCore.DataProtection": "1.2.0-*", - "Microsoft.AspNetCore.Http.Abstractions": "1.2.0-*", - "Microsoft.AspNetCore.Http.Extensions": "1.2.0-*", - "Microsoft.AspNetCore.WebUtilities": "1.2.0-*", - "Microsoft.Extensions.ObjectPool": "1.2.0-*", - "NETStandard.Library": "1.6.2-*" - }, - "frameworks": { - "netstandard1.3": {}, - "net451": { - "frameworkAssemblies": { - "System.Runtime": { - "type": "build" - } - } - } - } -} \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/Microsoft.AspNetCore.Antiforgery.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/Microsoft.AspNetCore.Antiforgery.FunctionalTests.csproj new file mode 100644 index 0000000000..34e281b1bb --- /dev/null +++ b/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/Microsoft.AspNetCore.Antiforgery.FunctionalTests.csproj @@ -0,0 +1,21 @@ + + + + + + netcoreapp1.1;net451 + win7-x64 + false + false + + + + + + + + + + + + diff --git a/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/Microsoft.AspNetCore.Antiforgery.FunctionalTests.xproj b/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/Microsoft.AspNetCore.Antiforgery.FunctionalTests.xproj deleted file mode 100644 index 1901f0cc82..0000000000 --- a/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/Microsoft.AspNetCore.Antiforgery.FunctionalTests.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 8b288810-5a96-4af5-9836-8ba2d2953203 - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/project.json deleted file mode 100644 index 3a19511a4e..0000000000 --- a/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "dependencies": { - "AntiforgerySample": "1.2.0-*", - "dotnet-test-xunit": "2.2.0-*", - "Microsoft.AspNetCore.TestHost": "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" - } - } - }, - "net451": { - "frameworkAssemblies": { - "System.Net.Http": "" - } - } - } -} \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Antiforgery.Test/Microsoft.AspNetCore.Antiforgery.Test.csproj b/test/Microsoft.AspNetCore.Antiforgery.Test/Microsoft.AspNetCore.Antiforgery.Test.csproj new file mode 100644 index 0000000000..1dfe470799 --- /dev/null +++ b/test/Microsoft.AspNetCore.Antiforgery.Test/Microsoft.AspNetCore.Antiforgery.Test.csproj @@ -0,0 +1,27 @@ + + + + + + netcoreapp1.1;net451 + + + + + + + + + + + + + + + + + + + + + diff --git a/test/Microsoft.AspNetCore.Antiforgery.Test/Microsoft.AspNetCore.Antiforgery.Test.xproj b/test/Microsoft.AspNetCore.Antiforgery.Test/Microsoft.AspNetCore.Antiforgery.Test.xproj deleted file mode 100644 index 87bf4fd855..0000000000 --- a/test/Microsoft.AspNetCore.Antiforgery.Test/Microsoft.AspNetCore.Antiforgery.Test.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 415e83f8-6002-47e4-aa8e-cd5169c06f28 - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Antiforgery.Test/project.json b/test/Microsoft.AspNetCore.Antiforgery.Test/project.json deleted file mode 100644 index e564174790..0000000000 --- a/test/Microsoft.AspNetCore.Antiforgery.Test/project.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk" - }, - "dependencies": { - "dotnet-test-xunit": "2.2.0-*", - "Microsoft.AspNetCore.Antiforgery": "1.2.0-*", - "Microsoft.AspNetCore.Http": "1.2.0-*", - "Microsoft.AspNetCore.Testing": "1.2.0-*", - "Microsoft.Extensions.DependencyInjection": "1.2.0-*", - "Microsoft.Extensions.Logging": "1.2.0-*", - "Microsoft.Extensions.Logging.Testing": "1.2.0-*", - "Microsoft.Extensions.WebEncoders": "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": { - "frameworkAssemblies": { - "System.Threading.Tasks": "" - } - } - } -} \ No newline at end of file diff --git a/version.props b/version.props new file mode 100644 index 0000000000..38c93687ab --- /dev/null +++ b/version.props @@ -0,0 +1,7 @@ + + + + 1.2.0 + preview1 + + \ No newline at end of file