Skip to content

Commit da80a32

Browse files
ScordoScordo
committed
Changed .Net Framework to 4.5
1 parent d7027a4 commit da80a32

18 files changed

Lines changed: 159 additions & 118 deletions

File tree

‎Samples/Console/Connect/Connect.csproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Connect</RootNamespace>
1111
<AssemblyName>Connect</AssemblyName>
12-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14-
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
14+
<TargetFrameworkProfile>
15+
</TargetFrameworkProfile>
1516
</PropertyGroup>
1617
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1718
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -22,6 +23,7 @@
2223
<DefineConstants>DEBUG;TRACE</DefineConstants>
2324
<ErrorReport>prompt</ErrorReport>
2425
<WarningLevel>4</WarningLevel>
26+
<Prefer32Bit>false</Prefer32Bit>
2527
</PropertyGroup>
2628
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2729
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -31,6 +33,7 @@
3133
<DefineConstants>TRACE</DefineConstants>
3234
<ErrorReport>prompt</ErrorReport>
3335
<WarningLevel>4</WarningLevel>
36+
<Prefer32Bit>false</Prefer32Bit>
3437
</PropertyGroup>
3538
<ItemGroup>
3639
<Reference Include="System" />

‎Samples/Console/Connect/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<startup><supportedRuntime version="v2.0.50727" sku="Client"/></startup></configuration>
3+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>

‎Samples/WPF/Connect/Connect.csproj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>Connect</RootNamespace>
1212
<AssemblyName>Connect</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14-
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
14+
<TargetFrameworkProfile>
15+
</TargetFrameworkProfile>
1516
<FileAlignment>512</FileAlignment>
1617
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1718
<WarningLevel>4</WarningLevel>
@@ -29,6 +30,7 @@
2930
<DefineConstants>DEBUG;TRACE</DefineConstants>
3031
<ErrorReport>prompt</ErrorReport>
3132
<WarningLevel>4</WarningLevel>
33+
<Prefer32Bit>false</Prefer32Bit>
3234
</PropertyGroup>
3335
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
3436
<PlatformTarget>x86</PlatformTarget>
@@ -38,6 +40,7 @@
3840
<DefineConstants>TRACE</DefineConstants>
3941
<ErrorReport>prompt</ErrorReport>
4042
<WarningLevel>4</WarningLevel>
43+
<Prefer32Bit>false</Prefer32Bit>
4144
</PropertyGroup>
4245
<ItemGroup>
4346
<Reference Include="System" />
@@ -93,6 +96,7 @@
9396
<Generator>ResXFileCodeGenerator</Generator>
9497
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
9598
</EmbeddedResource>
99+
<None Include="app.config" />
96100
<None Include="Properties\Settings.settings">
97101
<Generator>SettingsSingleFileGenerator</Generator>
98102
<LastGenOutput>Settings.Designer.cs</LastGenOutput>

‎Samples/WPF/Connect/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.

‎Samples/WPF/Connect/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.

‎Samples/WPF/Connect/app.config‎

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

