From 83f985851c9e399f468f56ab7ff55d7a5a4d02bd Mon Sep 17 00:00:00 2001
From: Lior Banai <36262995+LiorBanai@users.noreply.github.com>
Date: Sat, 1 May 2021 10:12:39 +0300
Subject: [PATCH]  [DevExpress 20.2] set default skin to be the same as old
 skin fix #971

---
 Analogy/Analogy.csproj                  |  4 ----
 Analogy/App.config                      | 18 +++---------------
 Analogy/CommonChangeLog.cs              |  1 +
 Analogy/Program.cs                      |  2 +-
 Analogy/Properties/Settings.Designer.cs |  6 +++---
 Analogy/Properties/Settings.settings    |  4 ++--
 6 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/Analogy/Analogy.csproj b/Analogy/Analogy.csproj
index b16f602a..da0cc5ec 100644
--- a/Analogy/Analogy.csproj
+++ b/Analogy/Analogy.csproj
@@ -65,10 +65,6 @@
 	<ItemGroup>
 		<EmbeddedResource Remove="UserControls\UCLogsNonFloatable.resx" />
 	</ItemGroup>
-
-	<ItemGroup>
-		<None Remove="App.config" Condition=" '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0-windows' " />
-	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Analogy.CommonUtilities" Version="1.4.6.2" />
 		<PackageReference Include="Analogy.LogViewer.Interfaces" Version="2.12.5" />
diff --git a/Analogy/App.config b/Analogy/App.config
index de5ebab4..ac452fa5 100644
--- a/Analogy/App.config
+++ b/Analogy/App.config
@@ -45,19 +45,7 @@
 	<appSettings>
     <add key="ClientSettingsProvider.ServiceUri" value=""/>
   </appSettings>
-  <system.web>
-    <membership defaultProvider="ClientAuthenticationMembershipProvider">
-      <providers>
-        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
-      </providers>
-    </membership>
-    <roleManager defaultProvider="ClientRoleProvider" enabled="true">
-      <providers>
-        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
-      </providers>
-    </roleManager>
-  </system.web>
-  <userSettings>
+	<userSettings>
     <Analogy.Properties.Settings>
       <setting name="ModuleText" serializeAs="String">
         <value />
@@ -90,7 +78,7 @@
         <value>0</value>
       </setting>
       <setting name="ApplicationSkinName" serializeAs="String">
-        <value />
+        <value>DevExpress Style</value>
       </setting>
       <setting name="SimpleMode" serializeAs="String">
         <value>True</value>
@@ -228,7 +216,7 @@
         <value />
       </setting>
       <setting name="ApplicationStyle" serializeAs="String">
-        <value />
+        <value>Skin</value>
       </setting>
       <setting name="FirstRun" serializeAs="String">
         <value>True</value>
diff --git a/Analogy/CommonChangeLog.cs b/Analogy/CommonChangeLog.cs
index 1f1ae633..18cb6f4a 100644
--- a/Analogy/CommonChangeLog.cs
+++ b/Analogy/CommonChangeLog.cs
@@ -11,6 +11,7 @@ public static IEnumerable<AnalogyChangeLog> GetChangeLog()
         {
             return new List<AnalogyChangeLog>
             {
+                new AnalogyChangeLog("V4.7.0 - [DevExpress 20.2] set default skin to be the same as old skin #971",AnalogChangeLogType.Improvement,"Lior Banai",new DateTime(2021,05,01)),
                 new AnalogyChangeLog("V4.7.0 - [Net framework 4.X] Remove WCF data provider #976",AnalogChangeLogType.Improvement,"Lior Banai",new DateTime(2021,05,01)),
                 new AnalogyChangeLog("V4.7.0 - [Analogy Updater] add partial mode for updating #977",AnalogChangeLogType.Improvement,"Lior Banai",new DateTime(2021,05,01)),
                 new AnalogyChangeLog("V4.7.0 - [DevExpress V20.2] FluentDesignForm ignores the mouse click in Windows 10 mode #973",AnalogChangeLogType.Bug,"Lior Banai",new DateTime(2021,04,29)),
diff --git a/Analogy/Program.cs b/Analogy/Program.cs
index 8898febc..91ad0c24 100644
--- a/Analogy/Program.cs
+++ b/Analogy/Program.cs
@@ -63,7 +63,7 @@ static void Main()
             };
             Application.SetCompatibleTextRenderingDefault(false);
             Application.EnableVisualStyles();
-#if NETCOREAPP3_1
+#if NETCOREAPP3_1 || NET
             Application.SetHighDpiMode(HighDpiMode.SystemAware);
 #endif
             Settings.IncreaseNumberOfLaunches();
diff --git a/Analogy/Properties/Settings.Designer.cs b/Analogy/Properties/Settings.Designer.cs
index c57266fe..82b0c6e4 100644
--- a/Analogy/Properties/Settings.Designer.cs
+++ b/Analogy/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace Analogy.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -145,7 +145,7 @@ public uint AnalogyLaunchesCount {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        [global::System.Configuration.DefaultSettingValueAttribute("DevExpress Style")]
         public string ApplicationSkinName {
             get {
                 return ((string)(this["ApplicationSkinName"]));
@@ -719,7 +719,7 @@ public string ApplicationSvgPaletteName {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        [global::System.Configuration.DefaultSettingValueAttribute("Skin")]
         public string ApplicationStyle {
             get {
                 return ((string)(this["ApplicationStyle"]));
diff --git a/Analogy/Properties/Settings.settings b/Analogy/Properties/Settings.settings
index 2a29bad7..f9c68ab1 100644
--- a/Analogy/Properties/Settings.settings
+++ b/Analogy/Properties/Settings.settings
@@ -33,7 +33,7 @@
       <Value Profile="(Default)">0</Value>
     </Setting>
     <Setting Name="ApplicationSkinName" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
+      <Value Profile="(Default)">DevExpress Style</Value>
     </Setting>
     <Setting Name="SimpleMode" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
@@ -171,7 +171,7 @@
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="ApplicationStyle" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
+      <Value Profile="(Default)">Skin</Value>
     </Setting>
     <Setting Name="FirstRun" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>