Skip to content

Commit 8444b1b

Browse files
SpicyDarkFoxSpicyDarkFox
committed
Фикс субмодуля
1 parent 666b453 commit 8444b1b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+61
-34
lines changed

‎Content.Benchmarks/Content.Benchmarks.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
33
<PropertyGroup>
44
<!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
@@ -10,6 +10,7 @@
1010
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1111
<LangVersion>12</LangVersion>
1212
</PropertyGroup>
13+
<Import Project="../Content.Shared/_PrivateShared/LPP_GlobalDefines.props" Condition="Exists('../Content.Shared/_PrivateShared/LPP_GlobalDefines.props')" />
1314
<ItemGroup>
1415
<PackageReference Include="BenchmarkDotNet" />
1516
</ItemGroup>

‎Content.Client/.filenesting.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"help":"https://go.microsoft.com/fwlink/?linkid=866610"
3+
}

‎Content.Client/Content.Client.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<Configurations>Debug;Release;Tools;DebugOpt</Configurations>
1313
<Platforms>AnyCPU</Platforms>
1414
</PropertyGroup>
15+
<Import Project="../Content.Shared/_PrivateShared/LPP_GlobalDefines.props" Condition="Exists('../Content.Shared/_PrivateShared/LPP_GlobalDefines.props')" />
1516
<ItemGroup>
1617
<PackageReference Include="Nett" />
1718
<PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />

‎Content.Client/Corvax/TTS/TTSSystem.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#define LPP_TTS_play //комментировать при ошибках
21
using Content.Shared.Chat;
32
using Content.Shared.Corvax.CCCVars;
43
using Content.Shared.Corvax.TTS;

‎Content.Client/Entry/EntryPoint.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#define LPP_Sponsors //комментировать при ошибках
21
using Content.Client.Administration.Managers;
32
using Content.Client.Changelog;
43
using Content.Client.Chat.Managers;

‎Content.Client/IoC/ClientContentIoC.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#define LPP_Sponsors //комментировать при ошибках
21
using Content.Client.Administration.Managers;
32
using Content.Client.Changelog;
43
using Content.Client.Chat.Managers;

‎Content.Client/Preferences/ClientPreferencesManager.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#define LPP_Sponsors //комментировать при ошибках
21
using System;
32
using System.Collections.Generic;
43
using System.Linq;

‎Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#define LPP_Sponsors //комментировать при ошибках
21
using System.Linq;
32
using System.Numerics;
43
using Content.Client.Humanoid;

‎Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#define LPP_Sponsors //комментировать при ошибках
21
using System.Linq;
32
using System.Numerics;
43
using Content.Client.Guidebook;

‎Content.IntegrationTests/Content.IntegrationTests.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
44
<TargetFramework>$(TargetFramework)</TargetFramework>
@@ -7,6 +7,7 @@
77
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
88
<LangVersion>12</LangVersion>
99
</PropertyGroup>
10+
<Import Project="../Content.Shared/_PrivateShared/LPP_GlobalDefines.props" Condition="Exists('../Content.Shared/_PrivateShared/LPP_GlobalDefines.props')" />
1011
<ItemGroup>
1112
<PackageReference Include="NUnit" />
1213
<PackageReference Include="NUnit3TestAdapter" />

‎Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#define LPP_Sponsors //комментировать при ошибках
21
using System.Collections.Generic;
32
using System.Linq;
43
using Content.Server.Database;

‎Content.MapRenderer/Content.MapRenderer.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<Nullable>enable</Nullable>
77
<ServerGarbageCollection>true</ServerGarbageCollection>
88
</PropertyGroup>
9+
<Import Project="../Content.Shared/_PrivateShared/LPP_GlobalDefines.props" Condition="Exists('../Content.Shared/_PrivateShared/LPP_GlobalDefines.props')" />
910

1011
<ItemGroup>
1112
<ProjectReference Include="..\Content.IntegrationTests\Content.IntegrationTests.csproj" />

