AmongUs/Impostor
1
0 Fork 0
mirror of https://github.com/Impostor/Impostor.git synced 2026-10-20 01:46:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update csproj

Browse Source
This commit is contained in:
AeonLucid committed 2020-10-14 13:45:52 +02:00
1 parent 4a91e532e8
commit 7027ba0e7e
6 files changed
+68 -98
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.github/workflows/main.yml
-51
View File
@@ -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
src/Impostor.Client/Impostor.Client.Cli/Impostor.Client.Cli.csproj
+12
View File
@@ -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>
src/Impostor.Client/Impostor.Client.Shared/Impostor.Client.Shared.csproj
+1
View File
@@ -2,6 +2,7 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
<Version>1.0.0</Version>
</PropertyGroup>
<ItemGroup>
src/Impostor.Client/Impostor.Client.WinForms/Impostor.Client.WinForms.csproj
+9 -5
View File
@@ -3,16 +3,20 @@
<PropertyGroup>
<ProjectGuid>{804CF172-0C87-4423-9688-BD97D549891E}</ProjectGuid>
<OutputType>WinExe</OutputType>
<AssemblyName>Impostor</AssemblyName>
<TargetFramework>net462</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<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>
<ApplicationIcon>icon.ico</ApplicationIcon>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
<Version>1.0.0</Version>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
src/Impostor.Server/Impostor.Server.csproj
+43 -39
View File
@@ -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>
src/Impostor.Server/Net/Redirector/NodeLocatorUDP.cs
+3 -3
View File
@@ -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
{