Skip to content

Commit 6b11408

Browse files
augustoproieteaugustoproiete
committed
Update projects to target .NET 4.5
1 parent 33de962 commit 6b11408

File tree

8 files changed

+37
-43
lines changed

8 files changed

+37
-43
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>

‎sample/Ookii.Dialogs.Wpf.Sample/App.xaml.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Configuration;
4-
using System.Data;
5-
using System.Linq;
64
using System.Windows;
75

86
namespace Ookii.Dialogs.Wpf.Sample

‎sample/Ookii.Dialogs.Wpf.Sample/MainWindow.xaml.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Linq;
43
using System.Text;
54
using System.Windows;
65
using System.Windows.Controls;

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

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>Ookii.Dialogs.Wpf.Sample</RootNamespace>
1212
<AssemblyName>Ookii.Dialogs.Wpf.Sample</AssemblyName>
13-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1616
<WarningLevel>4</WarningLevel>
1717
<ApplicationManifest>app.manifest</ApplicationManifest>
1818
<ApplicationIcon>ookii.ico</ApplicationIcon>
1919
<SignAssembly>true</SignAssembly>
2020
<AssemblyOriginatorKeyFile>ookii.snk</AssemblyOriginatorKeyFile>
21+
<TargetFrameworkProfile />
2122
</PropertyGroup>
2223
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2324
<DebugSymbols>true</DebugSymbols>
@@ -27,6 +28,7 @@
2728
<DefineConstants>DEBUG;TRACE</DefineConstants>
2829
<ErrorReport>prompt</ErrorReport>
2930
<WarningLevel>4</WarningLevel>
31+
<Prefer32Bit>false</Prefer32Bit>
3032
</PropertyGroup>
3133
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3234
<DebugType>pdbonly</DebugType>
@@ -35,19 +37,15 @@
3537
<DefineConstants>TRACE</DefineConstants>
3638
<ErrorReport>prompt</ErrorReport>
3739
<WarningLevel>4</WarningLevel>
40+
<Prefer32Bit>false</Prefer32Bit>
41+
</PropertyGroup>
42+
<PropertyGroup>
43+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
3844
</PropertyGroup>
3945
<ItemGroup>
4046
<Reference Include="System" />
41-
<Reference Include="System.Core">
42-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
43-
</Reference>
44-
<Reference Include="System.Xml.Linq">
45-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
46-
</Reference>
47-
<Reference Include="System.Data.DataSetExtensions">
48-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
49-
</Reference>
50-
<Reference Include="System.Data" />
47+
<Reference Include="System.Core" />
48+
<Reference Include="System.Xaml" />
5149
<Reference Include="System.Xml" />
5250
<Reference Include="WindowsBase" />
5351
<Reference Include="PresentationCore" />
@@ -89,6 +87,9 @@
8987
<Generator>ResXFileCodeGenerator</Generator>
9088
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
9189
</EmbeddedResource>
90+
<None Include="App.config">
91+
<SubType>Designer</SubType>
92+
</None>
9293
<None Include="app.manifest" />
9394
<None Include="ookii.snk" />
9495
<None Include="Properties\Settings.settings">

‎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/Ookii.Dialogs.Wpf.csproj

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>Ookii.Dialogs.Wpf</RootNamespace>
1212
<AssemblyName>Ookii.Dialogs.Wpf</AssemblyName>
13-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<SignAssembly>true</SignAssembly>
1616
<AssemblyOriginatorKeyFile>ookii.snk</AssemblyOriginatorKeyFile>
17+
<TargetFrameworkProfile />
1718
</PropertyGroup>
1819
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1920
<DebugSymbols>true</DebugSymbols>
@@ -24,6 +25,7 @@
2425
<ErrorReport>prompt</ErrorReport>
2526
<WarningLevel>4</WarningLevel>
2627
<DocumentationFile>bin\Debug\Ookii.Dialogs.Wpf.xml</DocumentationFile>
28+
<Prefer32Bit>false</Prefer32Bit>
2729
</PropertyGroup>
2830
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2931
<DebugType>pdbonly</DebugType>
@@ -34,32 +36,20 @@
3436
<WarningLevel>4</WarningLevel>
3537
<RunCodeAnalysis>true</RunCodeAnalysis>
3638
<DocumentationFile>bin\Release\Ookii.Dialogs.Wpf.xml</DocumentationFile>
39+
<Prefer32Bit>false</Prefer32Bit>
40+
</PropertyGroup>
41+
<PropertyGroup>
42+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
3743
</PropertyGroup>
3844
<ItemGroup>
39-
<Reference Include="PresentationCore">
40-
<RequiredTargetFramework>3.0</RequiredTargetFramework>
41-
</Reference>
42-
<Reference Include="PresentationFramework">
43-
<RequiredTargetFramework>3.0</RequiredTargetFramework>
44-
</Reference>
45+
<Reference Include="PresentationCore" />
46+
<Reference Include="PresentationFramework" />
4547
<Reference Include="System" />
46-
<Reference Include="System.Core">
47-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
48-
</Reference>
48+
<Reference Include="System.Core" />
4949
<Reference Include="System.Design" />
5050
<Reference Include="System.Drawing" />
5151
<Reference Include="System.Security" />
52-
<Reference Include="System.Xml.Linq">
53-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
54-
</Reference>
55-
<Reference Include="System.Data.DataSetExtensions">
56-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
57-
</Reference>
58-
<Reference Include="System.Data" />
59-
<Reference Include="System.Xml" />
60-
<Reference Include="WindowsBase">
61-
<RequiredTargetFramework>3.0</RequiredTargetFramework>
62-
</Reference>
52+
<Reference Include="WindowsBase" />
6353
</ItemGroup>
6454
<ItemGroup>
6555
<Compile Include="AnimationResource.cs" />

‎src/Ookii.Dialogs.Wpf/ProgressDialog.resx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,15 +112,15 @@
112112
<value>2.0</value>
113113
</resheader>
114114
<resheader name="reader">
115-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116116
</resheader>
117117
<resheader name="writer">
118-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<metadata name="_backgroundWorker.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
120+
<metadata name="_backgroundWorker.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
121121
<value>17, 17</value>
122122
</metadata>
123-
<metadata name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
123+
<metadata name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
124124
<value>False</value>
125125
</metadata>
126126
</root>

‎src/Ookii.Dialogs.Wpf/Properties/Resources.resx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@
112112
<value>2.0</value>
113113
</resheader>
114114
<resheader name="reader">
115-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116116
</resheader>
117117
<resheader name="writer">
118-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120120
<data name="AnimationLoadErrorFormat" xml:space="preserve">
121121
<value>Unable to load the progress dialog animation: {0}</value>

0 commit comments

Comments
 (0)