From f97cb73811951febbd22b46682776eeca11c93da Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 24 Feb 2017 14:54:20 +0000 Subject: [PATCH 01/16] Make HMR dramatically faster if you're using IIS Express Doesn't affect other scenarios (e.g., directly using Kestrel, which was already this fast). --- .../npm/aspnet-webpack/package.json | 2 +- .../src/WebpackDevMiddleware.ts | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json index 058bde9f..c319c266 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json @@ -1,6 +1,6 @@ { "name": "aspnet-webpack", - "version": "1.0.27", + "version": "1.0.28", "description": "Helpers for using Webpack in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.", "main": "index.js", "scripts": { diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts index c9296bfd..b07dbd1f 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts @@ -126,12 +126,51 @@ function attachWebpackDevMiddleware(app: any, webpackConfig: webpack.Configurati } catch (ex) { throw new Error('HotModuleReplacement failed because of an error while loading \'webpack-hot-middleware\'. Error was: ' + ex.stack); } + app.use(workaroundIISExpressEventStreamFlushingIssue(hmrServerEndpoint)); app.use(webpackHotMiddlewareModule(compiler, { path: hmrServerEndpoint })); } } +function workaroundIISExpressEventStreamFlushingIssue(path: string): connect.NextHandleFunction { + // IIS Express makes HMR seem very slow, because when it's reverse-proxying an EventStream response + // from Kestrel, it doesn't pass through the lines to the browser immediately, even if you're calling + // response.Flush (or equivalent) in your ASP.NET Core code. For some reason, it waits until the following + // line is sent. By default, that wouldn't be until the next HMR heartbeat, which can be up to 5 seconds later. + // In effect, it looks as if your code is taking 5 seconds longer to compile than it really does. + // + // As a workaround, this connect middleware intercepts requests to the HMR endpoint, and modifies the response + // stream so that all EventStream 'data' lines are immediately followed with a further blank line. This is + // harmless in non-IIS-Express cases, because it's OK to have extra blank lines in an EventStream response. + // The implementation is simplistic - rather than using a true stream reader, we just patch the 'write' + // method. This relies on webpack's HMR code always writing complete EventStream messages with a single + // 'write' call. That works fine today, but if webpack's HMR code was changed, this workaround might have + // to be updated. + const eventStreamLineStart = /^data\:/; + return (req, res, next) => { + // We only want to interfere with requests to the HMR endpoint, so check this request matches + const urlMatchesPath = (req.url === path) || (req.url.split('?', 1)[0] === path); + if (urlMatchesPath) { + const origWrite = res.write; + res.write = function (chunk) { + const result = origWrite.apply(this, arguments); + + // We only want to interfere with actual EventStream data lines, so check it is one + if (typeof (chunk) === 'string') { + if (eventStreamLineStart.test(chunk) && chunk.charAt(chunk.length - 1) === '\n') { + origWrite.call(this, '\n\n'); + } + } + + return result; + } + } + + return next(); + }; +} + function copyRecursiveToRealFsSync(from: typeof fs, rootDir: string, exclude: RegExp[]) { from.readdirSync(rootDir).forEach(filename => { const fullPath = pathJoinSafe(rootDir, filename); From 1541a2b6b331c060de86e05f0663fb1fd4e185ac Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 22 Feb 2017 10:33:16 +0000 Subject: [PATCH 02/16] Migrate NodeServices and NodeServices.Sockets to csproj --- JavaScriptServices.sln | 160 ++++-------------- global.json | 5 +- ...oft.AspNetCore.NodeServices.Sockets.csproj | 48 ++++++ .../SocketNodeInstanceEntryPoint.ts | 2 +- .../project.json | 39 ----- .../Microsoft.AspNetCore.NodeServices.csproj | 50 ++++++ .../Microsoft.AspNetCore.NodeServices.xproj | 18 -- .../project.json | 45 ----- 8 files changed, 136 insertions(+), 231 deletions(-) create mode 100644 src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj delete mode 100644 src/Microsoft.AspNetCore.NodeServices.Sockets/project.json create mode 100644 src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj delete mode 100644 src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.xproj delete mode 100644 src/Microsoft.AspNetCore.NodeServices/project.json diff --git a/JavaScriptServices.sln b/JavaScriptServices.sln index e9feef94..12f56d40 100644 --- a/JavaScriptServices.sln +++ b/JavaScriptServices.sln @@ -1,144 +1,54 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26206.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{E6E88944-4800-40BA-8AF5-069EA3ADFEB8}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{27304DDE-AFB2-4F8B-B765-E3E2F11E886C}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.NodeServices", "src\Microsoft.AspNetCore.NodeServices\Microsoft.AspNetCore.NodeServices.xproj", "{B0FA4175-8B29-4904-9780-28B3C24B0567}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.NodeServices", "src\Microsoft.AspNetCore.NodeServices\Microsoft.AspNetCore.NodeServices.csproj", "{66B77203-1469-41DF-92F2-2BE6900BD36F}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NodeServicesExamples", "samples\misc\NodeServicesExamples\NodeServicesExamples.xproj", "{6D4BCDD6-7951-449B-BE55-CB7F014B7430}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{78DAC76C-1092-45AB-BF0D-594B8C7B6569}" - ProjectSection(SolutionItems) = preProject - global.json = global.json - EndProjectSection -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MusicStore", "samples\angular\MusicStore\MusicStore.xproj", "{1A74148F-9DC0-435D-B5AC-7D1B0D3D5E0B}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ReactGrid", "samples\react\ReactGrid\ReactGrid.xproj", "{ABF90A5B-F4E0-438C-A6E4-9549FB43690B}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.AngularServices", "src\Microsoft.AspNetCore.AngularServices\Microsoft.AspNetCore.AngularServices.xproj", "{421807E6-B62C-417B-B901-46C5DEDAA8F1}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.ReactServices", "src\Microsoft.AspNetCore.ReactServices\Microsoft.AspNetCore.ReactServices.xproj", "{B04381DE-991F-4831-A0B5-FE1BD3EF80C4}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.SpaServices", "src\Microsoft.AspNetCore.SpaServices\Microsoft.AspNetCore.SpaServices.xproj", "{4624F728-6DFF-44B6-93B5-3C7D9C94BF3F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Templates", "Templates", "{727E6D58-6830-4792-96C6-E138A33959FB}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Angular2Spa", "templates\Angular2Spa\Angular2Spa.xproj", "{8F5CB8A9-3086-4B49-A1C2-32A9F89BCA11}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ReactReduxSpa", "templates\ReactReduxSpa\ReactReduxSpa.xproj", "{DBFC6DB0-A6D1-4694-A108-1C604B988DA3}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ReactSpa", "templates\ReactSpa\ReactSpa.xproj", "{E9D1A695-F0E6-46F2-B5E3-72F4AF805387}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WebApplicationBasic", "templates\WebApplicationBasic\WebApplicationBasic.xproj", "{CB4398D6-B7F1-449A-AE02-828769679232}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{E0771531-BE20-40CD-A1B0-A57E09511060}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Webpack", "samples\misc\Webpack\Webpack.xproj", "{A8905301-8492-42FD-9E83-F715A0FDC3A2}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "LatencyTest", "samples\misc\LatencyTest\LatencyTest.xproj", "{A64AF9D9-72AA-4433-BE1D-DC2524B6808A}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "React", "React", "{E0EBA813-4478-4C02-B11D-FB3793113FE4}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MusicStore", "samples\react\MusicStore\MusicStore.xproj", "{C870A92C-9E3F-4BF2-82B8-5758545A8B7C}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Angular", "Angular", "{4867A616-83D6-48DC-964D-6AE743596631}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Aurelia", "templates\AureliaSpa\Aurelia.xproj", "{33D8DAD9-74F9-471D-8BAD-55F828FAA736}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "KnockoutSpa", "templates\KnockoutSpa\KnockoutSpa.xproj", "{85231B41-6998-49AE-ABD2-5124C83DBEF2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.NodeServices.Sockets", "src\Microsoft.AspNetCore.NodeServices.Sockets\Microsoft.AspNetCore.NodeServices.Sockets.csproj", "{F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0FA4175-8B29-4904-9780-28B3C24B0567}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0FA4175-8B29-4904-9780-28B3C24B0567}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0FA4175-8B29-4904-9780-28B3C24B0567}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0FA4175-8B29-4904-9780-28B3C24B0567}.Release|Any CPU.Build.0 = Release|Any CPU - {6D4BCDD6-7951-449B-BE55-CB7F014B7430}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6D4BCDD6-7951-449B-BE55-CB7F014B7430}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D4BCDD6-7951-449B-BE55-CB7F014B7430}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6D4BCDD6-7951-449B-BE55-CB7F014B7430}.Release|Any CPU.Build.0 = Release|Any CPU - {1A74148F-9DC0-435D-B5AC-7D1B0D3D5E0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1A74148F-9DC0-435D-B5AC-7D1B0D3D5E0B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1A74148F-9DC0-435D-B5AC-7D1B0D3D5E0B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1A74148F-9DC0-435D-B5AC-7D1B0D3D5E0B}.Release|Any CPU.Build.0 = Release|Any CPU - {ABF90A5B-F4E0-438C-A6E4-9549FB43690B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ABF90A5B-F4E0-438C-A6E4-9549FB43690B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABF90A5B-F4E0-438C-A6E4-9549FB43690B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ABF90A5B-F4E0-438C-A6E4-9549FB43690B}.Release|Any CPU.Build.0 = Release|Any CPU - {421807E6-B62C-417B-B901-46C5DEDAA8F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {421807E6-B62C-417B-B901-46C5DEDAA8F1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {421807E6-B62C-417B-B901-46C5DEDAA8F1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {421807E6-B62C-417B-B901-46C5DEDAA8F1}.Release|Any CPU.Build.0 = Release|Any CPU - {B04381DE-991F-4831-A0B5-FE1BD3EF80C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B04381DE-991F-4831-A0B5-FE1BD3EF80C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B04381DE-991F-4831-A0B5-FE1BD3EF80C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B04381DE-991F-4831-A0B5-FE1BD3EF80C4}.Release|Any CPU.Build.0 = Release|Any CPU - {4624F728-6DFF-44B6-93B5-3C7D9C94BF3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4624F728-6DFF-44B6-93B5-3C7D9C94BF3F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4624F728-6DFF-44B6-93B5-3C7D9C94BF3F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4624F728-6DFF-44B6-93B5-3C7D9C94BF3F}.Release|Any CPU.Build.0 = Release|Any CPU - {8F5CB8A9-3086-4B49-A1C2-32A9F89BCA11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F5CB8A9-3086-4B49-A1C2-32A9F89BCA11}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F5CB8A9-3086-4B49-A1C2-32A9F89BCA11}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F5CB8A9-3086-4B49-A1C2-32A9F89BCA11}.Release|Any CPU.Build.0 = Release|Any CPU - {DBFC6DB0-A6D1-4694-A108-1C604B988DA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DBFC6DB0-A6D1-4694-A108-1C604B988DA3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DBFC6DB0-A6D1-4694-A108-1C604B988DA3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DBFC6DB0-A6D1-4694-A108-1C604B988DA3}.Release|Any CPU.Build.0 = Release|Any CPU - {E9D1A695-F0E6-46F2-B5E3-72F4AF805387}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E9D1A695-F0E6-46F2-B5E3-72F4AF805387}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E9D1A695-F0E6-46F2-B5E3-72F4AF805387}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E9D1A695-F0E6-46F2-B5E3-72F4AF805387}.Release|Any CPU.Build.0 = Release|Any CPU - {CB4398D6-B7F1-449A-AE02-828769679232}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB4398D6-B7F1-449A-AE02-828769679232}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB4398D6-B7F1-449A-AE02-828769679232}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB4398D6-B7F1-449A-AE02-828769679232}.Release|Any CPU.Build.0 = Release|Any CPU - {A8905301-8492-42FD-9E83-F715A0FDC3A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A8905301-8492-42FD-9E83-F715A0FDC3A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A8905301-8492-42FD-9E83-F715A0FDC3A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A8905301-8492-42FD-9E83-F715A0FDC3A2}.Release|Any CPU.Build.0 = Release|Any CPU - {A64AF9D9-72AA-4433-BE1D-DC2524B6808A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A64AF9D9-72AA-4433-BE1D-DC2524B6808A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A64AF9D9-72AA-4433-BE1D-DC2524B6808A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A64AF9D9-72AA-4433-BE1D-DC2524B6808A}.Release|Any CPU.Build.0 = Release|Any CPU - {C870A92C-9E3F-4BF2-82B8-5758545A8B7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C870A92C-9E3F-4BF2-82B8-5758545A8B7C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C870A92C-9E3F-4BF2-82B8-5758545A8B7C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C870A92C-9E3F-4BF2-82B8-5758545A8B7C}.Release|Any CPU.Build.0 = Release|Any CPU - {33D8DAD9-74F9-471D-8BAD-55F828FAA736}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {33D8DAD9-74F9-471D-8BAD-55F828FAA736}.Debug|Any CPU.Build.0 = Debug|Any CPU - {33D8DAD9-74F9-471D-8BAD-55F828FAA736}.Release|Any CPU.ActiveCfg = Release|Any CPU - {33D8DAD9-74F9-471D-8BAD-55F828FAA736}.Release|Any CPU.Build.0 = Release|Any CPU - {85231B41-6998-49AE-ABD2-5124C83DBEF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85231B41-6998-49AE-ABD2-5124C83DBEF2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85231B41-6998-49AE-ABD2-5124C83DBEF2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85231B41-6998-49AE-ABD2-5124C83DBEF2}.Release|Any CPU.Build.0 = Release|Any CPU + {66B77203-1469-41DF-92F2-2BE6900BD36F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {66B77203-1469-41DF-92F2-2BE6900BD36F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {66B77203-1469-41DF-92F2-2BE6900BD36F}.Debug|x64.ActiveCfg = Debug|x64 + {66B77203-1469-41DF-92F2-2BE6900BD36F}.Debug|x64.Build.0 = Debug|x64 + {66B77203-1469-41DF-92F2-2BE6900BD36F}.Debug|x86.ActiveCfg = Debug|x86 + {66B77203-1469-41DF-92F2-2BE6900BD36F}.Debug|x86.Build.0 = Debug|x86 + {66B77203-1469-41DF-92F2-2BE6900BD36F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {66B77203-1469-41DF-92F2-2BE6900BD36F}.Release|Any CPU.Build.0 = Release|Any CPU + {66B77203-1469-41DF-92F2-2BE6900BD36F}.Release|x64.ActiveCfg = Release|x64 + {66B77203-1469-41DF-92F2-2BE6900BD36F}.Release|x64.Build.0 = Release|x64 + {66B77203-1469-41DF-92F2-2BE6900BD36F}.Release|x86.ActiveCfg = Release|x86 + {66B77203-1469-41DF-92F2-2BE6900BD36F}.Release|x86.Build.0 = Release|x86 + {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Debug|x64.ActiveCfg = Debug|x64 + {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Debug|x64.Build.0 = Debug|x64 + {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Debug|x86.ActiveCfg = Debug|x86 + {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Debug|x86.Build.0 = Debug|x86 + {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Release|Any CPU.Build.0 = Release|Any CPU + {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Release|x64.ActiveCfg = Release|x64 + {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Release|x64.Build.0 = Release|x64 + {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Release|x86.ActiveCfg = Release|x86 + {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {6D4BCDD6-7951-449B-BE55-CB7F014B7430} = {E0771531-BE20-40CD-A1B0-A57E09511060} - {1A74148F-9DC0-435D-B5AC-7D1B0D3D5E0B} = {4867A616-83D6-48DC-964D-6AE743596631} - {ABF90A5B-F4E0-438C-A6E4-9549FB43690B} = {E0EBA813-4478-4C02-B11D-FB3793113FE4} - {8F5CB8A9-3086-4B49-A1C2-32A9F89BCA11} = {727E6D58-6830-4792-96C6-E138A33959FB} - {DBFC6DB0-A6D1-4694-A108-1C604B988DA3} = {727E6D58-6830-4792-96C6-E138A33959FB} - {E9D1A695-F0E6-46F2-B5E3-72F4AF805387} = {727E6D58-6830-4792-96C6-E138A33959FB} - {CB4398D6-B7F1-449A-AE02-828769679232} = {727E6D58-6830-4792-96C6-E138A33959FB} - {E0771531-BE20-40CD-A1B0-A57E09511060} = {E6E88944-4800-40BA-8AF5-069EA3ADFEB8} - {A8905301-8492-42FD-9E83-F715A0FDC3A2} = {E0771531-BE20-40CD-A1B0-A57E09511060} - {A64AF9D9-72AA-4433-BE1D-DC2524B6808A} = {E0771531-BE20-40CD-A1B0-A57E09511060} - {E0EBA813-4478-4C02-B11D-FB3793113FE4} = {E6E88944-4800-40BA-8AF5-069EA3ADFEB8} - {C870A92C-9E3F-4BF2-82B8-5758545A8B7C} = {E0EBA813-4478-4C02-B11D-FB3793113FE4} - {4867A616-83D6-48DC-964D-6AE743596631} = {E6E88944-4800-40BA-8AF5-069EA3ADFEB8} - {33D8DAD9-74F9-471D-8BAD-55F828FAA736} = {727E6D58-6830-4792-96C6-E138A33959FB} - {85231B41-6998-49AE-ABD2-5124C83DBEF2} = {727E6D58-6830-4792-96C6-E138A33959FB} + {66B77203-1469-41DF-92F2-2BE6900BD36F} = {27304DDE-AFB2-4F8B-B765-E3E2F11E886C} + {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3} = {27304DDE-AFB2-4F8B-B765-E3E2F11E886C} EndGlobalSection EndGlobal diff --git a/global.json b/global.json index fed8172c..397ac5fc 100644 --- a/global.json +++ b/global.json @@ -1,4 +1,3 @@ { - "projects": ["src"], - "sdk": { "version": "1.0.0-preview2-1-003177" } -} + "projects": ["src"] +} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj new file mode 100644 index 00000000..dc3feff6 --- /dev/null +++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj @@ -0,0 +1,48 @@ + + + + Socket-based RPC for Microsoft.AspNetCore.NodeServices + 1.1.0-beta2 + net451;netstandard1.6 + true + true + Microsoft.AspNetCore.NodeServices.Sockets + ../../tools/Key.snk + true + true + Microsoft.AspNetCore.NodeServices.Sockets + aspnetcore;aspnetcoremvc;nodeservices + git + git://github.com/aspnet/javascriptservices + 1.6.1-* + false + false + false + false + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/SocketNodeInstanceEntryPoint.ts b/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/SocketNodeInstanceEntryPoint.ts index 50b84826..dccc63b0 100644 --- a/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/SocketNodeInstanceEntryPoint.ts +++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/SocketNodeInstanceEntryPoint.ts @@ -70,7 +70,7 @@ const parsedArgs = parseArgs(process.argv); const listenAddress = (useWindowsNamedPipes ? '\\\\.\\pipe\\' : '/tmp/') + parsedArgs.listenAddress; server.listen(listenAddress); -exitWhenParentExits(parseInt(parsedArgs.parentPid)); +exitWhenParentExits(parseInt(parsedArgs.parentPid), /* ignoreSigint */ true); interface RpcInvocation { moduleName: string; diff --git a/src/Microsoft.AspNetCore.NodeServices.Sockets/project.json b/src/Microsoft.AspNetCore.NodeServices.Sockets/project.json deleted file mode 100644 index ee98c536..00000000 --- a/src/Microsoft.AspNetCore.NodeServices.Sockets/project.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "description": "Socket-based RPC for Microsoft.AspNetCore.NodeServices", - "version": "1.1.0-beta2-*", - "packOptions": { - "repository": { - "type": "git", - "url": "git://github.com/aspnet/javascriptservices" - }, - "tags": [ - "aspnetcore", - "aspnetcoremvc", - "nodeservices" - ] - }, - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - "embed": [ - "Content/**/*" - ], - "xmlDoc": true - }, - "dependencies": { - "Microsoft.AspNetCore.NodeServices": "1.1.0-*" - }, - "frameworks": { - "net451": { - "dependencies": { - "Microsoft.Tpl.Dataflow": "4.5.24" - } - }, - "netstandard1.6": { - "dependencies": { - "System.IO.Pipes": "4.3.0", - "System.Threading.Tasks.Dataflow": "4.7.0" - } - } - } -} diff --git a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj new file mode 100644 index 00000000..63e62cb7 --- /dev/null +++ b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj @@ -0,0 +1,50 @@ + + + + Invoke Node.js modules at runtime in ASP.NET Core applications. + 1.1.1-alpha + net451;netstandard1.6 + true + true + Microsoft.AspNetCore.NodeServices + ../../tools/Key.snk + true + true + Microsoft.AspNetCore.NodeServices + aspnetcore;aspnetcoremvc;nodeservices + git + git://github.com/aspnet/javascriptservices + 1.6.1-* + false + false + false + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.xproj b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.xproj deleted file mode 100644 index ee1f0389..00000000 --- a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - b0fa4175-8b29-4904-9780-28b3c24b0567 - Microsoft.AspNetCore.NodeServices - ..\JavaScriptServices.sln\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.NodeServices/project.json b/src/Microsoft.AspNetCore.NodeServices/project.json deleted file mode 100644 index acd9ee17..00000000 --- a/src/Microsoft.AspNetCore.NodeServices/project.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "description": "Invoke Node.js modules at runtime in ASP.NET Core applications.", - "version": "1.1.0-rtm-*", - "packOptions": { - "repository": { - "type": "git", - "url": "git://github.com/aspnet/javascriptservices" - }, - "tags": [ - "aspnetcore", - "aspnetcoremvc", - "nodeservices" - ] - }, - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - "embed": [ - "Content/**/*" - ], - "xmlDoc": true - }, - "dependencies": { - "Microsoft.AspNetCore.Hosting.Abstractions": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Newtonsoft.Json": "9.0.1", - "NETStandard.Library": "1.6.1-*" - }, - "frameworks": { - "net451": {}, - "netstandard1.6": { - "dependencies": { - "System.Diagnostics.Process": "4.3.0", - "System.IO.FileSystem.Watcher": "4.3.0", - "System.Runtime.Loader": "4.3.0" - } - } - }, - "scripts": { - "prepublish": [ - "npm install", - "node node_modules/webpack/bin/webpack.js" - ] - } -} From b4e7d7b4ee10c5678855b53f6ef0d449df0577c3 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 22 Feb 2017 10:42:22 +0000 Subject: [PATCH 03/16] Migrate SpaServices/AngularServices/ReactServices projects to csproj --- JavaScriptServices.sln | 45 +++++++++++++++++++ ...icrosoft.AspNetCore.AngularServices.csproj | 37 +++++++++++++++ ...Microsoft.AspNetCore.AngularServices.xproj | 18 -------- .../project.json | 28 ------------ .../Microsoft.AspNetCore.ReactServices.csproj | 37 +++++++++++++++ .../Microsoft.AspNetCore.ReactServices.xproj | 18 -------- .../project.json | 28 ------------ .../Microsoft.AspNetCore.SpaServices.csproj | 40 +++++++++++++++++ .../Microsoft.AspNetCore.SpaServices.xproj | 18 -------- .../project.json | 37 --------------- 10 files changed, 159 insertions(+), 147 deletions(-) create mode 100644 src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj delete mode 100644 src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.xproj delete mode 100644 src/Microsoft.AspNetCore.AngularServices/project.json create mode 100644 src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.csproj delete mode 100644 src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.xproj delete mode 100644 src/Microsoft.AspNetCore.ReactServices/project.json create mode 100644 src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj delete mode 100644 src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.xproj delete mode 100644 src/Microsoft.AspNetCore.SpaServices/project.json diff --git a/JavaScriptServices.sln b/JavaScriptServices.sln index 12f56d40..d97f3e79 100644 --- a/JavaScriptServices.sln +++ b/JavaScriptServices.sln @@ -9,6 +9,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.NodeSe EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.NodeServices.Sockets", "src\Microsoft.AspNetCore.NodeServices.Sockets\Microsoft.AspNetCore.NodeServices.Sockets.csproj", "{F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SpaServices", "src\Microsoft.AspNetCore.SpaServices\Microsoft.AspNetCore.SpaServices.csproj", "{66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AngularServices", "src\Microsoft.AspNetCore.AngularServices\Microsoft.AspNetCore.AngularServices.csproj", "{58AAABB6-9D21-42F6-BC97-3DD282B55FD6}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ReactServices", "src\Microsoft.AspNetCore.ReactServices\Microsoft.AspNetCore.ReactServices.csproj", "{F1081B9A-8D67-4A5E-80C6-615F9A975D4F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -43,6 +49,42 @@ Global {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Release|x64.Build.0 = Release|x64 {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Release|x86.ActiveCfg = Release|x86 {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Release|x86.Build.0 = Release|x86 + {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Debug|x64.ActiveCfg = Debug|x64 + {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Debug|x64.Build.0 = Debug|x64 + {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Debug|x86.ActiveCfg = Debug|x86 + {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Debug|x86.Build.0 = Debug|x86 + {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Release|Any CPU.Build.0 = Release|Any CPU + {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Release|x64.ActiveCfg = Release|x64 + {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Release|x64.Build.0 = Release|x64 + {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Release|x86.ActiveCfg = Release|x86 + {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Release|x86.Build.0 = Release|x86 + {58AAABB6-9D21-42F6-BC97-3DD282B55FD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {58AAABB6-9D21-42F6-BC97-3DD282B55FD6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {58AAABB6-9D21-42F6-BC97-3DD282B55FD6}.Debug|x64.ActiveCfg = Debug|x64 + {58AAABB6-9D21-42F6-BC97-3DD282B55FD6}.Debug|x64.Build.0 = Debug|x64 + {58AAABB6-9D21-42F6-BC97-3DD282B55FD6}.Debug|x86.ActiveCfg = Debug|x86 + {58AAABB6-9D21-42F6-BC97-3DD282B55FD6}.Debug|x86.Build.0 = Debug|x86 + {58AAABB6-9D21-42F6-BC97-3DD282B55FD6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {58AAABB6-9D21-42F6-BC97-3DD282B55FD6}.Release|Any CPU.Build.0 = Release|Any CPU + {58AAABB6-9D21-42F6-BC97-3DD282B55FD6}.Release|x64.ActiveCfg = Release|x64 + {58AAABB6-9D21-42F6-BC97-3DD282B55FD6}.Release|x64.Build.0 = Release|x64 + {58AAABB6-9D21-42F6-BC97-3DD282B55FD6}.Release|x86.ActiveCfg = Release|x86 + {58AAABB6-9D21-42F6-BC97-3DD282B55FD6}.Release|x86.Build.0 = Release|x86 + {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Debug|x64.ActiveCfg = Debug|x64 + {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Debug|x64.Build.0 = Debug|x64 + {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Debug|x86.ActiveCfg = Debug|x86 + {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Debug|x86.Build.0 = Debug|x86 + {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Release|Any CPU.Build.0 = Release|Any CPU + {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Release|x64.ActiveCfg = Release|x64 + {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Release|x64.Build.0 = Release|x64 + {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Release|x86.ActiveCfg = Release|x86 + {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -50,5 +92,8 @@ Global GlobalSection(NestedProjects) = preSolution {66B77203-1469-41DF-92F2-2BE6900BD36F} = {27304DDE-AFB2-4F8B-B765-E3E2F11E886C} {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3} = {27304DDE-AFB2-4F8B-B765-E3E2F11E886C} + {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC} = {27304DDE-AFB2-4F8B-B765-E3E2F11E886C} + {58AAABB6-9D21-42F6-BC97-3DD282B55FD6} = {27304DDE-AFB2-4F8B-B765-E3E2F11E886C} + {F1081B9A-8D67-4A5E-80C6-615F9A975D4F} = {27304DDE-AFB2-4F8B-B765-E3E2F11E886C} EndGlobalSection EndGlobal diff --git a/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj b/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj new file mode 100644 index 00000000..a440432b --- /dev/null +++ b/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj @@ -0,0 +1,37 @@ + + + + Helpers for building Angular 2 applications on ASP.NET Core. + 1.1.0-beta2 + net451;netstandard1.6 + true + true + Microsoft.AspNetCore.AngularServices + ../../tools/Key.snk + true + true + Microsoft.AspNetCore.AngularServices + aspnetcore;aspnetcoremvc;nodeservices + git + git://github.com/aspnet/javascriptservices + 1.6.1-* + false + false + false + false + + + + + + + + + + + + + + + + diff --git a/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.xproj b/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.xproj deleted file mode 100644 index 701af9a5..00000000 --- a/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 421807e6-b62c-417b-b901-46c5dedaa8f1 - Microsoft.AspNetCore.AngularServices - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.AngularServices/project.json b/src/Microsoft.AspNetCore.AngularServices/project.json deleted file mode 100644 index 4479f4f5..00000000 --- a/src/Microsoft.AspNetCore.AngularServices/project.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "description": "Helpers for building Angular 2 applications on ASP.NET Core.", - "version": "1.1.0-beta2-*", - "packOptions": { - "repository": { - "type": "git", - "url": "git://github.com/aspnet/javascriptservices" - }, - "tags": [ - "aspnetcore", - "aspnetcoremvc", - "nodeservices" - ] - }, - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - "xmlDoc": true - }, - "dependencies": { - "Microsoft.AspNetCore.Mvc.TagHelpers": "1.1.0", - "Microsoft.AspNetCore.SpaServices": "1.1.0-*" - }, - "frameworks": { - "net451": {}, - "netstandard1.6": {} - } -} diff --git a/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.csproj b/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.csproj new file mode 100644 index 00000000..bc3ea00d --- /dev/null +++ b/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.csproj @@ -0,0 +1,37 @@ + + + + Helpers for building React applications on ASP.NET Core. + 1.1.0-beta2 + net451;netstandard1.6 + true + true + Microsoft.AspNetCore.ReactServices + ../../tools/Key.snk + true + true + Microsoft.AspNetCore.ReactServices + aspnetcore;aspnetcoremvc;nodeservices + git + git://github.com/aspnet/javascriptservices + 1.6.1-* + false + false + false + false + + + + + + + + + + + + + + + + diff --git a/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.xproj b/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.xproj deleted file mode 100644 index ae962e27..00000000 --- a/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - b04381de-991f-4831-a0b5-fe1bd3ef80c4 - Microsoft.AspNetCore.ReactServices - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.ReactServices/project.json b/src/Microsoft.AspNetCore.ReactServices/project.json deleted file mode 100644 index 480587a6..00000000 --- a/src/Microsoft.AspNetCore.ReactServices/project.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "description": "Helpers for building React applications on ASP.NET Core.", - "version": "1.1.0-beta2-*", - "packOptions": { - "repository": { - "type": "git", - "url": "git://github.com/aspnet/javascriptservices" - }, - "tags": [ - "aspnetcore", - "aspnetcoremvc", - "nodeservices" - ] - }, - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - "xmlDoc": true - }, - "dependencies": { - "Microsoft.AspNetCore.Mvc.TagHelpers": "1.1.0", - "Microsoft.AspNetCore.SpaServices": "1.1.0-*" - }, - "frameworks": { - "net451": {}, - "netstandard1.6": {} - } -} diff --git a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj new file mode 100644 index 00000000..92488660 --- /dev/null +++ b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj @@ -0,0 +1,40 @@ + + + + Helpers for building single-page applications on ASP.NET MVC Core + 1.1.1-alpha + net451;netstandard1.6 + true + true + Microsoft.AspNetCore.SpaServices + ../../tools/Key.snk + true + true + Microsoft.AspNetCore.SpaServices + aspnetcore;aspnetcoremvc;nodeservices + git + git://github.com/aspnet/javascriptservices + 1.6.1-* + false + false + false + false + + + + + + + + + + + + + + + + + + + diff --git a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.xproj b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.xproj deleted file mode 100644 index 31f1d769..00000000 --- a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0.23107 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 4624f728-6dff-44b6-93b5-3c7d9c94bf3f - Microsoft.AspNetCore.SpaServices - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.SpaServices/project.json b/src/Microsoft.AspNetCore.SpaServices/project.json deleted file mode 100644 index a1ffc281..00000000 --- a/src/Microsoft.AspNetCore.SpaServices/project.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "description": "Helpers for building single-page applications on ASP.NET MVC Core", - "version": "1.1.0-rtm-*", - "packOptions": { - "repository": { - "type": "git", - "url": "git://github.com/aspnet/javascriptservices" - }, - "tags": [ - "aspnetcore", - "aspnetcoremvc", - "nodeservices" - ] - }, - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - "embed": [ - "Content/**/*" - ], - "xmlDoc": true - }, - "dependencies": { - "Microsoft.AspNetCore.Mvc": "1.1.0", - "Microsoft.AspNetCore.NodeServices": "1.1.0-*" - }, - "frameworks": { - "net451": {}, - "netstandard1.6": {} - }, - "scripts": { - "prepublish": [ - "npm install", - "node node_modules/webpack/bin/webpack.js" - ] - } -} From 5a0cf0e761194899e53904599bfa346082fa7594 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 22 Feb 2017 10:46:58 +0000 Subject: [PATCH 04/16] Add some solution items --- JavaScriptServices.sln | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/JavaScriptServices.sln b/JavaScriptServices.sln index d97f3e79..9ce4df85 100644 --- a/JavaScriptServices.sln +++ b/JavaScriptServices.sln @@ -15,6 +15,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Angula EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ReactServices", "src\Microsoft.AspNetCore.ReactServices\Microsoft.AspNetCore.ReactServices.csproj", "{F1081B9A-8D67-4A5E-80C6-615F9A975D4F}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{99EAF1FE-22C8-4526-BE78-74B24125D37F}" + ProjectSection(SolutionItems) = preProject + global.json = global.json + README.md = README.md + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU From 4e770547d7b56b87f21386094ba9060bcbdc5603 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 22 Feb 2017 11:03:50 +0000 Subject: [PATCH 05/16] Migrate LatencyTest/Webpack/NodeServicesExamples samples to csproj --- JavaScriptServices.sln | 50 +++++++++++++++++++ samples/misc/LatencyTest/LatencyTest.csproj | 17 +++++++ samples/misc/LatencyTest/LatencyTest.xproj | 19 ------- samples/misc/LatencyTest/project.json | 20 -------- .../NodeServicesExamples.csproj | 32 ++++++++++++ .../NodeServicesExamples.xproj | 20 -------- .../misc/NodeServicesExamples/project.json | 43 ---------------- samples/misc/Webpack/Dockerfile | 11 ---- samples/misc/Webpack/Webpack.csproj | 32 ++++++++++++ samples/misc/Webpack/Webpack.xproj | 20 -------- samples/misc/Webpack/project.json | 45 ----------------- 11 files changed, 131 insertions(+), 178 deletions(-) create mode 100644 samples/misc/LatencyTest/LatencyTest.csproj delete mode 100644 samples/misc/LatencyTest/LatencyTest.xproj delete mode 100755 samples/misc/LatencyTest/project.json create mode 100644 samples/misc/NodeServicesExamples/NodeServicesExamples.csproj delete mode 100644 samples/misc/NodeServicesExamples/NodeServicesExamples.xproj delete mode 100755 samples/misc/NodeServicesExamples/project.json delete mode 100644 samples/misc/Webpack/Dockerfile create mode 100644 samples/misc/Webpack/Webpack.csproj delete mode 100644 samples/misc/Webpack/Webpack.xproj delete mode 100755 samples/misc/Webpack/project.json diff --git a/JavaScriptServices.sln b/JavaScriptServices.sln index 9ce4df85..100488c6 100644 --- a/JavaScriptServices.sln +++ b/JavaScriptServices.sln @@ -21,6 +21,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{99EAF1FE-2 README.md = README.md EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{23836492-E7F4-4376-85BF-A635C304AC46}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{E6A161EA-646C-4033-9090-95BE809AB8D9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LatencyTest", "samples\misc\LatencyTest\LatencyTest.csproj", "{1931B19A-EC42-4D56-B2D0-FB06D17244DA}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Webpack", "samples\misc\Webpack\Webpack.csproj", "{DE479DC3-1461-4EAD-A188-4AF7AA4AE344}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NodeServicesExamples", "samples\misc\NodeServicesExamples\NodeServicesExamples.csproj", "{93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -91,6 +101,42 @@ Global {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Release|x64.Build.0 = Release|x64 {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Release|x86.ActiveCfg = Release|x86 {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Release|x86.Build.0 = Release|x86 + {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Debug|x64.ActiveCfg = Debug|x64 + {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Debug|x64.Build.0 = Debug|x64 + {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Debug|x86.ActiveCfg = Debug|x86 + {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Debug|x86.Build.0 = Debug|x86 + {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Release|Any CPU.Build.0 = Release|Any CPU + {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Release|x64.ActiveCfg = Release|x64 + {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Release|x64.Build.0 = Release|x64 + {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Release|x86.ActiveCfg = Release|x86 + {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Release|x86.Build.0 = Release|x86 + {DE479DC3-1461-4EAD-A188-4AF7AA4AE344}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DE479DC3-1461-4EAD-A188-4AF7AA4AE344}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DE479DC3-1461-4EAD-A188-4AF7AA4AE344}.Debug|x64.ActiveCfg = Debug|x64 + {DE479DC3-1461-4EAD-A188-4AF7AA4AE344}.Debug|x64.Build.0 = Debug|x64 + {DE479DC3-1461-4EAD-A188-4AF7AA4AE344}.Debug|x86.ActiveCfg = Debug|x86 + {DE479DC3-1461-4EAD-A188-4AF7AA4AE344}.Debug|x86.Build.0 = Debug|x86 + {DE479DC3-1461-4EAD-A188-4AF7AA4AE344}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DE479DC3-1461-4EAD-A188-4AF7AA4AE344}.Release|Any CPU.Build.0 = Release|Any CPU + {DE479DC3-1461-4EAD-A188-4AF7AA4AE344}.Release|x64.ActiveCfg = Release|x64 + {DE479DC3-1461-4EAD-A188-4AF7AA4AE344}.Release|x64.Build.0 = Release|x64 + {DE479DC3-1461-4EAD-A188-4AF7AA4AE344}.Release|x86.ActiveCfg = Release|x86 + {DE479DC3-1461-4EAD-A188-4AF7AA4AE344}.Release|x86.Build.0 = Release|x86 + {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Debug|x64.ActiveCfg = Debug|x64 + {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Debug|x64.Build.0 = Debug|x64 + {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Debug|x86.ActiveCfg = Debug|x86 + {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Debug|x86.Build.0 = Debug|x86 + {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Release|Any CPU.Build.0 = Release|Any CPU + {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Release|x64.ActiveCfg = Release|x64 + {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Release|x64.Build.0 = Release|x64 + {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Release|x86.ActiveCfg = Release|x86 + {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -101,5 +147,9 @@ Global {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC} = {27304DDE-AFB2-4F8B-B765-E3E2F11E886C} {58AAABB6-9D21-42F6-BC97-3DD282B55FD6} = {27304DDE-AFB2-4F8B-B765-E3E2F11E886C} {F1081B9A-8D67-4A5E-80C6-615F9A975D4F} = {27304DDE-AFB2-4F8B-B765-E3E2F11E886C} + {E6A161EA-646C-4033-9090-95BE809AB8D9} = {23836492-E7F4-4376-85BF-A635C304AC46} + {1931B19A-EC42-4D56-B2D0-FB06D17244DA} = {E6A161EA-646C-4033-9090-95BE809AB8D9} + {DE479DC3-1461-4EAD-A188-4AF7AA4AE344} = {E6A161EA-646C-4033-9090-95BE809AB8D9} + {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE} = {E6A161EA-646C-4033-9090-95BE809AB8D9} EndGlobalSection EndGlobal diff --git a/samples/misc/LatencyTest/LatencyTest.csproj b/samples/misc/LatencyTest/LatencyTest.csproj new file mode 100644 index 00000000..954867fa --- /dev/null +++ b/samples/misc/LatencyTest/LatencyTest.csproj @@ -0,0 +1,17 @@ + + + + netcoreapp1.0 + Exe + + + + + + + + + + + + diff --git a/samples/misc/LatencyTest/LatencyTest.xproj b/samples/misc/LatencyTest/LatencyTest.xproj deleted file mode 100644 index 310b3bac..00000000 --- a/samples/misc/LatencyTest/LatencyTest.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0.25123 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - a64af9d9-72aa-4433-be1d-dc2524b6808a - LatencyTest - .\obj - .\bin\ - - - - 2.0 - - - \ No newline at end of file diff --git a/samples/misc/LatencyTest/project.json b/samples/misc/LatencyTest/project.json deleted file mode 100755 index 5f96c5b4..00000000 --- a/samples/misc/LatencyTest/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - }, - "Microsoft.AspNetCore.NodeServices": "1.1.0-*", - "Microsoft.AspNetCore.NodeServices.Sockets": "1.1.0-*", - "Microsoft.Extensions.DependencyInjection": "1.1.0" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50" - } - } -} diff --git a/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj b/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj new file mode 100644 index 00000000..5201f7ed --- /dev/null +++ b/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj @@ -0,0 +1,32 @@ + + + + netcoreapp1.0 + true + NodeServicesExamples + Exe + NodeServicesExamples + 1.1.0 + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/misc/NodeServicesExamples/NodeServicesExamples.xproj b/samples/misc/NodeServicesExamples/NodeServicesExamples.xproj deleted file mode 100644 index 2cd1742b..00000000 --- a/samples/misc/NodeServicesExamples/NodeServicesExamples.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - true - - - - 6d4bcdd6-7951-449b-be55-cb7f014b7430 - NodeServicesExamples - ..\..\..\JavaScriptServices.sln\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - 2018 - - - \ No newline at end of file diff --git a/samples/misc/NodeServicesExamples/project.json b/samples/misc/NodeServicesExamples/project.json deleted file mode 100755 index bc083219..00000000 --- a/samples/misc/NodeServicesExamples/project.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "version": "1.0.0-*", - "tooling": { - "defaultNamespace": "NodeServicesExamples" - }, - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - "runtimeOptions": { - "gcServer": true - }, - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - }, - "Microsoft.AspNetCore.Diagnostics": "1.1.0", - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.AspNetCore.Mvc": "1.1.0", - "Microsoft.AspNetCore.Mvc.TagHelpers": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.AspNetCore.StaticFiles": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.AspNetCore.NodeServices": "1.1.0-*" - }, - "frameworks": { - "netcoreapp1.0": {} - }, - "publishExclude": [ - "node_modules", - "bower_components", - "**.xproj", - "**.user", - "**.vspscc" - ], - "scripts": { - "prepublish": [ "npm install" ], - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - } -} diff --git a/samples/misc/Webpack/Dockerfile b/samples/misc/Webpack/Dockerfile deleted file mode 100644 index 63d7c456..00000000 --- a/samples/misc/Webpack/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM microsoft/aspnet:1.0.0-rc1-update1 - -RUN printf "deb http://ftp.us.debian.org/debian jessie main\n" >> /etc/apt/sources.list -RUN apt-get -qq update && apt-get install -qqy sqlite3 libsqlite3-dev && rm -rf /var/lib/apt/lists/* - -COPY . /app -WORKDIR /app -RUN ["dnu", "restore"] - -EXPOSE 5000/tcp -ENTRYPOINT ["dnx", "-p", "project.json", "web"] diff --git a/samples/misc/Webpack/Webpack.csproj b/samples/misc/Webpack/Webpack.csproj new file mode 100644 index 00000000..655c405e --- /dev/null +++ b/samples/misc/Webpack/Webpack.csproj @@ -0,0 +1,32 @@ + + + + netcoreapp1.0 + true + Webpack + Exe + Webpack + 1.1.0 + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/misc/Webpack/Webpack.xproj b/samples/misc/Webpack/Webpack.xproj deleted file mode 100644 index 49bc6e47..00000000 --- a/samples/misc/Webpack/Webpack.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - true - - - - a8905301-8492-42fd-9e83-f715a0fdc3a2 - Webpack - ..\..\..\JavaScriptServices.sln\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - 2018 - - - \ No newline at end of file diff --git a/samples/misc/Webpack/project.json b/samples/misc/Webpack/project.json deleted file mode 100755 index bbaec0b2..00000000 --- a/samples/misc/Webpack/project.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - "runtimeOptions": { - "gcServer": true - }, - "tooling": { - "defaultNamespace": "Webpack" - }, - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - }, - "Microsoft.AspNetCore.Diagnostics": "1.1.0", - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.AspNetCore.Mvc": "1.1.0", - "Microsoft.AspNetCore.Mvc.TagHelpers": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.AspNetCore.StaticFiles": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.AspNetCore.SpaServices": "1.1.0-*" - }, - "frameworks": { - "netcoreapp1.0": {} - }, - "publishOptions": { - "exclude": [ - "node_modules", - "bower_components", - "**.xproj", - "**.user", - "**.vspscc" - ] - }, - "scripts": { - "prepublish": [ "npm install" ], - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - } -} From 9927664ca0fdfc4d146369804a53f03b1f0bd450 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 22 Feb 2017 11:50:12 +0000 Subject: [PATCH 06/16] Migrate Angular and React samples to csproj --- JavaScriptServices.sln | 51 +++++++++++++ samples/angular/MusicStore/MusicStore.csproj | 44 +++++++++++ samples/angular/MusicStore/MusicStore.xproj | 20 ----- samples/angular/MusicStore/project.json | 79 ------------------- samples/react/MusicStore/MusicStore.csproj | 50 ++++++++++++ samples/react/MusicStore/MusicStore.xproj | 20 ----- samples/react/MusicStore/project.json | 80 -------------------- samples/react/ReactGrid/ReactGrid.csproj | 27 +++++++ samples/react/ReactGrid/ReactGrid.xproj | 20 ----- samples/react/ReactGrid/project.json | 37 --------- 10 files changed, 172 insertions(+), 256 deletions(-) create mode 100644 samples/angular/MusicStore/MusicStore.csproj delete mode 100644 samples/angular/MusicStore/MusicStore.xproj delete mode 100755 samples/angular/MusicStore/project.json create mode 100644 samples/react/MusicStore/MusicStore.csproj delete mode 100644 samples/react/MusicStore/MusicStore.xproj delete mode 100755 samples/react/MusicStore/project.json create mode 100644 samples/react/ReactGrid/ReactGrid.csproj delete mode 100644 samples/react/ReactGrid/ReactGrid.xproj delete mode 100755 samples/react/ReactGrid/project.json diff --git a/JavaScriptServices.sln b/JavaScriptServices.sln index 100488c6..073b4c61 100644 --- a/JavaScriptServices.sln +++ b/JavaScriptServices.sln @@ -31,6 +31,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Webpack", "samples\misc\Web EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NodeServicesExamples", "samples\misc\NodeServicesExamples\NodeServicesExamples.csproj", "{93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "angular", "angular", "{B54435EB-D5E8-4CEC-A02E-DDCB0C750E34}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicStore", "samples\angular\MusicStore\MusicStore.csproj", "{63FC66E7-559B-4426-93E1-2D951EFC8293}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "react", "react", "{BD77E73E-13BC-4550-99DA-51869BD8DFC4}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactGrid", "samples\react\ReactGrid\ReactGrid.csproj", "{3B023106-88DB-4C3A-B01F-C1AECB02D80B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicStore", "samples\react\MusicStore\MusicStore.csproj", "{6E898586-79CA-4AA8-946E-943B3682F376}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -137,6 +147,42 @@ Global {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Release|x64.Build.0 = Release|x64 {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Release|x86.ActiveCfg = Release|x86 {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Release|x86.Build.0 = Release|x86 + {63FC66E7-559B-4426-93E1-2D951EFC8293}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {63FC66E7-559B-4426-93E1-2D951EFC8293}.Debug|Any CPU.Build.0 = Debug|Any CPU + {63FC66E7-559B-4426-93E1-2D951EFC8293}.Debug|x64.ActiveCfg = Debug|x64 + {63FC66E7-559B-4426-93E1-2D951EFC8293}.Debug|x64.Build.0 = Debug|x64 + {63FC66E7-559B-4426-93E1-2D951EFC8293}.Debug|x86.ActiveCfg = Debug|x86 + {63FC66E7-559B-4426-93E1-2D951EFC8293}.Debug|x86.Build.0 = Debug|x86 + {63FC66E7-559B-4426-93E1-2D951EFC8293}.Release|Any CPU.ActiveCfg = Release|Any CPU + {63FC66E7-559B-4426-93E1-2D951EFC8293}.Release|Any CPU.Build.0 = Release|Any CPU + {63FC66E7-559B-4426-93E1-2D951EFC8293}.Release|x64.ActiveCfg = Release|x64 + {63FC66E7-559B-4426-93E1-2D951EFC8293}.Release|x64.Build.0 = Release|x64 + {63FC66E7-559B-4426-93E1-2D951EFC8293}.Release|x86.ActiveCfg = Release|x86 + {63FC66E7-559B-4426-93E1-2D951EFC8293}.Release|x86.Build.0 = Release|x86 + {3B023106-88DB-4C3A-B01F-C1AECB02D80B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3B023106-88DB-4C3A-B01F-C1AECB02D80B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3B023106-88DB-4C3A-B01F-C1AECB02D80B}.Debug|x64.ActiveCfg = Debug|x64 + {3B023106-88DB-4C3A-B01F-C1AECB02D80B}.Debug|x64.Build.0 = Debug|x64 + {3B023106-88DB-4C3A-B01F-C1AECB02D80B}.Debug|x86.ActiveCfg = Debug|x86 + {3B023106-88DB-4C3A-B01F-C1AECB02D80B}.Debug|x86.Build.0 = Debug|x86 + {3B023106-88DB-4C3A-B01F-C1AECB02D80B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3B023106-88DB-4C3A-B01F-C1AECB02D80B}.Release|Any CPU.Build.0 = Release|Any CPU + {3B023106-88DB-4C3A-B01F-C1AECB02D80B}.Release|x64.ActiveCfg = Release|x64 + {3B023106-88DB-4C3A-B01F-C1AECB02D80B}.Release|x64.Build.0 = Release|x64 + {3B023106-88DB-4C3A-B01F-C1AECB02D80B}.Release|x86.ActiveCfg = Release|x86 + {3B023106-88DB-4C3A-B01F-C1AECB02D80B}.Release|x86.Build.0 = Release|x86 + {6E898586-79CA-4AA8-946E-943B3682F376}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6E898586-79CA-4AA8-946E-943B3682F376}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6E898586-79CA-4AA8-946E-943B3682F376}.Debug|x64.ActiveCfg = Debug|x64 + {6E898586-79CA-4AA8-946E-943B3682F376}.Debug|x64.Build.0 = Debug|x64 + {6E898586-79CA-4AA8-946E-943B3682F376}.Debug|x86.ActiveCfg = Debug|x86 + {6E898586-79CA-4AA8-946E-943B3682F376}.Debug|x86.Build.0 = Debug|x86 + {6E898586-79CA-4AA8-946E-943B3682F376}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6E898586-79CA-4AA8-946E-943B3682F376}.Release|Any CPU.Build.0 = Release|Any CPU + {6E898586-79CA-4AA8-946E-943B3682F376}.Release|x64.ActiveCfg = Release|x64 + {6E898586-79CA-4AA8-946E-943B3682F376}.Release|x64.Build.0 = Release|x64 + {6E898586-79CA-4AA8-946E-943B3682F376}.Release|x86.ActiveCfg = Release|x86 + {6E898586-79CA-4AA8-946E-943B3682F376}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -151,5 +197,10 @@ Global {1931B19A-EC42-4D56-B2D0-FB06D17244DA} = {E6A161EA-646C-4033-9090-95BE809AB8D9} {DE479DC3-1461-4EAD-A188-4AF7AA4AE344} = {E6A161EA-646C-4033-9090-95BE809AB8D9} {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE} = {E6A161EA-646C-4033-9090-95BE809AB8D9} + {B54435EB-D5E8-4CEC-A02E-DDCB0C750E34} = {23836492-E7F4-4376-85BF-A635C304AC46} + {63FC66E7-559B-4426-93E1-2D951EFC8293} = {B54435EB-D5E8-4CEC-A02E-DDCB0C750E34} + {BD77E73E-13BC-4550-99DA-51869BD8DFC4} = {23836492-E7F4-4376-85BF-A635C304AC46} + {3B023106-88DB-4C3A-B01F-C1AECB02D80B} = {BD77E73E-13BC-4550-99DA-51869BD8DFC4} + {6E898586-79CA-4AA8-946E-943B3682F376} = {BD77E73E-13BC-4550-99DA-51869BD8DFC4} EndGlobalSection EndGlobal diff --git a/samples/angular/MusicStore/MusicStore.csproj b/samples/angular/MusicStore/MusicStore.csproj new file mode 100644 index 00000000..5d88535d --- /dev/null +++ b/samples/angular/MusicStore/MusicStore.csproj @@ -0,0 +1,44 @@ + + + + netcoreapp1.1 + true + MusicStore + Exe + 1.1.0 + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/angular/MusicStore/MusicStore.xproj b/samples/angular/MusicStore/MusicStore.xproj deleted file mode 100644 index 93efb5ea..00000000 --- a/samples/angular/MusicStore/MusicStore.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - true - - - - 1a74148f-9dc0-435d-b5ac-7d1b0d3d5e0b - MusicStore - ..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - 5068 - - - \ No newline at end of file diff --git a/samples/angular/MusicStore/project.json b/samples/angular/MusicStore/project.json deleted file mode 100755 index 9af86f78..00000000 --- a/samples/angular/MusicStore/project.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - "tooling": { - "defaultNamespace": "MusicStore" - }, - - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - }, - "Microsoft.AspNetCore.AngularServices": "1.1.0-*", - "Microsoft.AspNetCore.Diagnostics": "1.1.0", - "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.1.0", - "Microsoft.AspNetCore.Mvc": "1.1.0", - "Microsoft.AspNetCore.Razor.Tools": { - "version": "1.0.0-preview2-final", - "type": "build" - }, - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.AspNetCore.StaticFiles": "1.1.0", - "Microsoft.EntityFrameworkCore.SQLite": "1.1.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Configuration.CommandLine": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0", - "AutoMapper": "5.0.2" - }, - - "tools": { - "Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final", - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final", - "Microsoft.DotNet.Watcher.Tools": "1.0.0-preview2-final" - }, - - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "dotnet5.6", - "portable-net45+win8" - ] - } - }, - - "publishOptions": { - "include": [ - "appsettings.json", - "ClientApp", - "node_modules", - "typings", - "Views", - "tsconfig.json", - "tsd.json", - "web.config", - "webpack.*.js", - "wwwroot" - ] - }, - "scripts": { - "prepublish": [ - "npm install", - "gulp" - ], - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - } -} diff --git a/samples/react/MusicStore/MusicStore.csproj b/samples/react/MusicStore/MusicStore.csproj new file mode 100644 index 00000000..76b8fc55 --- /dev/null +++ b/samples/react/MusicStore/MusicStore.csproj @@ -0,0 +1,50 @@ + + + + netcoreapp1.0 + true + MusicStore + Exe + MusicStore + 1.1.0 + + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/react/MusicStore/MusicStore.xproj b/samples/react/MusicStore/MusicStore.xproj deleted file mode 100644 index 672fd3fc..00000000 --- a/samples/react/MusicStore/MusicStore.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - true - - - - c870a92c-9e3f-4bf2-82b8-5758545a8b7c - MusicStore - ..\..\..\JavaScriptServices.sln\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - 2018 - - - \ No newline at end of file diff --git a/samples/react/MusicStore/project.json b/samples/react/MusicStore/project.json deleted file mode 100755 index 880eaa30..00000000 --- a/samples/react/MusicStore/project.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - }, - "Microsoft.AspNetCore.ReactServices": "1.1.0-*", - "Microsoft.AspNetCore.Diagnostics": "1.1.0", - "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.1.0", - "Microsoft.AspNetCore.Mvc": "1.1.0", - "Microsoft.AspNetCore.Razor.Tools": { - "version": "1.0.0-preview2-final", - "type": "build" - }, - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.AspNetCore.StaticFiles": "1.1.0", - "Microsoft.EntityFrameworkCore.SQLite": "1.1.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Configuration.CommandLine": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0", - "AutoMapper": "5.0.2" - }, - - "tools": { - "Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final", - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final", - "Microsoft.DotNet.Watcher.Tools": "1.0.0-preview2-final" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [] - } - }, - - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true, - "compile": { - "exclude": ["node_modules"] - } - }, - - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - - "publishOptions": { - "include": [ - "appsettings.json", - "ClientApp/dist", - "node_modules", - "Views", - "web.config", - "wwwroot" - ], - "exclude": [ - "wwwroot/dist/*.map" - ] - }, - - "scripts": { - "prepublish": [ - "npm install", - "node node_modules/webpack/bin/webpack.js" - ], - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - }, - - "tooling": { - "defaultNamespace": "MusicStore" - } -} diff --git a/samples/react/ReactGrid/ReactGrid.csproj b/samples/react/ReactGrid/ReactGrid.csproj new file mode 100644 index 00000000..18cdf9d0 --- /dev/null +++ b/samples/react/ReactGrid/ReactGrid.csproj @@ -0,0 +1,27 @@ + + + + netcoreapp1.0 + true + ReactGrid + Exe + ReactGrid + 1.1.0 + + + + + + + + + + + + + + + + + + diff --git a/samples/react/ReactGrid/ReactGrid.xproj b/samples/react/ReactGrid/ReactGrid.xproj deleted file mode 100644 index 0d002a64..00000000 --- a/samples/react/ReactGrid/ReactGrid.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - true - - - - abf90a5b-f4e0-438c-a6e4-9549fb43690b - ReactGrid - ..\..\..\artifacts\obj\$(MSBuildProjectName) - .\bin\ - - - 2.0 - 2311 - - - \ No newline at end of file diff --git a/samples/react/ReactGrid/project.json b/samples/react/ReactGrid/project.json deleted file mode 100755 index 631d408e..00000000 --- a/samples/react/ReactGrid/project.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - "runtimeOptions": { - "gcServer": true - }, - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - }, - "Microsoft.AspNetCore.Diagnostics": "1.1.0", - "Microsoft.AspNetCore.ReactServices": "1.1.0-*", - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.AspNetCore.StaticFiles": "1.1.0" - }, - "frameworks": { - "netcoreapp1.0": {} - }, - "publishOptions": { - "exclude": [ - "node_modules", - "bower_components", - "**.xproj", - "**.user", - "**.vspscc" - ] - }, - "scripts": { - "prepublish": [ "npm install" ], - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - } -} From bc66842cbaefc10d1695190598d0078b8b27f2a0 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 22 Feb 2017 12:07:27 +0000 Subject: [PATCH 07/16] Add SPA templates to VS .sln (also renaming Aurelia project to AureliaSpa for consistency) --- .gitignore | 2 + JavaScriptServices.sln | 78 +++++++++++++++++++ .../{Aurelia.csproj => AureliaSpa.csproj} | 0 3 files changed, 80 insertions(+) rename templates/AureliaSpa/{Aurelia.csproj => AureliaSpa.csproj} (100%) diff --git a/.gitignore b/.gitignore index 6453872e..9b53d656 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,5 @@ npm-debug.log /templates/*/ClientApp/dist/ /templates/*/yarn.lock .vscode/ + +/templates/*/Properties/launchSettings.json diff --git a/JavaScriptServices.sln b/JavaScriptServices.sln index 073b4c61..1eb088ad 100644 --- a/JavaScriptServices.sln +++ b/JavaScriptServices.sln @@ -17,6 +17,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ReactS EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{99EAF1FE-22C8-4526-BE78-74B24125D37F}" ProjectSection(SolutionItems) = preProject + .gitignore = .gitignore global.json = global.json README.md = README.md EndProjectSection @@ -41,6 +42,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactGrid", "samples\react\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicStore", "samples\react\MusicStore\MusicStore.csproj", "{6E898586-79CA-4AA8-946E-943B3682F376}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{1598B415-73F1-4B37-B3B4-0A10677ABB2D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KnockoutSpa", "templates\KnockoutSpa\KnockoutSpa.csproj", "{F60248B1-940E-43FB-BEA0-589362AA6320}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Angular2Spa", "templates\Angular2Spa\Angular2Spa.csproj", "{4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AureliaSpa", "templates\AureliaSpa\AureliaSpa.csproj", "{4D57B6E1-7141-48ED-959E-872BDD4A2F72}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactSpa", "templates\ReactSpa\ReactSpa.csproj", "{868A630E-C61B-4807-B7A8-7EB53BE1C28A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactReduxSpa", "templates\ReactReduxSpa\ReactReduxSpa.csproj", "{9D4D15A1-A25B-44EC-AB63-F1CE9986712E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -183,6 +196,66 @@ Global {6E898586-79CA-4AA8-946E-943B3682F376}.Release|x64.Build.0 = Release|x64 {6E898586-79CA-4AA8-946E-943B3682F376}.Release|x86.ActiveCfg = Release|x86 {6E898586-79CA-4AA8-946E-943B3682F376}.Release|x86.Build.0 = Release|x86 + {F60248B1-940E-43FB-BEA0-589362AA6320}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F60248B1-940E-43FB-BEA0-589362AA6320}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F60248B1-940E-43FB-BEA0-589362AA6320}.Debug|x64.ActiveCfg = Debug|x64 + {F60248B1-940E-43FB-BEA0-589362AA6320}.Debug|x64.Build.0 = Debug|x64 + {F60248B1-940E-43FB-BEA0-589362AA6320}.Debug|x86.ActiveCfg = Debug|x86 + {F60248B1-940E-43FB-BEA0-589362AA6320}.Debug|x86.Build.0 = Debug|x86 + {F60248B1-940E-43FB-BEA0-589362AA6320}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F60248B1-940E-43FB-BEA0-589362AA6320}.Release|Any CPU.Build.0 = Release|Any CPU + {F60248B1-940E-43FB-BEA0-589362AA6320}.Release|x64.ActiveCfg = Release|x64 + {F60248B1-940E-43FB-BEA0-589362AA6320}.Release|x64.Build.0 = Release|x64 + {F60248B1-940E-43FB-BEA0-589362AA6320}.Release|x86.ActiveCfg = Release|x86 + {F60248B1-940E-43FB-BEA0-589362AA6320}.Release|x86.Build.0 = Release|x86 + {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}.Debug|x64.ActiveCfg = Debug|x64 + {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}.Debug|x64.Build.0 = Debug|x64 + {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}.Debug|x86.ActiveCfg = Debug|x86 + {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}.Debug|x86.Build.0 = Debug|x86 + {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}.Release|Any CPU.Build.0 = Release|Any CPU + {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}.Release|x64.ActiveCfg = Release|x64 + {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}.Release|x64.Build.0 = Release|x64 + {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}.Release|x86.ActiveCfg = Release|x86 + {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}.Release|x86.Build.0 = Release|x86 + {4D57B6E1-7141-48ED-959E-872BDD4A2F72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4D57B6E1-7141-48ED-959E-872BDD4A2F72}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4D57B6E1-7141-48ED-959E-872BDD4A2F72}.Debug|x64.ActiveCfg = Debug|x64 + {4D57B6E1-7141-48ED-959E-872BDD4A2F72}.Debug|x64.Build.0 = Debug|x64 + {4D57B6E1-7141-48ED-959E-872BDD4A2F72}.Debug|x86.ActiveCfg = Debug|x86 + {4D57B6E1-7141-48ED-959E-872BDD4A2F72}.Debug|x86.Build.0 = Debug|x86 + {4D57B6E1-7141-48ED-959E-872BDD4A2F72}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4D57B6E1-7141-48ED-959E-872BDD4A2F72}.Release|Any CPU.Build.0 = Release|Any CPU + {4D57B6E1-7141-48ED-959E-872BDD4A2F72}.Release|x64.ActiveCfg = Release|x64 + {4D57B6E1-7141-48ED-959E-872BDD4A2F72}.Release|x64.Build.0 = Release|x64 + {4D57B6E1-7141-48ED-959E-872BDD4A2F72}.Release|x86.ActiveCfg = Release|x86 + {4D57B6E1-7141-48ED-959E-872BDD4A2F72}.Release|x86.Build.0 = Release|x86 + {868A630E-C61B-4807-B7A8-7EB53BE1C28A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {868A630E-C61B-4807-B7A8-7EB53BE1C28A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {868A630E-C61B-4807-B7A8-7EB53BE1C28A}.Debug|x64.ActiveCfg = Debug|x64 + {868A630E-C61B-4807-B7A8-7EB53BE1C28A}.Debug|x64.Build.0 = Debug|x64 + {868A630E-C61B-4807-B7A8-7EB53BE1C28A}.Debug|x86.ActiveCfg = Debug|x86 + {868A630E-C61B-4807-B7A8-7EB53BE1C28A}.Debug|x86.Build.0 = Debug|x86 + {868A630E-C61B-4807-B7A8-7EB53BE1C28A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {868A630E-C61B-4807-B7A8-7EB53BE1C28A}.Release|Any CPU.Build.0 = Release|Any CPU + {868A630E-C61B-4807-B7A8-7EB53BE1C28A}.Release|x64.ActiveCfg = Release|x64 + {868A630E-C61B-4807-B7A8-7EB53BE1C28A}.Release|x64.Build.0 = Release|x64 + {868A630E-C61B-4807-B7A8-7EB53BE1C28A}.Release|x86.ActiveCfg = Release|x86 + {868A630E-C61B-4807-B7A8-7EB53BE1C28A}.Release|x86.Build.0 = Release|x86 + {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Debug|x64.ActiveCfg = Debug|x64 + {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Debug|x64.Build.0 = Debug|x64 + {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Debug|x86.ActiveCfg = Debug|x86 + {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Debug|x86.Build.0 = Debug|x86 + {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Release|Any CPU.Build.0 = Release|Any CPU + {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Release|x64.ActiveCfg = Release|x64 + {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Release|x64.Build.0 = Release|x64 + {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Release|x86.ActiveCfg = Release|x86 + {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -202,5 +275,10 @@ Global {BD77E73E-13BC-4550-99DA-51869BD8DFC4} = {23836492-E7F4-4376-85BF-A635C304AC46} {3B023106-88DB-4C3A-B01F-C1AECB02D80B} = {BD77E73E-13BC-4550-99DA-51869BD8DFC4} {6E898586-79CA-4AA8-946E-943B3682F376} = {BD77E73E-13BC-4550-99DA-51869BD8DFC4} + {F60248B1-940E-43FB-BEA0-589362AA6320} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D} + {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D} + {4D57B6E1-7141-48ED-959E-872BDD4A2F72} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D} + {868A630E-C61B-4807-B7A8-7EB53BE1C28A} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D} + {9D4D15A1-A25B-44EC-AB63-F1CE9986712E} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D} EndGlobalSection EndGlobal diff --git a/templates/AureliaSpa/Aurelia.csproj b/templates/AureliaSpa/AureliaSpa.csproj similarity index 100% rename from templates/AureliaSpa/Aurelia.csproj rename to templates/AureliaSpa/AureliaSpa.csproj From 765586b3d17a1e17968d617d81d3852c7108381b Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 22 Feb 2017 12:09:39 +0000 Subject: [PATCH 08/16] Migrate WebApplicationBasic template to csproj --- JavaScriptServices.sln | 15 ++++ .../WebApplicationBasic.csproj | 41 ++++++++++ .../WebApplicationBasic.xproj | 20 ----- templates/WebApplicationBasic/project.json | 77 ------------------- 4 files changed, 56 insertions(+), 97 deletions(-) create mode 100644 templates/WebApplicationBasic/WebApplicationBasic.csproj delete mode 100644 templates/WebApplicationBasic/WebApplicationBasic.xproj delete mode 100755 templates/WebApplicationBasic/project.json diff --git a/JavaScriptServices.sln b/JavaScriptServices.sln index 1eb088ad..a1daf733 100644 --- a/JavaScriptServices.sln +++ b/JavaScriptServices.sln @@ -54,6 +54,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactSpa", "templates\React EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactReduxSpa", "templates\ReactReduxSpa\ReactReduxSpa.csproj", "{9D4D15A1-A25B-44EC-AB63-F1CE9986712E}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApplicationBasic", "templates\WebApplicationBasic\WebApplicationBasic.csproj", "{86911E07-C733-4C18-B49F-9A007A651246}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -256,6 +258,18 @@ Global {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Release|x64.Build.0 = Release|x64 {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Release|x86.ActiveCfg = Release|x86 {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Release|x86.Build.0 = Release|x86 + {86911E07-C733-4C18-B49F-9A007A651246}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {86911E07-C733-4C18-B49F-9A007A651246}.Debug|Any CPU.Build.0 = Debug|Any CPU + {86911E07-C733-4C18-B49F-9A007A651246}.Debug|x64.ActiveCfg = Debug|x64 + {86911E07-C733-4C18-B49F-9A007A651246}.Debug|x64.Build.0 = Debug|x64 + {86911E07-C733-4C18-B49F-9A007A651246}.Debug|x86.ActiveCfg = Debug|x86 + {86911E07-C733-4C18-B49F-9A007A651246}.Debug|x86.Build.0 = Debug|x86 + {86911E07-C733-4C18-B49F-9A007A651246}.Release|Any CPU.ActiveCfg = Release|Any CPU + {86911E07-C733-4C18-B49F-9A007A651246}.Release|Any CPU.Build.0 = Release|Any CPU + {86911E07-C733-4C18-B49F-9A007A651246}.Release|x64.ActiveCfg = Release|x64 + {86911E07-C733-4C18-B49F-9A007A651246}.Release|x64.Build.0 = Release|x64 + {86911E07-C733-4C18-B49F-9A007A651246}.Release|x86.ActiveCfg = Release|x86 + {86911E07-C733-4C18-B49F-9A007A651246}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -280,5 +294,6 @@ Global {4D57B6E1-7141-48ED-959E-872BDD4A2F72} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D} {868A630E-C61B-4807-B7A8-7EB53BE1C28A} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D} {9D4D15A1-A25B-44EC-AB63-F1CE9986712E} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D} + {86911E07-C733-4C18-B49F-9A007A651246} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D} EndGlobalSection EndGlobal diff --git a/templates/WebApplicationBasic/WebApplicationBasic.csproj b/templates/WebApplicationBasic/WebApplicationBasic.csproj new file mode 100644 index 00000000..3b7600d7 --- /dev/null +++ b/templates/WebApplicationBasic/WebApplicationBasic.csproj @@ -0,0 +1,41 @@ + + + + netcoreapp1.1 + true + WebApplicationBasic + Exe + WebApplicationBasic + 1.1.0 + $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/templates/WebApplicationBasic/WebApplicationBasic.xproj b/templates/WebApplicationBasic/WebApplicationBasic.xproj deleted file mode 100644 index 40c6b3ab..00000000 --- a/templates/WebApplicationBasic/WebApplicationBasic.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - true - - - - cb4398d6-b7f1-449a-ae02-828769679232 - WebApplicationBasic - .\obj - .\bin\ - v4.5.2 - - - 2.0 - - - \ No newline at end of file diff --git a/templates/WebApplicationBasic/project.json b/templates/WebApplicationBasic/project.json deleted file mode 100755 index bf79137d..00000000 --- a/templates/WebApplicationBasic/project.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - }, - "Microsoft.AspNetCore.Diagnostics": "1.1.0", - "Microsoft.AspNetCore.Mvc": "1.1.0", - "Microsoft.AspNetCore.Razor.Tools": { - "version": "1.0.0-preview2-final", - "type": "build" - }, - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.AspNetCore.StaticFiles": "1.1.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Configuration.CommandLine": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0" - }, - - "tools": { - "Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final", - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final" - }, - - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "dotnet5.6", - "portable-net45+win8" - ] - } - }, - - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true, - "compile": { - "exclude": ["node_modules"] - } - }, - - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - - "publishOptions": { - "include": [ - "appsettings.json", - "Views", - "web.config", - "wwwroot" - ], - "exclude": [ - "wwwroot/dist/*.map" - ] - }, - - "scripts": { - "prepublish": [ - "npm install", - "node node_modules/webpack/bin/webpack.js --config webpack.config.vendor.js", - "node node_modules/webpack/bin/webpack.js" - ], - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - }, - - "tooling": { - "defaultNamespace": "WebApplicationBasic" - } -} From f50a015cfd7050d6c92899a58cd7e8ecd5f64cbc Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 22 Feb 2017 12:19:21 +0000 Subject: [PATCH 09/16] Add template-builder and test dirs to VS solution as "web sites" until there's a better pure front-end project type --- JavaScriptServices.sln | 69 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/JavaScriptServices.sln b/JavaScriptServices.sln index a1daf733..a3fcd66e 100644 --- a/JavaScriptServices.sln +++ b/JavaScriptServices.sln @@ -56,6 +56,49 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactReduxSpa", "templates\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApplicationBasic", "templates\WebApplicationBasic\WebApplicationBasic.csproj", "{86911E07-C733-4C18-B49F-9A007A651246}" EndProject +Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "package-builder", "templates\package-builder\", "{1389D9BF-402E-4639-8573-8340EFB8FBD0}" + ProjectSection(WebsiteProperties) = preProject + TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0" + Debug.AspNetCompiler.VirtualPath = "/localhost_57758" + Debug.AspNetCompiler.PhysicalPath = "templates\package-builder\" + Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_57758\" + Debug.AspNetCompiler.Updateable = "true" + Debug.AspNetCompiler.ForceOverwrite = "true" + Debug.AspNetCompiler.FixedNames = "false" + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.VirtualPath = "/localhost_57758" + Release.AspNetCompiler.PhysicalPath = "templates\package-builder\" + Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_57758\" + Release.AspNetCompiler.Updateable = "true" + Release.AspNetCompiler.ForceOverwrite = "true" + Release.AspNetCompiler.FixedNames = "false" + Release.AspNetCompiler.Debug = "False" + VWDPort = "57758" + SlnRelativePath = "templates\package-builder\" + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{BDE761D9-8E1C-4FB1-BB86-110393C59176}" +EndProject +Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "test", "test\", "{A01B46C2-53D8-499D-8CDE-68E3E7B52804}" + ProjectSection(WebsiteProperties) = preProject + TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0" + Debug.AspNetCompiler.VirtualPath = "/localhost_54430" + Debug.AspNetCompiler.PhysicalPath = "test\" + Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_54430\" + Debug.AspNetCompiler.Updateable = "true" + Debug.AspNetCompiler.ForceOverwrite = "true" + Debug.AspNetCompiler.FixedNames = "false" + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.VirtualPath = "/localhost_54430" + Release.AspNetCompiler.PhysicalPath = "test\" + Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_54430\" + Release.AspNetCompiler.Updateable = "true" + Release.AspNetCompiler.ForceOverwrite = "true" + Release.AspNetCompiler.FixedNames = "false" + Release.AspNetCompiler.Debug = "False" + VWDPort = "54430" + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -270,6 +313,30 @@ Global {86911E07-C733-4C18-B49F-9A007A651246}.Release|x64.Build.0 = Release|x64 {86911E07-C733-4C18-B49F-9A007A651246}.Release|x86.ActiveCfg = Release|x86 {86911E07-C733-4C18-B49F-9A007A651246}.Release|x86.Build.0 = Release|x86 + {1389D9BF-402E-4639-8573-8340EFB8FBD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1389D9BF-402E-4639-8573-8340EFB8FBD0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1389D9BF-402E-4639-8573-8340EFB8FBD0}.Debug|x64.ActiveCfg = Debug|Any CPU + {1389D9BF-402E-4639-8573-8340EFB8FBD0}.Debug|x64.Build.0 = Debug|Any CPU + {1389D9BF-402E-4639-8573-8340EFB8FBD0}.Debug|x86.ActiveCfg = Debug|Any CPU + {1389D9BF-402E-4639-8573-8340EFB8FBD0}.Debug|x86.Build.0 = Debug|Any CPU + {1389D9BF-402E-4639-8573-8340EFB8FBD0}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {1389D9BF-402E-4639-8573-8340EFB8FBD0}.Release|Any CPU.Build.0 = Debug|Any CPU + {1389D9BF-402E-4639-8573-8340EFB8FBD0}.Release|x64.ActiveCfg = Debug|Any CPU + {1389D9BF-402E-4639-8573-8340EFB8FBD0}.Release|x64.Build.0 = Debug|Any CPU + {1389D9BF-402E-4639-8573-8340EFB8FBD0}.Release|x86.ActiveCfg = Debug|Any CPU + {1389D9BF-402E-4639-8573-8340EFB8FBD0}.Release|x86.Build.0 = Debug|Any CPU + {A01B46C2-53D8-499D-8CDE-68E3E7B52804}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A01B46C2-53D8-499D-8CDE-68E3E7B52804}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A01B46C2-53D8-499D-8CDE-68E3E7B52804}.Debug|x64.ActiveCfg = Debug|Any CPU + {A01B46C2-53D8-499D-8CDE-68E3E7B52804}.Debug|x64.Build.0 = Debug|Any CPU + {A01B46C2-53D8-499D-8CDE-68E3E7B52804}.Debug|x86.ActiveCfg = Debug|Any CPU + {A01B46C2-53D8-499D-8CDE-68E3E7B52804}.Debug|x86.Build.0 = Debug|Any CPU + {A01B46C2-53D8-499D-8CDE-68E3E7B52804}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {A01B46C2-53D8-499D-8CDE-68E3E7B52804}.Release|Any CPU.Build.0 = Debug|Any CPU + {A01B46C2-53D8-499D-8CDE-68E3E7B52804}.Release|x64.ActiveCfg = Debug|Any CPU + {A01B46C2-53D8-499D-8CDE-68E3E7B52804}.Release|x64.Build.0 = Debug|Any CPU + {A01B46C2-53D8-499D-8CDE-68E3E7B52804}.Release|x86.ActiveCfg = Debug|Any CPU + {A01B46C2-53D8-499D-8CDE-68E3E7B52804}.Release|x86.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -295,5 +362,7 @@ Global {868A630E-C61B-4807-B7A8-7EB53BE1C28A} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D} {9D4D15A1-A25B-44EC-AB63-F1CE9986712E} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D} {86911E07-C733-4C18-B49F-9A007A651246} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D} + {1389D9BF-402E-4639-8573-8340EFB8FBD0} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D} + {A01B46C2-53D8-499D-8CDE-68E3E7B52804} = {BDE761D9-8E1C-4FB1-BB86-110393C59176} EndGlobalSection EndGlobal From f4e151a739600826dd5919ac13037c60b12b0f08 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 22 Feb 2017 12:22:08 +0000 Subject: [PATCH 10/16] Add missing hint in solution file --- JavaScriptServices.sln | 1 + 1 file changed, 1 insertion(+) diff --git a/JavaScriptServices.sln b/JavaScriptServices.sln index a3fcd66e..8fb263f8 100644 --- a/JavaScriptServices.sln +++ b/JavaScriptServices.sln @@ -97,6 +97,7 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "test", "test\", "{A01B46C2- Release.AspNetCompiler.FixedNames = "false" Release.AspNetCompiler.Debug = "False" VWDPort = "54430" + SlnRelativePath = "test\" EndProjectSection EndProject Global From 7c95f7cab7d29fe9dccf063df9f22c21c73ec568 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 22 Feb 2017 13:02:43 +0000 Subject: [PATCH 11/16] Make sure VS doesn't litter the disk with irrelevant/harmful .js files whenever it sees .ts files --- samples/angular/MusicStore/MusicStore.csproj | 1 + samples/misc/NodeServicesExamples/NodeServicesExamples.csproj | 1 + samples/misc/Webpack/Webpack.csproj | 1 + samples/react/MusicStore/MusicStore.csproj | 1 + samples/react/ReactGrid/ReactGrid.csproj | 1 + .../Microsoft.AspNetCore.AngularServices.csproj | 1 + .../Microsoft.AspNetCore.NodeServices.Sockets.csproj | 1 + .../Microsoft.AspNetCore.NodeServices.csproj | 1 + .../Microsoft.AspNetCore.ReactServices.csproj | 1 + .../Microsoft.AspNetCore.SpaServices.csproj | 1 + templates/WebApplicationBasic/WebApplicationBasic.csproj | 1 + 11 files changed, 11 insertions(+) diff --git a/samples/angular/MusicStore/MusicStore.csproj b/samples/angular/MusicStore/MusicStore.csproj index 5d88535d..c3cbdc8e 100644 --- a/samples/angular/MusicStore/MusicStore.csproj +++ b/samples/angular/MusicStore/MusicStore.csproj @@ -6,6 +6,7 @@ MusicStore Exe 1.1.0 + true diff --git a/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj b/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj index 5201f7ed..42e1ffc9 100644 --- a/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj +++ b/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj @@ -7,6 +7,7 @@ Exe NodeServicesExamples 1.1.0 + true diff --git a/samples/misc/Webpack/Webpack.csproj b/samples/misc/Webpack/Webpack.csproj index 655c405e..88be63af 100644 --- a/samples/misc/Webpack/Webpack.csproj +++ b/samples/misc/Webpack/Webpack.csproj @@ -7,6 +7,7 @@ Exe Webpack 1.1.0 + true diff --git a/samples/react/MusicStore/MusicStore.csproj b/samples/react/MusicStore/MusicStore.csproj index 76b8fc55..c66b39bf 100644 --- a/samples/react/MusicStore/MusicStore.csproj +++ b/samples/react/MusicStore/MusicStore.csproj @@ -7,6 +7,7 @@ Exe MusicStore 1.1.0 + true diff --git a/samples/react/ReactGrid/ReactGrid.csproj b/samples/react/ReactGrid/ReactGrid.csproj index 18cdf9d0..2dac01ad 100644 --- a/samples/react/ReactGrid/ReactGrid.csproj +++ b/samples/react/ReactGrid/ReactGrid.csproj @@ -7,6 +7,7 @@ Exe ReactGrid 1.1.0 + true diff --git a/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj b/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj index a440432b..43006a69 100644 --- a/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj +++ b/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj @@ -19,6 +19,7 @@ false false false + true diff --git a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj index dc3feff6..54ce110a 100644 --- a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj +++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj @@ -19,6 +19,7 @@ false false false + true diff --git a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj index 63e62cb7..4791a706 100644 --- a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj +++ b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj @@ -19,6 +19,7 @@ false false false + true diff --git a/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.csproj b/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.csproj index bc3ea00d..a5f34e3b 100644 --- a/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.csproj +++ b/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.csproj @@ -19,6 +19,7 @@ false false false + true diff --git a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj index 92488660..9cb97cd9 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj +++ b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj @@ -19,6 +19,7 @@ false false false + true diff --git a/templates/WebApplicationBasic/WebApplicationBasic.csproj b/templates/WebApplicationBasic/WebApplicationBasic.csproj index 3b7600d7..1939547c 100644 --- a/templates/WebApplicationBasic/WebApplicationBasic.csproj +++ b/templates/WebApplicationBasic/WebApplicationBasic.csproj @@ -8,6 +8,7 @@ WebApplicationBasic 1.1.0 $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + true From 2c780a425543dc190041f4c96c18a9b3efe049f3 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 23 Feb 2017 12:10:09 +0000 Subject: [PATCH 12/16] Respond to csproj migration code review feedback --- JavaScriptServices.sln | 156 ------------------ global.json | 3 - samples/angular/MusicStore/MusicStore.csproj | 20 +-- samples/misc/LatencyTest/LatencyTest.csproj | 4 +- .../NodeServicesExamples.csproj | 17 +- samples/misc/Webpack/Webpack.csproj | 15 +- samples/react/MusicStore/MusicStore.csproj | 20 +-- samples/react/ReactGrid/ReactGrid.csproj | 13 +- ...icrosoft.AspNetCore.AngularServices.csproj | 25 +-- .../Properties/AssemblyInfo.cs | 12 -- ...oft.AspNetCore.NodeServices.Sockets.csproj | 22 +-- .../Properties/AssemblyInfo.cs | 12 -- .../Microsoft.AspNetCore.NodeServices.csproj | 25 +-- .../Properties/AssemblyInfo.cs | 12 -- .../Microsoft.AspNetCore.ReactServices.csproj | 25 +-- .../Properties/AssemblyInfo.cs | 12 -- .../Microsoft.AspNetCore.SpaServices.csproj | 25 +-- .../Properties/AssemblyInfo.cs | 12 -- src/common.props | 20 +++ templates/Angular2Spa/Angular2Spa.csproj | 2 +- templates/AureliaSpa/AureliaSpa.csproj | 2 +- templates/KnockoutSpa/KnockoutSpa.csproj | 2 +- templates/ReactReduxSpa/ReactReduxSpa.csproj | 2 +- templates/ReactSpa/ReactSpa.csproj | 2 +- .../WebApplicationBasic.csproj | 10 +- 25 files changed, 64 insertions(+), 406 deletions(-) delete mode 100644 global.json delete mode 100644 src/Microsoft.AspNetCore.AngularServices/Properties/AssemblyInfo.cs delete mode 100644 src/Microsoft.AspNetCore.NodeServices.Sockets/Properties/AssemblyInfo.cs delete mode 100644 src/Microsoft.AspNetCore.NodeServices/Properties/AssemblyInfo.cs delete mode 100644 src/Microsoft.AspNetCore.ReactServices/Properties/AssemblyInfo.cs delete mode 100644 src/Microsoft.AspNetCore.SpaServices/Properties/AssemblyInfo.cs create mode 100644 src/common.props diff --git a/JavaScriptServices.sln b/JavaScriptServices.sln index 8fb263f8..92572549 100644 --- a/JavaScriptServices.sln +++ b/JavaScriptServices.sln @@ -103,241 +103,85 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {66B77203-1469-41DF-92F2-2BE6900BD36F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {66B77203-1469-41DF-92F2-2BE6900BD36F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66B77203-1469-41DF-92F2-2BE6900BD36F}.Debug|x64.ActiveCfg = Debug|x64 - {66B77203-1469-41DF-92F2-2BE6900BD36F}.Debug|x64.Build.0 = Debug|x64 - {66B77203-1469-41DF-92F2-2BE6900BD36F}.Debug|x86.ActiveCfg = Debug|x86 - {66B77203-1469-41DF-92F2-2BE6900BD36F}.Debug|x86.Build.0 = Debug|x86 {66B77203-1469-41DF-92F2-2BE6900BD36F}.Release|Any CPU.ActiveCfg = Release|Any CPU {66B77203-1469-41DF-92F2-2BE6900BD36F}.Release|Any CPU.Build.0 = Release|Any CPU - {66B77203-1469-41DF-92F2-2BE6900BD36F}.Release|x64.ActiveCfg = Release|x64 - {66B77203-1469-41DF-92F2-2BE6900BD36F}.Release|x64.Build.0 = Release|x64 - {66B77203-1469-41DF-92F2-2BE6900BD36F}.Release|x86.ActiveCfg = Release|x86 - {66B77203-1469-41DF-92F2-2BE6900BD36F}.Release|x86.Build.0 = Release|x86 {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Debug|x64.ActiveCfg = Debug|x64 - {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Debug|x64.Build.0 = Debug|x64 - {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Debug|x86.ActiveCfg = Debug|x86 - {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Debug|x86.Build.0 = Debug|x86 {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Release|Any CPU.ActiveCfg = Release|Any CPU {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Release|Any CPU.Build.0 = Release|Any CPU - {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Release|x64.ActiveCfg = Release|x64 - {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Release|x64.Build.0 = Release|x64 - {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Release|x86.ActiveCfg = Release|x86 - {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Release|x86.Build.0 = Release|x86 {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Debug|x64.ActiveCfg = Debug|x64 - {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Debug|x64.Build.0 = Debug|x64 - {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Debug|x86.ActiveCfg = Debug|x86 - {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Debug|x86.Build.0 = Debug|x86 {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Release|Any CPU.ActiveCfg = Release|Any CPU {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Release|Any CPU.Build.0 = Release|Any CPU - {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Release|x64.ActiveCfg = Release|x64 - {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Release|x64.Build.0 = Release|x64 - {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Release|x86.ActiveCfg = Release|x86 - {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Release|x86.Build.0 = Release|x86 {58AAABB6-9D21-42F6-BC97-3DD282B55FD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {58AAABB6-9D21-42F6-BC97-3DD282B55FD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58AAABB6-9D21-42F6-BC97-3DD282B55FD6}.Debug|x64.ActiveCfg = Debug|x64 - {58AAABB6-9D21-42F6-BC97-3DD282B55FD6}.Debug|x64.Build.0 = Debug|x64 - {58AAABB6-9D21-42F6-BC97-3DD282B55FD6}.Debug|x86.ActiveCfg = Debug|x86 - {58AAABB6-9D21-42F6-BC97-3DD282B55FD6}.Debug|x86.Build.0 = Debug|x86 {58AAABB6-9D21-42F6-BC97-3DD282B55FD6}.Release|Any CPU.ActiveCfg = Release|Any CPU {58AAABB6-9D21-42F6-BC97-3DD282B55FD6}.Release|Any CPU.Build.0 = Release|Any CPU - {58AAABB6-9D21-42F6-BC97-3DD282B55FD6}.Release|x64.ActiveCfg = Release|x64 - {58AAABB6-9D21-42F6-BC97-3DD282B55FD6}.Release|x64.Build.0 = Release|x64 - {58AAABB6-9D21-42F6-BC97-3DD282B55FD6}.Release|x86.ActiveCfg = Release|x86 - {58AAABB6-9D21-42F6-BC97-3DD282B55FD6}.Release|x86.Build.0 = Release|x86 {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Debug|x64.ActiveCfg = Debug|x64 - {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Debug|x64.Build.0 = Debug|x64 - {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Debug|x86.ActiveCfg = Debug|x86 - {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Debug|x86.Build.0 = Debug|x86 {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Release|Any CPU.ActiveCfg = Release|Any CPU {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Release|Any CPU.Build.0 = Release|Any CPU - {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Release|x64.ActiveCfg = Release|x64 - {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Release|x64.Build.0 = Release|x64 - {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Release|x86.ActiveCfg = Release|x86 - {F1081B9A-8D67-4A5E-80C6-615F9A975D4F}.Release|x86.Build.0 = Release|x86 {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Debug|x64.ActiveCfg = Debug|x64 - {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Debug|x64.Build.0 = Debug|x64 - {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Debug|x86.ActiveCfg = Debug|x86 - {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Debug|x86.Build.0 = Debug|x86 {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Release|Any CPU.ActiveCfg = Release|Any CPU {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Release|Any CPU.Build.0 = Release|Any CPU - {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Release|x64.ActiveCfg = Release|x64 - {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Release|x64.Build.0 = Release|x64 - {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Release|x86.ActiveCfg = Release|x86 - {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Release|x86.Build.0 = Release|x86 {DE479DC3-1461-4EAD-A188-4AF7AA4AE344}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DE479DC3-1461-4EAD-A188-4AF7AA4AE344}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DE479DC3-1461-4EAD-A188-4AF7AA4AE344}.Debug|x64.ActiveCfg = Debug|x64 - {DE479DC3-1461-4EAD-A188-4AF7AA4AE344}.Debug|x64.Build.0 = Debug|x64 - {DE479DC3-1461-4EAD-A188-4AF7AA4AE344}.Debug|x86.ActiveCfg = Debug|x86 - {DE479DC3-1461-4EAD-A188-4AF7AA4AE344}.Debug|x86.Build.0 = Debug|x86 {DE479DC3-1461-4EAD-A188-4AF7AA4AE344}.Release|Any CPU.ActiveCfg = Release|Any CPU {DE479DC3-1461-4EAD-A188-4AF7AA4AE344}.Release|Any CPU.Build.0 = Release|Any CPU - {DE479DC3-1461-4EAD-A188-4AF7AA4AE344}.Release|x64.ActiveCfg = Release|x64 - {DE479DC3-1461-4EAD-A188-4AF7AA4AE344}.Release|x64.Build.0 = Release|x64 - {DE479DC3-1461-4EAD-A188-4AF7AA4AE344}.Release|x86.ActiveCfg = Release|x86 - {DE479DC3-1461-4EAD-A188-4AF7AA4AE344}.Release|x86.Build.0 = Release|x86 {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Debug|x64.ActiveCfg = Debug|x64 - {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Debug|x64.Build.0 = Debug|x64 - {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Debug|x86.ActiveCfg = Debug|x86 - {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Debug|x86.Build.0 = Debug|x86 {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Release|Any CPU.ActiveCfg = Release|Any CPU {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Release|Any CPU.Build.0 = Release|Any CPU - {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Release|x64.ActiveCfg = Release|x64 - {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Release|x64.Build.0 = Release|x64 - {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Release|x86.ActiveCfg = Release|x86 - {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Release|x86.Build.0 = Release|x86 {63FC66E7-559B-4426-93E1-2D951EFC8293}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {63FC66E7-559B-4426-93E1-2D951EFC8293}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63FC66E7-559B-4426-93E1-2D951EFC8293}.Debug|x64.ActiveCfg = Debug|x64 - {63FC66E7-559B-4426-93E1-2D951EFC8293}.Debug|x64.Build.0 = Debug|x64 - {63FC66E7-559B-4426-93E1-2D951EFC8293}.Debug|x86.ActiveCfg = Debug|x86 - {63FC66E7-559B-4426-93E1-2D951EFC8293}.Debug|x86.Build.0 = Debug|x86 {63FC66E7-559B-4426-93E1-2D951EFC8293}.Release|Any CPU.ActiveCfg = Release|Any CPU {63FC66E7-559B-4426-93E1-2D951EFC8293}.Release|Any CPU.Build.0 = Release|Any CPU - {63FC66E7-559B-4426-93E1-2D951EFC8293}.Release|x64.ActiveCfg = Release|x64 - {63FC66E7-559B-4426-93E1-2D951EFC8293}.Release|x64.Build.0 = Release|x64 - {63FC66E7-559B-4426-93E1-2D951EFC8293}.Release|x86.ActiveCfg = Release|x86 - {63FC66E7-559B-4426-93E1-2D951EFC8293}.Release|x86.Build.0 = Release|x86 {3B023106-88DB-4C3A-B01F-C1AECB02D80B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3B023106-88DB-4C3A-B01F-C1AECB02D80B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B023106-88DB-4C3A-B01F-C1AECB02D80B}.Debug|x64.ActiveCfg = Debug|x64 - {3B023106-88DB-4C3A-B01F-C1AECB02D80B}.Debug|x64.Build.0 = Debug|x64 - {3B023106-88DB-4C3A-B01F-C1AECB02D80B}.Debug|x86.ActiveCfg = Debug|x86 - {3B023106-88DB-4C3A-B01F-C1AECB02D80B}.Debug|x86.Build.0 = Debug|x86 {3B023106-88DB-4C3A-B01F-C1AECB02D80B}.Release|Any CPU.ActiveCfg = Release|Any CPU {3B023106-88DB-4C3A-B01F-C1AECB02D80B}.Release|Any CPU.Build.0 = Release|Any CPU - {3B023106-88DB-4C3A-B01F-C1AECB02D80B}.Release|x64.ActiveCfg = Release|x64 - {3B023106-88DB-4C3A-B01F-C1AECB02D80B}.Release|x64.Build.0 = Release|x64 - {3B023106-88DB-4C3A-B01F-C1AECB02D80B}.Release|x86.ActiveCfg = Release|x86 - {3B023106-88DB-4C3A-B01F-C1AECB02D80B}.Release|x86.Build.0 = Release|x86 {6E898586-79CA-4AA8-946E-943B3682F376}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6E898586-79CA-4AA8-946E-943B3682F376}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E898586-79CA-4AA8-946E-943B3682F376}.Debug|x64.ActiveCfg = Debug|x64 - {6E898586-79CA-4AA8-946E-943B3682F376}.Debug|x64.Build.0 = Debug|x64 - {6E898586-79CA-4AA8-946E-943B3682F376}.Debug|x86.ActiveCfg = Debug|x86 - {6E898586-79CA-4AA8-946E-943B3682F376}.Debug|x86.Build.0 = Debug|x86 {6E898586-79CA-4AA8-946E-943B3682F376}.Release|Any CPU.ActiveCfg = Release|Any CPU {6E898586-79CA-4AA8-946E-943B3682F376}.Release|Any CPU.Build.0 = Release|Any CPU - {6E898586-79CA-4AA8-946E-943B3682F376}.Release|x64.ActiveCfg = Release|x64 - {6E898586-79CA-4AA8-946E-943B3682F376}.Release|x64.Build.0 = Release|x64 - {6E898586-79CA-4AA8-946E-943B3682F376}.Release|x86.ActiveCfg = Release|x86 - {6E898586-79CA-4AA8-946E-943B3682F376}.Release|x86.Build.0 = Release|x86 {F60248B1-940E-43FB-BEA0-589362AA6320}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F60248B1-940E-43FB-BEA0-589362AA6320}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F60248B1-940E-43FB-BEA0-589362AA6320}.Debug|x64.ActiveCfg = Debug|x64 - {F60248B1-940E-43FB-BEA0-589362AA6320}.Debug|x64.Build.0 = Debug|x64 - {F60248B1-940E-43FB-BEA0-589362AA6320}.Debug|x86.ActiveCfg = Debug|x86 - {F60248B1-940E-43FB-BEA0-589362AA6320}.Debug|x86.Build.0 = Debug|x86 {F60248B1-940E-43FB-BEA0-589362AA6320}.Release|Any CPU.ActiveCfg = Release|Any CPU {F60248B1-940E-43FB-BEA0-589362AA6320}.Release|Any CPU.Build.0 = Release|Any CPU - {F60248B1-940E-43FB-BEA0-589362AA6320}.Release|x64.ActiveCfg = Release|x64 - {F60248B1-940E-43FB-BEA0-589362AA6320}.Release|x64.Build.0 = Release|x64 - {F60248B1-940E-43FB-BEA0-589362AA6320}.Release|x86.ActiveCfg = Release|x86 - {F60248B1-940E-43FB-BEA0-589362AA6320}.Release|x86.Build.0 = Release|x86 {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}.Debug|x64.ActiveCfg = Debug|x64 - {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}.Debug|x64.Build.0 = Debug|x64 - {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}.Debug|x86.ActiveCfg = Debug|x86 - {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}.Debug|x86.Build.0 = Debug|x86 {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}.Release|Any CPU.ActiveCfg = Release|Any CPU {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}.Release|Any CPU.Build.0 = Release|Any CPU - {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}.Release|x64.ActiveCfg = Release|x64 - {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}.Release|x64.Build.0 = Release|x64 - {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}.Release|x86.ActiveCfg = Release|x86 - {4D4B84C9-13F7-40CA-B05A-DC98FD6019AC}.Release|x86.Build.0 = Release|x86 {4D57B6E1-7141-48ED-959E-872BDD4A2F72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4D57B6E1-7141-48ED-959E-872BDD4A2F72}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D57B6E1-7141-48ED-959E-872BDD4A2F72}.Debug|x64.ActiveCfg = Debug|x64 - {4D57B6E1-7141-48ED-959E-872BDD4A2F72}.Debug|x64.Build.0 = Debug|x64 - {4D57B6E1-7141-48ED-959E-872BDD4A2F72}.Debug|x86.ActiveCfg = Debug|x86 - {4D57B6E1-7141-48ED-959E-872BDD4A2F72}.Debug|x86.Build.0 = Debug|x86 {4D57B6E1-7141-48ED-959E-872BDD4A2F72}.Release|Any CPU.ActiveCfg = Release|Any CPU {4D57B6E1-7141-48ED-959E-872BDD4A2F72}.Release|Any CPU.Build.0 = Release|Any CPU - {4D57B6E1-7141-48ED-959E-872BDD4A2F72}.Release|x64.ActiveCfg = Release|x64 - {4D57B6E1-7141-48ED-959E-872BDD4A2F72}.Release|x64.Build.0 = Release|x64 - {4D57B6E1-7141-48ED-959E-872BDD4A2F72}.Release|x86.ActiveCfg = Release|x86 - {4D57B6E1-7141-48ED-959E-872BDD4A2F72}.Release|x86.Build.0 = Release|x86 {868A630E-C61B-4807-B7A8-7EB53BE1C28A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {868A630E-C61B-4807-B7A8-7EB53BE1C28A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {868A630E-C61B-4807-B7A8-7EB53BE1C28A}.Debug|x64.ActiveCfg = Debug|x64 - {868A630E-C61B-4807-B7A8-7EB53BE1C28A}.Debug|x64.Build.0 = Debug|x64 - {868A630E-C61B-4807-B7A8-7EB53BE1C28A}.Debug|x86.ActiveCfg = Debug|x86 - {868A630E-C61B-4807-B7A8-7EB53BE1C28A}.Debug|x86.Build.0 = Debug|x86 {868A630E-C61B-4807-B7A8-7EB53BE1C28A}.Release|Any CPU.ActiveCfg = Release|Any CPU {868A630E-C61B-4807-B7A8-7EB53BE1C28A}.Release|Any CPU.Build.0 = Release|Any CPU - {868A630E-C61B-4807-B7A8-7EB53BE1C28A}.Release|x64.ActiveCfg = Release|x64 - {868A630E-C61B-4807-B7A8-7EB53BE1C28A}.Release|x64.Build.0 = Release|x64 - {868A630E-C61B-4807-B7A8-7EB53BE1C28A}.Release|x86.ActiveCfg = Release|x86 - {868A630E-C61B-4807-B7A8-7EB53BE1C28A}.Release|x86.Build.0 = Release|x86 {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Debug|x64.ActiveCfg = Debug|x64 - {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Debug|x64.Build.0 = Debug|x64 - {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Debug|x86.ActiveCfg = Debug|x86 - {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Debug|x86.Build.0 = Debug|x86 {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Release|Any CPU.ActiveCfg = Release|Any CPU {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Release|Any CPU.Build.0 = Release|Any CPU - {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Release|x64.ActiveCfg = Release|x64 - {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Release|x64.Build.0 = Release|x64 - {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Release|x86.ActiveCfg = Release|x86 - {9D4D15A1-A25B-44EC-AB63-F1CE9986712E}.Release|x86.Build.0 = Release|x86 {86911E07-C733-4C18-B49F-9A007A651246}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {86911E07-C733-4C18-B49F-9A007A651246}.Debug|Any CPU.Build.0 = Debug|Any CPU - {86911E07-C733-4C18-B49F-9A007A651246}.Debug|x64.ActiveCfg = Debug|x64 - {86911E07-C733-4C18-B49F-9A007A651246}.Debug|x64.Build.0 = Debug|x64 - {86911E07-C733-4C18-B49F-9A007A651246}.Debug|x86.ActiveCfg = Debug|x86 - {86911E07-C733-4C18-B49F-9A007A651246}.Debug|x86.Build.0 = Debug|x86 {86911E07-C733-4C18-B49F-9A007A651246}.Release|Any CPU.ActiveCfg = Release|Any CPU {86911E07-C733-4C18-B49F-9A007A651246}.Release|Any CPU.Build.0 = Release|Any CPU - {86911E07-C733-4C18-B49F-9A007A651246}.Release|x64.ActiveCfg = Release|x64 - {86911E07-C733-4C18-B49F-9A007A651246}.Release|x64.Build.0 = Release|x64 - {86911E07-C733-4C18-B49F-9A007A651246}.Release|x86.ActiveCfg = Release|x86 - {86911E07-C733-4C18-B49F-9A007A651246}.Release|x86.Build.0 = Release|x86 {1389D9BF-402E-4639-8573-8340EFB8FBD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1389D9BF-402E-4639-8573-8340EFB8FBD0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1389D9BF-402E-4639-8573-8340EFB8FBD0}.Debug|x64.ActiveCfg = Debug|Any CPU - {1389D9BF-402E-4639-8573-8340EFB8FBD0}.Debug|x64.Build.0 = Debug|Any CPU - {1389D9BF-402E-4639-8573-8340EFB8FBD0}.Debug|x86.ActiveCfg = Debug|Any CPU - {1389D9BF-402E-4639-8573-8340EFB8FBD0}.Debug|x86.Build.0 = Debug|Any CPU {1389D9BF-402E-4639-8573-8340EFB8FBD0}.Release|Any CPU.ActiveCfg = Debug|Any CPU {1389D9BF-402E-4639-8573-8340EFB8FBD0}.Release|Any CPU.Build.0 = Debug|Any CPU - {1389D9BF-402E-4639-8573-8340EFB8FBD0}.Release|x64.ActiveCfg = Debug|Any CPU - {1389D9BF-402E-4639-8573-8340EFB8FBD0}.Release|x64.Build.0 = Debug|Any CPU - {1389D9BF-402E-4639-8573-8340EFB8FBD0}.Release|x86.ActiveCfg = Debug|Any CPU - {1389D9BF-402E-4639-8573-8340EFB8FBD0}.Release|x86.Build.0 = Debug|Any CPU {A01B46C2-53D8-499D-8CDE-68E3E7B52804}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A01B46C2-53D8-499D-8CDE-68E3E7B52804}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A01B46C2-53D8-499D-8CDE-68E3E7B52804}.Debug|x64.ActiveCfg = Debug|Any CPU - {A01B46C2-53D8-499D-8CDE-68E3E7B52804}.Debug|x64.Build.0 = Debug|Any CPU - {A01B46C2-53D8-499D-8CDE-68E3E7B52804}.Debug|x86.ActiveCfg = Debug|Any CPU - {A01B46C2-53D8-499D-8CDE-68E3E7B52804}.Debug|x86.Build.0 = Debug|Any CPU {A01B46C2-53D8-499D-8CDE-68E3E7B52804}.Release|Any CPU.ActiveCfg = Debug|Any CPU {A01B46C2-53D8-499D-8CDE-68E3E7B52804}.Release|Any CPU.Build.0 = Debug|Any CPU - {A01B46C2-53D8-499D-8CDE-68E3E7B52804}.Release|x64.ActiveCfg = Debug|Any CPU - {A01B46C2-53D8-499D-8CDE-68E3E7B52804}.Release|x64.Build.0 = Debug|Any CPU - {A01B46C2-53D8-499D-8CDE-68E3E7B52804}.Release|x86.ActiveCfg = Debug|Any CPU - {A01B46C2-53D8-499D-8CDE-68E3E7B52804}.Release|x86.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/global.json b/global.json deleted file mode 100644 index 397ac5fc..00000000 --- a/global.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "projects": ["src"] -} \ No newline at end of file diff --git a/samples/angular/MusicStore/MusicStore.csproj b/samples/angular/MusicStore/MusicStore.csproj index c3cbdc8e..60b14425 100644 --- a/samples/angular/MusicStore/MusicStore.csproj +++ b/samples/angular/MusicStore/MusicStore.csproj @@ -2,36 +2,20 @@ netcoreapp1.1 - true - MusicStore - Exe - 1.1.0 true + false - - - PreserveNewest - - - - + - - - - - - - diff --git a/samples/misc/LatencyTest/LatencyTest.csproj b/samples/misc/LatencyTest/LatencyTest.csproj index 954867fa..b4d33f0b 100644 --- a/samples/misc/LatencyTest/LatencyTest.csproj +++ b/samples/misc/LatencyTest/LatencyTest.csproj @@ -1,8 +1,8 @@  - netcoreapp1.0 - Exe + netcoreapp1.1 + false diff --git a/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj b/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj index 42e1ffc9..6c1ba9df 100644 --- a/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj +++ b/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj @@ -1,28 +1,19 @@ - netcoreapp1.0 - true - NodeServicesExamples - Exe - NodeServicesExamples - 1.1.0 + netcoreapp1.1 true + false - - - + + - - - - diff --git a/samples/misc/Webpack/Webpack.csproj b/samples/misc/Webpack/Webpack.csproj index 88be63af..a7c74ba6 100644 --- a/samples/misc/Webpack/Webpack.csproj +++ b/samples/misc/Webpack/Webpack.csproj @@ -1,13 +1,9 @@ - netcoreapp1.0 - true - Webpack - Exe - Webpack - 1.1.0 + netcoreapp1.1 true + false @@ -15,14 +11,9 @@ - - + - - - - diff --git a/samples/react/MusicStore/MusicStore.csproj b/samples/react/MusicStore/MusicStore.csproj index c66b39bf..bd3a2d80 100644 --- a/samples/react/MusicStore/MusicStore.csproj +++ b/samples/react/MusicStore/MusicStore.csproj @@ -1,20 +1,13 @@ - netcoreapp1.0 - true - MusicStore - Exe - MusicStore - 1.1.0 + netcoreapp1.1 true + false - - PreserveNewest - @@ -22,18 +15,11 @@ - + - - - - - - - diff --git a/samples/react/ReactGrid/ReactGrid.csproj b/samples/react/ReactGrid/ReactGrid.csproj index 2dac01ad..a317f3c8 100644 --- a/samples/react/ReactGrid/ReactGrid.csproj +++ b/samples/react/ReactGrid/ReactGrid.csproj @@ -1,13 +1,9 @@ - netcoreapp1.0 - true - ReactGrid - Exe - ReactGrid - 1.1.0 + netcoreapp1.1 true + false @@ -15,9 +11,8 @@ - - - + + diff --git a/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj b/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj index 43006a69..80c4416a 100644 --- a/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj +++ b/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj @@ -1,24 +1,12 @@  + + Helpers for building Angular 2 applications on ASP.NET Core. - 1.1.0-beta2 - net451;netstandard1.6 - true - true - Microsoft.AspNetCore.AngularServices - ../../tools/Key.snk - true - true - Microsoft.AspNetCore.AngularServices + 1.1.0 + beta2 aspnetcore;aspnetcoremvc;nodeservices - git - git://github.com/aspnet/javascriptservices - 1.6.1-* - false - false - false - false true @@ -30,9 +18,4 @@ - - - - - diff --git a/src/Microsoft.AspNetCore.AngularServices/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.AngularServices/Properties/AssemblyInfo.cs deleted file mode 100644 index de407880..00000000 --- a/src/Microsoft.AspNetCore.AngularServices/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,12 +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; -using System.Runtime.CompilerServices; - -[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.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj index 54ce110a..2677c185 100644 --- a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj +++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj @@ -1,24 +1,12 @@  + + Socket-based RPC for Microsoft.AspNetCore.NodeServices - 1.1.0-beta2 - net451;netstandard1.6 - true - true - Microsoft.AspNetCore.NodeServices.Sockets - ../../tools/Key.snk - true - true - Microsoft.AspNetCore.NodeServices.Sockets + 1.1.0 + beta2 aspnetcore;aspnetcoremvc;nodeservices - git - git://github.com/aspnet/javascriptservices - 1.6.1-* - false - false - false - false true @@ -32,8 +20,6 @@ - - diff --git a/src/Microsoft.AspNetCore.NodeServices.Sockets/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.NodeServices.Sockets/Properties/AssemblyInfo.cs deleted file mode 100644 index de407880..00000000 --- a/src/Microsoft.AspNetCore.NodeServices.Sockets/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,12 +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; -using System.Runtime.CompilerServices; - -[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.NodeServices/Microsoft.AspNetCore.NodeServices.csproj b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj index 4791a706..1a2cd760 100644 --- a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj +++ b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj @@ -1,24 +1,12 @@  + + Invoke Node.js modules at runtime in ASP.NET Core applications. - 1.1.1-alpha - net451;netstandard1.6 - true - true - Microsoft.AspNetCore.NodeServices - ../../tools/Key.snk - true - true - Microsoft.AspNetCore.NodeServices + 1.1.1 + alpha aspnetcore;aspnetcoremvc;nodeservices - git - git://github.com/aspnet/javascriptservices - 1.6.1-* - false - false - false - false true @@ -31,11 +19,6 @@ - - - - - diff --git a/src/Microsoft.AspNetCore.NodeServices/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.NodeServices/Properties/AssemblyInfo.cs deleted file mode 100644 index de407880..00000000 --- a/src/Microsoft.AspNetCore.NodeServices/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,12 +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; -using System.Runtime.CompilerServices; - -[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.ReactServices/Microsoft.AspNetCore.ReactServices.csproj b/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.csproj index a5f34e3b..bb7faf78 100644 --- a/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.csproj +++ b/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.csproj @@ -1,24 +1,12 @@  + + Helpers for building React applications on ASP.NET Core. - 1.1.0-beta2 - net451;netstandard1.6 - true - true - Microsoft.AspNetCore.ReactServices - ../../tools/Key.snk - true - true - Microsoft.AspNetCore.ReactServices + 1.1.0 + beta2 aspnetcore;aspnetcoremvc;nodeservices - git - git://github.com/aspnet/javascriptservices - 1.6.1-* - false - false - false - false true @@ -30,9 +18,4 @@ - - - - - diff --git a/src/Microsoft.AspNetCore.ReactServices/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.ReactServices/Properties/AssemblyInfo.cs deleted file mode 100644 index de407880..00000000 --- a/src/Microsoft.AspNetCore.ReactServices/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,12 +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; -using System.Runtime.CompilerServices; - -[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.SpaServices/Microsoft.AspNetCore.SpaServices.csproj b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj index 9cb97cd9..15745a33 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj +++ b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj @@ -1,24 +1,12 @@  + + Helpers for building single-page applications on ASP.NET MVC Core - 1.1.1-alpha - net451;netstandard1.6 - true - true - Microsoft.AspNetCore.SpaServices - ../../tools/Key.snk - true - true - Microsoft.AspNetCore.SpaServices + 1.1.1 + alpha aspnetcore;aspnetcoremvc;nodeservices - git - git://github.com/aspnet/javascriptservices - 1.6.1-* - false - false - false - false true @@ -28,11 +16,6 @@ - - - - - diff --git a/src/Microsoft.AspNetCore.SpaServices/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.SpaServices/Properties/AssemblyInfo.cs deleted file mode 100644 index de407880..00000000 --- a/src/Microsoft.AspNetCore.SpaServices/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,12 +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; -using System.Runtime.CompilerServices; - -[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/common.props b/src/common.props new file mode 100644 index 00000000..bb22d94d --- /dev/null +++ b/src/common.props @@ -0,0 +1,20 @@ + + + net451;netstandard1.6 + 1.6.1-* + true + + ../../tools/Key.snk + true + true + + git + https://github.com/aspnet/javascriptservices + + true + true + true + true + true + + \ No newline at end of file diff --git a/templates/Angular2Spa/Angular2Spa.csproj b/templates/Angular2Spa/Angular2Spa.csproj index 1ae07555..2fb16c25 100644 --- a/templates/Angular2Spa/Angular2Spa.csproj +++ b/templates/Angular2Spa/Angular2Spa.csproj @@ -2,7 +2,7 @@ netcoreapp1.1 true - $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; + false diff --git a/templates/AureliaSpa/AureliaSpa.csproj b/templates/AureliaSpa/AureliaSpa.csproj index c33bf901..db423e26 100644 --- a/templates/AureliaSpa/AureliaSpa.csproj +++ b/templates/AureliaSpa/AureliaSpa.csproj @@ -2,7 +2,7 @@ netcoreapp1.1 true - $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; + false diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/KnockoutSpa/KnockoutSpa.csproj index c33bf901..db423e26 100644 --- a/templates/KnockoutSpa/KnockoutSpa.csproj +++ b/templates/KnockoutSpa/KnockoutSpa.csproj @@ -2,7 +2,7 @@ netcoreapp1.1 true - $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; + false diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/ReactReduxSpa/ReactReduxSpa.csproj index 1ae07555..2fb16c25 100644 --- a/templates/ReactReduxSpa/ReactReduxSpa.csproj +++ b/templates/ReactReduxSpa/ReactReduxSpa.csproj @@ -2,7 +2,7 @@ netcoreapp1.1 true - $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; + false diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/ReactSpa/ReactSpa.csproj index c33bf901..db423e26 100644 --- a/templates/ReactSpa/ReactSpa.csproj +++ b/templates/ReactSpa/ReactSpa.csproj @@ -2,7 +2,7 @@ netcoreapp1.1 true - $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; + false diff --git a/templates/WebApplicationBasic/WebApplicationBasic.csproj b/templates/WebApplicationBasic/WebApplicationBasic.csproj index 1939547c..50bef0da 100644 --- a/templates/WebApplicationBasic/WebApplicationBasic.csproj +++ b/templates/WebApplicationBasic/WebApplicationBasic.csproj @@ -2,20 +2,12 @@ netcoreapp1.1 - true - WebApplicationBasic - Exe - WebApplicationBasic - 1.1.0 - $(PackageTargetFallback);dotnet5.6;portable-net45+win8 true + false - - PreserveNewest - From f125d3f01a0955781520603260de6be60ba23754 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 24 Feb 2017 10:24:25 +0000 Subject: [PATCH 13/16] Add references to Internal.AspNetCore.Sdk. Move build files into "build\" dir for consistency. --- JavaScriptServices.sln | 7 ++++++ NuGet.config | 8 ++++++ NuGet.master.config | 8 ------ pack-local.sh | 23 ------------------ ...icrosoft.AspNetCore.AngularServices.csproj | 3 ++- ...oft.AspNetCore.NodeServices.Sockets.csproj | 3 ++- .../Microsoft.AspNetCore.NodeServices.csproj | 3 ++- .../Microsoft.AspNetCore.ReactServices.csproj | 3 ++- .../Microsoft.AspNetCore.SpaServices.csproj | 3 ++- {tools => src/build}/Key.snk | Bin src/build/common.props | 19 +++++++++++++++ src/common.props | 20 --------------- 12 files changed, 44 insertions(+), 56 deletions(-) create mode 100644 NuGet.config delete mode 100755 NuGet.master.config delete mode 100755 pack-local.sh rename {tools => src/build}/Key.snk (100%) create mode 100644 src/build/common.props delete mode 100644 src/common.props diff --git a/JavaScriptServices.sln b/JavaScriptServices.sln index 92572549..f4c55cc1 100644 --- a/JavaScriptServices.sln +++ b/JavaScriptServices.sln @@ -100,6 +100,12 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "test", "test\", "{A01B46C2- SlnRelativePath = "test\" EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{E415FE14-13B0-469F-836D-95059E6BAA6E}" + ProjectSection(SolutionItems) = preProject + src\build\common.props = src\build\common.props + src\build\Key.snk = src\build\Key.snk + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -209,5 +215,6 @@ Global {86911E07-C733-4C18-B49F-9A007A651246} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D} {1389D9BF-402E-4639-8573-8340EFB8FBD0} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D} {A01B46C2-53D8-499D-8CDE-68E3E7B52804} = {BDE761D9-8E1C-4FB1-BB86-110393C59176} + {E415FE14-13B0-469F-836D-95059E6BAA6E} = {27304DDE-AFB2-4F8B-B765-E3E2F11E886C} EndGlobalSection EndGlobal diff --git a/NuGet.config b/NuGet.config new file mode 100644 index 00000000..6f9f028c --- /dev/null +++ b/NuGet.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/NuGet.master.config b/NuGet.master.config deleted file mode 100755 index 1ff3c9aa..00000000 --- a/NuGet.master.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/pack-local.sh b/pack-local.sh deleted file mode 100755 index 581ee6db..00000000 --- a/pack-local.sh +++ /dev/null @@ -1,23 +0,0 @@ -versionSuffix=$1 -dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -projects=( - ./src/Microsoft.AspNetCore.NodeServices - ./src/Microsoft.AspNetCore.NodeServices.Sockets - ./src/Microsoft.AspNetCore.SpaServices - ./src/Microsoft.AspNetCore.AngularServices - ./src/Microsoft.AspNetCore.ReactServices -) - -if [ -z "$versionSuffix" ]; then - echo "Usage: pack-local.sh " - echo "Example: pack-local.sh beta-000001" - exit 1 -fi - -pushd $dir > /dev/null - -for proj in "${projects[@]}"; do - dotnet pack $proj --version-suffix $versionSuffix -o ./artifacts/ -done - -popd > /dev/null diff --git a/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj b/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj index 80c4416a..67817e92 100644 --- a/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj +++ b/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj @@ -1,9 +1,10 @@  - + Helpers for building Angular 2 applications on ASP.NET Core. + net451;netstandard1.6 1.1.0 beta2 aspnetcore;aspnetcoremvc;nodeservices diff --git a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj index 2677c185..6898f328 100644 --- a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj +++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj @@ -1,9 +1,10 @@  - + Socket-based RPC for Microsoft.AspNetCore.NodeServices + net451;netstandard1.6 1.1.0 beta2 aspnetcore;aspnetcoremvc;nodeservices diff --git a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj index 1a2cd760..cf3629f7 100644 --- a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj +++ b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj @@ -1,9 +1,10 @@  - + Invoke Node.js modules at runtime in ASP.NET Core applications. + net451;netstandard1.6 1.1.1 alpha aspnetcore;aspnetcoremvc;nodeservices diff --git a/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.csproj b/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.csproj index bb7faf78..9b8d04f9 100644 --- a/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.csproj +++ b/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.csproj @@ -1,9 +1,10 @@  - + Helpers for building React applications on ASP.NET Core. + net451;netstandard1.6 1.1.0 beta2 aspnetcore;aspnetcoremvc;nodeservices diff --git a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj index 15745a33..f4955ae1 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj +++ b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj @@ -1,9 +1,10 @@  - + Helpers for building single-page applications on ASP.NET MVC Core + net451;netstandard1.6 1.1.1 alpha aspnetcore;aspnetcoremvc;nodeservices diff --git a/tools/Key.snk b/src/build/Key.snk similarity index 100% rename from tools/Key.snk rename to src/build/Key.snk diff --git a/src/build/common.props b/src/build/common.props new file mode 100644 index 00000000..2c73df14 --- /dev/null +++ b/src/build/common.props @@ -0,0 +1,19 @@ + + + Microsoft ASP.NET Core + https://github.com/aspnet/javascriptservices + git + $(MSBuildThisFileDirectory)Key.snk + true + true + + + + 1.6.1-* + true + + + + + + \ No newline at end of file diff --git a/src/common.props b/src/common.props deleted file mode 100644 index bb22d94d..00000000 --- a/src/common.props +++ /dev/null @@ -1,20 +0,0 @@ - - - net451;netstandard1.6 - 1.6.1-* - true - - ../../tools/Key.snk - true - true - - git - https://github.com/aspnet/javascriptservices - - true - true - true - true - true - - \ No newline at end of file From 45a64602525b1bce249a60782c1729550e889d63 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 24 Feb 2017 10:29:43 +0000 Subject: [PATCH 14/16] Remove unnecessary `Exclude` attributes as per CR feedback --- .../Microsoft.AspNetCore.NodeServices.Sockets.csproj | 2 +- .../Microsoft.AspNetCore.NodeServices.csproj | 2 +- .../Microsoft.AspNetCore.SpaServices.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj index 6898f328..d6639ab2 100644 --- a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj +++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj index cf3629f7..bed6d1b6 100644 --- a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj +++ b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj index f4955ae1..a8f48165 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj +++ b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj @@ -12,7 +12,7 @@ - + From 0429fbf857129df97e163a3149adb31a74e4bbfc Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 24 Feb 2017 10:33:05 +0000 Subject: [PATCH 15/16] Only reference released versions of ASP.NET Core packages --- NuGet.config | 1 - 1 file changed, 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 6f9f028c..df0491be 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,7 +1,6 @@  - From d0c3e81f29da254f658620640a4090837c1659f0 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 28 Feb 2017 09:14:48 +0000 Subject: [PATCH 16/16] End package descriptions with periods --- .../Microsoft.AspNetCore.NodeServices.Sockets.csproj | 2 +- .../Microsoft.AspNetCore.SpaServices.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj index d6639ab2..067a5905 100644 --- a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj +++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj @@ -3,7 +3,7 @@ - Socket-based RPC for Microsoft.AspNetCore.NodeServices + Socket-based RPC for Microsoft.AspNetCore.NodeServices. net451;netstandard1.6 1.1.0 beta2 diff --git a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj index a8f48165..2b829f86 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj +++ b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj @@ -3,7 +3,7 @@ - Helpers for building single-page applications on ASP.NET MVC Core + Helpers for building single-page applications on ASP.NET MVC Core. net451;netstandard1.6 1.1.1 alpha