diff --git a/src/ConanServerManager/ConanServerManager.csproj b/src/ConanServerManager/ConanServerManager.csproj index ba20a2fb..4f03ff5a 100644 --- a/src/ConanServerManager/ConanServerManager.csproj +++ b/src/ConanServerManager/ConanServerManager.csproj @@ -189,7 +189,7 @@ GameDataWindow.xaml - + GlobalSettingsControl.xaml @@ -222,7 +222,7 @@ ServerMonitorWindow.xaml - + ServerSettingsControl.xaml @@ -319,7 +319,7 @@ MSBuild:Compile Designer - + MSBuild:Compile Designer @@ -363,7 +363,7 @@ MSBuild:Compile Designer - + MSBuild:Compile Designer diff --git a/src/ConanServerManager/Windows/GlobalSettingsControl.xaml b/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml similarity index 100% rename from src/ConanServerManager/Windows/GlobalSettingsControl.xaml rename to src/ConanServerManager/UserControls/GlobalSettingsControl.xaml diff --git a/src/ConanServerManager/Windows/GlobalSettingsControl.xaml.cs b/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml.cs similarity index 100% rename from src/ConanServerManager/Windows/GlobalSettingsControl.xaml.cs rename to src/ConanServerManager/UserControls/GlobalSettingsControl.xaml.cs diff --git a/src/ConanServerManager/Windows/ServerSettingsControl.xaml b/src/ConanServerManager/UserControls/ServerSettingsControl.xaml similarity index 100% rename from src/ConanServerManager/Windows/ServerSettingsControl.xaml rename to src/ConanServerManager/UserControls/ServerSettingsControl.xaml diff --git a/src/ConanServerManager/Windows/ServerSettingsControl.xaml.cs b/src/ConanServerManager/UserControls/ServerSettingsControl.xaml.cs similarity index 100% rename from src/ConanServerManager/Windows/ServerSettingsControl.xaml.cs rename to src/ConanServerManager/UserControls/ServerSettingsControl.xaml.cs diff --git a/src/ConanServerManager/VersionFeed.xml b/src/ConanServerManager/VersionFeed.xml index 4376ec66..b43286c3 100644 --- a/src/ConanServerManager/VersionFeed.xml +++ b/src/ConanServerManager/VersionFeed.xml @@ -5,14 +5,14 @@ Conan Server Manager Version Feed This is the Conan Server Manager release version feed. - 2021-12-08T00:00:00Z + 2021-12-09T00:00:00Z urn:uuid:F8A08616-749B-48E7-87D5-D97E86AB3926 - 1.1.56 (1.1.56.3) - 1.1.56.3 + 1.1.56 (1.1.56.4) + 1.1.56.4 - 2021-12-08T00:00:00Z + 2021-12-09T00:00:00Z

diff --git a/src/ConanServerManager/VersionFeedBeta.xml b/src/ConanServerManager/VersionFeedBeta.xml index b82355ae..8b2239b6 100644 --- a/src/ConanServerManager/VersionFeedBeta.xml +++ b/src/ConanServerManager/VersionFeedBeta.xml @@ -5,7 +5,30 @@ Conan Server Manager Version Feed This is the Conan Server Manager beta version feed. - 2021-12-08T00:00:00Z + 2021-12-09T00:00:00Z + + + urn:uuid:BECA74AB-1107-40B0-932A-A851E978EABF + 1.1.56 (1.1.56.4) +

1.1.56.4 + + 2021-12-09T00:00:00Z + +
+

+ BUGFIX +
+

    +
  • Fixed a minor issue when clicking the data directory reset button - fringe case that I found during testing.
  • +
+

+
+
+ + bletch + bletch1971@hotmail.com + + urn:uuid:8C834060-F20F-4ACE-8F49-0B459531BA3C