Skip to content

Commit ad1b795

Browse files
committed
[.NET 3.1/5/6] missing DevExpress Assembly Fix #1180
1 parent 5813630 commit ad1b795

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

Analogy/Analogy.csproj

+9-2
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,9 @@
131131
<PackagePath></PackagePath>
132132
</None>
133133
</ItemGroup>
134-
134+
<!--<ItemGroup>
135+
<PackageReference Include="DevExpress.Win.WinterJoySkin" Version="1.0.1" />
136+
</ItemGroup>-->
135137

136138
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0-windows' or '$(TargetFramework)' == 'net6.0-windows' ">
137139
<Reference Include="DevExpress.BonusSkins.v21.2">
@@ -154,6 +156,11 @@
154156
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
155157
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
156158
</Reference>
159+
<Reference Include="DevExpress.Dialogs.v21.2.Core">
160+
<HintPath>..\DevExpress\.net core\DevExpress.Dialogs.v21.2.Core.dll</HintPath>
161+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
162+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
163+
</Reference>
157164
<Reference Include="DevExpress.Images.v21.2">
158165
<HintPath>..\DevExpress\.net core\DevExpress.Images.v21.2.dll</HintPath>
159166
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -444,7 +451,7 @@
444451
<Reference Include="System.Windows.Forms" />
445452

446453
</ItemGroup>
447-
454+
448455
<ItemGroup Condition=" '$(TargetFramework)' == 'net48' or '$(TargetFramework)' == 'net472' or '$(TargetFramework)' == 'net471' ">
449456
<Compile Update="Forms\AboutDataSourceBox.cs" />
450457
<Compile Update="Forms\AboutDataSourceBox.Designer.cs">

Analogy/Program.cs

+7-3
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,11 @@ static void Main()
8989
Settings.ApplicationSvgPaletteName = laf.ActiveSvgPaletteName;
9090

9191
};
92-
92+
//// Register the Winter Joy skin.
93+
//System.Reflection.Assembly asm = typeof(DevExpress.UserSkins.WinterJoy).Assembly;
94+
//DevExpress.Skins.SkinManager.Default.RegisterAssembly(asm);
95+
//// Apply the skin.
96+
//DevExpress.XtraEditors.WindowsFormsSettings.DefaultLookAndFeel.SetSkinStyle("Winter Joy");
9397
if (UserSettingsManager.UserSettings.SingleInstance &&
9498
Process.GetProcessesByName(Process.GetCurrentProcess().ProcessName).Length > 1)
9599
{
@@ -112,8 +116,8 @@ static void Main()
112116

113117
if (Settings.IsFirstRun)
114118
{
115-
//FirstTimeRunForm f = new FirstTimeRunForm();
116-
//f.ShowDialog();
119+
//FirstTimeRunForm f = new FirstTimeRunForm();
120+
//f.ShowDialog();
117121
}
118122
if (Settings.MainFormType == MainFormType.RibbonForm)
119123
{
Binary file not shown.

0 commit comments

Comments
 (0)