diff --git a/appveyor.yml b/appveyor.yml index bcadda4a23..1c3cc40930 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,6 +22,7 @@ cache: - C:\ProgramData\chocolatey\lib -> appveyor.yml install: - choco install fciv doxygen.portable codecov + - nuget restore tgstation-server.sln build: project: tgstation-server.sln parallel: false @@ -35,7 +36,13 @@ after_build: test_script: - set path=%ProgramFiles(x86)%\Microsoft Visual Studio\2017\TestAgent\Common7\IDE\CommonExtensions\Microsoft\TestWindow;%path% - copy "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Extensions\appveyor.*" "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\TestAgent\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Extensions" /y - - vstest.console /logger:trx;LogFileName=results.trx "src\Tgstation.Server.Host.Console.Tests\bin\Release\netcoreapp2.1\Tgstation.Server.Host.Console.Tests.dll" /Enablecodecoverage /Settings:"Tools/CoverageExclusions.runsettings" /inIsolation /Platform:x64 + - vstest.console /logger:trx;LogFileName=results.trx "src\Tgstation.Server.Api.Tests\bin\%CONFIGURATION%\netcoreapp2.1\Tgstation.Server.Api.Tests.dll" /Enablecodecoverage /inIsolation /Platform:x64 + - vstest.console /logger:trx;LogFileName=results.trx "src\Tgstation.Server.Client.Tests\bin\%CONFIGURATION%\netcoreapp2.1\Tgstation.Server.Client.Tests.dll" /Enablecodecoverage /inIsolation /Platform:x64 + - vstest.console /logger:trx;LogFileName=results.trx "src\Tgstation.Server.CommandLine.Tests\bin\%CONFIGURATION%\netcoreapp2.1\Tgstation.Server.CommandLine.Tests.dll" /Enablecodecoverage /inIsolation /Platform:x64 + - vstest.console /logger:trx;LogFileName=results.trx "src\Tgstation.Server.Host.Tests\bin\%CONFIGURATION%\netcoreapp2.1\Tgstation.Server.Host.Tests.dll" /Enablecodecoverage /inIsolation /Platform:x64 + - vstest.console /logger:trx;LogFileName=results.trx "src\Tgstation.Server.Host.Console.Tests\bin\%CONFIGURATION%\netcoreapp2.1\Tgstation.Server.Host.Console.Tests.dll" /Enablecodecoverage /inIsolation /Platform:x64 + - vstest.console /logger:trx;LogFileName=results.trx "src\Tgstation.Server.Host.Service.Tests\bin\%CONFIGURATION%\Tgstation.Server.Host.Service.Tests.dll" /Enablecodecoverage /inIsolation /Platform:x64 + - vstest.console /logger:trx;LogFileName=results.trx "src\Tgstation.Server.ControlPanel.Tests\bin\%CONFIGURATION%\Tgstation.Server.ControlPanel.Tests.dll" /Enablecodecoverage /inIsolation /Platform:x64 - ps: $wc = New-Object 'System.Net.WebClient' - ps: $wc.UploadFile("https://ci.appveyor.com/api/testresults/mstest/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\TestResults\results.trx)) after_test: diff --git a/build/tgs.ico b/build/tgs.ico new file mode 100644 index 0000000000..6ed69fadfc Binary files /dev/null and b/build/tgs.ico differ diff --git a/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj b/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj new file mode 100644 index 0000000000..e9c7a313a0 --- /dev/null +++ b/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj @@ -0,0 +1,22 @@ + + + + netstandard2.0 + + + + latest + true + + bin\Release\netstandard2.0\Tgstation.Server.Api.xml + + + + latest + + + + + + + diff --git a/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj b/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj new file mode 100644 index 0000000000..c5553e1517 --- /dev/null +++ b/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj @@ -0,0 +1,34 @@ + + + + netstandard2.0 + 4.0.0.0 + false + Cyberboss + /tg/station 13 + + Client library for tgstation-server + https://tgstation.github.io/tgstation-server + https://github.com/tgstation/tgstation-server + Git + en-CA + https://raw.githubusercontent.com/tgstation/tgstation-server/master/build/tgs.ico + https://github.com/tgstation/tgstation-server/blob/master/LICENSE + + + + latest + true + + bin\Release\netstandard2.0\Tgstation.Server.Client.xml + + + + latest + + + + + + + diff --git a/src/Tgstation.Server.CommandLine/Program.cs b/src/Tgstation.Server.CommandLine/Program.cs new file mode 100644 index 0000000000..669d070b67 --- /dev/null +++ b/src/Tgstation.Server.CommandLine/Program.cs @@ -0,0 +1,17 @@ +using System.Threading.Tasks; + +namespace Tgstation.Server.CommandLine +{ + /// + /// Contains the entrypoint for the application + /// + public static class Program + { + /// + /// Entrypoint for the application + /// + /// The command line arguments for the application + /// A representing the running operation + public static Task Main(string[] args) => Task.CompletedTask; + } +} diff --git a/src/Tgstation.Server.CommandLine/Tgstation.Server.CommandLine.csproj b/src/Tgstation.Server.CommandLine/Tgstation.Server.CommandLine.csproj new file mode 100644 index 0000000000..1e5abf7f56 --- /dev/null +++ b/src/Tgstation.Server.CommandLine/Tgstation.Server.CommandLine.csproj @@ -0,0 +1,27 @@ + + + + Exe + netcoreapp2.0 + + + + latest + bin\Release\netcoreapp2.0\Tgstation.Server.CommandLine.xml + true + + + + + latest + + + + + + + + + + + diff --git a/src/Tgstation.Server.ControlPanel/App.config b/src/Tgstation.Server.ControlPanel/App.config new file mode 100644 index 0000000000..787dcbecc6 --- /dev/null +++ b/src/Tgstation.Server.ControlPanel/App.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/Tgstation.Server.ControlPanel/App.xaml b/src/Tgstation.Server.ControlPanel/App.xaml new file mode 100644 index 0000000000..88756359fb --- /dev/null +++ b/src/Tgstation.Server.ControlPanel/App.xaml @@ -0,0 +1,9 @@ + + + + + diff --git a/src/Tgstation.Server.ControlPanel/App.xaml.cs b/src/Tgstation.Server.ControlPanel/App.xaml.cs new file mode 100644 index 0000000000..64dd7ac70c --- /dev/null +++ b/src/Tgstation.Server.ControlPanel/App.xaml.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Configuration; +using System.Data; +using System.Linq; +using System.Threading.Tasks; +using System.Windows; + +namespace Tgstation.Server.ControlPanel +{ + /// + /// Interaction logic for App.xaml + /// + sealed partial class App : Application + { + } +} diff --git a/src/Tgstation.Server.ControlPanel/GlobalSuppressions.cs b/src/Tgstation.Server.ControlPanel/GlobalSuppressions.cs new file mode 100644 index 0000000000..abaff863e7 Binary files /dev/null and b/src/Tgstation.Server.ControlPanel/GlobalSuppressions.cs differ diff --git a/src/Tgstation.Server.ControlPanel/MainWindow.xaml b/src/Tgstation.Server.ControlPanel/MainWindow.xaml new file mode 100644 index 0000000000..c2e27d3e3d --- /dev/null +++ b/src/Tgstation.Server.ControlPanel/MainWindow.xaml @@ -0,0 +1,12 @@ + + + + + diff --git a/src/Tgstation.Server.ControlPanel/MainWindow.xaml.cs b/src/Tgstation.Server.ControlPanel/MainWindow.xaml.cs new file mode 100644 index 0000000000..93f05f280f --- /dev/null +++ b/src/Tgstation.Server.ControlPanel/MainWindow.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Tgstation.Server.ControlPanel +{ + /// + /// Interaction logic for MainWindow.xaml + /// + sealed partial class MainWindow : Window + { + public MainWindow() + { + InitializeComponent(); + } + } +} diff --git a/src/Tgstation.Server.ControlPanel/Properties/AssemblyInfo.cs b/src/Tgstation.Server.ControlPanel/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..101764093f --- /dev/null +++ b/src/Tgstation.Server.ControlPanel/Properties/AssemblyInfo.cs @@ -0,0 +1,26 @@ +using System; +using System.Reflection; +using System.Resources; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Windows; + +[assembly: AssemblyTitle("Tgstation.Server.ControlPanel")] +[assembly: InternalsVisibleTo("Tgstation.Server.ControlPanel.Tests")] +[assembly: ComVisible(false)] +[assembly: CLSCompliant(true)] +[assembly: NeutralResourcesLanguage("en-CA", UltimateResourceFallbackLocation.Satellite)] + + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] + +[assembly: AssemblyVersion("4.0.0.0")] +[assembly: AssemblyFileVersion("4.0.0.0")] +[assembly: AssemblyInformationalVersion("4.0.0.0")] diff --git a/src/Tgstation.Server.ControlPanel/Properties/Resources.Designer.cs b/src/Tgstation.Server.ControlPanel/Properties/Resources.Designer.cs new file mode 100644 index 0000000000..6b8d38cdb3 --- /dev/null +++ b/src/Tgstation.Server.ControlPanel/Properties/Resources.Designer.cs @@ -0,0 +1,71 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tgstation.Server.ControlPanel.Properties +{ + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources + { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() + { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager + { + get + { + if ((resourceMan == null)) + { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Tgstation.Server.ControlPanel.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture + { + get + { + return resourceCulture; + } + set + { + resourceCulture = value; + } + } + } +} diff --git a/src/Tgstation.Server.ControlPanel/Properties/Resources.resx b/src/Tgstation.Server.ControlPanel/Properties/Resources.resx new file mode 100644 index 0000000000..af7dbebbac --- /dev/null +++ b/src/Tgstation.Server.ControlPanel/Properties/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/src/Tgstation.Server.ControlPanel/Properties/Settings.Designer.cs b/src/Tgstation.Server.ControlPanel/Properties/Settings.Designer.cs new file mode 100644 index 0000000000..5ed0707325 --- /dev/null +++ b/src/Tgstation.Server.ControlPanel/Properties/Settings.Designer.cs @@ -0,0 +1,30 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tgstation.Server.ControlPanel.Properties +{ + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase + { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default + { + get + { + return defaultInstance; + } + } + } +} diff --git a/src/Tgstation.Server.ControlPanel/Properties/Settings.settings b/src/Tgstation.Server.ControlPanel/Properties/Settings.settings new file mode 100644 index 0000000000..033d7a5e9e --- /dev/null +++ b/src/Tgstation.Server.ControlPanel/Properties/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/Tgstation.Server.ControlPanel/Tgstation.Server.ControlPanel.csproj b/src/Tgstation.Server.ControlPanel/Tgstation.Server.ControlPanel.csproj new file mode 100644 index 0000000000..ec1bab3bc6 --- /dev/null +++ b/src/Tgstation.Server.ControlPanel/Tgstation.Server.ControlPanel.csproj @@ -0,0 +1,107 @@ + + + + + Debug + AnyCPU + {D38BE569-04B7-4C64-BDB5-683767B26FEB} + WinExe + Tgstation.Server.ControlPanel + Tgstation.Server.ControlPanel + v4.7.1 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + true + en-CA + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + latest + true + AllRules.ruleset + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + latest + true + bin\Release\Tgstation.Server.ControlPanel.xml + true + AllRules.ruleset + + + Tgstation.Server.ControlPanel.App + + + + + + + + + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + App.xaml + Code + + + + MainWindow.xaml + Code + + + + + Code + + + True + True + Resources.resx + + + True + Settings.settings + True + + + ResXFileCodeGenerator + Resources.Designer.cs + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + + + + {e0ac911f-7675-4a91-9499-d8a2e2390aad} + Tgstation.Server.Client + + + + \ No newline at end of file diff --git a/src/Tgstation.Server.Host.Console/Program.cs b/src/Tgstation.Server.Host.Console/Program.cs index bd4bb949f7..2ce75674c3 100644 --- a/src/Tgstation.Server.Host.Console/Program.cs +++ b/src/Tgstation.Server.Host.Console/Program.cs @@ -5,16 +5,12 @@ namespace Tgstation.Server.Host.Console /// /// Contains the entrypoint for the application /// - static class Program + public static class Program { /// /// Entrypoint for the application /// /// A representing the running operation - public static async Task Main() - { - System.Console.WriteLine("Hello World!"); - await Task.CompletedTask.ConfigureAwait(false); - } + public static Task Main() => Task.CompletedTask; } } diff --git a/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj b/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj index c8d2e85c39..bbedcfffef 100644 --- a/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj +++ b/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj @@ -19,7 +19,7 @@ - + diff --git a/src/Tgstation.Server.Host.Service/GlobalSuppressions.cs b/src/Tgstation.Server.Host.Service/GlobalSuppressions.cs new file mode 100644 index 0000000000..e314a34cff Binary files /dev/null and b/src/Tgstation.Server.Host.Service/GlobalSuppressions.cs differ diff --git a/src/Tgstation.Server.Host.Service/Program.cs b/src/Tgstation.Server.Host.Service/Program.cs new file mode 100644 index 0000000000..0e1f417d3d --- /dev/null +++ b/src/Tgstation.Server.Host.Service/Program.cs @@ -0,0 +1,16 @@ +namespace Tgstation.Server.Host.Service +{ + /// + /// Contains the entrypoint for the application + /// + static class Program + { + /// + /// Entrypoint for the application + /// + /// A representing the running operation + static void Main() + { + } + } +} diff --git a/src/Tgstation.Server.Host.Service/Properties/AssemblyInfo.cs b/src/Tgstation.Server.Host.Service/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..295c7cb2a0 --- /dev/null +++ b/src/Tgstation.Server.Host.Service/Properties/AssemblyInfo.cs @@ -0,0 +1,12 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +[assembly: AssemblyTitle("Tgstation.Server.Host.Service")] +[assembly: ComVisible(false)] +[assembly: Guid("29927416-3b78-49a7-a560-5ccaa638b6b4")] +[assembly: InternalsVisibleTo("Tgstation.Server.Host.Service.Tests")] + +[assembly: AssemblyVersion("4.0.0.0")] +[assembly: AssemblyFileVersion("4.0.0.0")] +[assembly: AssemblyInformationalVersion("4.0.0.0")] diff --git a/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj b/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj new file mode 100644 index 0000000000..4072e3c73b --- /dev/null +++ b/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj @@ -0,0 +1,84 @@ + + + + + Debug + AnyCPU + {29927416-3B78-49A7-A560-5CCAA638B6B4} + WinExe + Tgstation.Server.Host.Service + Tgstation.Server.Host.Service + v4.7.1 + 512 + true + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + latest + true + AllRules.ruleset + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + latest + true + bin\Release\Tgstation.Server.Host.Service.xml + true + AllRules.ruleset + + + Tgstation.Server.Host.Service.Program + + + + + + + + + False + Microsoft .NET Framework 4.7.1 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + + + + + {2b69ad6d-2b5a-4023-8ead-0bd1b18e028a} + Tgstation.Server.Host + + + + \ No newline at end of file diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj new file mode 100644 index 0000000000..6082d6d99c --- /dev/null +++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj @@ -0,0 +1,27 @@ + + + + netstandard2.0 + + + + latest + true + + bin\Release\netstandard2.0\Tgstation.Server.Host.xml + + + + latest + + + + + + + + + + + + diff --git a/tests/Tgstation.Server.Api.Tests/Tgstation.Server.Api.Tests.csproj b/tests/Tgstation.Server.Api.Tests/Tgstation.Server.Api.Tests.csproj new file mode 100644 index 0000000000..103f4472b1 --- /dev/null +++ b/tests/Tgstation.Server.Api.Tests/Tgstation.Server.Api.Tests.csproj @@ -0,0 +1,20 @@ + + + + netcoreapp2.0 + + false + latest + + + + + + + + + + + + + diff --git a/tests/Tgstation.Server.Client.Tests/Tgstation.Server.Client.Tests.csproj b/tests/Tgstation.Server.Client.Tests/Tgstation.Server.Client.Tests.csproj new file mode 100644 index 0000000000..8061f3b7e8 --- /dev/null +++ b/tests/Tgstation.Server.Client.Tests/Tgstation.Server.Client.Tests.csproj @@ -0,0 +1,20 @@ + + + + netcoreapp2.0 + + false + latest + + + + + + + + + + + + + diff --git a/tests/Tgstation.Server.CommandLine.Tests/Tgstation.Server.CommandLine.Tests.csproj b/tests/Tgstation.Server.CommandLine.Tests/Tgstation.Server.CommandLine.Tests.csproj new file mode 100644 index 0000000000..46bbd02d4a --- /dev/null +++ b/tests/Tgstation.Server.CommandLine.Tests/Tgstation.Server.CommandLine.Tests.csproj @@ -0,0 +1,20 @@ + + + + netcoreapp2.0 + + false + latest + + + + + + + + + + + + + diff --git a/tests/Tgstation.Server.ControlPanel.Tests/Properties/AssemblyInfo.cs b/tests/Tgstation.Server.ControlPanel.Tests/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..8a27ad97fc --- /dev/null +++ b/tests/Tgstation.Server.ControlPanel.Tests/Properties/AssemblyInfo.cs @@ -0,0 +1,20 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +[assembly: AssemblyTitle("Tgstation.Server.ControlPanel.Tests")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Tgstation.Server.ControlPanel.Tests")] +[assembly: AssemblyCopyright("Copyright © 2018")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +[assembly: ComVisible(false)] + +[assembly: Guid("93ca946d-50de-4ad4-bada-d0353f0affcc")] + +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/tests/Tgstation.Server.ControlPanel.Tests/Tgstation.Server.ControlPanel.Tests.csproj b/tests/Tgstation.Server.ControlPanel.Tests/Tgstation.Server.ControlPanel.Tests.csproj new file mode 100644 index 0000000000..d3d8ba781d --- /dev/null +++ b/tests/Tgstation.Server.ControlPanel.Tests/Tgstation.Server.ControlPanel.Tests.csproj @@ -0,0 +1,72 @@ + + + + + Debug + AnyCPU + {93CA946D-50DE-4AD4-BADA-D0353F0AFFCC} + Library + Properties + Tgstation.Server.ControlPanel.Tests + Tgstation.Server.ControlPanel.Tests + v4.7.1 + 512 + {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 15.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages + False + UnitTest + + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + latest + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + latest + + + + ..\..\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll + + + ..\..\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + + + + + + + + + + + {d38be569-04b7-4c64-bdb5-683767b26feb} + Tgstation.Server.ControlPanel + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + \ No newline at end of file diff --git a/tests/Tgstation.Server.ControlPanel.Tests/packages.config b/tests/Tgstation.Server.ControlPanel.Tests/packages.config new file mode 100644 index 0000000000..8819694ccc --- /dev/null +++ b/tests/Tgstation.Server.ControlPanel.Tests/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/tests/Tgstation.Server.Host.Console.Tests/Tgstation.Server.Host.Console.Tests.csproj b/tests/Tgstation.Server.Host.Console.Tests/Tgstation.Server.Host.Console.Tests.csproj index 65432ec2af..1234f45518 100644 --- a/tests/Tgstation.Server.Host.Console.Tests/Tgstation.Server.Host.Console.Tests.csproj +++ b/tests/Tgstation.Server.Host.Console.Tests/Tgstation.Server.Host.Console.Tests.csproj @@ -4,6 +4,7 @@ netcoreapp2.0 false + latest diff --git a/tests/Tgstation.Server.Host.Service.Tests/Properties/AssemblyInfo.cs b/tests/Tgstation.Server.Host.Service.Tests/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..e7c6fc8a51 --- /dev/null +++ b/tests/Tgstation.Server.Host.Service.Tests/Properties/AssemblyInfo.cs @@ -0,0 +1,20 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +[assembly: AssemblyTitle("Tgstation.Server.Host.Service.Tests")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Tgstation.Server.Host.Service.Tests")] +[assembly: AssemblyCopyright("Copyright © 2018")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +[assembly: ComVisible(false)] + +[assembly: Guid("f0cd3f14-e9c0-4477-99f7-f1e22cb8d85e")] + +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/tests/Tgstation.Server.Host.Service.Tests/Tgstation.Server.Host.Service.Tests.csproj b/tests/Tgstation.Server.Host.Service.Tests/Tgstation.Server.Host.Service.Tests.csproj new file mode 100644 index 0000000000..3741d9e073 --- /dev/null +++ b/tests/Tgstation.Server.Host.Service.Tests/Tgstation.Server.Host.Service.Tests.csproj @@ -0,0 +1,72 @@ + + + + + Debug + AnyCPU + {F0CD3F14-E9C0-4477-99F7-F1E22CB8D85E} + Library + Properties + Tgstation.Server.Host.Service.Tests + Tgstation.Server.Host.Service.Tests + v4.7.1 + 512 + {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 15.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages + False + UnitTest + + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + latest + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + latest + + + + ..\..\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll + + + ..\..\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + + + + + + + + + + + {29927416-3b78-49a7-a560-5ccaa638b6b4} + Tgstation.Server.Host.Service + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + \ No newline at end of file diff --git a/tests/Tgstation.Server.Host.Service.Tests/packages.config b/tests/Tgstation.Server.Host.Service.Tests/packages.config new file mode 100644 index 0000000000..8819694ccc --- /dev/null +++ b/tests/Tgstation.Server.Host.Service.Tests/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/tests/Tgstation.Server.Host.Tests/Tgstation.Server.Host.Tests.csproj b/tests/Tgstation.Server.Host.Tests/Tgstation.Server.Host.Tests.csproj new file mode 100644 index 0000000000..4f0518d744 --- /dev/null +++ b/tests/Tgstation.Server.Host.Tests/Tgstation.Server.Host.Tests.csproj @@ -0,0 +1,20 @@ + + + + netcoreapp2.0 + + false + latest + + + + + + + + + + + + + diff --git a/tgstation-server.sln b/tgstation-server.sln index 9924c0b2db..25c76f7da8 100644 --- a/tgstation-server.sln +++ b/tgstation-server.sln @@ -21,9 +21,34 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{6FF654E6 ProjectSection(SolutionItems) = preProject build\BuildDox.ps1 = build\BuildDox.ps1 build\Doxyfile = build\Doxyfile + build\tgs.ico = build\tgs.ico build\UploadCoverage.ps1 = build\UploadCoverage.ps1 EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tgstation.Server.Host", "src\Tgstation.Server.Host\Tgstation.Server.Host.csproj", "{2B69AD6D-2B5A-4023-8EAD-0BD1B18E028A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tgstation.Server.Api", "src\Tgstation.Server.Api\Tgstation.Server.Api.csproj", "{8B4A208D-A48A-4A5D-8B94-E2661138865D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tgstation.Server.Host.Service", "src\Tgstation.Server.Host.Service\Tgstation.Server.Host.Service.csproj", "{29927416-3B78-49A7-A560-5CCAA638B6B4}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tgstation.Server.CommandLine", "src\Tgstation.Server.CommandLine\Tgstation.Server.CommandLine.csproj", "{657C3624-3534-4A0C-B4E7-196FC830F547}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tgstation.Server.ControlPanel", "src\Tgstation.Server.ControlPanel\Tgstation.Server.ControlPanel.csproj", "{D38BE569-04B7-4C64-BDB5-683767B26FEB}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tgstation.Server.Client", "src\Tgstation.Server.Client\Tgstation.Server.Client.csproj", "{E0AC911F-7675-4A91-9499-D8A2E2390AAD}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tgstation.Server.ControlPanel.Tests", "tests\Tgstation.Server.ControlPanel.Tests\Tgstation.Server.ControlPanel.Tests.csproj", "{93CA946D-50DE-4AD4-BADA-D0353F0AFFCC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tgstation.Server.Host.Service.Tests", "tests\Tgstation.Server.Host.Service.Tests\Tgstation.Server.Host.Service.Tests.csproj", "{F0CD3F14-E9C0-4477-99F7-F1E22CB8D85E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tgstation.Server.Api.Tests", "tests\Tgstation.Server.Api.Tests\Tgstation.Server.Api.Tests.csproj", "{BE0E8F49-334F-49D7-A04D-D82E9AB7AA36}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tgstation.Server.Client.Tests", "tests\Tgstation.Server.Client.Tests\Tgstation.Server.Client.Tests.csproj", "{E5301AF1-4F74-4982-BF24-95F23CC5D5B2}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tgstation.Server.CommandLine.Tests", "tests\Tgstation.Server.CommandLine.Tests\Tgstation.Server.CommandLine.Tests.csproj", "{90D400B4-FCB0-447E-8FB2-1CF58EE7E55D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tgstation.Server.Host.Tests", "tests\Tgstation.Server.Host.Tests\Tgstation.Server.Host.Tests.csproj", "{A3362FF6-550F-480F-859E-8EC1EB6EAB31}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -38,6 +63,54 @@ Global {D36B99C4-E771-42D6-A95F-1102B3E236DF}.Debug|Any CPU.Build.0 = Debug|Any CPU {D36B99C4-E771-42D6-A95F-1102B3E236DF}.Release|Any CPU.ActiveCfg = Release|Any CPU {D36B99C4-E771-42D6-A95F-1102B3E236DF}.Release|Any CPU.Build.0 = Release|Any CPU + {2B69AD6D-2B5A-4023-8EAD-0BD1B18E028A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2B69AD6D-2B5A-4023-8EAD-0BD1B18E028A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2B69AD6D-2B5A-4023-8EAD-0BD1B18E028A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2B69AD6D-2B5A-4023-8EAD-0BD1B18E028A}.Release|Any CPU.Build.0 = Release|Any CPU + {8B4A208D-A48A-4A5D-8B94-E2661138865D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8B4A208D-A48A-4A5D-8B94-E2661138865D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8B4A208D-A48A-4A5D-8B94-E2661138865D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8B4A208D-A48A-4A5D-8B94-E2661138865D}.Release|Any CPU.Build.0 = Release|Any CPU + {29927416-3B78-49A7-A560-5CCAA638B6B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {29927416-3B78-49A7-A560-5CCAA638B6B4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {29927416-3B78-49A7-A560-5CCAA638B6B4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {29927416-3B78-49A7-A560-5CCAA638B6B4}.Release|Any CPU.Build.0 = Release|Any CPU + {657C3624-3534-4A0C-B4E7-196FC830F547}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {657C3624-3534-4A0C-B4E7-196FC830F547}.Debug|Any CPU.Build.0 = Debug|Any CPU + {657C3624-3534-4A0C-B4E7-196FC830F547}.Release|Any CPU.ActiveCfg = Release|Any CPU + {657C3624-3534-4A0C-B4E7-196FC830F547}.Release|Any CPU.Build.0 = Release|Any CPU + {D38BE569-04B7-4C64-BDB5-683767B26FEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D38BE569-04B7-4C64-BDB5-683767B26FEB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D38BE569-04B7-4C64-BDB5-683767B26FEB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D38BE569-04B7-4C64-BDB5-683767B26FEB}.Release|Any CPU.Build.0 = Release|Any CPU + {E0AC911F-7675-4A91-9499-D8A2E2390AAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E0AC911F-7675-4A91-9499-D8A2E2390AAD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E0AC911F-7675-4A91-9499-D8A2E2390AAD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E0AC911F-7675-4A91-9499-D8A2E2390AAD}.Release|Any CPU.Build.0 = Release|Any CPU + {93CA946D-50DE-4AD4-BADA-D0353F0AFFCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {93CA946D-50DE-4AD4-BADA-D0353F0AFFCC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {93CA946D-50DE-4AD4-BADA-D0353F0AFFCC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {93CA946D-50DE-4AD4-BADA-D0353F0AFFCC}.Release|Any CPU.Build.0 = Release|Any CPU + {F0CD3F14-E9C0-4477-99F7-F1E22CB8D85E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F0CD3F14-E9C0-4477-99F7-F1E22CB8D85E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F0CD3F14-E9C0-4477-99F7-F1E22CB8D85E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F0CD3F14-E9C0-4477-99F7-F1E22CB8D85E}.Release|Any CPU.Build.0 = Release|Any CPU + {BE0E8F49-334F-49D7-A04D-D82E9AB7AA36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BE0E8F49-334F-49D7-A04D-D82E9AB7AA36}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BE0E8F49-334F-49D7-A04D-D82E9AB7AA36}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BE0E8F49-334F-49D7-A04D-D82E9AB7AA36}.Release|Any CPU.Build.0 = Release|Any CPU + {E5301AF1-4F74-4982-BF24-95F23CC5D5B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E5301AF1-4F74-4982-BF24-95F23CC5D5B2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E5301AF1-4F74-4982-BF24-95F23CC5D5B2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E5301AF1-4F74-4982-BF24-95F23CC5D5B2}.Release|Any CPU.Build.0 = Release|Any CPU + {90D400B4-FCB0-447E-8FB2-1CF58EE7E55D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {90D400B4-FCB0-447E-8FB2-1CF58EE7E55D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {90D400B4-FCB0-447E-8FB2-1CF58EE7E55D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {90D400B4-FCB0-447E-8FB2-1CF58EE7E55D}.Release|Any CPU.Build.0 = Release|Any CPU + {A3362FF6-550F-480F-859E-8EC1EB6EAB31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A3362FF6-550F-480F-859E-8EC1EB6EAB31}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A3362FF6-550F-480F-859E-8EC1EB6EAB31}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A3362FF6-550F-480F-859E-8EC1EB6EAB31}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE