Skip to content

Commit 03ae5d0

Browse files
nefariusnefarius
committed
Upgraded to .NET 4.5 for future updates
Fixed log4net dependencies
1 parent f66256f commit 03ae5d0

19 files changed

+69
-46
lines changed

‎ScpControl/ScpControl.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>ScpControl</RootNamespace>
1212
<AssemblyName>ScpControl</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<TargetFrameworkProfile />
1616
</PropertyGroup>
@@ -22,6 +22,7 @@
2222
<DefineConstants>DEBUG;TRACE</DefineConstants>
2323
<ErrorReport>prompt</ErrorReport>
2424
<WarningLevel>4</WarningLevel>
25+
<Prefer32Bit>false</Prefer32Bit>
2526
</PropertyGroup>
2627
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2728
<DebugType>pdbonly</DebugType>
@@ -30,6 +31,7 @@
3031
<DefineConstants>TRACE</DefineConstants>
3132
<ErrorReport>prompt</ErrorReport>
3233
<WarningLevel>4</WarningLevel>
34+
<Prefer32Bit>false</Prefer32Bit>
3335
</PropertyGroup>
3436
<ItemGroup>
3537
<Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">

‎ScpControl/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="log4net" version="2.0.3" targetFramework="net40" />
3+
<package id="log4net" version="2.0.3" targetFramework="net45" />
44
</packages>

‎ScpInstaller/ScpInstaller.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<ItemGroup>
5959
<Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
6060
<SpecificVersion>False</SpecificVersion>
61-
<HintPath>..\packages\log4net.2.0.3\lib\net40-client\log4net.dll</HintPath>
61+
<HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
6262
</Reference>
6363
<Reference Include="System" />
6464
<Reference Include="System.Configuration.Install" />

‎ScpInstaller/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="log4net" version="2.0.3" targetFramework="net40-Client" requireReinstallation="True" />
3+
<package id="log4net" version="2.0.3" targetFramework="net45" />
44
</packages>

‎ScpMonitor/Properties/Resources.Designer.cs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ScpMonitor/Properties/Settings.Designer.cs

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ScpMonitor/ScpMonitor.csproj

+4-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>ScpMonitor</RootNamespace>
1212
<AssemblyName>ScpMonitor</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<TargetFrameworkProfile />
1616
</PropertyGroup>
@@ -29,6 +29,7 @@
2929
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
3030
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
3131
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
32+
<Prefer32Bit>false</Prefer32Bit>
3233
</PropertyGroup>
3334
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
3435
<DebugSymbols>true</DebugSymbols>
@@ -45,6 +46,7 @@
4546
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
4647
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
4748
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
49+
<Prefer32Bit>false</Prefer32Bit>
4850
</PropertyGroup>
4951
<PropertyGroup>
5052
<ApplicationIcon>Resources\Scp_All.ico</ApplicationIcon>
@@ -136,6 +138,7 @@
136138
<EmbeddedResource Include="SettingsForm.resx">
137139
<DependentUpon>SettingsForm.cs</DependentUpon>
138140
</EmbeddedResource>
141+
<None Include="app.config" />
139142
<None Include="packages.config" />
140143
<None Include="Properties\Settings.settings">
141144
<Generator>SettingsSingleFileGenerator</Generator>

‎ScpMonitor/app.config

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

‎ScpMonitor/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="log4net" version="2.0.3" targetFramework="net40" />
3+
<package id="log4net" version="2.0.3" targetFramework="net45" />
44
</packages>

‎ScpPair/ScpPair.csproj

+8-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>ScpPair</RootNamespace>
1212
<AssemblyName>ScpPair</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<TargetFrameworkProfile>
1515
</TargetFrameworkProfile>
1616
<FileAlignment>512</FileAlignment>
@@ -30,6 +30,7 @@
3030
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
3131
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
3232
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
33+
<Prefer32Bit>false</Prefer32Bit>
3334
</PropertyGroup>
3435
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
3536
<OutputPath>..\..\bin\</OutputPath>
@@ -44,11 +45,16 @@
4445
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
4546
<CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
4647
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
48+
<Prefer32Bit>false</Prefer32Bit>
4749
</PropertyGroup>
4850
<PropertyGroup>
4951
<ApplicationIcon>Resources\Scp_All.ico</ApplicationIcon>
5052
</PropertyGroup>
5153
<ItemGroup>
54+
<Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
55+
<SpecificVersion>False</SpecificVersion>
56+
<HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
57+
</Reference>
5258
<Reference Include="System" />
5359
<Reference Include="System.Drawing" />
5460
<Reference Include="System.Web" />
@@ -78,6 +84,7 @@
7884
<DesignTime>True</DesignTime>
7985
</Compile>
8086
<None Include="app.config" />
87+
<None Include="packages.config" />
8188
<None Include="Properties\Settings.settings">
8289
<Generator>SettingsSingleFileGenerator</Generator>
8390
<LastGenOutput>Settings.Designer.cs</LastGenOutput>

‎ScpPair/packages.config

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="log4net" version="2.0.3" targetFramework="net45" />
4+
</packages>

‎ScpServer/App.config

+14-16
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,38 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
1+
<?xml version="1.0" encoding="utf-8"?>
32
<configuration>
43
<configSections>
5-
<sectionGroup name="applicationSettings"
6-
type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
7-
<section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
4+
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5+
<section name="log4net" type="System.Configuration.IgnoreSectionHandler"/>
86
</sectionGroup>
97
</configSections>
108

