diff options
| author | Michael <[email protected]> | 2017-01-18 15:36:06 -0500 |
|---|---|---|
| committer | Michael <[email protected]> | 2017-01-18 15:36:06 -0500 |
| commit | fd7d44a07f1f74f9e4eaa38a68bb2e5592c8eb8f (patch) | |
| tree | 58b243a463aecd2865898a5c480dd0c4b37c6b02 /ShiftOS.Server | |
| parent | e7b60fea37b6976e412d2f7deeb583b82c140c8f (diff) | |
| download | shiftos_thereturn-fd7d44a07f1f74f9e4eaa38a68bb2e5592c8eb8f.tar.gz shiftos_thereturn-fd7d44a07f1f74f9e4eaa38a68bb2e5592c8eb8f.tar.bz2 shiftos_thereturn-fd7d44a07f1f74f9e4eaa38a68bb2e5592c8eb8f.zip | |
Linux test
Diffstat (limited to 'ShiftOS.Server')
| -rw-r--r-- | ShiftOS.Server/Program.cs | 2 | ||||
| -rw-r--r-- | ShiftOS.Server/ShiftOS.Server.csproj | 20 |
2 files changed, 10 insertions, 12 deletions
diff --git a/ShiftOS.Server/Program.cs b/ShiftOS.Server/Program.cs index 099df86..0219590 100644 --- a/ShiftOS.Server/Program.cs +++ b/ShiftOS.Server/Program.cs @@ -131,7 +131,7 @@ namespace ShiftOS.Server server.OnStarted += (o, a) => { Console.WriteLine($"Server started on address {server.Address}, port {server.Port}."); - ServerStarted?.Invoke(server.Address.MapToIPv4().ToString()); + ServerStarted?.Invoke(server.Address.ToString()); }; server.OnStopped += (o, a) => diff --git a/ShiftOS.Server/ShiftOS.Server.csproj b/ShiftOS.Server/ShiftOS.Server.csproj index ae6248c..6c039c2 100644 --- a/ShiftOS.Server/ShiftOS.Server.csproj +++ b/ShiftOS.Server/ShiftOS.Server.csproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> @@ -9,7 +9,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>ShiftOS.Server</RootNamespace> <AssemblyName>ShiftOS.Server</AssemblyName> - <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> </PropertyGroup> @@ -33,17 +33,9 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="DynamicLua, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\DynamicLua.1.1.2.0\lib\net40-Client\DynamicLua.dll</HintPath> - <Private>True</Private> - </Reference> <Reference Include="NetSockets"> <HintPath>..\Libraries\NetSockets.dll</HintPath> </Reference> - <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> - <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath> - <Private>True</Private> - </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Xml.Linq" /> @@ -52,6 +44,12 @@ <Reference Include="System.Data" /> <Reference Include="System.Net.Http" /> <Reference Include="System.Xml" /> + <Reference Include="DynamicLua, Version=1.1.2.0, Culture=neutral, PublicKeyToken=null"> + <HintPath>..\packages\DynamicLua.1.1.2.0\lib\net40-Client\DynamicLua.dll</HintPath> + </Reference> + <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"> + <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath> + </Reference> </ItemGroup> <ItemGroup> <Compile Include="Program.cs" /> @@ -68,7 +66,7 @@ </ItemGroup> <ItemGroup> <ProjectReference Include="..\ShiftOS.Objects\ShiftOS.Objects.csproj"> - <Project>{a069089a-8962-4607-b2b2-4cf4a371066e}</Project> + <Project>{A069089A-8962-4607-B2B2-4CF4A371066E}</Project> <Name>ShiftOS.Objects</Name> </ProjectReference> </ItemGroup> |