‎Samples/Web/Connect/Connect.csproj‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
1414
<RootNamespace>Connect</RootNamespace>
1515
<AssemblyName>Connect</AssemblyName>
16-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1717
<UseIISExpress>false</UseIISExpress>
1818
<SccProjectName>SAK</SccProjectName>
1919
<SccLocalPath>SAK</SccLocalPath>
@@ -24,6 +24,13 @@
2424
<UpgradeBackupLocation>
2525
</UpgradeBackupLocation>
2626
<OldToolsVersion>4.0</OldToolsVersion>
27+
<TargetFrameworkProfile />
28+
<Use64BitIISExpress />
29+
<IISExpressSSLPort />
30+
<IISExpressAnonymousAuthentication />
31+
<IISExpressWindowsAuthentication />
32+
<IISExpressUseClassicPipelineMode />
33+
<UseGlobalApplicationHostFile />
2734
</PropertyGroup>
2835
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2936
<DebugSymbols>true</DebugSymbols>
@@ -33,6 +40,7 @@
3340
<DefineConstants>DEBUG;TRACE</DefineConstants>
3441
<ErrorReport>prompt</ErrorReport>
3542
<WarningLevel>4</WarningLevel>
43+
<Prefer32Bit>false</Prefer32Bit>
3644
</PropertyGroup>
3745
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3846
<DebugType>pdbonly</DebugType>
@@ -41,24 +49,24 @@
4149
<DefineConstants>TRACE</DefineConstants>
4250
<ErrorReport>prompt</ErrorReport>
4351
<WarningLevel>4</WarningLevel>
52+
<Prefer32Bit>false</Prefer32Bit>
4453
</PropertyGroup>
4554
<ItemGroup>
4655
<Reference Include="Microsoft.CSharp" />
56+
<Reference Include="System.Data.DataSetExtensions" />
4757
<Reference Include="System.Web.DynamicData" />
4858
<Reference Include="System.Web.Entity" />
4959
<Reference Include="System.Web.ApplicationServices" />
5060
<Reference Include="System" />
5161
<Reference Include="System.Data" />
52-
<Reference Include="System.Core" />
53-
<Reference Include="System.Data.DataSetExtensions" />
5462
<Reference Include="System.Web.Extensions" />
55-
<Reference Include="System.Xml.Linq" />
5663
<Reference Include="System.Drawing" />
5764
<Reference Include="System.Web" />
5865
<Reference Include="System.Xml" />
5966
<Reference Include="System.Configuration" />
6067
<Reference Include="System.Web.Services" />
6168
<Reference Include="System.EnterpriseServices" />
69+
<Reference Include="System.Xml.Linq" />
6270
</ItemGroup>
6371
<ItemGroup>
6472
<Content Include="Default.aspx" />

‎Samples/Web/Connect/web.config‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
<?xml version="1.0"?>
22
<configuration>
3+
<!--
4+
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
35
4-
<system.web>
5-
<compilation debug="true" targetFramework="4.0" />
6-
</system.web>
7-
8-
</configuration>
6+
The following attributes can be set on the <httpRuntime> tag.
7+
<system.Web>
8+
<httpRuntime targetFramework="4.5" />
9+
</system.Web>
10+
-->
11+
<system.web>
12+
<compilation debug="true" targetFramework="4.5"/>
13+
<pages controlRenderingCompatibilityVersion="4.0"/>
14+
</system.web>
15+
</configuration>

‎Samples/WinForms/Connect/Connect.csproj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>Connect</RootNamespace>
1212
<AssemblyName>Connect</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14-
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
14+
<TargetFrameworkProfile>
15+
</TargetFrameworkProfile>
1516
<FileAlignment>512</FileAlignment>
1617
<SccProjectName>SAK</SccProjectName>
1718
<SccLocalPath>SAK</SccLocalPath>
@@ -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|x86' ">
3234
<PlatformTarget>x86</PlatformTarget>
@@ -36,6 +38,7 @@
3638
<DefineConstants>TRACE</DefineConstants>
3739
<ErrorReport>prompt</ErrorReport>
3840
<WarningLevel>4</WarningLevel>
41+
<Prefer32Bit>false</Prefer32Bit>
3942
</PropertyGroup>
4043
<ItemGroup>
4144
<Reference Include="System" />
@@ -63,6 +66,7 @@
6366
<EmbeddedResource Include="MainForm.resx">
6467
<DependentUpon>MainForm.cs</DependentUpon>
6568
</EmbeddedResource>
69+
<None Include="app.config" />
6670
<None Include="Properties\Settings.settings">
6771
<Generator>SettingsSingleFileGenerator</Generator>
6872
<LastGenOutput>Settings.Designer.cs</LastGenOutput>

‎Samples/WinForms/Connect/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.

0 commit comments

Comments
 (0)