:merge: Merge Api

pull/1/head
Noan07 2 years ago
commit 41ddfd133f

@ -1,5 +1,12 @@
FROM mcr.microsoft.com/dotnet/sdk:6.0 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
WORKDIR /app
RUN dotnet new console
COPY server/Server/Program.cs Program.cs
RUN dotnet publish -c Release -o out
CMD dotnet run --project /server/Server.csproj FROM mcr.microsoft.com/dotnet/runtime:6.0
WORKDIR /app
COPY --from=build /app/out .
ENTRYPOINT ["dotnet", "app.dll"]
EXPOSE 3131 EXPOSE 3131

@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17 # Visual Studio Version 17
VisualStudioVersion = 17.2.32526.322 VisualStudioVersion = 17.2.32526.322
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server", "Server\Server.csproj", "{356E6AA3-C180-4309-ACCE-C6E66B4DF441}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataBase", "DataBase\DataBase.csproj", "{240EEEA0-7EFB-4919-A5C9-584DC6505C58}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "Client\Client.csproj", "{1D3CF318-8453-4D0C-B11D-2A6B7E44AA47}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server", "Server\Server.csproj", "{95CCBA12-CAB4-4574-A91C-77844E5C2C10}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataBase", "DataBase\DataBase.csproj", "{240EEEA0-7EFB-4919-A5C9-584DC6505C58}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataBase", "DataBase\DataBase.csproj", "{240EEEA0-7EFB-4919-A5C9-584DC6505C58}"
EndProject EndProject
@ -19,18 +19,14 @@ Global
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{356E6AA3-C180-4309-ACCE-C6E66B4DF441}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{356E6AA3-C180-4309-ACCE-C6E66B4DF441}.Debug|Any CPU.Build.0 = Debug|Any CPU
{356E6AA3-C180-4309-ACCE-C6E66B4DF441}.Release|Any CPU.ActiveCfg = Release|Any CPU
{356E6AA3-C180-4309-ACCE-C6E66B4DF441}.Release|Any CPU.Build.0 = Release|Any CPU
{1D3CF318-8453-4D0C-B11D-2A6B7E44AA47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1D3CF318-8453-4D0C-B11D-2A6B7E44AA47}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1D3CF318-8453-4D0C-B11D-2A6B7E44AA47}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1D3CF318-8453-4D0C-B11D-2A6B7E44AA47}.Release|Any CPU.Build.0 = Release|Any CPU
{240EEEA0-7EFB-4919-A5C9-584DC6505C58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {240EEEA0-7EFB-4919-A5C9-584DC6505C58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{240EEEA0-7EFB-4919-A5C9-584DC6505C58}.Debug|Any CPU.Build.0 = Debug|Any CPU {240EEEA0-7EFB-4919-A5C9-584DC6505C58}.Debug|Any CPU.Build.0 = Debug|Any CPU
{240EEEA0-7EFB-4919-A5C9-584DC6505C58}.Release|Any CPU.ActiveCfg = Release|Any CPU {240EEEA0-7EFB-4919-A5C9-584DC6505C58}.Release|Any CPU.ActiveCfg = Release|Any CPU
{240EEEA0-7EFB-4919-A5C9-584DC6505C58}.Release|Any CPU.Build.0 = Release|Any CPU {240EEEA0-7EFB-4919-A5C9-584DC6505C58}.Release|Any CPU.Build.0 = Release|Any CPU
{95CCBA12-CAB4-4574-A91C-77844E5C2C10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{95CCBA12-CAB4-4574-A91C-77844E5C2C10}.Debug|Any CPU.Build.0 = Debug|Any CPU
{95CCBA12-CAB4-4574-A91C-77844E5C2C10}.Release|Any CPU.ActiveCfg = Release|Any CPU
{95CCBA12-CAB4-4574-A91C-77844E5C2C10}.Release|Any CPU.Build.0 = Release|Any CPU
{693F37D1-B10C-45B2-A180-24D26B5A4841}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {693F37D1-B10C-45B2-A180-24D26B5A4841}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{693F37D1-B10C-45B2-A180-24D26B5A4841}.Debug|Any CPU.Build.0 = Debug|Any CPU {693F37D1-B10C-45B2-A180-24D26B5A4841}.Debug|Any CPU.Build.0 = Debug|Any CPU
{693F37D1-B10C-45B2-A180-24D26B5A4841}.Release|Any CPU.ActiveCfg = Release|Any CPU {693F37D1-B10C-45B2-A180-24D26B5A4841}.Release|Any CPU.ActiveCfg = Release|Any CPU

@ -13,9 +13,10 @@ class Program
static void StartServer() static void StartServer()
{ {
IPEndPoint endPoint = new IPEndPoint(IPAddress.Parse("192.168.41.58"), 3131); IPEndPoint endPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 3131);
UdpClient server = new UdpClient(endPoint); UdpClient server = new UdpClient(endPoint);
Console.WriteLine("Server started, waiting for clients to connect..."); Console.WriteLine("Server started, waiting for clients to connect...");
Console.WriteLine(endPoint.Address.ToString());
while (true) while (true)
{ {

Binary file not shown.

Binary file not shown.
Loading…
Cancel
Save