From 347fb527dabfbe828f6621c8221d6343957daa38 Mon Sep 17 00:00:00 2001 From: Daniel Lo Nigro Date: Sun, 7 May 2017 19:48:57 -0700 Subject: [PATCH 01/14] [WIP] Upgrade to Visual Studio 2017 + csproj tooling --- build.proj | 17 ++--- dev-build-push.bat | 4 +- dev-build.bat | 4 +- global.json | 3 - release-build-push.bat | 4 +- release-build.bat | 4 +- src/Cassette.React/Cassette.React.csproj | 38 ++++++++++ src/Cassette.React/Cassette.React.xproj | 19 ----- src/Cassette.React/project.json | 37 ---------- src/React.AspNet/React.AspNet.csproj | 57 +++++++++++++++ src/React.AspNet/React.AspNet.xproj | 19 ----- src/React.AspNet/project.json | 55 -------------- src/React.Core/React.Core.csproj | 50 +++++++++++++ src/React.Core/React.Core.xproj | 20 ------ src/React.Core/project.json | 62 ---------------- src/React.MSBuild/React.MSBuild.csproj | 42 +++++++++++ src/React.MSBuild/React.MSBuild.xproj | 21 ------ src/React.MSBuild/project.json | 46 ------------ src/React.Owin/React.Owin.csproj | 45 ++++++++++++ src/React.Owin/React.Owin.xproj | 20 ------ src/React.Owin/project.json | 43 ----------- .../React.Sample.Cassette.csproj | 30 ++++---- .../React.Sample.ConsoleApp.csproj | 31 ++++++++ .../React.Sample.ConsoleApp.xproj | 19 ----- src/React.Sample.ConsoleApp/project.json | 33 --------- .../React.Sample.Mvc4.csproj | 23 +++--- .../React.Sample.Mvc6.csproj | 56 +++++++++++++++ src/React.Sample.Mvc6/React.Sample.Mvc6.xproj | 21 ------ src/React.Sample.Mvc6/project.json | 72 ------------------- .../React.Sample.Owin.csproj | 44 ++++++++++++ src/React.Sample.Owin/React.Sample.Owin.xproj | 19 ----- src/React.Sample.Owin/project.json | 39 ---------- .../React.Sample.Webpack.csproj | 26 +++---- src/React.Web.Mvc4/React.Web.Mvc4.csproj | 47 ++++++++++++ src/React.Web.Mvc4/React.Web.Mvc4.xproj | 21 ------ src/React.Web.Mvc4/project.json | 51 ------------- src/React.Web/React.Web.csproj | 46 ++++++++++++ src/React.Web/React.Web.xproj | 21 ------ src/React.Web/project.json | 46 ------------ src/React.sln | 29 ++++---- src/React.tasks.proj | 43 ----------- .../System.Web.Optimization.React.csproj | 44 ++++++++++++ .../System.Web.Optimization.React.xproj | 21 ------ .../project.json | 42 ----------- tests/React.Tests/React.Tests.csproj | 43 +++++++++++ tests/React.Tests/React.Tests.xproj | 22 ------ tests/React.Tests/project.json | 28 -------- 47 files changed, 613 insertions(+), 914 deletions(-) create mode 100644 src/Cassette.React/Cassette.React.csproj delete mode 100644 src/Cassette.React/Cassette.React.xproj delete mode 100644 src/Cassette.React/project.json create mode 100644 src/React.AspNet/React.AspNet.csproj delete mode 100644 src/React.AspNet/React.AspNet.xproj delete mode 100644 src/React.AspNet/project.json create mode 100644 src/React.Core/React.Core.csproj delete mode 100644 src/React.Core/React.Core.xproj delete mode 100644 src/React.Core/project.json create mode 100644 src/React.MSBuild/React.MSBuild.csproj delete mode 100644 src/React.MSBuild/React.MSBuild.xproj delete mode 100644 src/React.MSBuild/project.json create mode 100644 src/React.Owin/React.Owin.csproj delete mode 100644 src/React.Owin/React.Owin.xproj delete mode 100644 src/React.Owin/project.json create mode 100644 src/React.Sample.ConsoleApp/React.Sample.ConsoleApp.csproj delete mode 100644 src/React.Sample.ConsoleApp/React.Sample.ConsoleApp.xproj delete mode 100644 src/React.Sample.ConsoleApp/project.json create mode 100644 src/React.Sample.Mvc6/React.Sample.Mvc6.csproj delete mode 100644 src/React.Sample.Mvc6/React.Sample.Mvc6.xproj delete mode 100644 src/React.Sample.Mvc6/project.json create mode 100644 src/React.Sample.Owin/React.Sample.Owin.csproj delete mode 100644 src/React.Sample.Owin/React.Sample.Owin.xproj delete mode 100644 src/React.Sample.Owin/project.json create mode 100644 src/React.Web.Mvc4/React.Web.Mvc4.csproj delete mode 100644 src/React.Web.Mvc4/React.Web.Mvc4.xproj delete mode 100644 src/React.Web.Mvc4/project.json create mode 100644 src/React.Web/React.Web.csproj delete mode 100644 src/React.Web/React.Web.xproj delete mode 100644 src/React.Web/project.json delete mode 100644 src/React.tasks.proj create mode 100644 src/System.Web.Optimization.React/System.Web.Optimization.React.csproj delete mode 100644 src/System.Web.Optimization.React/System.Web.Optimization.React.xproj delete mode 100644 src/System.Web.Optimization.React/project.json create mode 100644 tests/React.Tests/React.Tests.csproj delete mode 100644 tests/React.Tests/React.Tests.xproj delete mode 100644 tests/React.Tests/project.json diff --git a/build.proj b/build.proj index a3a390214..f218a92ae 100644 --- a/build.proj +++ b/build.proj @@ -15,7 +15,7 @@ of patent rights can be found in the PATENTS file in the same directory. 0 http://reactjs.net/packages/ $(MSBuildProjectDirectory)\tools\MSBuildTasks - output + $(MSBuildProjectDirectory)\output Dev src\React.sln @@ -31,13 +31,13 @@ of patent rights can be found in the PATENTS file in the same directory. - - + + - - @@ -104,7 +99,7 @@ of patent rights can be found in the PATENTS file in the same directory. @@ -116,7 +111,7 @@ of patent rights can be found in the PATENTS file in the same directory. diff --git a/dev-build-push.bat b/dev-build-push.bat index 865d96510..3fbd73f2a 100644 --- a/dev-build-push.bat +++ b/dev-build-push.bat @@ -1,3 +1,3 @@ @echo off -"%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" build.proj /t:Package;Push /p:BuildType=Dev -pause \ No newline at end of file +"%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" build.proj /t:Package;Push /p:BuildType=Dev +pause diff --git a/dev-build.bat b/dev-build.bat index 977dffb8b..7b345ebf2 100644 --- a/dev-build.bat +++ b/dev-build.bat @@ -1,3 +1,3 @@ @echo off -"%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" build.proj -pause \ No newline at end of file +"%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" build.proj +pause diff --git a/global.json b/global.json index cdc9c71af..04970a156 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,3 @@ { - "sdk": { - "version": "1.0.0-preview2-003121" - }, "projects": [ "src", "test" ] } \ No newline at end of file diff --git a/release-build-push.bat b/release-build-push.bat index 5deb7b982..23465ee7b 100644 --- a/release-build-push.bat +++ b/release-build-push.bat @@ -1,3 +1,3 @@ @echo off -"%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" build.proj /t:Package;Push /p:BuildType=Release -pause \ No newline at end of file +"%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" build.proj /t:Package;Push /p:BuildType=Release +pause diff --git a/release-build.bat b/release-build.bat index 0bcd2242c..d47427d68 100644 --- a/release-build.bat +++ b/release-build.bat @@ -1,3 +1,3 @@ @echo off -"%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" build.proj /p:BuildType=Release -pause \ No newline at end of file +"%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" build.proj /p:BuildType=Release +pause diff --git a/src/Cassette.React/Cassette.React.csproj b/src/Cassette.React/Cassette.React.csproj new file mode 100644 index 000000000..787a57fe0 --- /dev/null +++ b/src/Cassette.React/Cassette.React.csproj @@ -0,0 +1,38 @@ + + + + Allows you to transpile JavaScript via Babel using Cassette. + Copyright 2014-Present Facebook, Inc + ReactJS.NET - Babel for Cassette + 3.0.1 + Daniel Lo Nigro + net40 + true + Cassette.React + Cassette.React + asp.net;mvc;asp;jquery;javascript;js;react;facebook;reactjs;babel;cassette + http://reactjs.net/img/logo_64.png + http://reactjs.net/ + https://github.com/reactjs/React.NET#licence + false + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Cassette.React/Cassette.React.xproj b/src/Cassette.React/Cassette.React.xproj deleted file mode 100644 index 4a11a8b3e..000000000 --- a/src/Cassette.React/Cassette.React.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - b7d39e1d-6caa-4489-a03f-0c176402cfb2 - Cassette.React - .\obj - .\bin\ - v4.0 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Cassette.React/project.json b/src/Cassette.React/project.json deleted file mode 100644 index f23e1d69f..000000000 --- a/src/Cassette.React/project.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "version": "3.0.1-*", - "title": "ReactJS.NET - Babel for Cassette", - "authors": [ "Daniel Lo Nigro" ], - "copyright": "Copyright 2014-Present Facebook, Inc", - "description": "Allows you to transpile JavaScript via Babel using Cassette.", - - "buildOptions": { - "compile": { - "includeFiles": [ - "../SharedAssemblyInfo.cs" - ] - }, - "xmlDoc": true - }, - - "packOptions": { - "iconUrl": "http://reactjs.net/img/logo_64.png", - "licenseUrl": "https://github.com/reactjs/React.NET#licence", - "owners": [ "Daniel Lo Nigro" ], - "projectUrl": "http://reactjs.net/", - "summary": "ReactJS and Babel tools for .NET", - "tags": [ "asp.net", "mvc", "asp", "jquery", "javascript", "js", "react", "facebook", "reactjs", "babel", "cassette" ] - }, - - "dependencies": { - "Cassette": "2.4.2", - "React.Core": { - "target": "project" - } - }, - - "frameworks": { - "net40": { - } - } -} diff --git a/src/React.AspNet/React.AspNet.csproj b/src/React.AspNet/React.AspNet.csproj new file mode 100644 index 000000000..4faf4389f --- /dev/null +++ b/src/React.AspNet/React.AspNet.csproj @@ -0,0 +1,57 @@ + + + + ReactJS and Babel tools for ASP.NET Core, including ASP.NET Core MVC. Please refer to project site (http://reactjs.net/) for full installation instructions, usage examples and sample code + Copyright 2014-Present Facebook, Inc + ReactJS.NET (ASP.NET Core MVC) + 3.0.1 + Daniel Lo Nigro + net451;netstandard1.6 + true + React.AspNet + ../key.snk + true + true + React.AspNet + asp.net;mvc;asp;javascript;js;react;facebook;reactjs;vnext;asp.net 5 + http://reactjs.net/img/logo_64.png + http://reactjs.net/ + https://github.com/reactjs/React.NET#licence + false + + + + + + + + + + + + + + + + + + + + + + + + + + $(DefineConstants);ASPNETCORE + + + + true + + + + + + + diff --git a/src/React.AspNet/React.AspNet.xproj b/src/React.AspNet/React.AspNet.xproj deleted file mode 100644 index 28ed515c5..000000000 --- a/src/React.AspNet/React.AspNet.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - a7acdb56-5e43-40a6-92c9-2c52228e6074 - React.AspNet - .\obj - .\bin\ - v4.5.1 - - - 2.0 - - - diff --git a/src/React.AspNet/project.json b/src/React.AspNet/project.json deleted file mode 100644 index f2b799420..000000000 --- a/src/React.AspNet/project.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "version": "3.0.1-*", - "authors": [ "Daniel Lo Nigro" ], - "copyright": "Copyright 2014-Present Facebook, Inc", - "title": "ReactJS.NET (ASP.NET Core MVC)", - "description": "ReactJS and Babel tools for ASP.NET Core, including ASP.NET Core MVC. Please refer to project site (http://reactjs.net/) for full installation instructions, usage examples and sample code", - "packOptions": { - "owners": [ "Daniel Lo Nigro" ], - "licenseUrl": "https://github.com/reactjs/React.NET#licence", - "iconUrl": "http://reactjs.net/img/logo_64.png", - "tags": [ "asp.net", "mvc", "asp", "javascript", "js", "react", "facebook", "reactjs", "vnext", "asp.net 5" ], - "projectUrl": "http://reactjs.net/" - }, - "configurations": { - "Debug": { - "buildOptions": { - "define": [ "DEBUG", "TRACE", "ASPNETCORE" ] - } - }, - "Release": { - "buildOptions": { - "define": [ "RELEASE", "TRACE", "ASPNETCORE" ], - "optimize": true, - "warningsAsErrors": true - } - } - }, - "dependencies": { - "Microsoft.AspNetCore.Mvc.Core": "1.0.0", - "Microsoft.AspNetCore.StaticFiles": "1.0.0", - "Microsoft.Extensions.FileProviders.Physical": "1.0.0", - "Microsoft.AspNetCore.Mvc.ViewFeatures": "1.0.0", - "Microsoft.Extensions.DependencyInjection": "1.0.0", - "React.Core": { - "target": "project" - } - }, - "frameworks": { - "net451": {}, - "netstandard16": { - "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "1.0.0" - } - } - }, - "buildOptions": { - "compile": { - "includeFiles": [ - "../SharedAssemblyInfo.cs" - ] - }, - "keyFile": "../key.snk", - "xmlDoc": true - } -} diff --git a/src/React.Core/React.Core.csproj b/src/React.Core/React.Core.csproj new file mode 100644 index 000000000..b89cf2d5c --- /dev/null +++ b/src/React.Core/React.Core.csproj @@ -0,0 +1,50 @@ + + + + ReactJS and Babel tools for .NET. Important: This package does not do much on its own; you probably want an integration package (like React.Web.Mvc4) as well. Please refer to project site (http://reactjs.net/) for more details, usage examples and sample code. + Copyright 2014-Present Facebook, Inc + ReactJS.NET Core + Daniel Lo Nigro + net40;netstandard1.6 + true + React.Core + ../key.snk + true + true + React.Core + asp.net;mvc;asp;jquery;javascript;js;react;facebook;reactjs;babel + http://reactjs.net/img/logo_64.png + http://reactjs.net/ + https://github.com/reactjs/React.NET#licence + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/React.Core/React.Core.xproj b/src/React.Core/React.Core.xproj deleted file mode 100644 index e1ae1e3bf..000000000 --- a/src/React.Core/React.Core.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - {D0CC8A22-CEE6-485C-924B-1F94426FEA59} - React - .\obj - .\bin\ - v4.0 - - - - 2.0 - - - diff --git a/src/React.Core/project.json b/src/React.Core/project.json deleted file mode 100644 index 325ab6be7..000000000 --- a/src/React.Core/project.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "version": "3.0.1-*", - "title": "ReactJS.NET Core", - "authors": [ "Daniel Lo Nigro" ], - "copyright": "Copyright 2014-Present Facebook, Inc", - "description": "ReactJS and Babel tools for .NET. Important: This package does not do much on its own; you probably want an integration package (like React.Web.Mvc4) as well. Please refer to project site (http://reactjs.net/) for more details, usage examples and sample code.", - - "buildOptions": { - "compile": { - "includeFiles": [ - "../SharedAssemblyInfo.cs" - ] - }, - "embed": { - "includeFiles": [ - "Resources/shims.js", - "Resources/react.generated.js", - "Resources/react.generated.min.js", - "Resources/babel.generated.min.js" - ] - }, - "keyFile": "../key.snk", - "xmlDoc": true - }, - - "packOptions": { - "iconUrl": "http://reactjs.net/img/logo_64.png", - "licenseUrl": "https://github.com/reactjs/React.NET#licence", - "owners": [ "Daniel Lo Nigro" ], - "projectUrl": "http://reactjs.net/", - "summary": "ReactJS and Babel tools for .NET", - "tags": [ "asp.net", "mvc", "asp", "jquery", "javascript", "js", "react", "facebook", "reactjs", "babel" ] - }, - - "dependencies": { - "JavaScriptEngineSwitcher.ChakraCore": "2.3.2", - "JavaScriptEngineSwitcher.Core": "2.2.0", - "JavaScriptEngineSwitcher.Msie": "2.3.2", - "JSPool": "2.0.1", - "MsieJavaScriptEngine": "2.1.2", - "Newtonsoft.Json": "9.0.1" - }, - - "frameworks": { - "net40": { - "dependencies": { - "JavaScriptEngineSwitcher.V8": "2.2.0", - "VroomJs": "1.2.3" - }, - "frameworkAssemblies": { - "System.Runtime.Caching": "4.0.0.0" - } - }, - "netstandard16": { - "dependencies": { - "Microsoft.Extensions.DependencyModel": "1.0.0", - "VroomJs": "1.2.3" - } - } - } -} - diff --git a/src/React.MSBuild/React.MSBuild.csproj b/src/React.MSBuild/React.MSBuild.csproj new file mode 100644 index 000000000..61c3f01d2 --- /dev/null +++ b/src/React.MSBuild/React.MSBuild.csproj @@ -0,0 +1,42 @@ + + + + An MSBuild task to transpile JavaScript via Babel. + Copyright 2014-Present Facebook, Inc + ReactJS.NET - Babel for MSBuild + 3.0.1 + Daniel Lo Nigro + net40 + true + React.MSBuild + ../key.snk + true + true + React.MSBuild + asp.net;mvc;asp;jquery;javascript;js;react;facebook;reactjs;babel;msbuild + http://reactjs.net/img/logo_64.png + http://reactjs.net/ + https://github.com/reactjs/React.NET#licence + false + + + + + + + true + + + + + + + + + + + + + + + diff --git a/src/React.MSBuild/React.MSBuild.xproj b/src/React.MSBuild/React.MSBuild.xproj deleted file mode 100644 index dc89b439b..000000000 --- a/src/React.MSBuild/React.MSBuild.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - {AF531A37-B93F-4113-9C2C-4DB28064B926} - React.MSBuild - .\obj - .\bin\ - v4.0 - - - - 2.0 - - - diff --git a/src/React.MSBuild/project.json b/src/React.MSBuild/project.json deleted file mode 100644 index a3022f479..000000000 --- a/src/React.MSBuild/project.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "version": "3.0.1-*", - "title": "ReactJS.NET - Babel for MSBuild", - "authors": [ "Daniel Lo Nigro" ], - "copyright": "Copyright 2014-Present Facebook, Inc", - "description": "An MSBuild task to transpile JavaScript via Babel.", - - "buildOptions": { - "compile": { - "includeFiles": [ - "../SharedAssemblyInfo.cs" - ] - }, - "keyFile": "../key.snk", - "xmlDoc": true - }, - - "packOptions": { - "files": { - "include": [ - "tools", - "Content" - ] - }, - "iconUrl": "http://reactjs.net/img/logo_64.png", - "licenseUrl": "https://github.com/reactjs/React.NET#licence", - "owners": [ "Daniel Lo Nigro" ], - "projectUrl": "http://reactjs.net/", - "tags": [ "asp.net", "mvc", "asp", "jquery", "javascript", "js", "react", "facebook", "reactjs", "babel", "msbuild" ], - }, - - "dependencies": { - "React.Core": { - "target": "project" - } - }, - - "frameworks": { - "net40": { - "frameworkAssemblies": { - "Microsoft.Build.Framework": "4.0.0.0", - "Microsoft.Build.Utilities.v4.0": "4.0.0.0" - } - } - } -} diff --git a/src/React.Owin/React.Owin.csproj b/src/React.Owin/React.Owin.csproj new file mode 100644 index 000000000..6b3779934 --- /dev/null +++ b/src/React.Owin/React.Owin.csproj @@ -0,0 +1,45 @@ + + + + OWIN middleware for transpiling JavaScript via Babel. + Copyright 2014-Present Facebook, Inc + ReactJS.NET - Babel for OWIN + 3.0.1 + Daniel Lo Nigro + net45 + $(DefineConstants);OWIN + true + React.Owin + ../key.snk + true + true + React.Owin + asp.net;mvc;asp;jquery;javascript;js;react;facebook;reactjs;babel;owin + http://reactjs.net/img/logo_64.png + http://reactjs.net/ + https://github.com/reactjs/React.NET#licence + false + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/React.Owin/React.Owin.xproj b/src/React.Owin/React.Owin.xproj deleted file mode 100644 index 08445ea44..000000000 --- a/src/React.Owin/React.Owin.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - {C3BF8D49-B7CC-4D7F-B0F0-A94347C595EA} - React.Owin - .\obj - .\bin\ - v4.0 - - - - 2.0 - - - diff --git a/src/React.Owin/project.json b/src/React.Owin/project.json deleted file mode 100644 index 44c22c4e3..000000000 --- a/src/React.Owin/project.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "version": "3.0.1-*", - "title": "ReactJS.NET - Babel for OWIN", - "authors": [ "Daniel Lo Nigro" ], - "copyright": "Copyright 2014-Present Facebook, Inc", - "description": "OWIN middleware for transpiling JavaScript via Babel.", - - "buildOptions": { - "compile": { - "includeFiles": [ - "../SharedAssemblyInfo.cs", - "../React.AspNet/BabelFileOptions.cs", - "../React.AspNet/BabelFileSystem.cs" - ] - }, - "define": [ "OWIN" ], - "keyFile": "../key.snk", - "xmlDoc": true - }, - - "packOptions": { - "iconUrl": "http://reactjs.net/img/logo_64.png", - "licenseUrl": "https://github.com/reactjs/React.NET#licence", - "owners": [ "Daniel Lo Nigro" ], - "projectUrl": "http://reactjs.net/", - "summary": "ReactJS and Babel tools for .NET", - "tags": [ "asp.net", "mvc", "asp", "jquery", "javascript", "js", "react", "facebook", "reactjs", "babel", "owin" ] - }, - - "dependencies": { - "Microsoft.Owin": "3.0.1", - "Microsoft.Owin.FileSystems": "3.0.1", - "Microsoft.Owin.StaticFiles": "3.0.1", - "Owin": "1.0.0", - "React.Core": { - "target": "project" - } - }, - - "frameworks": { - "net45": {} - } -} diff --git a/src/React.Sample.Cassette/React.Sample.Cassette.csproj b/src/React.Sample.Cassette/React.Sample.Cassette.csproj index 924defe99..1f73c5138 100644 --- a/src/React.Sample.Cassette/React.Sample.Cassette.csproj +++ b/src/React.Sample.Cassette/React.Sample.Cassette.csproj @@ -64,10 +64,6 @@ ..\packages\Cassette.MSBuild.2.4.2\lib\net40\Cassette.MSBuild.dll True - - False - ..\Cassette.React\bin\$(Configuration)\net40\Cassette.React.dll - ..\packages\Cassette.Views.2.4.2\lib\net40\Cassette.Views.dll True @@ -77,18 +73,6 @@ True - - False - ..\React.Core\bin\$(Configuration)\net40\React.Core.dll - - - False - ..\React.Web\bin\$(Configuration)\net40\React.Web.dll - - - False - ..\React.Web.Mvc4\bin\$(Configuration)\net40\React.Web.Mvc4.dll - @@ -199,6 +183,20 @@ + + + {b7d39e1d-6caa-4489-a03f-0c176402cfb2} + Cassette.React + + + {d0cc8a22-cee6-485c-924b-1f94426fea59} + React.Core + + + {662d52ac-1ee9-4372-bd74-379f9ac56451} + React.Web.Mvc4 + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/src/React.Sample.ConsoleApp/React.Sample.ConsoleApp.csproj b/src/React.Sample.ConsoleApp/React.Sample.ConsoleApp.csproj new file mode 100644 index 000000000..fe3535345 --- /dev/null +++ b/src/React.Sample.ConsoleApp/React.Sample.ConsoleApp.csproj @@ -0,0 +1,31 @@ + + + + Copyright 2014-Present Facebook, Inc + ReactJS.NET Console Sample + 3.0.0 + Daniel Lo Nigro + net40;netcoreapp1.0 + React.Sample.ConsoleApp + Exe + React.Sample.ConsoleApp + 1.0.4 + false + + + + + + + + + + + + + + + + + + diff --git a/src/React.Sample.ConsoleApp/React.Sample.ConsoleApp.xproj b/src/React.Sample.ConsoleApp/React.Sample.ConsoleApp.xproj deleted file mode 100644 index fb3d0a24b..000000000 --- a/src/React.Sample.ConsoleApp/React.Sample.ConsoleApp.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - {350EFB8E-693C-4DFE-8162-C99C359CFC71} - React.Sample.Owin - .\obj - .\bin\ - v4.0 - - - 2.0 - - - diff --git a/src/React.Sample.ConsoleApp/project.json b/src/React.Sample.ConsoleApp/project.json deleted file mode 100644 index f51bebe55..000000000 --- a/src/React.Sample.ConsoleApp/project.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "version": "3.0.0-*", - "title": "ReactJS.NET Console Sample", - "authors": [ "Daniel Lo Nigro" ], - "copyright": "Copyright 2014-Present Facebook, Inc", - - "buildOptions": { - "compile": { - "includeFiles": [ - "../SharedAssemblyInfo.cs" - ] - }, - "emitEntryPoint": true - }, - - "dependencies": { - "React.Core": { - "target": "project" - } - }, - - "frameworks": { - "net40": {}, - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - } - } - } - } -} diff --git a/src/React.Sample.Mvc4/React.Sample.Mvc4.csproj b/src/React.Sample.Mvc4/React.Sample.Mvc4.csproj index d504fa50e..99491c500 100644 --- a/src/React.Sample.Mvc4/React.Sample.Mvc4.csproj +++ b/src/React.Sample.Mvc4/React.Sample.Mvc4.csproj @@ -82,15 +82,6 @@ ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll True - - ..\React.Core\bin\$(Configuration)\net40\React.Core.dll - - - ..\React.Web\bin\$(Configuration)\net40\React.Web.dll - - - ..\React.Web.Mvc4\bin\$(Configuration)\net40\React.Web.Mvc4.dll - @@ -190,6 +181,20 @@ + + + {d0cc8a22-cee6-485c-924b-1f94426fea59} + React.Core + + + {662d52ac-1ee9-4372-bd74-379f9ac56451} + React.Web.Mvc4 + + + {134edd16-8dc8-4983-a2e0-b38dab1ecf1c} + React.Web + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/src/React.Sample.Mvc6/React.Sample.Mvc6.csproj b/src/React.Sample.Mvc6/React.Sample.Mvc6.csproj new file mode 100644 index 000000000..c1213b45e --- /dev/null +++ b/src/React.Sample.Mvc6/React.Sample.Mvc6.csproj @@ -0,0 +1,56 @@ + + + + 2.5.0 + net451;netcoreapp1.0 + true + React.Sample.Mvc6 + Exe + React.Sample.Mvc6 + 1.0.4 + + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/React.Sample.Mvc6/React.Sample.Mvc6.xproj b/src/React.Sample.Mvc6/React.Sample.Mvc6.xproj deleted file mode 100644 index 4502ff88c..000000000 --- a/src/React.Sample.Mvc6/React.Sample.Mvc6.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 022dc77e-5e48-4cf4-ad8b-dc4b9b52e02e - React.Sample.Mvc6 - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - v4.5.1 - - - 2.0 - 3044 - True - - - \ No newline at end of file diff --git a/src/React.Sample.Mvc6/project.json b/src/React.Sample.Mvc6/project.json deleted file mode 100644 index 933063daa..000000000 --- a/src/React.Sample.Mvc6/project.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "version": "2.5.0-*", - - "dependencies": { - "Microsoft.AspNetCore.Mvc": "1.0.0", - "Microsoft.AspNetCore.Diagnostics": "1.0.0", - "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.AspNetCore.StaticFiles": "1.0.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0", - "Microsoft.Extensions.Configuration.Json": "1.0.0", - "Microsoft.Extensions.Logging": "1.0.0", - "Microsoft.Extensions.Logging.Console": "1.0.0", - "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0", - "React.Core": { - "target": "project" - }, - "React.AspNet": { - "target": "project" - } - }, - - "tools": { - "Microsoft.AspNetCore.Server.IISIntegration.Tools": { - "version": "1.0.0-preview2-final", - "imports": "portable-net45+win8+dnxcore50" - } - }, - - "frameworks": { - "net451": { - "dependencies": { - "JavaScriptEngineSwitcher.V8": "2.2.0" - } - }, - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0", - "type": "platform" - }, - "VroomJs": "1.2.3" - } - } - }, - - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - - "publishOptions": { - "include": [ - "wwwroot", - "Views", - "appsettings.json", - "web.config" - ] - }, - - "scripts": { - "prepublish": [ "npm install", "bower install", "gulp clean", "gulp min" ], - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - } -} diff --git a/src/React.Sample.Owin/React.Sample.Owin.csproj b/src/React.Sample.Owin/React.Sample.Owin.csproj new file mode 100644 index 000000000..b76f6d3af --- /dev/null +++ b/src/React.Sample.Owin/React.Sample.Owin.csproj @@ -0,0 +1,44 @@ + + + + Copyright 2014-Present Facebook, Inc + ReactJS.NET OWIN Sample + 2.6.0 + Daniel Lo Nigro + net45 + React.Sample.Owin + Exe + React.Sample.Owin + false + + + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/React.Sample.Owin/React.Sample.Owin.xproj b/src/React.Sample.Owin/React.Sample.Owin.xproj deleted file mode 100644 index e789c5295..000000000 --- a/src/React.Sample.Owin/React.Sample.Owin.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 68f48008-ed43-4bdb-933d-d30d757f5eea - React.Sample.Owin - .\obj - .\bin\ - v4.5 - - - 2.0 - - - \ No newline at end of file diff --git a/src/React.Sample.Owin/project.json b/src/React.Sample.Owin/project.json deleted file mode 100644 index 753d3b7e2..000000000 --- a/src/React.Sample.Owin/project.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "version": "2.6.0-*", - "title": "ReactJS.NET OWIN Sample", - "authors": [ "Daniel Lo Nigro" ], - "copyright": "Copyright 2014-Present Facebook, Inc", - - "buildOptions": { - "compile": { - "includeFiles": [ - "../SharedAssemblyInfo.cs" - ] - }, - "copyToOutput": { - "include": [ - "Content" - ] - }, - "emitEntryPoint": true - }, - - "dependencies": { - "Microsoft.Owin": "3.0.1", - "Microsoft.Owin.Diagnostics": "3.0.1", - "Microsoft.Owin.FileSystems": "3.0.1", - "Microsoft.Owin.Host.HttpListener": "3.0.1", - "Microsoft.Owin.Hosting": "3.0.1", - "Microsoft.Owin.SelfHost": "3.0.1", - "Microsoft.Owin.StaticFiles": "3.0.1", - "Newtonsoft.Json": "9.0.1", - "Owin": "1.0", - "React.Owin": { - "target": "project" - } - }, - - "frameworks": { - "net45": {} - } -} diff --git a/src/React.Sample.Webpack/React.Sample.Webpack.csproj b/src/React.Sample.Webpack/React.Sample.Webpack.csproj index 7e95de259..05bf0b2f6 100644 --- a/src/React.Sample.Webpack/React.Sample.Webpack.csproj +++ b/src/React.Sample.Webpack/React.Sample.Webpack.csproj @@ -63,18 +63,6 @@ True - - False - ..\React.Core\bin\$(Configuration)\net40\React.Core.dll - - - False - ..\React.Web\bin\$(Configuration)\net40\React.Web.dll - - - False - ..\React.Web.Mvc4\bin\$(Configuration)\net40\React.Web.Mvc4.dll - @@ -174,6 +162,20 @@ + + + {d0cc8a22-cee6-485c-924b-1f94426fea59} + React.Core + + + {662d52ac-1ee9-4372-bd74-379f9ac56451} + React.Web.Mvc4 + + + {134edd16-8dc8-4983-a2e0-b38dab1ecf1c} + React.Web + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/src/React.Web.Mvc4/React.Web.Mvc4.csproj b/src/React.Web.Mvc4/React.Web.Mvc4.csproj new file mode 100644 index 000000000..11b3e7e1a --- /dev/null +++ b/src/React.Web.Mvc4/React.Web.Mvc4.csproj @@ -0,0 +1,47 @@ + + + + ReactJS tools for ASP.NET MVC 4 and 5. For ASP.NET Core, install React.AspNet instead! Please refer to project site (http://reactjs.net/) for more details, usage examples and sample code. + Copyright 2014-Present Facebook, Inc + ReactJS.NET (MVC 4 and 5) + 3.0.1 + Daniel Lo Nigro + net40 + $(DefineConstants);LEGACYASPNET + true + React.Web.Mvc4 + ../key.snk + true + true + React.Web.Mvc4 + asp.net;mvc;asp;jquery;javascript;js;react;facebook;reactjs;babel + http://reactjs.net/img/logo_64.png + http://reactjs.net/ + https://github.com/reactjs/React.NET#licence + false + + + + + + + true + + + + + + + + + + + + + + + + + + + diff --git a/src/React.Web.Mvc4/React.Web.Mvc4.xproj b/src/React.Web.Mvc4/React.Web.Mvc4.xproj deleted file mode 100644 index c089c8b81..000000000 --- a/src/React.Web.Mvc4/React.Web.Mvc4.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - {662D52AC-1EE9-4372-BD74-379F9AC56451} - React.Web.Mvc4 - .\obj - .\bin\ - v4.0 - - - - 2.0 - - - diff --git a/src/React.Web.Mvc4/project.json b/src/React.Web.Mvc4/project.json deleted file mode 100644 index 04377aa07..000000000 --- a/src/React.Web.Mvc4/project.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "version": "3.0.1-*", - "title": "ReactJS.NET (MVC 4 and 5)", - "authors": [ "Daniel Lo Nigro" ], - "copyright": "Copyright 2014-Present Facebook, Inc", - "description": "ReactJS tools for ASP.NET MVC 4 and 5. For ASP.NET Core, install React.AspNet instead! Please refer to project site (http://reactjs.net/) for more details, usage examples and sample code.", - - "buildOptions": { - "define": [ "LEGACYASPNET" ], - "compile": { - "includeFiles": [ - "../SharedAssemblyInfo.cs", - "../React.AspNet/HtmlHelperExtensions.cs" - ] - }, - "keyFile": "../key.snk", - "xmlDoc": true - }, - - "packOptions": { - "files": { - "include": [ - "Content" - ] - }, - "iconUrl": "http://reactjs.net/img/logo_64.png", - "licenseUrl": "https://github.com/reactjs/React.NET#licence", - "owners": [ "Daniel Lo Nigro" ], - "projectUrl": "http://reactjs.net/", - "summary": "ReactJS and Babel tools for ASP.NET MVC 4 and 5", - "tags": [ "asp.net", "mvc", "asp", "jquery", "javascript", "js", "react", "facebook", "reactjs", "babel" ] - }, - - "dependencies": { - "Microsoft.AspNet.Mvc": "4.0.20710", - "React.Core": { - "target": "project" - }, - "React.Web": { - "target": "project" - } - }, - - "frameworks": { - "net40": { - "frameworkAssemblies": { - "System.Web": "4.0.0.0" - } - } - } -} diff --git a/src/React.Web/React.Web.csproj b/src/React.Web/React.Web.csproj new file mode 100644 index 000000000..de423e2ed --- /dev/null +++ b/src/React.Web/React.Web.csproj @@ -0,0 +1,46 @@ + + + + ReactJS tools for ASP.NET. If using ASP.NET MVC, also install React.Web.Mvc4. For ASP.NET Core, install React.AspNet instead! Please refer to project site (http://reactjs.net/) for more details, usage examples and sample code. + Copyright 2014-Present Facebook, Inc + ReactJS.NET for ASP.NET 4 + 3.0.1 + Daniel Lo Nigro + net40 + true + React.Web + ../key.snk + true + true + React.Web + asp.net;mvc;asp;jquery;javascript;js;react;facebook;reactjs;babel + http://reactjs.net/img/logo_64.png + http://reactjs.net/ + https://github.com/reactjs/React.NET#licence + false + + + + + + + true + + + + + + + + + + + + + + + + + + + diff --git a/src/React.Web/React.Web.xproj b/src/React.Web/React.Web.xproj deleted file mode 100644 index 25a1d68dd..000000000 --- a/src/React.Web/React.Web.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - {134EDD16-8DC8-4983-A2E0-B38DAB1ECF1C} - React.Web - .\obj - .\bin\ - v4.0 - - - - 2.0 - - - diff --git a/src/React.Web/project.json b/src/React.Web/project.json deleted file mode 100644 index a19e2d249..000000000 --- a/src/React.Web/project.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "version": "3.0.1-*", - "title": "ReactJS.NET for ASP.NET 4", - "authors": [ "Daniel Lo Nigro" ], - "copyright": "Copyright 2014-Present Facebook, Inc", - "description": "ReactJS tools for ASP.NET. If using ASP.NET MVC, also install React.Web.Mvc4. For ASP.NET Core, install React.AspNet instead! Please refer to project site (http://reactjs.net/) for more details, usage examples and sample code.", - - "buildOptions": { - "compile": { - "includeFiles": [ - "../SharedAssemblyInfo.cs" - ] - }, - "keyFile": "../key.snk", - "xmlDoc": true - }, - - "packOptions": { - "files": { - "include": [ - "Content" - ] - }, - "iconUrl": "http://reactjs.net/img/logo_64.png", - "licenseUrl": "https://github.com/reactjs/React.NET#licence", - "owners": [ "Daniel Lo Nigro" ], - "projectUrl": "http://reactjs.net/", - "summary": "ReactJS and Babel tools for ASP.NET 4", - "tags": [ "asp.net", "mvc", "asp", "jquery", "javascript", "js", "react", "facebook", "reactjs", "babel" ] - }, - - "dependencies": { - "React.Core": { - "target": "project" - }, - "Microsoft.Web.Infrastructure": "1.0.0", - "WebActivatorEx": "2.2.0" }, - - "frameworks": { - "net40": { - "frameworkAssemblies": { - "System.Web": "4.0.0.0" - } - } - } -} diff --git a/src/React.sln b/src/React.sln index fcb85fb5c..da6c7c9c5 100644 --- a/src/React.sln +++ b/src/React.sln @@ -1,7 +1,7 @@  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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{F567B25C-E869-4C93-9C96-077761250F87}" EndProject @@ -15,7 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{CB51F03F ..\build.proj = ..\build.proj ..\dev-build-push.bat = ..\dev-build-push.bat ..\dev-build.bat = ..\dev-build.bat - React.tasks.proj = React.tasks.proj ..\README.md = ..\README.md ..\release-build-push.bat = ..\release-build-push.bat ..\release-build.bat = ..\release-build.bat @@ -40,36 +39,36 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "React.Sample.Webpack", "Rea {662D52AC-1EE9-4372-BD74-379F9AC56451} = {662D52AC-1EE9-4372-BD74-379F9AC56451} EndProjectSection EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "React.Sample.Mvc6", "React.Sample.Mvc6\React.Sample.Mvc6.xproj", "{022DC77E-5E48-4CF4-AD8B-DC4B9B52E02E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "React.Sample.Mvc6", "React.Sample.Mvc6\React.Sample.Mvc6.csproj", "{022DC77E-5E48-4CF4-AD8B-DC4B9B52E02E}" ProjectSection(ProjectDependencies) = postProject {D0CC8A22-CEE6-485C-924B-1F94426FEA59} = {D0CC8A22-CEE6-485C-924B-1F94426FEA59} {A7ACDB56-5E43-40A6-92C9-2C52228E6074} = {A7ACDB56-5E43-40A6-92C9-2C52228E6074} EndProjectSection EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "React.AspNet", "React.AspNet\React.AspNet.xproj", "{A7ACDB56-5E43-40A6-92C9-2C52228E6074}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "React.AspNet", "React.AspNet\React.AspNet.csproj", "{A7ACDB56-5E43-40A6-92C9-2C52228E6074}" ProjectSection(ProjectDependencies) = postProject {D0CC8A22-CEE6-485C-924B-1F94426FEA59} = {D0CC8A22-CEE6-485C-924B-1F94426FEA59} EndProjectSection EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "React.Core", "React.Core\React.Core.xproj", "{D0CC8A22-CEE6-485C-924B-1F94426FEA59}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "React.Core", "React.Core\React.Core.csproj", "{D0CC8A22-CEE6-485C-924B-1F94426FEA59}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Cassette.React", "Cassette.React\Cassette.React.xproj", "{B7D39E1D-6CAA-4489-A03F-0C176402CFB2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cassette.React", "Cassette.React\Cassette.React.csproj", "{B7D39E1D-6CAA-4489-A03F-0C176402CFB2}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "React.Web", "React.Web\React.Web.xproj", "{134EDD16-8DC8-4983-A2E0-B38DAB1ECF1C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "React.Web", "React.Web\React.Web.csproj", "{134EDD16-8DC8-4983-A2E0-B38DAB1ECF1C}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "React.Web.Mvc4", "React.Web.Mvc4\React.Web.Mvc4.xproj", "{662D52AC-1EE9-4372-BD74-379F9AC56451}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "React.Web.Mvc4", "React.Web.Mvc4\React.Web.Mvc4.csproj", "{662D52AC-1EE9-4372-BD74-379F9AC56451}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "System.Web.Optimization.React", "System.Web.Optimization.React\System.Web.Optimization.React.xproj", "{889CEF81-75D6-4BAB-8E2C-B64B7CA97C77}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Web.Optimization.React", "System.Web.Optimization.React\System.Web.Optimization.React.csproj", "{889CEF81-75D6-4BAB-8E2C-B64B7CA97C77}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "React.MSBuild", "React.MSBuild\React.MSBuild.xproj", "{AF531A37-B93F-4113-9C2C-4DB28064B926}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "React.MSBuild", "React.MSBuild\React.MSBuild.csproj", "{AF531A37-B93F-4113-9C2C-4DB28064B926}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "React.Owin", "React.Owin\React.Owin.xproj", "{C3BF8D49-B7CC-4D7F-B0F0-A94347C595EA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "React.Owin", "React.Owin\React.Owin.csproj", "{C3BF8D49-B7CC-4D7F-B0F0-A94347C595EA}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "React.Sample.Owin", "React.Sample.Owin\React.Sample.Owin.xproj", "{68F48008-ED43-4BDB-933D-D30D757F5EEA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "React.Sample.Owin", "React.Sample.Owin\React.Sample.Owin.csproj", "{68F48008-ED43-4BDB-933D-D30D757F5EEA}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "React.Sample.ConsoleApp", "React.Sample.ConsoleApp\React.Sample.ConsoleApp.xproj", "{350EFB8E-693C-4DFE-8162-C99C359CFC71}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "React.Sample.ConsoleApp", "React.Sample.ConsoleApp\React.Sample.ConsoleApp.csproj", "{350EFB8E-693C-4DFE-8162-C99C359CFC71}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "React.Tests", "..\tests\React.Tests\React.Tests.xproj", "{6AA0D75E-5797-4690-BEFC-098A60C511A3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "React.Tests", "..\tests\React.Tests\React.Tests.csproj", "{6AA0D75E-5797-4690-BEFC-098A60C511A3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/React.tasks.proj b/src/React.tasks.proj deleted file mode 100644 index d65bd109a..000000000 --- a/src/React.tasks.proj +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/src/System.Web.Optimization.React/System.Web.Optimization.React.csproj b/src/System.Web.Optimization.React/System.Web.Optimization.React.csproj new file mode 100644 index 000000000..4024faa9e --- /dev/null +++ b/src/System.Web.Optimization.React/System.Web.Optimization.React.csproj @@ -0,0 +1,44 @@ + + + + Allows you to transpile JavaScript via Babel in the ASP.NET Web Optimization Framework. + Copyright 2014-Present Facebook, Inc + ReactJS.NET - Babel for ASP.NET Web Optimization Framework + 3.0.1 + Daniel Lo Nigro + net40 + true + System.Web.Optimization.React + ../key.snk + true + true + System.Web.Optimization.React + asp.net;mvc;asp;jquery;javascript;js;react;facebook;reactjs;babel + http://reactjs.net/img/logo_64.png + http://reactjs.net/ + https://github.com/reactjs/React.NET#licence + false + + + + + + + true + + + + + + + + + + + + + + + + + diff --git a/src/System.Web.Optimization.React/System.Web.Optimization.React.xproj b/src/System.Web.Optimization.React/System.Web.Optimization.React.xproj deleted file mode 100644 index d9cf6a354..000000000 --- a/src/System.Web.Optimization.React/System.Web.Optimization.React.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - {889CEF81-75D6-4BAB-8E2C-B64B7CA97C77} - System.Web.Optimization.React - .\obj - .\bin\ - v4.0 - - - - 2.0 - - - diff --git a/src/System.Web.Optimization.React/project.json b/src/System.Web.Optimization.React/project.json deleted file mode 100644 index 29775a48e..000000000 --- a/src/System.Web.Optimization.React/project.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "version": "3.0.1-*", - "title": "ReactJS.NET - Babel for ASP.NET Web Optimization Framework", - "authors": [ "Daniel Lo Nigro" ], - "copyright": "Copyright 2014-Present Facebook, Inc", - "description": "Allows you to transpile JavaScript via Babel in the ASP.NET Web Optimization Framework.", - - "buildOptions": { - "compile": { - "includeFiles": [ - "../SharedAssemblyInfo.cs" - ] - }, - "keyFile": "../key.snk", - "xmlDoc": true - }, - - "packOptions": { - "files": { - "includeFiles": [ - "readme.txt" - ] - }, - "iconUrl": "http://reactjs.net/img/logo_64.png", - "licenseUrl": "https://github.com/reactjs/React.NET#licence", - "owners": [ "Daniel Lo Nigro" ], - "projectUrl": "http://reactjs.net/", - "tags": [ "asp.net", "mvc", "asp", "jquery", "javascript", "js", "react", "facebook", "reactjs", "babel" ] - }, - - "dependencies": { - "Microsoft.AspNet.Web.Optimization": "1.1.3", - "React.Core": { - "target": "project" - } - }, - - "frameworks": { - "net40": { - } - } -} diff --git a/tests/React.Tests/React.Tests.csproj b/tests/React.Tests/React.Tests.csproj new file mode 100644 index 000000000..d59f17959 --- /dev/null +++ b/tests/React.Tests/React.Tests.csproj @@ -0,0 +1,43 @@ + + + + Copyright 2014-Present Facebook, Inc + ReactJS.NET Unit Tests + 2.6.0 + Daniel Lo Nigro + net452 + React.Tests + ../../src/key.snk + true + true + React.Tests + true + false + false + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/React.Tests/React.Tests.xproj b/tests/React.Tests/React.Tests.xproj deleted file mode 100644 index fdfb463e8..000000000 --- a/tests/React.Tests/React.Tests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 6aa0d75e-5797-4690-befc-098a60c511a3 - React.Tests - .\obj - .\bin\ - v4.6 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/tests/React.Tests/project.json b/tests/React.Tests/project.json deleted file mode 100644 index 597b20804..000000000 --- a/tests/React.Tests/project.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "version": "2.6.0-*", - "title": "ReactJS.NET Unit Tests", - "authors": [ "Daniel Lo Nigro" ], - "copyright": "Copyright 2014-Present Facebook, Inc", - - "buildOptions": { - "keyFile": "../../src/key.snk" - }, - "dependencies": { - "dotnet-test-xunit": "2.2.0-preview2-build1029", - "Moq": "4.5.30", - "xunit": "2.3.0-beta1-build3642", - "React.Core": { - "target": "project" - }, - "React.Owin": { - "target": "project" - }, - "React.Web.Mvc4": { - "target": "project" - } - }, - "frameworks": { - "net451": {} - }, - "testRunner": "xunit" -} From 3a32176bb7c8df8f557f8fb1fd02dbadd3029e00 Mon Sep 17 00:00:00 2001 From: Daniel Lo Nigro Date: Sun, 7 May 2017 21:18:45 -0700 Subject: [PATCH 02/14] Include workaround for https://github.com/NuGet/Home/issues/4337 (explicitly specify version when restoring NuGet packages) --- build.proj | 23 +++++++++++++---------- src/React.AspNet/React.AspNet.csproj | 6 +----- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/build.proj b/build.proj index f218a92ae..f108c8c47 100644 --- a/build.proj +++ b/build.proj @@ -33,16 +33,16 @@ of patent rights can be found in the PATENTS file in the same directory. - - + + - + - $(Build) + $(Major).$(Minor).$(Build) dev-$(Date) - $(Build)-$(BuildSuffix) + $(Major).$(Minor).$(Build)-$(BuildSuffix) + + + @@ -111,7 +114,7 @@ of patent rights can be found in the PATENTS file in the same directory. diff --git a/src/React.AspNet/React.AspNet.csproj b/src/React.AspNet/React.AspNet.csproj index 4faf4389f..f0a388497 100644 --- a/src/React.AspNet/React.AspNet.csproj +++ b/src/React.AspNet/React.AspNet.csproj @@ -4,7 +4,6 @@ ReactJS and Babel tools for ASP.NET Core, including ASP.NET Core MVC. Please refer to project site (http://reactjs.net/) for full installation instructions, usage examples and sample code Copyright 2014-Present Facebook, Inc ReactJS.NET (ASP.NET Core MVC) - 3.0.1 Daniel Lo Nigro net451;netstandard1.6 true @@ -18,6 +17,7 @@ http://reactjs.net/ https://github.com/reactjs/React.NET#licence false + $(DefineConstants);ASPNETCORE @@ -42,10 +42,6 @@ - - $(DefineConstants);ASPNETCORE - - true From 17a8a461cb5715236a0329193c29cb89104a8290 Mon Sep 17 00:00:00 2001 From: Daniel Lo Nigro Date: Mon, 8 May 2017 21:43:41 -0700 Subject: [PATCH 03/14] Work around https://github.com/dotnet/cli-migrate/issues/11 --- src/React.MSBuild/React.MSBuild.csproj | 9 +++++++-- src/React.Web.Mvc4/React.Web.Mvc4.csproj | 5 +++-- src/React.Web/React.Web.csproj | 5 +++-- .../System.Web.Optimization.React.csproj | 5 +++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/React.MSBuild/React.MSBuild.csproj b/src/React.MSBuild/React.MSBuild.csproj index 61c3f01d2..151e1bfae 100644 --- a/src/React.MSBuild/React.MSBuild.csproj +++ b/src/React.MSBuild/React.MSBuild.csproj @@ -23,9 +23,14 @@ - + true - + tools\ + + + true + content\ + diff --git a/src/React.Web.Mvc4/React.Web.Mvc4.csproj b/src/React.Web.Mvc4/React.Web.Mvc4.csproj index 11b3e7e1a..f651f84b7 100644 --- a/src/React.Web.Mvc4/React.Web.Mvc4.csproj +++ b/src/React.Web.Mvc4/React.Web.Mvc4.csproj @@ -24,9 +24,10 @@ - + true - + content\ + diff --git a/src/React.Web/React.Web.csproj b/src/React.Web/React.Web.csproj index de423e2ed..a8ab89f30 100644 --- a/src/React.Web/React.Web.csproj +++ b/src/React.Web/React.Web.csproj @@ -23,9 +23,10 @@ - + true - + content\ + diff --git a/src/System.Web.Optimization.React/System.Web.Optimization.React.csproj b/src/System.Web.Optimization.React/System.Web.Optimization.React.csproj index 4024faa9e..961a02d8e 100644 --- a/src/System.Web.Optimization.React/System.Web.Optimization.React.csproj +++ b/src/System.Web.Optimization.React/System.Web.Optimization.React.csproj @@ -23,9 +23,10 @@ - + true - + content\ + From 51d1ad635c519e6eb546bdc43c0ae088e3150423 Mon Sep 17 00:00:00 2001 From: Daniel Lo Nigro Date: Mon, 8 May 2017 21:55:21 -0700 Subject: [PATCH 04/14] Upgrade to .NET Core 1.1.x --- src/React.AspNet/React.AspNet.csproj | 12 ++++----- src/React.Core/React.Core.csproj | 2 +- .../React.Sample.ConsoleApp.csproj | 5 ++-- .../React.Sample.Mvc6.csproj | 27 +++++++++---------- 4 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/React.AspNet/React.AspNet.csproj b/src/React.AspNet/React.AspNet.csproj index f0a388497..75bbc1569 100644 --- a/src/React.AspNet/React.AspNet.csproj +++ b/src/React.AspNet/React.AspNet.csproj @@ -30,11 +30,11 @@ - - - - - + + + + + @@ -47,7 +47,7 @@ - + diff --git a/src/React.Core/React.Core.csproj b/src/React.Core/React.Core.csproj index b89cf2d5c..a37903822 100644 --- a/src/React.Core/React.Core.csproj +++ b/src/React.Core/React.Core.csproj @@ -43,7 +43,7 @@ - + diff --git a/src/React.Sample.ConsoleApp/React.Sample.ConsoleApp.csproj b/src/React.Sample.ConsoleApp/React.Sample.ConsoleApp.csproj index fe3535345..2c4463f77 100644 --- a/src/React.Sample.ConsoleApp/React.Sample.ConsoleApp.csproj +++ b/src/React.Sample.ConsoleApp/React.Sample.ConsoleApp.csproj @@ -3,13 +3,12 @@ Copyright 2014-Present Facebook, Inc ReactJS.NET Console Sample - 3.0.0 Daniel Lo Nigro - net40;netcoreapp1.0 + net40;netcoreapp1.1 React.Sample.ConsoleApp Exe React.Sample.ConsoleApp - 1.0.4 + 1.1 false diff --git a/src/React.Sample.Mvc6/React.Sample.Mvc6.csproj b/src/React.Sample.Mvc6/React.Sample.Mvc6.csproj index c1213b45e..afe1c78c2 100644 --- a/src/React.Sample.Mvc6/React.Sample.Mvc6.csproj +++ b/src/React.Sample.Mvc6/React.Sample.Mvc6.csproj @@ -1,13 +1,12 @@ - + - 2.5.0 - net451;netcoreapp1.0 + net451;netcoreapp1.1 true React.Sample.Mvc6 Exe React.Sample.Mvc6 - 1.0.4 + 1.1 @@ -23,17 +22,17 @@ - - - - + + + + - - - - - - + + + + + + From ed4d2ea8849c38595c44e2950e3eb5152535c34e Mon Sep 17 00:00:00 2001 From: Daniel Lo Nigro Date: Mon, 8 May 2017 21:55:39 -0700 Subject: [PATCH 05/14] Remove VersionPrefix from all csproj files --- src/Cassette.React/Cassette.React.csproj | 1 - src/React.MSBuild/React.MSBuild.csproj | 1 - src/React.Owin/React.Owin.csproj | 1 - src/React.Sample.Owin/React.Sample.Owin.csproj | 1 - src/React.Web.Mvc4/React.Web.Mvc4.csproj | 1 - src/React.Web/React.Web.csproj | 1 - .../System.Web.Optimization.React.csproj | 1 - tests/React.Tests/React.Tests.csproj | 1 - 8 files changed, 8 deletions(-) diff --git a/src/Cassette.React/Cassette.React.csproj b/src/Cassette.React/Cassette.React.csproj index 787a57fe0..91a4e1ebf 100644 --- a/src/Cassette.React/Cassette.React.csproj +++ b/src/Cassette.React/Cassette.React.csproj @@ -4,7 +4,6 @@ Allows you to transpile JavaScript via Babel using Cassette. Copyright 2014-Present Facebook, Inc ReactJS.NET - Babel for Cassette - 3.0.1 Daniel Lo Nigro net40 true diff --git a/src/React.MSBuild/React.MSBuild.csproj b/src/React.MSBuild/React.MSBuild.csproj index 151e1bfae..1fcd9e095 100644 --- a/src/React.MSBuild/React.MSBuild.csproj +++ b/src/React.MSBuild/React.MSBuild.csproj @@ -4,7 +4,6 @@ An MSBuild task to transpile JavaScript via Babel. Copyright 2014-Present Facebook, Inc ReactJS.NET - Babel for MSBuild - 3.0.1 Daniel Lo Nigro net40 true diff --git a/src/React.Owin/React.Owin.csproj b/src/React.Owin/React.Owin.csproj index 6b3779934..d8ad35963 100644 --- a/src/React.Owin/React.Owin.csproj +++ b/src/React.Owin/React.Owin.csproj @@ -4,7 +4,6 @@ OWIN middleware for transpiling JavaScript via Babel. Copyright 2014-Present Facebook, Inc ReactJS.NET - Babel for OWIN - 3.0.1 Daniel Lo Nigro net45 $(DefineConstants);OWIN diff --git a/src/React.Sample.Owin/React.Sample.Owin.csproj b/src/React.Sample.Owin/React.Sample.Owin.csproj index b76f6d3af..d6e646634 100644 --- a/src/React.Sample.Owin/React.Sample.Owin.csproj +++ b/src/React.Sample.Owin/React.Sample.Owin.csproj @@ -3,7 +3,6 @@ Copyright 2014-Present Facebook, Inc ReactJS.NET OWIN Sample - 2.6.0 Daniel Lo Nigro net45 React.Sample.Owin diff --git a/src/React.Web.Mvc4/React.Web.Mvc4.csproj b/src/React.Web.Mvc4/React.Web.Mvc4.csproj index f651f84b7..a2e5c0043 100644 --- a/src/React.Web.Mvc4/React.Web.Mvc4.csproj +++ b/src/React.Web.Mvc4/React.Web.Mvc4.csproj @@ -4,7 +4,6 @@ ReactJS tools for ASP.NET MVC 4 and 5. For ASP.NET Core, install React.AspNet instead! Please refer to project site (http://reactjs.net/) for more details, usage examples and sample code. Copyright 2014-Present Facebook, Inc ReactJS.NET (MVC 4 and 5) - 3.0.1 Daniel Lo Nigro net40 $(DefineConstants);LEGACYASPNET diff --git a/src/React.Web/React.Web.csproj b/src/React.Web/React.Web.csproj index a8ab89f30..a85c3d4de 100644 --- a/src/React.Web/React.Web.csproj +++ b/src/React.Web/React.Web.csproj @@ -4,7 +4,6 @@ ReactJS tools for ASP.NET. If using ASP.NET MVC, also install React.Web.Mvc4. For ASP.NET Core, install React.AspNet instead! Please refer to project site (http://reactjs.net/) for more details, usage examples and sample code. Copyright 2014-Present Facebook, Inc ReactJS.NET for ASP.NET 4 - 3.0.1 Daniel Lo Nigro net40 true diff --git a/src/System.Web.Optimization.React/System.Web.Optimization.React.csproj b/src/System.Web.Optimization.React/System.Web.Optimization.React.csproj index 961a02d8e..e009015e2 100644 --- a/src/System.Web.Optimization.React/System.Web.Optimization.React.csproj +++ b/src/System.Web.Optimization.React/System.Web.Optimization.React.csproj @@ -4,7 +4,6 @@ Allows you to transpile JavaScript via Babel in the ASP.NET Web Optimization Framework. Copyright 2014-Present Facebook, Inc ReactJS.NET - Babel for ASP.NET Web Optimization Framework - 3.0.1 Daniel Lo Nigro net40 true diff --git a/tests/React.Tests/React.Tests.csproj b/tests/React.Tests/React.Tests.csproj index d59f17959..662774500 100644 --- a/tests/React.Tests/React.Tests.csproj +++ b/tests/React.Tests/React.Tests.csproj @@ -3,7 +3,6 @@ Copyright 2014-Present Facebook, Inc ReactJS.NET Unit Tests - 2.6.0 Daniel Lo Nigro net452 React.Tests From 1b6669932a271f2820922c5e4bd9d4990d7fd7fa Mon Sep 17 00:00:00 2001 From: Daniel Lo Nigro Date: Mon, 8 May 2017 21:59:45 -0700 Subject: [PATCH 06/14] Legacy NuGet restore is no longer needed --- build.proj | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/build.proj b/build.proj index f108c8c47..5d2098fc8 100644 --- a/build.proj +++ b/build.proj @@ -34,12 +34,6 @@ of patent rights can be found in the PATENTS file in the same directory. - - - - + From 167934054275c73991ce14edd06b2ba44914a0e3 Mon Sep 17 00:00:00 2001 From: Daniel Lo Nigro Date: Mon, 8 May 2017 22:15:47 -0700 Subject: [PATCH 07/14] Disable CS1701 warning for sample projects --- build.proj | 2 +- src/React.Sample.ConsoleApp/React.Sample.ConsoleApp.csproj | 1 + src/React.Sample.Mvc6/React.Sample.Mvc6.csproj | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build.proj b/build.proj index 5d2098fc8..ad0e2404e 100644 --- a/build.proj +++ b/build.proj @@ -89,7 +89,7 @@ of patent rights can be found in the PATENTS file in the same directory. - + diff --git a/src/React.Sample.ConsoleApp/React.Sample.ConsoleApp.csproj b/src/React.Sample.ConsoleApp/React.Sample.ConsoleApp.csproj index 2c4463f77..c5ae6b0a6 100644 --- a/src/React.Sample.ConsoleApp/React.Sample.ConsoleApp.csproj +++ b/src/React.Sample.ConsoleApp/React.Sample.ConsoleApp.csproj @@ -8,6 +8,7 @@ React.Sample.ConsoleApp Exe React.Sample.ConsoleApp + 1701 1.1 false diff --git a/src/React.Sample.Mvc6/React.Sample.Mvc6.csproj b/src/React.Sample.Mvc6/React.Sample.Mvc6.csproj index afe1c78c2..054c5ba70 100644 --- a/src/React.Sample.Mvc6/React.Sample.Mvc6.csproj +++ b/src/React.Sample.Mvc6/React.Sample.Mvc6.csproj @@ -6,6 +6,7 @@ React.Sample.Mvc6 Exe React.Sample.Mvc6 + 1701 1.1 From 5ce687d1e26200a5582162f118c505fa6c63784b Mon Sep 17 00:00:00 2001 From: Daniel Lo Nigro Date: Mon, 8 May 2017 22:15:58 -0700 Subject: [PATCH 08/14] Turns out we actually do need the legacy NuGet restore --- build.proj | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build.proj b/build.proj index ad0e2404e..4104c8b93 100644 --- a/build.proj +++ b/build.proj @@ -34,6 +34,12 @@ of patent rights can be found in the PATENTS file in the same directory. + + + Date: Mon, 8 May 2017 22:23:58 -0700 Subject: [PATCH 09/14] Use VS2017 AppVeyor image --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 59f9e5ac1..3fa90d856 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ version: '{build}' -os: Visual Studio 2015 +os: Visual Studio 2017 install: - set PATH=%ProgramFiles(x86)%\MSBuild\14.0\Bin;%PATH% build: From 702cb213b4341f2cef76dd28f5d8dcf954dd118e Mon Sep 17 00:00:00 2001 From: Daniel Lo Nigro Date: Tue, 9 May 2017 20:52:41 -0700 Subject: [PATCH 10/14] Remove project dependencies to work around https://github.com/NuGet/Home/issues/5193 and https://github.com/NuGet/Home/issues/4578 --- src/React.sln | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/src/React.sln b/src/React.sln index da6c7c9c5..6533baa78 100644 --- a/src/React.sln +++ b/src/React.sln @@ -39,17 +39,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "React.Sample.Webpack", "Rea {662D52AC-1EE9-4372-BD74-379F9AC56451} = {662D52AC-1EE9-4372-BD74-379F9AC56451} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "React.Sample.Mvc6", "React.Sample.Mvc6\React.Sample.Mvc6.csproj", "{022DC77E-5E48-4CF4-AD8B-DC4B9B52E02E}" - ProjectSection(ProjectDependencies) = postProject - {D0CC8A22-CEE6-485C-924B-1F94426FEA59} = {D0CC8A22-CEE6-485C-924B-1F94426FEA59} - {A7ACDB56-5E43-40A6-92C9-2C52228E6074} = {A7ACDB56-5E43-40A6-92C9-2C52228E6074} - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "React.AspNet", "React.AspNet\React.AspNet.csproj", "{A7ACDB56-5E43-40A6-92C9-2C52228E6074}" - ProjectSection(ProjectDependencies) = postProject - {D0CC8A22-CEE6-485C-924B-1F94426FEA59} = {D0CC8A22-CEE6-485C-924B-1F94426FEA59} - EndProjectSection -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "React.Core", "React.Core\React.Core.csproj", "{D0CC8A22-CEE6-485C-924B-1F94426FEA59}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cassette.React", "Cassette.React\Cassette.React.csproj", "{B7D39E1D-6CAA-4489-A03F-0C176402CFB2}" @@ -70,6 +59,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "React.Sample.ConsoleApp", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "React.Tests", "..\tests\React.Tests\React.Tests.csproj", "{6AA0D75E-5797-4690-BEFC-098A60C511A3}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "React.AspNet", "React.AspNet\React.AspNet.csproj", "{631FCC55-0219-46DC-838A-C5A3E878943A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "React.Sample.Mvc6", "React.Sample.Mvc6\React.Sample.Mvc6.csproj", "{6E2C1144-703C-4FF5-893D-B9C1A2C55C3B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -88,14 +81,6 @@ Global {E20376AD-80F7-4865-ACE3-1DE616991DF7}.Debug|Any CPU.Build.0 = Debug|Any CPU {E20376AD-80F7-4865-ACE3-1DE616991DF7}.Release|Any CPU.ActiveCfg = Release|Any CPU {E20376AD-80F7-4865-ACE3-1DE616991DF7}.Release|Any CPU.Build.0 = Release|Any CPU - {022DC77E-5E48-4CF4-AD8B-DC4B9B52E02E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {022DC77E-5E48-4CF4-AD8B-DC4B9B52E02E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {022DC77E-5E48-4CF4-AD8B-DC4B9B52E02E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {022DC77E-5E48-4CF4-AD8B-DC4B9B52E02E}.Release|Any CPU.Build.0 = Release|Any CPU - {A7ACDB56-5E43-40A6-92C9-2C52228E6074}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7ACDB56-5E43-40A6-92C9-2C52228E6074}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7ACDB56-5E43-40A6-92C9-2C52228E6074}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7ACDB56-5E43-40A6-92C9-2C52228E6074}.Release|Any CPU.Build.0 = Release|Any CPU {D0CC8A22-CEE6-485C-924B-1F94426FEA59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D0CC8A22-CEE6-485C-924B-1F94426FEA59}.Debug|Any CPU.Build.0 = Debug|Any CPU {D0CC8A22-CEE6-485C-924B-1F94426FEA59}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -136,6 +121,14 @@ Global {6AA0D75E-5797-4690-BEFC-098A60C511A3}.Debug|Any CPU.Build.0 = Debug|Any CPU {6AA0D75E-5797-4690-BEFC-098A60C511A3}.Release|Any CPU.ActiveCfg = Release|Any CPU {6AA0D75E-5797-4690-BEFC-098A60C511A3}.Release|Any CPU.Build.0 = Release|Any CPU + {631FCC55-0219-46DC-838A-C5A3E878943A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {631FCC55-0219-46DC-838A-C5A3E878943A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {631FCC55-0219-46DC-838A-C5A3E878943A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {631FCC55-0219-46DC-838A-C5A3E878943A}.Release|Any CPU.Build.0 = Release|Any CPU + {6E2C1144-703C-4FF5-893D-B9C1A2C55C3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6E2C1144-703C-4FF5-893D-B9C1A2C55C3B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6E2C1144-703C-4FF5-893D-B9C1A2C55C3B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6E2C1144-703C-4FF5-893D-B9C1A2C55C3B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -144,8 +137,6 @@ Global {22796879-968A-4C26-9B4B-4C44792B36DB} = {A51CE5B6-294F-4D39-B32B-BF08DAF9B40B} {F1EB6834-80A5-411C-90FD-CECC05715A10} = {A51CE5B6-294F-4D39-B32B-BF08DAF9B40B} {E20376AD-80F7-4865-ACE3-1DE616991DF7} = {A51CE5B6-294F-4D39-B32B-BF08DAF9B40B} - {022DC77E-5E48-4CF4-AD8B-DC4B9B52E02E} = {A51CE5B6-294F-4D39-B32B-BF08DAF9B40B} - {A7ACDB56-5E43-40A6-92C9-2C52228E6074} = {681C45FB-103C-48BC-B992-20C5B6B78F92} {D0CC8A22-CEE6-485C-924B-1F94426FEA59} = {681C45FB-103C-48BC-B992-20C5B6B78F92} {B7D39E1D-6CAA-4489-A03F-0C176402CFB2} = {681C45FB-103C-48BC-B992-20C5B6B78F92} {134EDD16-8DC8-4983-A2E0-B38DAB1ECF1C} = {681C45FB-103C-48BC-B992-20C5B6B78F92} @@ -156,5 +147,7 @@ Global {68F48008-ED43-4BDB-933D-D30D757F5EEA} = {A51CE5B6-294F-4D39-B32B-BF08DAF9B40B} {350EFB8E-693C-4DFE-8162-C99C359CFC71} = {A51CE5B6-294F-4D39-B32B-BF08DAF9B40B} {6AA0D75E-5797-4690-BEFC-098A60C511A3} = {F567B25C-E869-4C93-9C96-077761250F87} + {631FCC55-0219-46DC-838A-C5A3E878943A} = {681C45FB-103C-48BC-B992-20C5B6B78F92} + {6E2C1144-703C-4FF5-893D-B9C1A2C55C3B} = {A51CE5B6-294F-4D39-B32B-BF08DAF9B40B} EndGlobalSection EndGlobal From 12979484b491bbfaeefeb31892b70db4a1244439 Mon Sep 17 00:00:00 2001 From: Daniel Lo Nigro Date: Mon, 8 May 2017 22:37:55 -0700 Subject: [PATCH 11/14] Use MSBuild 15 on AppVeyor --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 3fa90d856..2d46ab160 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ version: '{build}' os: Visual Studio 2017 install: -- set PATH=%ProgramFiles(x86)%\MSBuild\14.0\Bin;%PATH% +- set PATH=%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\;%PATH% build: project: build.proj verbosity: normal From a91c4a64f930bc98fe46ca9b427f646b5535df99 Mon Sep 17 00:00:00 2001 From: Daniel Lo Nigro Date: Tue, 9 May 2017 21:15:06 -0700 Subject: [PATCH 12/14] Enforce .NET Core tools 1.0.0 in global.json --- global.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/global.json b/global.json index 04970a156..10082b2b4 100644 --- a/global.json +++ b/global.json @@ -1,3 +1,6 @@ { + "sdk": { + "version": "1.0.0" + }, "projects": [ "src", "test" ] -} \ No newline at end of file +} From 1ccf414191ef5e41e1dcd696a680999af119d0d8 Mon Sep 17 00:00:00 2001 From: Daniel Lo Nigro Date: Wed, 10 May 2017 21:32:17 -0700 Subject: [PATCH 13/14] Use newer npm on AppVeyor (as a workaround for https://github.com/dotnet/cli/issues/6561 and https://github.com/Microsoft/msbuild/issues/406), and run correct test command --- appveyor.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 2d46ab160..59e2cdbc4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,10 +2,12 @@ version: '{build}' os: Visual Studio 2017 install: - set PATH=%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\;%PATH% +- ps: Install-Product node 6 +- npm install --global npm build: project: build.proj verbosity: normal test_script: -- dotnet test --configuration Release --no-build tests/React.Tests +- dotnet test --configuration Release --no-build tests/React.Tests/React.Tests.csproj artifacts: - path: output\*.nupkg From 235cb481cd7e5a1790f32e3cb1ce50d832e292bb Mon Sep 17 00:00:00 2001 From: Daniel Lo Nigro Date: Wed, 10 May 2017 21:41:11 -0700 Subject: [PATCH 14/14] Remove empty PropertyGroup and unnecessary BuildSuffix property from build.proj --- build.proj | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/build.proj b/build.proj index 4104c8b93..dd156a7ed 100644 --- a/build.proj +++ b/build.proj @@ -64,15 +64,10 @@ of patent rights can be found in the PATENTS file in the same directory. - $(Major).$(Minor).$(Build) - dev-$(Date) - $(Major).$(Minor).$(Build)-$(BuildSuffix) - - - + $(Major).$(Minor).$(Build)-dev-$(Date)