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

+6
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

+1-6
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

+1-12
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

+42
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

+19-27
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

+2-2
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

+10-14
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.

‎sample/Ookii.Dialogs.Wpf.Sample/app.manifest

+73
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
3+
<assemblyIdentity version="2.0.0.0" name="Ookii.Dialogs.Wpf.Sample.app"/>
4+
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
5+
<security>
6+
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
7+
<!-- UAC Manifest Options
8+
If you want to change the Windows User Account Control level replace the
9+
requestedExecutionLevel node with one of the following.
10+
11+
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
12+
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
13+
<requestedExecutionLevel level="highestAvailable" uiAccess="false" />
14+
15+
Specifying requestedExecutionLevel element will disable file and registry virtualization.
16+
Remove this element if your application requires this virtualization for backwards
17+
compatibility.
18+
-->
19+
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
20+
</requestedPrivileges>
21+
</security>
22+
</trustInfo>
23+
24+
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
25+
<application>
26+
<!-- A list of the Windows versions that this application has been tested on
27+
and is designed to work with. Uncomment the appropriate elements
28+
and Windows will automatically select the most compatible environment. -->
29+
30+
<!-- Windows Vista -->
31+
<!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
32+
33+
<!-- Windows 7 -->
34+
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
35+
36+
<!-- Windows 8 -->
37+
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
38+
39+
<!-- Windows 8.1 -->
40+
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
41+
42+
<!-- Windows 10 -->
43+
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
44+
</application>
45+
</compatibility>
46+
47+
<!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
48+
DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need
49+
to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should
50+
also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
51+
<!--
52+
<application xmlns="urn:schemas-microsoft-com:asm.v3">
53+
<windowsSettings>
54+
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
55+
</windowsSettings>
56+
</application>
57+
-->
58+
59+
<!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
60+
<dependency>
61+
<dependentAssembly>
62+
<assemblyIdentity
63+
type="win32"
64+
name="Microsoft.Windows.Common-Controls"
65+
version="6.0.0.0"
66+
processorArchitecture="*"
67+
publicKeyToken="6595b64144ccf1df"
68+
language="*"
69+
/>
70+
</dependentAssembly>
71+
</dependency>
72+
73+
</assembly>

‎src/Ookii.Dialogs.Wpf.Sample/ookii.ico renamed to ‎sample/Ookii.Dialogs.Wpf.Sample/ookii.ico

File renamed without changes.

0 commit comments

Comments
 (0)