Фикс субмодуля

Content.Benchmarks/Content.Benchmarks.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
   <PropertyGroup>
     <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
@@ -10,6 +10,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>12</LangVersion>
   </PropertyGroup>
+  <Import Project="../Content.Shared/_PrivateShared/LPP_GlobalDefines.props" Condition="Exists('../Content.Shared/_PrivateShared/LPP_GlobalDefines.props')" />
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" />
   </ItemGroup>

Content.Client/.filenesting.json

@@ -0,0 +1,3 @@
+{
+    "help":"https://go.microsoft.com/fwlink/?linkid=866610"
+}

Content.Client/Content.Client.csproj

@@ -12,6 +12,7 @@
     <Configurations>Debug;Release;Tools;DebugOpt</Configurations>
     <Platforms>AnyCPU</Platforms>
   </PropertyGroup>
+  <Import Project="../Content.Shared/_PrivateShared/LPP_GlobalDefines.props" Condition="Exists('../Content.Shared/_PrivateShared/LPP_GlobalDefines.props')" />
   <ItemGroup>
     <PackageReference Include="Nett" />
     <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />

Content.Client/Corvax/TTS/TTSSystem.cs

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

Content.Client/Entry/EntryPoint.cs

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

Content.Client/IoC/ClientContentIoC.cs

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

Content.Client/Preferences/ClientPreferencesManager.cs

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

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

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

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

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

Content.IntegrationTests/Content.IntegrationTests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
     <TargetFramework>$(TargetFramework)</TargetFramework>
@@ -7,6 +7,7 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <LangVersion>12</LangVersion>
   </PropertyGroup>
+  <Import Project="../Content.Shared/_PrivateShared/LPP_GlobalDefines.props" Condition="Exists('../Content.Shared/_PrivateShared/LPP_GlobalDefines.props')" />
   <ItemGroup>
     <PackageReference Include="NUnit" />
     <PackageReference Include="NUnit3TestAdapter" />

Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs

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

Content.MapRenderer/Content.MapRenderer.csproj

@@ -6,6 +6,7 @@
     <Nullable>enable</Nullable>
     <ServerGarbageCollection>true</ServerGarbageCollection>
   </PropertyGroup>
+  <Import Project="../Content.Shared/_PrivateShared/LPP_GlobalDefines.props" Condition="Exists('../Content.Shared/_PrivateShared/LPP_GlobalDefines.props')" />
 
   <ItemGroup>
     <ProjectReference Include="..\Content.IntegrationTests\Content.IntegrationTests.csproj" />

Content.Packaging/Content.Packaging.csproj

@@ -5,6 +5,7 @@
     <Nullable>enable</Nullable>
     <ServerGarbageCollection>True</ServerGarbageCollection>
   </PropertyGroup>
+  <Import Project="../Content.Shared/_PrivateShared/LPP_GlobalDefines.props" Condition="Exists('../Content.Shared/_PrivateShared/LPP_GlobalDefines.props')" />
 
   <ItemGroup>
     <ProjectReference Include="..\RobustToolbox\Robust.Packaging\Robust.Packaging.csproj" />

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

@@ -11,6 +11,8 @@
     <NoWarn>RA0003</NoWarn>
   </PropertyGroup>
 
+  <Import Project="../Content.Shared/_PrivateShared/LPP_GlobalDefines.props" Condition="Exists('../Content.Shared/_PrivateShared/LPP_GlobalDefines.props')" />
+
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

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

@@ -1,3 +1,4 @@
+#if LPP_Sponsors
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
@@ -42,3 +43,4 @@ protected override void Down(MigrationBuilder migrationBuilder)
         }
     }
 }
+#endif

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

@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+#if LPP_Sponsors
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
@@ -24,3 +25,4 @@ protected override void Down(MigrationBuilder migrationBuilder)
         }
     }
 }
+#endif

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

@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+#if LPP_Sponsors
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
@@ -44,3 +45,4 @@ protected override void Down(MigrationBuilder migrationBuilder)
         }
     }
 }
+#endif

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

@@ -1,3 +1,4 @@
+#if LPP_Sponsors
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
@@ -41,3 +42,4 @@ protected override void Down(MigrationBuilder migrationBuilder)
         }
     }
 }
+#endif

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

@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+#if LPP_Sponsors
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
@@ -24,3 +25,4 @@ protected override void Down(MigrationBuilder migrationBuilder)
         }
     }
 }
+#endif

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

@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+#if LPP_Sponsors
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
@@ -45,3 +46,4 @@ protected override void Down(MigrationBuilder migrationBuilder)
         }
     }
 }
+#endif

Content.Server.Database/Model.cs

@@ -1,4 +1,3 @@
-#define LPP_Sponsors    //комментировать при ошибках
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -41,7 +40,9 @@ protected ServerDbContext(DbContextOptions options) : base(options)
         public DbSet<AdminNote> AdminNotes { get; set; } = null!;
         public DbSet<AdminWatchlist> AdminWatchlists { get; set; } = null!;
         public DbSet<AdminMessage> AdminMessages { get; set; } = null!;
