From de87d971dd81c4c6fece1b91f0870d80969b928a Mon Sep 17 00:00:00 2001 From: nezroy Date: Thu, 16 Apr 2015 23:57:30 -0600 Subject: [PATCH] split sample project into naked and CWM samples --- CityWebServer.sln | 8 +- .../Properties/AssemblyInfo.cs | 6 +- .../SampleCityWebMod.csproj | 4 +- .../SampleRequestHandler.cs | 2 +- .../UserModInfo.cs | 10 +-- .../Properties/AssemblyInfo.cs | 34 +++++++++ .../SampleNakedHandlerMod.csproj | 73 +++++++++++++++++++ SampleNakedHandlerMod/SampleRequestHandler.cs | 23 ++++++ SampleNakedHandlerMod/UserModInfo.cs | 19 +++++ 9 files changed, 167 insertions(+), 12 deletions(-) rename {SampleWebServerExtension => SampleCityWebMod}/Properties/AssemblyInfo.cs (87%) rename SampleWebServerExtension/SampleWebServerExtension.csproj => SampleCityWebMod/SampleCityWebMod.csproj (96%) rename {SampleWebServerExtension => SampleCityWebMod}/SampleRequestHandler.cs (93%) rename {SampleWebServerExtension => SampleCityWebMod}/UserModInfo.cs (79%) create mode 100644 SampleNakedHandlerMod/Properties/AssemblyInfo.cs create mode 100644 SampleNakedHandlerMod/SampleNakedHandlerMod.csproj create mode 100644 SampleNakedHandlerMod/SampleRequestHandler.cs create mode 100644 SampleNakedHandlerMod/UserModInfo.cs diff --git a/CityWebServer.sln b/CityWebServer.sln index a1e90ff..9898c04 100644 --- a/CityWebServer.sln +++ b/CityWebServer.sln @@ -7,7 +7,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CityWebServer", "CityWebSer EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CityWebServer.Extensibility", "CityWebServer.Extensibility\CityWebServer.Extensibility.csproj", "{DB96EFB4-FA45-4ACC-8D51-7ED37065CC79}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleWebServerExtension", "SampleWebServerExtension\SampleWebServerExtension.csproj", "{7DF15DF6-C475-4866-9111-F5150C1336E1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleNakedHandlerMod", "SampleNakedHandlerMod\SampleNakedHandlerMod.csproj", "{671CB9E5-3EFD-4466-935E-1BF58470296F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleCityWebMod", "SampleCityWebMod\SampleCityWebMod.csproj", "{7DF15DF6-C475-4866-9111-F5150C1336E1}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -23,6 +25,10 @@ Global {DB96EFB4-FA45-4ACC-8D51-7ED37065CC79}.Debug|Any CPU.Build.0 = Debug|Any CPU {DB96EFB4-FA45-4ACC-8D51-7ED37065CC79}.Release|Any CPU.ActiveCfg = Release|Any CPU {DB96EFB4-FA45-4ACC-8D51-7ED37065CC79}.Release|Any CPU.Build.0 = Release|Any CPU + {671CB9E5-3EFD-4466-935E-1BF58470296F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {671CB9E5-3EFD-4466-935E-1BF58470296F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {671CB9E5-3EFD-4466-935E-1BF58470296F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {671CB9E5-3EFD-4466-935E-1BF58470296F}.Release|Any CPU.Build.0 = Release|Any CPU {7DF15DF6-C475-4866-9111-F5150C1336E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7DF15DF6-C475-4866-9111-F5150C1336E1}.Debug|Any CPU.Build.0 = Debug|Any CPU {7DF15DF6-C475-4866-9111-F5150C1336E1}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/SampleWebServerExtension/Properties/AssemblyInfo.cs b/SampleCityWebMod/Properties/AssemblyInfo.cs similarity index 87% rename from SampleWebServerExtension/Properties/AssemblyInfo.cs rename to SampleCityWebMod/Properties/AssemblyInfo.cs index bb65233..051b4be 100644 --- a/SampleWebServerExtension/Properties/AssemblyInfo.cs +++ b/SampleCityWebMod/Properties/AssemblyInfo.cs @@ -4,11 +4,11 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("SampleWebServerExtension")] +[assembly: AssemblyTitle("SampleCityWebMod")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("SampleWebServerExtension")] +[assembly: AssemblyProduct("SampleCityWebMod")] [assembly: AssemblyCopyright("Copyright © 2015")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -19,7 +19,7 @@ [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("4f860aa2-80ae-427e-b9ea-b31b40d67d8a")] +[assembly: Guid("f256642a-950b-4950-a608-ce6891954c29")] // Version information for an assembly consists of the following four values: // diff --git a/SampleWebServerExtension/SampleWebServerExtension.csproj b/SampleCityWebMod/SampleCityWebMod.csproj similarity index 96% rename from SampleWebServerExtension/SampleWebServerExtension.csproj rename to SampleCityWebMod/SampleCityWebMod.csproj index 4753e17..40f1584 100644 --- a/SampleWebServerExtension/SampleWebServerExtension.csproj +++ b/SampleCityWebMod/SampleCityWebMod.csproj @@ -7,8 +7,8 @@ {7DF15DF6-C475-4866-9111-F5150C1336E1} Library Properties - SampleWebServerExtension - SampleWebServerExtension + SampleCityWebMod + SampleCityWebMod v3.5 512 diff --git a/SampleWebServerExtension/SampleRequestHandler.cs b/SampleCityWebMod/SampleRequestHandler.cs similarity index 93% rename from SampleWebServerExtension/SampleRequestHandler.cs rename to SampleCityWebMod/SampleRequestHandler.cs index b700108..ec341ae 100644 --- a/SampleWebServerExtension/SampleRequestHandler.cs +++ b/SampleCityWebMod/SampleRequestHandler.cs @@ -3,7 +3,7 @@ using CityWebServer.Extensibility; using JetBrains.Annotations; -namespace SampleWebServerExtension +namespace SampleCityWebMod { [UsedImplicitly] public class SampleRequestHandler : RequestHandlerBase diff --git a/SampleWebServerExtension/UserModInfo.cs b/SampleCityWebMod/UserModInfo.cs similarity index 79% rename from SampleWebServerExtension/UserModInfo.cs rename to SampleCityWebMod/UserModInfo.cs index 4839878..02d91fa 100644 --- a/SampleWebServerExtension/UserModInfo.cs +++ b/SampleCityWebMod/UserModInfo.cs @@ -3,28 +3,28 @@ using ICities; using CityWebServer.Extensibility; -namespace SampleWebServerExtension +namespace SampleCityWebMod { public class UserModInfo : IUserMod, ICityWebMod { public String Name { - get { return "Sample Web Server Extension"; } + get { return "CityWebServer - Sample CityWebMod"; } } public String ModName { - get { return "Sample Extension"; } + get { return "Sample CWM"; } } public String ModAuthor { - get { return "Rychard"; } + get { return "nezroy"; } } public String ModID { - get { return "sample"; } + get { return "samplecwm"; } } public String Description diff --git a/SampleNakedHandlerMod/Properties/AssemblyInfo.cs b/SampleNakedHandlerMod/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..3391bb0 --- /dev/null +++ b/SampleNakedHandlerMod/Properties/AssemblyInfo.cs @@ -0,0 +1,34 @@ +using System.Reflection; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("SampleNakedHandlerMod")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("SampleNakedHandlerMod")] +[assembly: AssemblyCopyright("Copyright © 2015")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("5ae91567-7726-4730-a8a1-8bebf725b9a0")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.*")] \ No newline at end of file diff --git a/SampleNakedHandlerMod/SampleNakedHandlerMod.csproj b/SampleNakedHandlerMod/SampleNakedHandlerMod.csproj new file mode 100644 index 0000000..09bf354 --- /dev/null +++ b/SampleNakedHandlerMod/SampleNakedHandlerMod.csproj @@ -0,0 +1,73 @@ + + + + + Debug + AnyCPU + {671CB9E5-3EFD-4466-935E-1BF58470296F} + Library + Properties + SampleNakedHandlerMod + SampleNakedHandlerMod + v3.5 + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\ICities.dll + + + + + + + + + False + ..\UnityEngine.dll + + + + + + + + + + {db96efb4-fa45-4acc-8d51-7ed37065cc79} + CityWebServer.Extensibility + + + + + mkdir "%25LOCALAPPDATA%25\Colossal Order\Cities_Skylines\Addons\Mods\$(SolutionName)_$(ProjectName)" + +del "%25LOCALAPPDATA%25\Colossal Order\Cities_Skylines\Addons\Mods\$(SolutionName)_$(ProjectName)\$(TargetFileName)" + +xcopy /Y "$(TargetPath)" "%25LOCALAPPDATA%25\Colossal Order\Cities_Skylines\Addons\Mods\$(SolutionName)_$(ProjectName)" + + + \ No newline at end of file diff --git a/SampleNakedHandlerMod/SampleRequestHandler.cs b/SampleNakedHandlerMod/SampleRequestHandler.cs new file mode 100644 index 0000000..d5a110c --- /dev/null +++ b/SampleNakedHandlerMod/SampleRequestHandler.cs @@ -0,0 +1,23 @@ +using System; +using System.Net; +using CityWebServer.Extensibility; +using JetBrains.Annotations; + +namespace SampleNakedHandlerMod +{ + [UsedImplicitly] + public class SampleRequestHandler : RequestHandlerBase + { + public SampleRequestHandler(IWebServer server) + : base(server, "Sample Naked Handler", "Rychard", 100, "/samplenaked") + { + } + + public override IResponseFormatter Handle(HttpListenerRequest request, String slug, String wwwroot) + { + const String content = "This is a sample page!"; + + return HtmlResponse(content); + } + } +} \ No newline at end of file diff --git a/SampleNakedHandlerMod/UserModInfo.cs b/SampleNakedHandlerMod/UserModInfo.cs new file mode 100644 index 0000000..f34aa54 --- /dev/null +++ b/SampleNakedHandlerMod/UserModInfo.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using ICities; + +namespace SampleNakedHandlerMod +{ + public class UserModInfo : IUserMod + { + public String Name + { + get { return "CityWebServer - Sample Naked Handler Mod"; } + } + + public String Description + { + get { return "Adds a sample page to the integrated web server. Doesn't do anything without it!"; } + } + } +} \ No newline at end of file