Skip to content

Commit 4d908e5

Browse files
punitganshanipunitganshani
committed
Upgrade to .NET 4.6
Upgraded the solution to .NET 4.6
1 parent 02f7daa commit 4d908e5

18 files changed

Lines changed: 76 additions & 37 deletions

‎CInject.Engine/CInject.Engine.csproj‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>CInject.Engine</RootNamespace>
1212
<AssemblyName>CInject.Engine</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<SccProjectName>SAK</SccProjectName>
1616
<SccLocalPath>SAK</SccLocalPath>
@@ -41,20 +41,30 @@
4141
<AssemblyOriginatorKeyFile>CInject.snk</AssemblyOriginatorKeyFile>
4242
</PropertyGroup>
4343
<ItemGroup>
44-
<Reference Include="log4net">
45-
<HintPath>..\Reference Assemblies\log4net.dll</HintPath>
44+
<Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
45+
<HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
46+
<Private>True</Private>
4647
</Reference>
47-
<Reference Include="Mono.Cecil">
48-
<HintPath>..\Reference Assemblies\Mono.Cecil.dll</HintPath>
48+
<Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
49+
<HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll</HintPath>
50+
<Private>True</Private>
4951
</Reference>
50-
<Reference Include="System" />
51-
<Reference Include="System.ComponentModel.Composition.Codeplex">
52-
<HintPath>..\Reference Assemblies\System.ComponentModel.Composition.Codeplex.dll</HintPath>
52+
<Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
53+
<HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
54+
<Private>True</Private>
5355
</Reference>
54-
<Reference Include="System.Core" />
55-
<Reference Include="System.Reflection.Context">
56-
<HintPath>..\Reference Assemblies\System.Reflection.Context.dll</HintPath>
56+
<Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
57+
<HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
58+
<Private>True</Private>
59+
</Reference>
60+
<Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
61+
<HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Rocks.dll</HintPath>
62+
<Private>True</Private>
5763
</Reference>
64+
<Reference Include="System" />
65+
<Reference Include="System.ComponentModel.Composition" />
66+
<Reference Include="System.Core" />
67+
<Reference Include="System.Reflection.Context" />
5868
<Reference Include="System.Xml.Linq" />
5969
<Reference Include="System.Data.DataSetExtensions" />
6070
<Reference Include="Microsoft.CSharp" />
@@ -83,6 +93,7 @@
8393
</ItemGroup>
8494
<ItemGroup>
8595
<None Include="CInject.snk" />
96+
<None Include="packages.config" />
8697
</ItemGroup>
8798
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
8899
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎CInject.Engine/packages.config‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="log4net" version="2.0.5" targetFramework="net46" />
4+
<package id="Mono.Cecil" version="0.9.6.1" targetFramework="net46" />
5+
</packages>

‎CInject.Injections/CInject.Injections.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>CInject.Injections</RootNamespace>
1212
<AssemblyName>CInject.Injections</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<SccProjectName>SAK</SccProjectName>
1616
<SccLocalPath>SAK</SccLocalPath>
@@ -41,9 +41,9 @@
4141
<AssemblyOriginatorKeyFile>CInject.Injections.snk</AssemblyOriginatorKeyFile>
4242
</PropertyGroup>
4343
<ItemGroup>
44-
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=828b2481ec32b7f8, processorArchitecture=MSIL">
45-
<SpecificVersion>False</SpecificVersion>
46-
<HintPath>..\Reference Assemblies\log4net.dll</HintPath>
44+
<Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
45+
<HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
46+
<Private>True</Private>
4747
</Reference>
4848
<Reference Include="System" />
4949
<Reference Include="System.configuration" />
@@ -74,6 +74,7 @@
7474
<SubType>Designer</SubType>
7575
</None>
7676
<None Include="CInject.Injections.snk" />
77+
<None Include="packages.config" />
7778
</ItemGroup>
7879
<ItemGroup>
7980
<Content Include="LogInject.log4net.xml">

‎CInject.Injections/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache‎

250 Bytes
Binary file not shown.

‎CInject.Injections/packages.config‎

Lines changed: 4 additions & 0 deletions
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.5" targetFramework="net46" />
4+
</packages>

‎CInject.Plugin.Sample/CInject.Plugin.Sample.csproj‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>CInject.Plugin.Sample</RootNamespace>
1212
<AssemblyName>CInject.Plugin.SamplePlugin</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<SccProjectName>SAK</SccProjectName>
1616
<SccLocalPath>SAK</SccLocalPath>
@@ -42,10 +42,7 @@
4242
</PropertyGroup>
4343
<ItemGroup>
4444
<Reference Include="System" />
45-
<Reference Include="System.ComponentModel.Composition.Codeplex, Version=4.1.2.0, Culture=neutral, PublicKeyToken=13e5ffd4e05db186, processorArchitecture=MSIL">
46-
<SpecificVersion>False</SpecificVersion>
47-
<HintPath>..\Reference Assemblies\System.ComponentModel.Composition.Codeplex.dll</HintPath>
48-
</Reference>
45+
<Reference Include="System.ComponentModel.Composition" />
4946
<Reference Include="System.Core" />
5047
<Reference Include="System.Drawing" />
5148
<Reference Include="System.Windows.Forms" />

‎CInject.PluginInterface/CInject.PluginInterface.csproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>CInject.PluginInterface</RootNamespace>
1212
<AssemblyName>CInject.PluginInterface</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<SccProjectName>SAK</SccProjectName>
1616
<SccLocalPath>SAK</SccLocalPath>
@@ -42,9 +42,7 @@
4242
</PropertyGroup>
4343
<ItemGroup>
4444
<Reference Include="System" />
45-
<Reference Include="System.ComponentModel.Composition.Codeplex">
46-
<HintPath>..\..\..\..\assembly\MEF2 Preview 5\System.ComponentModel.Composition.Codeplex.dll</HintPath>
47-
</Reference>
45+
<Reference Include="System.ComponentModel.Composition" />
4846
<Reference Include="System.Core" />
4947
<Reference Include="System.Drawing" />
5048
<Reference Include="System.Windows.Forms" />

‎CInject.SampleWPF/CInject.SampleWPF.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>CInject.SampleWPF</RootNamespace>
1111
<AssemblyName>CInject.SampleWPF</AssemblyName>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1515
<WarningLevel>4</WarningLevel>

‎CInject.SampleWinform/CInject.SampleWinform.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>CInject.SampleWinform</RootNamespace>
1111
<AssemblyName>CInject.SampleWinform</AssemblyName>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SccProjectName>SAK</SccProjectName>
1515
<SccLocalPath>SAK</SccLocalPath>

‎CInject.TargetAssembly/CInject.TargetAssembly.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AppDesignerFolder>Properties</AppDesignerFolder>
1212
<RootNamespace>CInject.TargetAssembly</RootNamespace>
1313
<AssemblyName>CInject.TargetAssembly</AssemblyName>
14-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
1515
<TargetFrameworkProfile>
1616
</TargetFrameworkProfile>
1717
<FileAlignment>512</FileAlignment>

0 commit comments

Comments
 (0)