-        public DbSet<Sponsor> Sponsors { get; set; } = null!;   // _LostParadise-Sponsors
+#if LPP_Sponsors  // _LostParadise-Sponsors
+        public DbSet<Sponsor> Sponsors { get; set; } = null!;
+#endif
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
@@ -64,12 +65,11 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             modelBuilder.Entity<Loadout>()
                 .HasIndex(p => new {HumanoidProfileId = p.ProfileId, p.LoadoutName})
                 .IsUnique();
-
+#if LPP_Sponsors
             modelBuilder.Entity<Sponsor>()          // _LostParadise-Sponsors
                 .HasIndex(p => p.UserId)
                 .IsUnique();
 
-#if LPP_Sponsors  // _LostParadise-Sponsors
             modelBuilder.Entity<Donate>()
                 .HasIndex(p => new { HumanoidProfileId = p.ProfileId, p.DonateName })
                 .IsUnique();
@@ -1051,7 +1051,8 @@ public class AdminMessage : IAdminRemarksCommon
         public bool Dismissed { get; set; }
     }
 
-    [Table("sponsors")]     // _LostParadise-Sponsors
+#if LPP_Sponsors  // _LostParadise-Sponsors
+    [Table("sponsors")] 
     public class Sponsor
     {
         [Required, Key] public Guid UserId { get; set; }
@@ -1063,4 +1064,5 @@ public class Sponsor
         public DateTime ExpireDate {get;set;}
         public bool AllowJob { get; set; } = false;
     }
+#endif
 }

Content.Server/Chat/Managers/ChatManager.cs

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

Content.Server/Connection/ConnectionManager.cs

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

Content.Server/Content.Server.csproj

@@ -13,6 +13,7 @@
     <Nullable>enable</Nullable>
     <ServerGarbageCollection>true</ServerGarbageCollection>
   </PropertyGroup>
+  <Import Project="../Content.Shared/_PrivateShared/LPP_GlobalDefines.props" Condition="Exists('../Content.Shared/_PrivateShared/LPP_GlobalDefines.props')" />
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
   </ItemGroup>

Content.Server/Database/ServerDbBase.cs

@@ -1,4 +1,3 @@
-#define LPP_Sponsors    //комментировать при ошибках
 using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
@@ -1601,7 +1600,7 @@ protected abstract class DbGuard : IAsyncDisposable
 
             public abstract ValueTask DisposeAsync();
         }
-
+#if LPP_Sponsors
         #region Sponsors
         public async Task<Sponsor?> GetSponsorInfo(NetUserId userId)   // _LostParadise-Sponsors
         {
@@ -1615,5 +1614,6 @@ protected abstract class DbGuard : IAsyncDisposable
             return await db.DbContext.Sponsors.AsNoTracking().ToArrayAsync();
         }
         #endregion
+#endif
     }
 }

Content.Server/Database/ServerDbManager.cs

@@ -286,10 +286,12 @@ Task<int> AddConnectionLogAsync(
 
         #endregion
 
+#if LPP_Sponsors
         #region Sponsors
         Task<Sponsor?> GetSponsorInfo(NetUserId userId, CancellationToken cancel = default);    //_LostParadise-Sponsors
         Task<Sponsor[]?> GetSponsorList(CancellationToken cancel = default);
         #endregion
+#endif
     }
 
     public sealed class ServerDbManager : IServerDbManager
@@ -921,7 +923,7 @@ private IAsyncEnumerable<T> RunDbCommand<T>(Func<IAsyncEnumerable<T>> command)
             return enumerable;
         }
 
-        // _LostParadise-Sponsors
+#if LPP_Sponsors    // _LostParadise-Sponsors
         public async Task<Sponsor?> GetSponsorInfo(NetUserId userId, CancellationToken cancel = default)
         {
             DbWriteOpsMetric.Inc();
@@ -933,6 +935,7 @@ private IAsyncEnumerable<T> RunDbCommand<T>(Func<IAsyncEnumerable<T>> command)
             DbWriteOpsMetric.Inc();
             return await _db.GetSponsorList();
         }
+#endif
 
         private DbContextOptions<PostgresServerDbContext> CreatePostgresOptions()
         {

Content.Server/Entry/EntryPoint.cs

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

Content.Server/IoC/ServerContentIoC.cs

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

Content.Server/Preferences/Managers/ServerPreferencesManager.cs

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

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

@@ -3,6 +3,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
+  <Import Project="../Content.Shared/_PrivateShared/LPP_GlobalDefines.props" Condition="Exists('../Content.Shared/_PrivateShared/LPP_GlobalDefines.props')" />
 
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
 </Project>

Content.Shared/Content.Shared.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
     <TargetFramework>$(TargetFramework)</TargetFramework>
@@ -8,6 +8,7 @@
     <WarningsAsErrors>nullable</WarningsAsErrors>
     <Nullable>enable</Nullable>
   </PropertyGroup>
+  <Import Project="../Content.Shared/_PrivateShared/LPP_GlobalDefines.props" Condition="Exists('../Content.Shared/_PrivateShared/LPP_GlobalDefines.props')" />
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
   </ItemGroup>

Content.Shared/Humanoid/HumanoidCharacterAppearance.cs

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

Content.Shared/Humanoid/Markings/MarkingsSet.cs

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