Skip to content

Commit e8448b6

Browse files
committed
client started
1 parent 755cc51 commit e8448b6

File tree

7 files changed

+32
-32
lines changed

7 files changed

+32
-32
lines changed

Intersect.Client.Core/Intersect.Client.Core.csproj

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,6 @@
3333
<ProjectReference Include="..\Intersect.Network\Intersect.Network.csproj" />
3434
</ItemGroup>
3535

36-
<ItemGroup>
37-
<Compile Update="Properties\Resources.Designer.cs">
38-
<DesignTime>True</DesignTime>
39-
<AutoGen>True</AutoGen>
40-
<DependentUpon>Resources.resx</DependentUpon>
41-
</Compile>
42-
</ItemGroup>
43-
44-
<ItemGroup>
45-
<EmbeddedResource Update="Properties\Resources.resx">
46-
<Generator>ResXFileCodeGenerator</Generator>
47-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
48-
</EmbeddedResource>
49-
</ItemGroup>
50-
5136
<ItemGroup Label="Project Embedded Resources">
5237
<EmbeddedResource Include="$(NetworkHandshakePublicKey)" />
5338
<EmbeddedResource Include="$(IntersectRepoPath)\assets\intersect-logo-qu.bmp">

Intersect.Client.Core/MonoGame/Network/MonoSocket.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.Collections.Concurrent;
1+
using System.Collections.Concurrent;
22
using System.Diagnostics;
33
using System.Diagnostics.CodeAnalysis;
44
using System.Net;
@@ -45,7 +45,7 @@ internal partial class MonoSocket : GameSocket
4545
private const long ServerStatusPingInterval = 15_000;
4646
#endif
4747

48-
private const string AsymmetricKeyManifestResourceName = "Intersect.Client.network.handshake.bkey.pub";
48+
private const string AsymmetricKeyManifestResourceName = "Intersect.Client.Core.network.handshake.bkey.pub";
4949

5050
private IClient? _network;
5151

Intersect.Client.Core/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ private static void ExportDependency(string filename, string? folder = default,
239239
{
240240
cleanFolder += '.';
241241
}
242-
var resourceName = $"Intersect.Client.Resources.{cleanFolder}{filename}";
242+
var resourceName = $"Intersect.Client.Core.Resources.{cleanFolder}{filename}";
243243

244244
if (assembly.GetManifestResourceNames().Contains(resourceName))
245245
{

Intersect.Client/Intersect.Client.csproj

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,19 @@
2828
<ProjectReference Include="..\Intersect.Client.Core\Intersect.Client.Core.csproj" />
2929
</ItemGroup>
3030

31+
<ItemGroup>
32+
<Compile Update="Properties\Resources.Designer.cs">
33+
<DependentUpon>Resources.resx</DependentUpon>
34+
<DesignTime>True</DesignTime>
35+
<AutoGen>True</AutoGen>
36+
</Compile>
37+
</ItemGroup>
38+
39+
<ItemGroup>
40+
<EmbeddedResource Update="Properties\Resources.resx">
41+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
42+
<Generator>ResXFileCodeGenerator</Generator>
43+
</EmbeddedResource>
44+
</ItemGroup>
45+
3146
</Project>

Intersect.Client.Core/Properties/Resources.Designer.cs renamed to Intersect.Client/Properties/Resources.Designer.cs

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)