From d02e36d03f2cc73c0032a0fa3477a393e8375a1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schr=C3=B6dinger?= <132720404+Schrodinger71@users.noreply.github.com> Date: Sat, 10 Aug 2024 00:18:30 +0300 Subject: [PATCH 1/7] Fix Packaging TEST --- Content.Packaging/ClientPackaging.cs | 50 ++-------------------------- 1 file changed, 3 insertions(+), 47 deletions(-) diff --git a/Content.Packaging/ClientPackaging.cs b/Content.Packaging/ClientPackaging.cs index 4651164d7f..0aafab5ef5 100644 --- a/Content.Packaging/ClientPackaging.cs +++ b/Content.Packaging/ClientPackaging.cs @@ -1,4 +1,4 @@ -using System.Diagnostics; +using System.Diagnostics; using System.IO.Compression; using Robust.Packaging; using Robust.Packaging.AssetProcessing; @@ -10,7 +10,6 @@ namespace Content.Packaging; public static class ClientPackaging { - private static readonly bool UseSecrets = File.Exists(Path.Combine("Secrets", "CorvaxSecrets.sln")); // Corvax-Secrets /// /// Be advised this can be called from server packaging during a HybridACZ build. /// @@ -35,24 +34,6 @@ await ProcessHelpers.RunCheck(new ProcessStartInfo "/m" } }); - if (UseSecrets) - { - await ProcessHelpers.RunCheck(new ProcessStartInfo - { - FileName = "dotnet", - ArgumentList = - { - "build", - Path.Combine("Secrets","Content.Corvax.Client", "Content.Corvax.Client.csproj"), - "-c", "Release", - "--nologo", - "/v:m", - "/t:Rebuild", - "/p:FullRelease=true", - "/m" - } - }); - } } logger.Info("Packaging client..."); @@ -84,40 +65,15 @@ public static async Task WriteResources( var inputPass = graph.Input; - // Corvax-Secrets-Start: Add Corvax interfaces to Magic ACZ - var assemblies = new List { "Content.Client", "Content.Shared", "Content.Shared.Database", "Content.Corvax.Interfaces.Client", "Content.Corvax.Interfaces.Shared" }; - if (UseSecrets) - assemblies.AddRange(new[] { "Content.Corvax.Shared", "Content.Corvax.Client" }); - // Corvax-Secrets-End - await RobustSharedPackaging.WriteContentAssemblies( inputPass, contentDir, "Content.Client", - assemblies, // Corvax-Secrets + new[] { "Content.Client", "Content.Shared", "Content.Shared.Database" }, cancel: cancel); - await WriteClientResources(contentDir, pass, cancel); // Corvax-Secrets: Support content resource ignore to ignore server-only prototypes + await RobustClientPackaging.WriteClientResources(contentDir, pass, cancel); inputPass.InjectFinished(); } - - // Corvax-Secrets-Start - public static IReadOnlySet ContentClientIgnoredResources { get; } = new HashSet - { - "CorvaxSecretsServer" - }; - - private static async Task WriteClientResources( - string contentDir, - AssetPass pass, - CancellationToken cancel = default) - { - var ignoreSet = RobustClientPackaging.ClientIgnoredResources - .Union(RobustSharedPackaging.SharedIgnoredResources) - .Union(ContentClientIgnoredResources).ToHashSet(); - - await RobustSharedPackaging.DoResourceCopy(Path.Combine(contentDir, "Resources"), pass, ignoreSet, cancel: cancel); - } - // Corvax-Secrets-End } From b741bc2e8e4c54a633721cb6947b1cd32fe8bf31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schr=C3=B6dinger?= <132720404+Schrodinger71@users.noreply.github.com> Date: Sat, 10 Aug 2024 00:51:11 +0300 Subject: [PATCH 2/7] Update PanicBunkerChangedEvent.cs --- Content.Shared/Administration/Events/PanicBunkerChangedEvent.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/Administration/Events/PanicBunkerChangedEvent.cs b/Content.Shared/Administration/Events/PanicBunkerChangedEvent.cs index 372bb4fb78..f545f096e3 100644 --- a/Content.Shared/Administration/Events/PanicBunkerChangedEvent.cs +++ b/Content.Shared/Administration/Events/PanicBunkerChangedEvent.cs @@ -12,7 +12,7 @@ public sealed class PanicBunkerStatus public bool ShowReason; public int MinAccountAgeMinutes; public int MinOverallMinutes; - public bool DenyVpn; // Corvax-VPNGuard + //public bool DenyVpn; // Corvax-VPNGuard } [Serializable, NetSerializable] From 7a8903006572eaae4cde890e56714f5e1ed5c318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schr=C3=B6dinger?= <132720404+Schrodinger71@users.noreply.github.com> Date: Sat, 10 Aug 2024 00:54:09 +0300 Subject: [PATCH 3/7] Update main.toml --- Resources/ConfigPresets/Corvax/main.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/ConfigPresets/Corvax/main.toml b/Resources/ConfigPresets/Corvax/main.toml index 7241bcde3d..891726a7a4 100644 --- a/Resources/ConfigPresets/Corvax/main.toml +++ b/Resources/ConfigPresets/Corvax/main.toml @@ -11,7 +11,7 @@ enabled = true show_reason = true min_account_age = 0 min_overall_minutes = 0 -deny_vpn = true +#deny_vpn = true # Fix ADT enable_without_admins = true disable_with_admins = true From 6e7e46491596db0d66fe36527f1feb623aaddcc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schr=C3=B6dinger?= <132720404+Schrodinger71@users.noreply.github.com> Date: Sat, 10 Aug 2024 00:54:37 +0300 Subject: [PATCH 4/7] Update elysium.toml --- Resources/ConfigPresets/Corvax/elysium.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/ConfigPresets/Corvax/elysium.toml b/Resources/ConfigPresets/Corvax/elysium.toml index 0d72f98b82..8d34b73c50 100644 --- a/Resources/ConfigPresets/Corvax/elysium.toml +++ b/Resources/ConfigPresets/Corvax/elysium.toml @@ -11,7 +11,7 @@ enabled = true show_reason = true min_account_age = 0 min_overall_minutes = 0 -deny_vpn = true +#deny_vpn = true #ADT Fix enable_without_admins = true disable_with_admins = true From ee2e7c1fc2358ace7806d61be70af6d67bfb5874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schr=C3=B6dinger?= <132720404+Schrodinger71@users.noreply.github.com> Date: Sat, 10 Aug 2024 00:55:02 +0300 Subject: [PATCH 5/7] Update solaris.toml --- Resources/ConfigPresets/Corvax/solaris.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/ConfigPresets/Corvax/solaris.toml b/Resources/ConfigPresets/Corvax/solaris.toml index cbd31f7f66..424aa4a078 100644 --- a/Resources/ConfigPresets/Corvax/solaris.toml +++ b/Resources/ConfigPresets/Corvax/solaris.toml @@ -11,7 +11,7 @@ enabled = true show_reason = true min_account_age = 0 min_overall_minutes = 0 -deny_vpn = true +#deny_vpn = true #ADT Fix enable_without_admins = true disable_with_admins = true From 3ab25d635013bd27df1d91597b0d09b4820957d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schr=C3=B6dinger?= <132720404+Schrodinger71@users.noreply.github.com> Date: Sat, 10 Aug 2024 00:55:29 +0300 Subject: [PATCH 6/7] Update athara.toml --- Resources/ConfigPresets/Corvax/athara.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/ConfigPresets/Corvax/athara.toml b/Resources/ConfigPresets/Corvax/athara.toml index 836b8501ae..fbef948a76 100644 --- a/Resources/ConfigPresets/Corvax/athara.toml +++ b/Resources/ConfigPresets/Corvax/athara.toml @@ -11,7 +11,7 @@ enabled = true show_reason = true min_account_age = 0 min_overall_minutes = 0 -deny_vpn = true +#deny_vpn = true #FIX ADT enable_without_admins = true disable_with_admins = true From c079791f7c4699ed5c5aef173d41aec9e7543898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schr=C3=B6dinger?= <132720404+Schrodinger71@users.noreply.github.com> Date: Sat, 10 Aug 2024 00:56:09 +0300 Subject: [PATCH 7/7] Update nebula.toml --- Resources/ConfigPresets/Corvax/nebula.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/ConfigPresets/Corvax/nebula.toml b/Resources/ConfigPresets/Corvax/nebula.toml index 9051e4cc3a..bad6a9d9a6 100644 --- a/Resources/ConfigPresets/Corvax/nebula.toml +++ b/Resources/ConfigPresets/Corvax/nebula.toml @@ -11,7 +11,7 @@ enabled = true show_reason = true min_account_age = 0 min_overall_minutes = 0 -deny_vpn = true +#deny_vpn = true # FIX ADT enable_without_admins = true disable_with_admins = true