From 5dfca955b3400c1d0149c05596ed4c525bb79cfd Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Wed, 5 Aug 2015 12:12:39 -0700 Subject: [PATCH] Move GeneratedCode project so no NuGet package gets created --- KestrelHttpServer.sln | 7 +++++-- src/Microsoft.AspNet.Server.Kestrel/project.json | 4 ++-- .../KnownHeaders.cs | 0 .../Microsoft.AspNet.Server.Kestrel.GeneratedCode.xproj | 0 .../Program.cs | 0 .../project.json | 5 ----- 6 files changed, 7 insertions(+), 9 deletions(-) rename {src => tools}/Microsoft.AspNet.Server.Kestrel.GeneratedCode/KnownHeaders.cs (100%) rename {src => tools}/Microsoft.AspNet.Server.Kestrel.GeneratedCode/Microsoft.AspNet.Server.Kestrel.GeneratedCode.xproj (100%) rename {src => tools}/Microsoft.AspNet.Server.Kestrel.GeneratedCode/Program.cs (100%) rename {src => tools}/Microsoft.AspNet.Server.Kestrel.GeneratedCode/project.json (81%) diff --git a/KestrelHttpServer.sln b/KestrelHttpServer.sln index 207aa84895..4758d52998 100644 --- a/KestrelHttpServer.sln +++ b/KestrelHttpServer.sln @@ -26,7 +26,10 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{8A3D00B8-1CCF-4BE6-A060-11104CE2D9CE}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "LargeResponseApp", "samples\LargeResponseApp\LargeResponseApp.xproj", "{B35D4D31-E74C-4646-8A11-7A7A40F0021E}" -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Server.Kestrel.GeneratedCode", "src\Microsoft.AspNet.Server.Kestrel.GeneratedCode\Microsoft.AspNet.Server.Kestrel.GeneratedCode.xproj", "{BD2D4D29-1BD9-40D0-BB31-337D5416B63C}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Server.Kestrel.GeneratedCode", "tools\Microsoft.AspNet.Server.Kestrel.GeneratedCode\Microsoft.AspNet.Server.Kestrel.GeneratedCode.xproj", "{BD2D4D29-1BD9-40D0-BB31-337D5416B63C}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{327F7880-D9AF-46BD-B45C-3B7E34A01DFD}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -68,6 +71,6 @@ Global {2C3CB3DC-EEBF-4F52-9E1C-4F2F972E76C3} = {8A3D00B8-1CCF-4BE6-A060-11104CE2D9CE} {30B7617E-58EF-4382-B3EA-5B2E718CF1A6} = {2D5D5227-4DBD-499A-96B1-76A36B03B750} {B35D4D31-E74C-4646-8A11-7A7A40F0021E} = {8A3D00B8-1CCF-4BE6-A060-11104CE2D9CE} - {BD2D4D29-1BD9-40D0-BB31-337D5416B63C} = {2D5D5227-4DBD-499A-96B1-76A36B03B750} + {BD2D4D29-1BD9-40D0-BB31-337D5416B63C} = {327F7880-D9AF-46BD-B45C-3B7E34A01DFD} EndGlobalSection EndGlobal diff --git a/src/Microsoft.AspNet.Server.Kestrel/project.json b/src/Microsoft.AspNet.Server.Kestrel/project.json index 067079aaec..2a36031520 100644 --- a/src/Microsoft.AspNet.Server.Kestrel/project.json +++ b/src/Microsoft.AspNet.Server.Kestrel/project.json @@ -35,8 +35,8 @@ }, "scripts": { "prepare": [ - "dnu restore ../Microsoft.AspNet.Server.Kestrel.GeneratedCode", - "dnx --appbase ../Microsoft.AspNet.Server.Kestrel.GeneratedCode Microsoft.Dnx.ApplicationHost run Http/FrameHeaders.Generated.cs" + "dnu restore ../../tools/Microsoft.AspNet.Server.Kestrel.GeneratedCode", + "dnx --appbase ../../tools/Microsoft.AspNet.Server.Kestrel.GeneratedCode Microsoft.Dnx.ApplicationHost run Http/FrameHeaders.Generated.cs" ] } } diff --git a/src/Microsoft.AspNet.Server.Kestrel.GeneratedCode/KnownHeaders.cs b/tools/Microsoft.AspNet.Server.Kestrel.GeneratedCode/KnownHeaders.cs similarity index 100% rename from src/Microsoft.AspNet.Server.Kestrel.GeneratedCode/KnownHeaders.cs rename to tools/Microsoft.AspNet.Server.Kestrel.GeneratedCode/KnownHeaders.cs diff --git a/src/Microsoft.AspNet.Server.Kestrel.GeneratedCode/Microsoft.AspNet.Server.Kestrel.GeneratedCode.xproj b/tools/Microsoft.AspNet.Server.Kestrel.GeneratedCode/Microsoft.AspNet.Server.Kestrel.GeneratedCode.xproj similarity index 100% rename from src/Microsoft.AspNet.Server.Kestrel.GeneratedCode/Microsoft.AspNet.Server.Kestrel.GeneratedCode.xproj rename to tools/Microsoft.AspNet.Server.Kestrel.GeneratedCode/Microsoft.AspNet.Server.Kestrel.GeneratedCode.xproj diff --git a/src/Microsoft.AspNet.Server.Kestrel.GeneratedCode/Program.cs b/tools/Microsoft.AspNet.Server.Kestrel.GeneratedCode/Program.cs similarity index 100% rename from src/Microsoft.AspNet.Server.Kestrel.GeneratedCode/Program.cs rename to tools/Microsoft.AspNet.Server.Kestrel.GeneratedCode/Program.cs diff --git a/src/Microsoft.AspNet.Server.Kestrel.GeneratedCode/project.json b/tools/Microsoft.AspNet.Server.Kestrel.GeneratedCode/project.json similarity index 81% rename from src/Microsoft.AspNet.Server.Kestrel.GeneratedCode/project.json rename to tools/Microsoft.AspNet.Server.Kestrel.GeneratedCode/project.json index 31f0818def..bfcbc212b3 100644 --- a/src/Microsoft.AspNet.Server.Kestrel.GeneratedCode/project.json +++ b/tools/Microsoft.AspNet.Server.Kestrel.GeneratedCode/project.json @@ -1,10 +1,5 @@ { "version": "1.0.0-*", - "description": "", - "authors": [ "" ], - "tags": [ "" ], - "projectUrl": "", - "licenseUrl": "", "dependencies": { "Microsoft.Dnx.Compilation.CSharp.Abstractions": "1.0.0-*"