‎Content.Packaging/Content.Packaging.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<Nullable>enable</Nullable>
66
<ServerGarbageCollection>True</ServerGarbageCollection>
77
</PropertyGroup>
8+
<Import Project="../Content.Shared/_PrivateShared/LPP_GlobalDefines.props" Condition="Exists('../Content.Shared/_PrivateShared/LPP_GlobalDefines.props')" />
89

910
<ItemGroup>
1011
<ProjectReference Include="..\RobustToolbox\Robust.Packaging\Robust.Packaging.csproj" />

‎Content.Server.Database/Content.Server.Database.csproj

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
<NoWarn>RA0003</NoWarn>
1212
</PropertyGroup>
1313

14+
<Import Project="../Content.Shared/_PrivateShared/LPP_GlobalDefines.props" Condition="Exists('../Content.Shared/_PrivateShared/LPP_GlobalDefines.props')" />
15+
1416
<ItemGroup>
1517
<PackageReference Include="Microsoft.EntityFrameworkCore.Design">
1618
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎Content.Server.Database/Migrations/Postgres/20221128142328_Sponsors.Designer.cs

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Content.Server.Database/Migrations/Postgres/20221128142328_Sponsors.cs

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#if LPP_Sponsors
12
using System;
23
using Microsoft.EntityFrameworkCore.Migrations;
34

@@ -42,3 +43,4 @@ protected override void Down(MigrationBuilder migrationBuilder)
4243
}
4344
}
4445
}
46+
#endif

‎Content.Server.Database/Migrations/Postgres/20221202112609_Sponsor-AllowJob.Designer.cs

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Content.Server.Database/Migrations/Postgres/20221202112609_Sponsor-AllowJob.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Microsoft.EntityFrameworkCore.Migrations;
1+
#if LPP_Sponsors
2+
using Microsoft.EntityFrameworkCore.Migrations;
23

34
#nullable disable
45

@@ -24,3 +25,4 @@ protected override void Down(MigrationBuilder migrationBuilder)
2425
}
2526
}
2627
}
28+
#endif

‎Content.Server.Database/Migrations/Postgres/20240422101522_Donate.Designer.cs

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Content.Server.Database/Migrations/Postgres/20240422101522_Donate.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Microsoft.EntityFrameworkCore.Migrations;
1+
#if LPP_Sponsors
2+
using Microsoft.EntityFrameworkCore.Migrations;
23

34
#nullable disable
45

@@ -44,3 +45,4 @@ protected override void Down(MigrationBuilder migrationBuilder)
4445
}
4546
}
4647
}
48+
#endif

‎Content.Server.Database/Migrations/Sqlite/20221128142316_Sponsors.Designer.cs

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Content.Server.Database/Migrations/Sqlite/20221128142316_Sponsors.cs

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#if LPP_Sponsors
12
using System;
23
using Microsoft.EntityFrameworkCore.Migrations;
34

@@ -41,3 +42,4 @@ protected override void Down(MigrationBuilder migrationBuilder)
4142
}
4243
}
4344
}
45+
#endif

‎Content.Server.Database/Migrations/Sqlite/20221202112556_Sponsor-AllowJob.Designer.cs

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Content.Server.Database/Migrations/Sqlite/20221202112556_Sponsor-AllowJob.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Microsoft.EntityFrameworkCore.Migrations;
1+
#if LPP_Sponsors
2+
using Microsoft.EntityFrameworkCore.Migrations;
23

34
#nullable disable
45

@@ -24,3 +25,4 @@ protected override void Down(MigrationBuilder migrationBuilder)
2425
}
2526
}
2627
}
28+
#endif

‎Content.Server.Database/Migrations/Sqlite/20240422101522_Donate.Designer.cs

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Content.Server.Database/Migrations/Sqlite/20240422101522_Donate.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Microsoft.EntityFrameworkCore.Migrations;
1+
#if LPP_Sponsors
2+
using Microsoft.EntityFrameworkCore.Migrations;
23

34
#nullable disable
45

