Skip to content

Commit 26e8b5b

Browse files
augustoproieteaugustoproiete
committed
Bring source code back to v3.0.0 state (revert fa15326)
1 parent fa15326 commit 26e8b5b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+565
-575
lines changed

‎sample/Ookii.Dialogs.Wpf.Sample/App.config

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<startup>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
5+
</startup>
6+
</configuration>

‎src/Ookii.Dialogs.Wpf.Sample/App.xaml renamed to ‎sample/Ookii.Dialogs.Wpf.Sample/App.xaml

File renamed without changes.

‎src/Ookii.Dialogs.Wpf.Sample/App.xaml.cs renamed to ‎sample/Ookii.Dialogs.Wpf.Sample/App.xaml.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Configuration;
4-
using System.Data;
5-
using System.Linq;
6-
using System.Windows;
1+
using System.Windows;
72

83
namespace Ookii.Dialogs.Wpf.Sample
94
{

‎src/Ookii.Dialogs.Wpf.Sample/MainWindow.xaml renamed to ‎sample/Ookii.Dialogs.Wpf.Sample/MainWindow.xaml

File renamed without changes.

‎src/Ookii.Dialogs.Wpf.Sample/MainWindow.xaml.cs renamed to ‎sample/Ookii.Dialogs.Wpf.Sample/MainWindow.xaml.cs

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
52
using System.Windows;
6-
using System.Windows.Controls;
7-
using System.Windows.Data;
8-
using System.Windows.Documents;
9-
using System.Windows.Input;
10-
using System.Windows.Media;
11-
using System.Windows.Media.Imaging;
12-
using System.Windows.Navigation;
13-
using System.Windows.Shapes;
143
using System.Threading;
154
using System.ComponentModel;
165

@@ -33,7 +22,7 @@ public MainWindow()
3322
{
3423
InitializeComponent();
3524

36-
_sampleProgressDialog.DoWork += new System.ComponentModel.DoWorkEventHandler(_sampleProgressDialog_DoWork);
25+
_sampleProgressDialog.DoWork += new DoWorkEventHandler(_sampleProgressDialog_DoWork);
3726
}
3827

3928

‎sample/Ookii.Dialogs.Wpf.Sample/Ookii.Dialogs.Wpf.Sample.csproj

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
2+
3+
<PropertyGroup>
4+
<TargetFrameworks>net45;netcoreapp3.1;net5.0-windows</TargetFrameworks>
5+
<OutputType>WinExe</OutputType>
6+
<UseWPF>true</UseWPF>
7+
<UseWindowsForms>true</UseWindowsForms>
8+
<RootNamespace>Ookii.Dialogs.Wpf.Sample</RootNamespace>
9+
10+
<AssemblyName>Ookii.Dialogs.Wpf.Sample</AssemblyName>
11+
<ApplicationIcon>ookii.ico</ApplicationIcon>
12+
<NeutralLanguage>en</NeutralLanguage>
13+
<ApplicationManifest>app.manifest</ApplicationManifest>
14+
15+
<SignAssembly>true</SignAssembly>
16+
<AssemblyOriginatorKeyFile>../../assets/ookii-dialogs.snk</AssemblyOriginatorKeyFile>
17+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
18+
19+
<NoWarn>$(NoWarn);NU5048</NoWarn>
20+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
21+
<TreatSpecificWarningsAsErrors />
22+
</PropertyGroup>
23+
24+
<PropertyGroup>
25+
<DisableImplicitFrameworkReferences Condition=" '$(TargetFramework)' == 'net45' ">true</DisableImplicitFrameworkReferences>
26+
</PropertyGroup>
27+
28+
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
29+
<Reference Include="System" />
30+
<Reference Include="System.Core" />
31+
<Reference Include="System.Xaml" />
32+
<Reference Include="System.Xml" />
33+
<Reference Include="WindowsBase" />
34+
<Reference Include="PresentationCore" />
35+
<Reference Include="PresentationFramework" />
36+
</ItemGroup>
37+
38+
<ItemGroup>
39+
<ProjectReference Include="..\..\src\Ookii.Dialogs.Wpf\Ookii.Dialogs.Wpf.csproj" />
40+
</ItemGroup>
41+
42+
</Project>

‎src/Ookii.Dialogs.Wpf.Sample/Properties/Resources.Designer.cs renamed to ‎sample/Ookii.Dialogs.Wpf.Sample/Properties/Resources.Designer.cs

Lines changed: 19 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Ookii.Dialogs.Wpf.Sample/Properties/Resources.resx renamed to ‎sample/Ookii.Dialogs.Wpf.Sample/Properties/Resources.resx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@
109109
<value>2.0</value>
110110
</resheader>
111111
<resheader name="reader">
112-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
112+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
113113
</resheader>
114114
<resheader name="writer">
115-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116116
</resheader>
117117
</root>

‎src/Ookii.Dialogs.Wpf.Sample/Properties/Settings.Designer.cs renamed to ‎sample/Ookii.Dialogs.Wpf.Sample/Properties/Settings.Designer.cs

Lines changed: 10 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Ookii.Dialogs.Wpf.Sample/Properties/Settings.settings renamed to ‎sample/Ookii.Dialogs.Wpf.Sample/Properties/Settings.settings

File renamed without changes.

0 commit comments

Comments
 (0)