Update csproj

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
deleted file mode 100644 (file)
index 7432c72..0000000
--- a/.github/workflows/main.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-name: Build
-
-on:
-  push:
-    branches: [ master, dev ]
-    paths:
-      - 'src/**'
-      - '.gitmodules'
-      - '.github/workflows/main.yml'
-  pull_request:
-    branches: [ master, dev ]
-    paths:
-      - 'src/**'
-      - '.gitmodules'
-      - '.github/workflows/main.yml'
-
-jobs:
-  build-client:
-    name: Build Client
-    runs-on: windows-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          submodules: true
-      - name: Setup MSBuild.exe
-        uses: microsoft/setup-msbuild@v1.0.1
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 3.1.402
-      - name: Build Impostor.Client
-        run: dotnet build ./src/Impostor.Client/Impostor.Client.WinForms/Impostor.Client.WinForms.csproj -c Release
-  build-server:
-    name: Build Server
-    runs-on: windows-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          submodules: true
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 5.0.100-rc.1.20452.10
-      - name: Install dependencies
-        run: dotnet restore ./src
-      - name: Build Impostor.Server
-        run: dotnet build --no-restore -c Release -f net5.0 ./src/Impostor.Server/Impostor.Server.csproj /p:PublishTrimmed=false
-      - name: Test
-        run: dotnet test --no-restore -v normal -f net5.0 ./src

diff --git a/src/Impostor.Client/Impostor.Client.Cli/Impostor.Client.Cli.csproj b/src/Impostor.Client/Impostor.Client.Cli/Impostor.Client.Cli.csproj
index 2f1b7a510787fdbfb28a1f29d765f836f4478ae3..943c25e91bfefdb00c26718cf6766b1f322fe8c4 100644 (file)
--- a/src/Impostor.Client/Impostor.Client.Cli/Impostor.Client.Cli.csproj
+++ b/src/Impostor.Client/Impostor.Client.Cli/Impostor.Client.Cli.csproj
@@ -5,6 +5,18 @@
         <TargetFramework>net5.0</TargetFramework>
     </PropertyGroup>
 
+    <PropertyGroup>
+        <AssemblyName>Impostor</AssemblyName>
+        <AssemblyTitle>Impostor</AssemblyTitle>
+        <Product>Impostor</Product>
+        <Copyright>Copyright © AeonLucid 2020</Copyright>
+        <Version>1.0.0</Version>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+        <DebugType>none</DebugType>
+    </PropertyGroup>
+
     <ItemGroup>
         <ProjectReference Include="..\Impostor.Client.Shared\Impostor.Client.Shared.csproj" />
     </ItemGroup>

diff --git a/src/Impostor.Client/Impostor.Client.Shared/Impostor.Client.Shared.csproj b/src/Impostor.Client/Impostor.Client.Shared/Impostor.Client.Shared.csproj
index b69a98de7a6dfb1a391e96a9a51a04553bcd9ea2..604bf319e3cc92ec599148664bb45dfc589e7710 100644 (file)
--- a/src/Impostor.Client/Impostor.Client.Shared/Impostor.Client.Shared.csproj
+++ b/src/Impostor.Client/Impostor.Client.Shared/Impostor.Client.Shared.csproj
@@ -2,6 +2,7 @@
 
     <PropertyGroup>
         <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+        <Version>1.0.0</Version>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/Impostor.Client/Impostor.Client.WinForms/Impostor.Client.WinForms.csproj b/src/Impostor.Client/Impostor.Client.WinForms/Impostor.Client.WinForms.csproj
index 0bbb5380fa82854069f70fbb9a78a578d6c6255c..9078c6287bb8d6729f7a7cce3caf0780f09c410b 100644 (file)
--- a/src/Impostor.Client/Impostor.Client.WinForms/Impostor.Client.WinForms.csproj
+++ b/src/Impostor.Client/Impostor.Client.WinForms/Impostor.Client.WinForms.csproj
@@ -3,18 +3,22 @@
     <PropertyGroup>
         <ProjectGuid>{804CF172-0C87-4423-9688-BD97D549891E}</ProjectGuid>
         <OutputType>WinExe</OutputType>
-        <AssemblyName>Impostor</AssemblyName>
         <TargetFramework>net462</TargetFramework>
         <UseWindowsForms>true</UseWindowsForms>
-        <AssemblyTitle>Impostor</AssemblyTitle>
-        <Product>Impostor</Product>
         <Copyright>Copyright © AeonLucid 2020</Copyright>
         <ApplicationIcon>icon.ico</ApplicationIcon>
-
         <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
         <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
     </PropertyGroup>
 
+    <PropertyGroup>
+        <AssemblyName>Impostor</AssemblyName>
+        <AssemblyTitle>Impostor</AssemblyTitle>
+        <Product>Impostor</Product>
+        <Copyright>Copyright © AeonLucid 2020</Copyright>
+        <Version>1.0.0</Version>
+    </PropertyGroup>
+
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
         <DebugType>none</DebugType>
     </PropertyGroup>