@@ -45,3 +46,4 @@ protected override void Down(MigrationBuilder migrationBuilder)
4546
}
4647
}
4748
}
49+
#endif

‎Content.Server.Database/Model.cs

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#define LPP_Sponsors //комментировать при ошибках
21
using System;
32
using System.Collections.Generic;
43
using System.ComponentModel.DataAnnotations;
@@ -41,7 +40,9 @@ protected ServerDbContext(DbContextOptions options) : base(options)
4140
public DbSet<AdminNote> AdminNotes { get; set; } = null!;
4241
public DbSet<AdminWatchlist> AdminWatchlists { get; set; } = null!;
4342
public DbSet<AdminMessage> AdminMessages { get; set; } = null!;
44-
public DbSet<Sponsor> Sponsors { get; set; } = null!; // _LostParadise-Sponsors
43+
#if LPP_Sponsors // _LostParadise-Sponsors
44+
public DbSet<Sponsor> Sponsors { get; set; } = null!;
45+
#endif
4546

4647
protected override void OnModelCreating(ModelBuilder modelBuilder)
4748
{
@@ -64,12 +65,11 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
6465
modelBuilder.Entity<Loadout>()
6566
.HasIndex(p => new {HumanoidProfileId = p.ProfileId, p.LoadoutName})
6667
.IsUnique();
67-
68+
#if LPP_Sponsors
6869
modelBuilder.Entity<Sponsor>() // _LostParadise-Sponsors
6970
.HasIndex(p => p.UserId)
7071
.IsUnique();
7172

72-
#if LPP_Sponsors // _LostParadise-Sponsors
7373
modelBuilder.Entity<Donate>()
7474
.HasIndex(p => new { HumanoidProfileId = p.ProfileId, p.DonateName })
7575
.IsUnique();
@@ -1051,7 +1051,8 @@ public class AdminMessage : IAdminRemarksCommon
10511051
public bool Dismissed { get; set; }
10521052
}
10531053

1054-
[Table("sponsors")] // _LostParadise-Sponsors
1054+
#if LPP_Sponsors // _LostParadise-Sponsors
1055+
[Table("sponsors")]
10551056
public class Sponsor
10561057
{
10571058
[Required, Key] public Guid UserId { get; set; }
@@ -1063,4 +1064,5 @@ public class Sponsor
10631064
public DateTime ExpireDate {get;set;}
10641065
public bool AllowJob { get; set; } = false;
10651066
}
1067+
#endif
10661068
}

‎Content.Server/Chat/Managers/ChatManager.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#define LPP_Sponsors //комментировать при ошибках
21
using System.Diagnostics.CodeAnalysis;
32
using System.Linq;
43
using System.Runtime.InteropServices;

‎Content.Server/Connection/ConnectionManager.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#define LPP_Sponsors //комментировать при ошибках
21
using System.Collections.Immutable;
32
using System.Runtime.InteropServices;
43
using System.Text.Json.Nodes;

‎Content.Server/Content.Server.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<Nullable>enable</Nullable>
1414
<ServerGarbageCollection>true</ServerGarbageCollection>
1515
</PropertyGroup>
16+
<Import Project="../Content.Shared/_PrivateShared/LPP_GlobalDefines.props" Condition="Exists('../Content.Shared/_PrivateShared/LPP_GlobalDefines.props')" />
1617
<ItemGroup>
1718
<PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
1819
</ItemGroup>

‎Content.Server/Database/ServerDbBase.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#define LPP_Sponsors //комментировать при ошибках
21
using System.Collections.Immutable;
32
using System.Diagnostics.CodeAnalysis;
43
using System.Linq;
@@ -1601,7 +1600,7 @@ protected abstract class DbGuard : IAsyncDisposable
16011600

16021601
public abstract ValueTask DisposeAsync();
16031602
}
1604-
1603+
#if LPP_Sponsors
16051604
#region Sponsors
16061605
public async Task<Sponsor?> GetSponsorInfo(NetUserId userId) // _LostParadise-Sponsors
16071606
{
@@ -1615,5 +1614,6 @@ protected abstract class DbGuard : IAsyncDisposable
16151614
return await db.DbContext.Sponsors.AsNoTracking().ToArrayAsync();
16161615
}
16171616
#endregion
1617+
#endif
16181618
}
16191619
}

