diff --git a/src/ARKServerManager.Common/ARKServerManager.Common.csproj b/src/ARKServerManager.Common/ARKServerManager.Common.csproj index ba4dc363..5e3bcbe9 100644 --- a/src/ARKServerManager.Common/ARKServerManager.Common.csproj +++ b/src/ARKServerManager.Common/ARKServerManager.Common.csproj @@ -4,6 +4,7 @@ {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} https://dev.azure.com/bretthewitson . + Debug;Release;Debug - Beta net462 diff --git a/src/ARKServerManager/ARKServerManager.csproj b/src/ARKServerManager/ARKServerManager.csproj index 2a4f4f22..679fd46f 100644 --- a/src/ARKServerManager/ARKServerManager.csproj +++ b/src/ARKServerManager/ARKServerManager.csproj @@ -97,6 +97,15 @@ + + true + bin\Debug - Beta\ + TRACE;DEBUG + full + AnyCPU + 7.3 + prompt + ..\packages\DotNetZip.1.13.8\lib\net40\DotNetZip.dll @@ -230,6 +239,9 @@ ServerMonitorWindow.xaml + + SupplyCrateOverridesWindow.xaml + VersionFeedWindow.xaml @@ -405,6 +417,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/src/ARKServerManager/Windows/MainWindow.xaml.cs b/src/ARKServerManager/Windows/MainWindow.xaml.cs index 0e1142d4..0375d9c8 100644 --- a/src/ARKServerManager/Windows/MainWindow.xaml.cs +++ b/src/ARKServerManager/Windows/MainWindow.xaml.cs @@ -129,7 +129,7 @@ namespace ServerManagerTool public MainWindow() { - BetaVersion = App.Instance.BetaVersion; + this.BetaVersion = App.Instance.BetaVersion; this.CurrentConfig = Config.Default; InitializeComponent(); diff --git a/src/ARKServerManager/Windows/ServerSettingsControl.xaml b/src/ARKServerManager/Windows/ServerSettingsControl.xaml index 3a623236..ea21be43 100644 --- a/src/ARKServerManager/Windows/ServerSettingsControl.xaml +++ b/src/ARKServerManager/Windows/ServerSettingsControl.xaml @@ -5363,6 +5363,9 @@ Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.SupplyCrateOverridesSection}"> + diff --git a/src/ARKServerManager/Windows/ServerSettingsControl.xaml.cs b/src/ARKServerManager/Windows/ServerSettingsControl.xaml.cs index 9f7170fc..8cca3e4b 100644 --- a/src/ARKServerManager/Windows/ServerSettingsControl.xaml.cs +++ b/src/ARKServerManager/Windows/ServerSettingsControl.xaml.cs @@ -97,6 +97,7 @@ namespace ServerManagerTool public static readonly DependencyProperty BaseTotalConversionsProperty = DependencyProperty.Register(nameof(BaseTotalConversions), typeof(ComboBoxItemList), typeof(ServerSettingsControl), new PropertyMetadata(null)); public static readonly DependencyProperty BaseBranchesProperty = DependencyProperty.Register(nameof(BaseBranches), typeof(ComboBoxItemList), typeof(ServerSettingsControl), new PropertyMetadata(null)); public static readonly DependencyProperty BaseEventsProperty = DependencyProperty.Register(nameof(BaseEvents), typeof(ComboBoxItemList), typeof(ServerSettingsControl), new PropertyMetadata(null)); + public static readonly DependencyProperty BetaVersionProperty = DependencyProperty.Register(nameof(BetaVersion), typeof(bool), typeof(ServerSettingsControl), new PropertyMetadata(false)); public static readonly DependencyProperty CurrentConfigProperty = DependencyProperty.Register(nameof(CurrentConfig), typeof(Config), typeof(ServerSettingsControl)); public static readonly DependencyProperty IsAdministratorProperty = DependencyProperty.Register(nameof(IsAdministrator), typeof(bool), typeof(ServerSettingsControl), new PropertyMetadata(false)); public static readonly DependencyProperty NetworkInterfacesProperty = DependencyProperty.Register(nameof(NetworkInterfaces), typeof(List), typeof(ServerSettingsControl), new PropertyMetadata(new List())); @@ -192,6 +193,12 @@ namespace ServerManagerTool set { SetValue(BaseEventsProperty, value); } } + public bool BetaVersion + { + get { return (bool)GetValue(BetaVersionProperty); } + set { SetValue(BetaVersionProperty, value); } + } + public Config CurrentConfig { get { return GetValue(CurrentConfigProperty) as Config; } @@ -357,6 +364,7 @@ namespace ServerManagerTool public ServerSettingsControl() { + this.BetaVersion = App.Instance.BetaVersion; this.CurrentConfig = Config.Default; this.CurrentCulture = Thread.CurrentThread.CurrentCulture; @@ -4300,5 +4308,15 @@ namespace ServerManagerTool this.ProfileLastStarted = $"{_globalizer.GetResourceString("ServerSettings_LastStartedLabel")} {date}"; } #endregion + + private void OpenSupplyCrateOverridesWindow_Click(object sender, RoutedEventArgs e) + { + var window = new SupplyCrateOverridesWindow(this.Server.Profile); + window.Owner = Window.GetWindow(this); + window.Closed += Window_Closed; + //window.SavePerformed += SupplyCrateOverridesWindow_SavePerformed; + window.Show(); + window.Focus(); + } } } diff --git a/src/ARKServerManager/Windows/SupplyCrateOverridesWindow.xaml b/src/ARKServerManager/Windows/SupplyCrateOverridesWindow.xaml new file mode 100644 index 00000000..fa12da5c --- /dev/null +++ b/src/ARKServerManager/Windows/SupplyCrateOverridesWindow.xaml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ARKServerManager/Windows/SupplyCrateOverridesWindow.xaml.cs b/src/ARKServerManager/Windows/SupplyCrateOverridesWindow.xaml.cs new file mode 100644 index 00000000..59f5b683 --- /dev/null +++ b/src/ARKServerManager/Windows/SupplyCrateOverridesWindow.xaml.cs @@ -0,0 +1,49 @@ +using NLog; +using ServerManagerTool.Common.Utils; +using ServerManagerTool.Lib; +using System; +using System.ComponentModel; +using System.Windows; +using WPFSharp.Globalizer; + +namespace ServerManagerTool +{ + /// + /// Interaction logic for SupplyCrateOverridesWindow.xaml + /// + public partial class SupplyCrateOverridesWindow : Window + { + private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); + + public EventHandler SavePerformed; + + private readonly GlobalizedApplication _globalizer = GlobalizedApplication.Instance; + private readonly ServerProfile _profile = null; + + public SupplyCrateOverridesWindow(ServerProfile profile) + { + InitializeComponent(); + WindowUtils.RemoveDefaultResourceDictionary(this, Config.Default.DefaultGlobalizationFile); + + _profile = profile; + this.Title = $"{this.Title} - {_profile?.ProfileName}"; // string.Format(_globalizer.GetResourceString("SupplyCrateOverridesWindow_ProfileTitle"), _profile?.ProfileName); + + this.DataContext = this; + } + + private async void Window_Loaded(object sender, RoutedEventArgs e) + { + + } + + private void Window_Closing(object sender, CancelEventArgs e) + { + + } + + protected void OnSavePerformed() + { + SavePerformed?.Invoke(this, new ProfileEventArgs(_profile)); + } + } +} diff --git a/src/ArkData/ArkData.csproj b/src/ArkData/ArkData.csproj index 495a9546..ba820ea8 100644 --- a/src/ArkData/ArkData.csproj +++ b/src/ArkData/ArkData.csproj @@ -4,6 +4,7 @@ {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} https://dev.azure.com/bretthewitson . + Debug;Release;Debug - Beta net462 diff --git a/src/ConanData/ConanData.csproj b/src/ConanData/ConanData.csproj index 3a684f68..8ee79662 100644 --- a/src/ConanData/ConanData.csproj +++ b/src/ConanData/ConanData.csproj @@ -4,6 +4,7 @@ {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} https://dev.azure.com/bretthewitson . + Debug;Release;Debug - Beta net462 diff --git a/src/ConanServerManager.Common/ConanServerManager.Common.csproj b/src/ConanServerManager.Common/ConanServerManager.Common.csproj index 6dc4e262..366ceca7 100644 --- a/src/ConanServerManager.Common/ConanServerManager.Common.csproj +++ b/src/ConanServerManager.Common/ConanServerManager.Common.csproj @@ -4,6 +4,7 @@ {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} https://dev.azure.com/bretthewitson . + Debug;Release;Debug - Beta net462 diff --git a/src/ConanServerManager/ConanServerManager.csproj b/src/ConanServerManager/ConanServerManager.csproj index a3204a3e..d364d700 100644 --- a/src/ConanServerManager/ConanServerManager.csproj +++ b/src/ConanServerManager/ConanServerManager.csproj @@ -87,6 +87,15 @@ false + + true + bin\Debug - Beta\ + DEBUG;TRACE + full + AnyCPU + 7.3 + prompt + ..\packages\DotNetZip.1.13.8\lib\net40\DotNetZip.dll diff --git a/src/NeXtVdf/NeXt.Vdf.csproj b/src/NeXtVdf/NeXt.Vdf.csproj index 35ad6613..23c1c7c0 100644 --- a/src/NeXtVdf/NeXt.Vdf.csproj +++ b/src/NeXtVdf/NeXt.Vdf.csproj @@ -4,6 +4,7 @@ {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} https://dev.azure.com/bretthewitson . + Debug;Release;Debug - Beta net462 diff --git a/src/Plugin.Common/Plugin.Common.csproj b/src/Plugin.Common/Plugin.Common.csproj index 70274438..f77c2699 100644 --- a/src/Plugin.Common/Plugin.Common.csproj +++ b/src/Plugin.Common/Plugin.Common.csproj @@ -4,6 +4,7 @@ {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} https://dev.azure.com/bretthewitson . + Debug;Release;Debug - Beta net462 diff --git a/src/Plugin.Discord/Plugin.Discord.csproj b/src/Plugin.Discord/Plugin.Discord.csproj index 1a5cd235..e018afa0 100644 --- a/src/Plugin.Discord/Plugin.Discord.csproj +++ b/src/Plugin.Discord/Plugin.Discord.csproj @@ -4,6 +4,7 @@ {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} https://dev.azure.com/bretthewitson . + Debug;Release;Debug - Beta net462 diff --git a/src/QueryMaster/QueryMaster.csproj b/src/QueryMaster/QueryMaster.csproj index d9c68489..1ab78819 100644 --- a/src/QueryMaster/QueryMaster.csproj +++ b/src/QueryMaster/QueryMaster.csproj @@ -4,6 +4,7 @@ {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} https://dev.azure.com/bretthewitson . + Debug;Release;Debug - Beta net462 diff --git a/src/Server-Managers.sln b/src/Server-Managers.sln index 37f9f08c..377bdd90 100644 --- a/src/Server-Managers.sln +++ b/src/Server-Managers.sln @@ -42,58 +42,85 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConanServerManager.Common", EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug - Beta|Any CPU = Debug - Beta|Any CPU Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7C99D9F7-0C65-4116-927A-94EB018C88FD}.Debug - Beta|Any CPU.ActiveCfg = Debug - Beta|Any CPU + {7C99D9F7-0C65-4116-927A-94EB018C88FD}.Debug - Beta|Any CPU.Build.0 = Debug - Beta|Any CPU {7C99D9F7-0C65-4116-927A-94EB018C88FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7C99D9F7-0C65-4116-927A-94EB018C88FD}.Debug|Any CPU.Build.0 = Debug|Any CPU {7C99D9F7-0C65-4116-927A-94EB018C88FD}.Release|Any CPU.ActiveCfg = Release|Any CPU {7C99D9F7-0C65-4116-927A-94EB018C88FD}.Release|Any CPU.Build.0 = Release|Any CPU + {715461E8-4E54-4993-80A8-8E72892135E0}.Debug - Beta|Any CPU.ActiveCfg = Debug - Beta|Any CPU + {715461E8-4E54-4993-80A8-8E72892135E0}.Debug - Beta|Any CPU.Build.0 = Debug - Beta|Any CPU {715461E8-4E54-4993-80A8-8E72892135E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {715461E8-4E54-4993-80A8-8E72892135E0}.Debug|Any CPU.Build.0 = Debug|Any CPU {715461E8-4E54-4993-80A8-8E72892135E0}.Release|Any CPU.ActiveCfg = Release|Any CPU {715461E8-4E54-4993-80A8-8E72892135E0}.Release|Any CPU.Build.0 = Release|Any CPU + {E4EDA8B8-006C-4D41-822F-F64B6DB0021F}.Debug - Beta|Any CPU.ActiveCfg = Debug - Beta|Any CPU + {E4EDA8B8-006C-4D41-822F-F64B6DB0021F}.Debug - Beta|Any CPU.Build.0 = Debug - Beta|Any CPU {E4EDA8B8-006C-4D41-822F-F64B6DB0021F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E4EDA8B8-006C-4D41-822F-F64B6DB0021F}.Debug|Any CPU.Build.0 = Debug|Any CPU {E4EDA8B8-006C-4D41-822F-F64B6DB0021F}.Release|Any CPU.ActiveCfg = Release|Any CPU {E4EDA8B8-006C-4D41-822F-F64B6DB0021F}.Release|Any CPU.Build.0 = Release|Any CPU + {679FE859-9A82-4FFB-A758-C1E8DF915F58}.Debug - Beta|Any CPU.ActiveCfg = Debug - Beta|Any CPU + {679FE859-9A82-4FFB-A758-C1E8DF915F58}.Debug - Beta|Any CPU.Build.0 = Debug - Beta|Any CPU {679FE859-9A82-4FFB-A758-C1E8DF915F58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {679FE859-9A82-4FFB-A758-C1E8DF915F58}.Debug|Any CPU.Build.0 = Debug|Any CPU {679FE859-9A82-4FFB-A758-C1E8DF915F58}.Release|Any CPU.ActiveCfg = Release|Any CPU {679FE859-9A82-4FFB-A758-C1E8DF915F58}.Release|Any CPU.Build.0 = Release|Any CPU + {936EF260-FECF-4E9E-A21E-092D65931C7D}.Debug - Beta|Any CPU.ActiveCfg = Debug - Beta|Any CPU + {936EF260-FECF-4E9E-A21E-092D65931C7D}.Debug - Beta|Any CPU.Build.0 = Debug - Beta|Any CPU {936EF260-FECF-4E9E-A21E-092D65931C7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {936EF260-FECF-4E9E-A21E-092D65931C7D}.Debug|Any CPU.Build.0 = Debug|Any CPU {936EF260-FECF-4E9E-A21E-092D65931C7D}.Release|Any CPU.ActiveCfg = Release|Any CPU {936EF260-FECF-4E9E-A21E-092D65931C7D}.Release|Any CPU.Build.0 = Release|Any CPU + {3E0C9EE6-780F-4FEF-BA03-E38062A5FDB6}.Debug - Beta|Any CPU.ActiveCfg = Debug - Beta|Any CPU + {3E0C9EE6-780F-4FEF-BA03-E38062A5FDB6}.Debug - Beta|Any CPU.Build.0 = Debug - Beta|Any CPU {3E0C9EE6-780F-4FEF-BA03-E38062A5FDB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3E0C9EE6-780F-4FEF-BA03-E38062A5FDB6}.Debug|Any CPU.Build.0 = Debug|Any CPU {3E0C9EE6-780F-4FEF-BA03-E38062A5FDB6}.Release|Any CPU.ActiveCfg = Release|Any CPU {3E0C9EE6-780F-4FEF-BA03-E38062A5FDB6}.Release|Any CPU.Build.0 = Release|Any CPU + {D2EE1483-021F-4900-BBE8-88338D1386F4}.Debug - Beta|Any CPU.ActiveCfg = Debug - Beta|Any CPU + {D2EE1483-021F-4900-BBE8-88338D1386F4}.Debug - Beta|Any CPU.Build.0 = Debug - Beta|Any CPU {D2EE1483-021F-4900-BBE8-88338D1386F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D2EE1483-021F-4900-BBE8-88338D1386F4}.Debug|Any CPU.Build.0 = Debug|Any CPU {D2EE1483-021F-4900-BBE8-88338D1386F4}.Release|Any CPU.ActiveCfg = Release|Any CPU {D2EE1483-021F-4900-BBE8-88338D1386F4}.Release|Any CPU.Build.0 = Release|Any CPU + {F7A82C6A-32CD-4847-AD16-D79ADC72746E}.Debug - Beta|Any CPU.ActiveCfg = Debug - Beta|Any CPU + {F7A82C6A-32CD-4847-AD16-D79ADC72746E}.Debug - Beta|Any CPU.Build.0 = Debug - Beta|Any CPU {F7A82C6A-32CD-4847-AD16-D79ADC72746E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F7A82C6A-32CD-4847-AD16-D79ADC72746E}.Debug|Any CPU.Build.0 = Debug|Any CPU {F7A82C6A-32CD-4847-AD16-D79ADC72746E}.Release|Any CPU.ActiveCfg = Release|Any CPU {F7A82C6A-32CD-4847-AD16-D79ADC72746E}.Release|Any CPU.Build.0 = Release|Any CPU + {96832688-29BD-464F-9DCE-482E37BFC751}.Debug - Beta|Any CPU.ActiveCfg = Debug - Beta|Any CPU + {96832688-29BD-464F-9DCE-482E37BFC751}.Debug - Beta|Any CPU.Build.0 = Debug - Beta|Any CPU {96832688-29BD-464F-9DCE-482E37BFC751}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {96832688-29BD-464F-9DCE-482E37BFC751}.Debug|Any CPU.Build.0 = Debug|Any CPU {96832688-29BD-464F-9DCE-482E37BFC751}.Release|Any CPU.ActiveCfg = Release|Any CPU {96832688-29BD-464F-9DCE-482E37BFC751}.Release|Any CPU.Build.0 = Release|Any CPU + {95D4E57F-06F9-4B41-BEBB-2A8E81759BD2}.Debug - Beta|Any CPU.ActiveCfg = Debug - Beta|Any CPU + {95D4E57F-06F9-4B41-BEBB-2A8E81759BD2}.Debug - Beta|Any CPU.Build.0 = Debug - Beta|Any CPU {95D4E57F-06F9-4B41-BEBB-2A8E81759BD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {95D4E57F-06F9-4B41-BEBB-2A8E81759BD2}.Debug|Any CPU.Build.0 = Debug|Any CPU {95D4E57F-06F9-4B41-BEBB-2A8E81759BD2}.Release|Any CPU.ActiveCfg = Release|Any CPU {95D4E57F-06F9-4B41-BEBB-2A8E81759BD2}.Release|Any CPU.Build.0 = Release|Any CPU + {4CA9C894-518F-42D7-BBE2-CFDFE7A03F8A}.Debug - Beta|Any CPU.ActiveCfg = Debug - Beta|Any CPU + {4CA9C894-518F-42D7-BBE2-CFDFE7A03F8A}.Debug - Beta|Any CPU.Build.0 = Debug - Beta|Any CPU {4CA9C894-518F-42D7-BBE2-CFDFE7A03F8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4CA9C894-518F-42D7-BBE2-CFDFE7A03F8A}.Debug|Any CPU.Build.0 = Debug|Any CPU {4CA9C894-518F-42D7-BBE2-CFDFE7A03F8A}.Release|Any CPU.ActiveCfg = Release|Any CPU {4CA9C894-518F-42D7-BBE2-CFDFE7A03F8A}.Release|Any CPU.Build.0 = Release|Any CPU + {DD0A2401-99B8-4DE1-B8ED-9B075172F8AF}.Debug - Beta|Any CPU.ActiveCfg = Debug - Beta|Any CPU + {DD0A2401-99B8-4DE1-B8ED-9B075172F8AF}.Debug - Beta|Any CPU.Build.0 = Debug - Beta|Any CPU {DD0A2401-99B8-4DE1-B8ED-9B075172F8AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DD0A2401-99B8-4DE1-B8ED-9B075172F8AF}.Debug|Any CPU.Build.0 = Debug|Any CPU {DD0A2401-99B8-4DE1-B8ED-9B075172F8AF}.Release|Any CPU.ActiveCfg = Release|Any CPU {DD0A2401-99B8-4DE1-B8ED-9B075172F8AF}.Release|Any CPU.Build.0 = Release|Any CPU + {630422CA-4BCC-4D1D-9701-87D8EAF0B209}.Debug - Beta|Any CPU.ActiveCfg = Debug - Beta|Any CPU + {630422CA-4BCC-4D1D-9701-87D8EAF0B209}.Debug - Beta|Any CPU.Build.0 = Debug - Beta|Any CPU {630422CA-4BCC-4D1D-9701-87D8EAF0B209}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {630422CA-4BCC-4D1D-9701-87D8EAF0B209}.Debug|Any CPU.Build.0 = Debug|Any CPU {630422CA-4BCC-4D1D-9701-87D8EAF0B209}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/src/ServerManager.Common/ServerManager.Common.csproj b/src/ServerManager.Common/ServerManager.Common.csproj index 2b1d40de..74b0458f 100644 --- a/src/ServerManager.Common/ServerManager.Common.csproj +++ b/src/ServerManager.Common/ServerManager.Common.csproj @@ -4,6 +4,7 @@ {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} https://dev.azure.com/bretthewitson . + Debug;Release;Debug - Beta net462 diff --git a/src/ServerManager.Updater/ServerManager.Updater.csproj b/src/ServerManager.Updater/ServerManager.Updater.csproj index d6f83939..e81d3b44 100644 --- a/src/ServerManager.Updater/ServerManager.Updater.csproj +++ b/src/ServerManager.Updater/ServerManager.Updater.csproj @@ -4,6 +4,7 @@ {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} https://dev.azure.com/bretthewitson . + Debug;Release;Debug - Beta Exe @@ -22,6 +23,9 @@ AnyCPU + + AnyCPU + diff --git a/src/WPFSharp.Globalizer/WPFSharp.Globalizer.csproj b/src/WPFSharp.Globalizer/WPFSharp.Globalizer.csproj index 15735552..5e71d70c 100644 --- a/src/WPFSharp.Globalizer/WPFSharp.Globalizer.csproj +++ b/src/WPFSharp.Globalizer/WPFSharp.Globalizer.csproj @@ -4,6 +4,7 @@ {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} https://dev.azure.com/bretthewitson . + Debug;Release;Debug - Beta net462