diff --git a/src/Impostor.Server/Impostor.Server.csproj b/src/Impostor.Server/Impostor.Server.csproj
index 017b18c60a02c1bd292db74bf66dc857f3dcc6f7..4bf452f89103e0cdc140e392827f7e4bd1065428 100644 (file)
--- a/src/Impostor.Server/Impostor.Server.csproj
+++ b/src/Impostor.Server/Impostor.Server.csproj
@@ -1,54 +1,58 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-      <OutputType>Exe</OutputType>
-      <TargetFramework>net5.0</TargetFramework>
-      <RuntimeIdentifiers>win-x64;linux-x64;linux-arm;linux-arm64;osx-x64</RuntimeIdentifiers>
-      <PublishTrimmed>true</PublishTrimmed>
-      <TrimMode>Link</TrimMode>
-      <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
-      <AssemblyTitle>Impostor.Server</AssemblyTitle>
-      <Product>Impostor.Server</Product>
-      <Copyright>Copyright © AeonLucid 2020</Copyright>
-      <Version>1.1.0</Version>
-      <ApplicationIcon>icon.ico</ApplicationIcon>
-      <DebugType Condition=" '$(Configuration)' == 'Release' ">None</DebugType>
-      <CodeAnalysisRuleSet>ProjectRules.ruleset</CodeAnalysisRuleSet>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net5.0</TargetFramework>
+        <RuntimeIdentifiers>win-x64;linux-x64;linux-arm;linux-arm64;osx-x64</RuntimeIdentifiers>
+        <PublishTrimmed>true</PublishTrimmed>
+        <TrimMode>Link</TrimMode>
+        <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
+        <ApplicationIcon>icon.ico</ApplicationIcon>
+        <DebugType Condition=" '$(Configuration)' == 'Release' ">None</DebugType>
+        <CodeAnalysisRuleSet>ProjectRules.ruleset</CodeAnalysisRuleSet>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <AssemblyName>Impostor.Server</AssemblyName>
+        <AssemblyTitle>Impostor.Server</AssemblyTitle>
+        <Product>Impostor.Server</Product>
+        <Copyright>Copyright © AeonLucid 2020</Copyright>
+        <Version>1.0.0</Version>
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Impostor.Server.Api\Impostor.Server.Api.csproj" />
-      <ProjectReference Include="..\Impostor.Server.Hazel\Impostor.Server.Hazel.csproj" />
-      <ProjectReference Include="..\Impostor.Shared\Impostor.Shared.csproj" />
+        <ProjectReference Include="..\Impostor.Server.Api\Impostor.Server.Api.csproj"/>
+        <ProjectReference Include="..\Impostor.Server.Hazel\Impostor.Server.Hazel.csproj"/>
+        <ProjectReference Include="..\Impostor.Shared\Impostor.Shared.csproj"/>
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="5.0.0-rc.1.20451.7" />
-      <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0-rc.1.20451.14" />
-      <PackageReference Include="Serilog.Extensions.Hosting" Version="3.1.0" />
-      <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
-      <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
-        <PrivateAssets>all</PrivateAssets>
-        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      </PackageReference>
+        <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="5.0.0-rc.1.20451.7"/>
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0-rc.1.20451.14"/>
+        <PackageReference Include="Serilog.Extensions.Hosting" Version="3.1.0"/>
+        <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1"/>
+        <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
     </ItemGroup>
 
     <ItemGroup>
-      <Content Include="config.json">
-        <CopyToPublishDirectory>Always</CopyToPublishDirectory>
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      </Content>
-      <Content Update="config.Development.json">
-        <CopyToPublishDirectory>Never</CopyToPublishDirectory>
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      </Content>
-      <Content Include="config.full.json">
-        <CopyToPublishDirectory>Never</CopyToPublishDirectory>
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      </Content>
+        <Content Include="config.json">
+            <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+        </Content>
+        <Content Update="config.Development.json">
+            <CopyToPublishDirectory>Never</CopyToPublishDirectory>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+        </Content>
+        <Content Include="config.full.json">
+            <CopyToPublishDirectory>Never</CopyToPublishDirectory>
+            <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+            <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+        </Content>
     </ItemGroup>
 
 </Project>
\ No newline at end of file

diff --git a/src/Impostor.Server/Net/Redirector/NodeLocatorUDP.cs b/src/Impostor.Server/Net/Redirector/NodeLocatorUDP.cs
index 8fe843bb67d4eca19bd7793bf7addfd902c910e9..b1efb99e7d0369fc73af8a15ad52b1da2eeea7fc 100644 (file)
--- a/src/Impostor.Server/Net/Redirector/NodeLocatorUDP.cs
+++ b/src/Impostor.Server/Net/Redirector/NodeLocatorUDP.cs
@@ -1,11 +1,11 @@
-using Impostor.Server.Data;
-using Microsoft.Extensions.Options;
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Net;
 using System.Net.Sockets;
 using System.Text;
+using Impostor.Server.Data;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 
 namespace Impostor.Server.Net.Redirector
 {