119
<applicationSettings>
1210
<!-- This section contains the log4net configuration settings -->
1311
<log4net debug="false">
1412
<appender name="FileAppender" type="log4net.Appender.FileAppender">
15-
<file value="ScpDsxServer.log" />
16-
<appendToFile value="true" />
13+
<file value="ScpDsxServer.log"/>
14+
<appendToFile value="true"/>
1715
<layout type="log4net.Layout.PatternLayout">
18-
<conversionPattern value="%date [%thread] %-5level %logger [%property{NDC}] - %message%newline" />
16+
<conversionPattern value="%date [%thread] %-5level %logger [%property{NDC}] - %message%newline"/>
1917
</layout>
20-
<param name="ImmediateFlush" value="true" />
18+
<param name="ImmediateFlush" value="true"/>
2119
</appender>
2220

2321
<appender name="listView" type="ScpServer.Utilities.ListViewAppender, ScpServer">
24-
<formName value="ScpForm" />
25-
<listViewName value="lvDebug" />
22+
<formName value="ScpForm"/>
23+
<listViewName value="lvDebug"/>
2624
<layout type="log4net.Layout.PatternLayout">
27-
<conversionPattern value="%date %-5level %logger - %message" />
25+
<conversionPattern value="%date %-5level %logger - %message"/>
2826
</layout>
2927
</appender>
3028

3129
<!-- Setup the root category, add the appenders and set the default priority -->
3230
<root>
33-
<level value="ALL" />
34-
<appender-ref ref="FileAppender" />
35-
<appender-ref ref="listView" />
31+
<level value="ALL"/>
32+
<appender-ref ref="FileAppender"/>
33+
<appender-ref ref="listView"/>
3634
<!-- other appenders enabled here -->
3735
</root>
3836
</log4net>
3937
</applicationSettings>
40-
</configuration>
38+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>

‎ScpServer/Properties/Resources.Designer.cs

+4-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ScpServer/Properties/Settings.Designer.cs

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ScpServer/ScpServer.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>ScpServer</RootNamespace>
1212
<AssemblyName>ScpServer</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<TargetFrameworkProfile />
1616
</PropertyGroup>
@@ -30,6 +30,7 @@
3030
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
3131
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
3232
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
33+
<Prefer32Bit>false</Prefer32Bit>
3334
</PropertyGroup>
3435
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
3536
<OutputPath>..\..\bin\</OutputPath>
@@ -46,6 +47,7 @@
4647
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
4748
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
4849
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
50+
<Prefer32Bit>false</Prefer32Bit>
4951
</PropertyGroup>
5052
<PropertyGroup>
5153
<ApplicationIcon>Resources\Scp_All.ico</ApplicationIcon>

‎ScpServer/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="log4net" version="2.0.3" targetFramework="net40" />
3+
<package id="log4net" version="2.0.3" targetFramework="net45" />
44
</packages>

‎ScpService/App.config

+10-12
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,29 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
1+
<?xml version="1.0" encoding="utf-8"?>
32
<configuration>
43
<configSections>
5-
<sectionGroup name="applicationSettings"
6-
type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
7-
<section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
4+
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5+
<section name="log4net" type="System.Configuration.IgnoreSectionHandler"/>
86
</sectionGroup>
97
</configSections>
108

119
<applicationSettings>
1210
<!-- This section contains the log4net configuration settings -->
1311
<log4net debug="false">
1412
<appender name="FileAppender" type="log4net.Appender.FileAppender">
15-
<file value="ScpDsxService.log" />
16-
<appendToFile value="true" />
13+
<file value="ScpDsxService.log"/>
14+
<appendToFile value="true"/>
1715
<layout type="log4net.Layout.PatternLayout">
18-
<conversionPattern value="%date [%thread] %-5level %logger [%property{NDC}] - %message%newline" />
16+
<conversionPattern value="%date [%thread] %-5level %logger [%property{NDC}] - %message%newline"/>
1917
</layout>
20-
<param name="ImmediateFlush" value="true" />
18+
<param name="ImmediateFlush" value="true"/>
2119
</appender>
2220

2321
<!-- Setup the root category, add the appenders and set the default priority -->
2422
<root>
25-
<level value="ALL" />
26-
<appender-ref ref="FileAppender" />
23+
<level value="ALL"/>
24+
<appender-ref ref="FileAppender"/>
2725
<!-- other appenders enabled here -->
2826
</root>
2927
</log4net>
3028
</applicationSettings>
31-
</configuration>
29+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>

‎ScpService/ScpService.csproj

+5-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>ScpService</RootNamespace>
1212
<AssemblyName>ScpService</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<TargetFrameworkProfile />
1616
</PropertyGroup>
@@ -33,6 +33,7 @@
3333
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
3434
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
3535
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
36+
<Prefer32Bit>false</Prefer32Bit>
3637
</PropertyGroup>
3738
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
3839
<OutputPath>..\..\bin\</OutputPath>
@@ -49,9 +50,11 @@
4950
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
5051
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
5152
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
53+
<Prefer32Bit>false</Prefer32Bit>
5254
</PropertyGroup>
5355
<ItemGroup>
54-
<Reference Include="log4net">
56+
<Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
57+
<SpecificVersion>False</SpecificVersion>
5558
<HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
5659
</Reference>
5760
<Reference Include="System" />

‎ScpService/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="log4net" version="2.0.3" targetFramework="net40" />
3+
<package id="log4net" version="2.0.3" targetFramework="net45" />
44
</packages>

0 commit comments

Comments
 (0)