‎Content.Server/Database/ServerDbManager.cs

+4-1
Original file line numberDiff line numberDiff line change
@@ -286,10 +286,12 @@ Task<int> AddConnectionLogAsync(
286286

287287
#endregion
288288

289+
#if LPP_Sponsors
289290
#region Sponsors
290291
Task<Sponsor?> GetSponsorInfo(NetUserId userId, CancellationToken cancel = default); //_LostParadise-Sponsors
291292
Task<Sponsor[]?> GetSponsorList(CancellationToken cancel = default);
292293
#endregion
294+
#endif
293295
}
294296

295297
public sealed class ServerDbManager : IServerDbManager
@@ -921,7 +923,7 @@ private IAsyncEnumerable<T> RunDbCommand<T>(Func<IAsyncEnumerable<T>> command)
921923
return enumerable;
922924
}
923925

924-
// _LostParadise-Sponsors
926+
#if LPP_Sponsors // _LostParadise-Sponsors
925927
public async Task<Sponsor?> GetSponsorInfo(NetUserId userId, CancellationToken cancel = default)
926928
{
927929
DbWriteOpsMetric.Inc();
@@ -933,6 +935,7 @@ private IAsyncEnumerable<T> RunDbCommand<T>(Func<IAsyncEnumerable<T>> command)
933935
DbWriteOpsMetric.Inc();
934936
return await _db.GetSponsorList();
935937
}
938+
#endif
936939

937940
private DbContextOptions<PostgresServerDbContext> CreatePostgresOptions()
938941
{

‎Content.Server/Entry/EntryPoint.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#define LPP_Sponsors //комментировать при ошибках
21
using Content.Server.Acz;
32
using Content.Server.Administration;
43
using Content.Server.Administration.Logs;

‎Content.Server/IoC/ServerContentIoC.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#define LPP_Sponsors //комментировать при ошибках
21
using Content.Server.Administration;
32
using Content.Server.Administration.Logs;
43
using Content.Server.Administration.Managers;

‎Content.Server/Preferences/Managers/ServerPreferencesManager.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#define LPP_Sponsors //комментировать при ошибках
21
using System.Diagnostics.CodeAnalysis;
32
using System.Linq;
43
using System.Threading;

‎Content.Shared.Database/Content.Shared.Database.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<ImplicitUsings>enable</ImplicitUsings>
44
<Nullable>enable</Nullable>
55
</PropertyGroup>
6+
<Import Project="../Content.Shared/_PrivateShared/LPP_GlobalDefines.props" Condition="Exists('../Content.Shared/_PrivateShared/LPP_GlobalDefines.props')" />
67

78
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
89
</Project>

‎Content.Shared/Content.Shared.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
44
<TargetFramework>$(TargetFramework)</TargetFramework>
@@ -8,6 +8,7 @@
88
<WarningsAsErrors>nullable</WarningsAsErrors>
99
<Nullable>enable</Nullable>
1010
</PropertyGroup>
11+
<Import Project="../Content.Shared/_PrivateShared/LPP_GlobalDefines.props" Condition="Exists('../Content.Shared/_PrivateShared/LPP_GlobalDefines.props')" />
1112
<ItemGroup>
1213
<PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
1314
</ItemGroup>

‎Content.Shared/Humanoid/HumanoidCharacterAppearance.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#define LPP_Sponsors //комментировать при ошибках
21
using System.Linq;
32
using Content.Shared.Humanoid.Markings;
43
using Content.Shared.Humanoid.Prototypes;

‎Content.Shared/Humanoid/Markings/MarkingsSet.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#define LPP_Sponsors //комментировать при ошибках
21
using System.Collections;
32
using System.Diagnostics.CodeAnalysis;
43
using System.Linq;

0 commit comments

Comments
 (0)