Skip to content

Commit

Permalink
NET45 fix for TypeExtensions inclusin
Browse files Browse the repository at this point in the history
  • Loading branch information
yanisimov committed Sep 13, 2016
1 parent 8b35ae2 commit a968414
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 200 deletions.
4 changes: 2 additions & 2 deletions Benchmarks/Benchmarks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ExpressMapper NET451\ExpressMapper NET451.csproj">
<ProjectReference Include="..\ExpressMapper NET45\ExpressMapper NET45.csproj">
<Project>{5e211506-6d4e-4cd8-b454-d02672cf948a}</Project>
<Name>ExpressMapper NET451</Name>
<Name>ExpressMapper NET45</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
15 changes: 5 additions & 10 deletions ExpressMapper NET45/ExpressMapper NET45.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{67AC5D64-8CA8-481F-AD23-5788755F4A33}</ProjectGuid>
<ProjectGuid>{5E211506-6D4E-4CD8-B454-D02672CF948A}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ExpressMapper</RootNamespace>
<AssemblyName>ExpressMapper</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -139,19 +140,13 @@
<Compile Include="..\ExpressMapper NET40\SubstituteParameterVisitor.cs">
<Link>SubstituteParameterVisitor.cs</Link>
</Compile>
<Compile Include="..\ExpressMapper NET40\TypeExtensions.cs">
<Link>TypeExtensions.cs</Link>
</Compile>
<Compile Include="..\ExpressMapper NET40\TypeExtensions.cs">
<Link>TypeExtensions.cs</Link>
</Compile>
<Compile Include="..\ExpressMapper NET40\TypeMapperBase.cs">
<Link>TypeMapperBase.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ExpressMapper NET40\ExpressMapper NET40.csproj">
<Project>{E701191E-BF2E-41B8-A4F0-3D8954E3DD58}</Project>
<Name>ExpressMapper NET40</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="Expressmapper.snk" />
</ItemGroup>
Expand Down
161 changes: 0 additions & 161 deletions ExpressMapper NET451/ExpressMapper NET451.csproj

This file was deleted.

Binary file removed ExpressMapper NET451/Expressmapper.snk
Binary file not shown.
File renamed without changes.
2 changes: 1 addition & 1 deletion ExpressMapper NETCORE/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",
"buildOptions": {
"outputName": "ExpressMapper"
Expand Down
2 changes: 1 addition & 1 deletion ExpressMapper.Tests NET45/ExpressMapper.Tests NET45.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ExpressMapper NET45\ExpressMapper NET45.csproj">
<Project>{67ac5d64-8ca8-481f-ad23-5788755f4a33}</Project>
<Project>{5e211506-6d4e-4cd8-b454-d02672cf948a}</Project>
<Name>ExpressMapper NET45</Name>
</ProjectReference>
<ProjectReference Include="..\ExpressMapper.Tests.Model\ExpressMapper.Tests.Model.csproj">
Expand Down
4 changes: 0 additions & 4 deletions ExpressMapper.Tests NET451/ExpressMapper.Tests NET451.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,6 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ExpressMapper NET40\ExpressMapper NET40.csproj">
<Project>{E701191E-BF2E-41B8-A4F0-3D8954E3DD58}</Project>
<Name>ExpressMapper NET40</Name>
</ProjectReference>
<ProjectReference Include="..\ExpressMapper.Tests.Model\ExpressMapper.Tests.Model.csproj">
<Project>{9170a04c-8d4b-47a7-a6e3-7fc0f24244dd}</Project>
<Name>ExpressMapper.Tests.Model</Name>
Expand Down
2 changes: 1 addition & 1 deletion ExpressMapper.Tests NETCORE/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",
"buildOptions": {
"emitEntryPoint": true
Expand Down
2 changes: 1 addition & 1 deletion ExpressMapper.Tests.Model NETCORE/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",

"dependencies": {
Expand Down
26 changes: 7 additions & 19 deletions ExpressMapper.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExpressMapper NET45", "ExpressMapper NET45\ExpressMapper NET45.csproj", "{67AC5D64-8CA8-481F-AD23-5788755F4A33}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExpressMapper NET451", "ExpressMapper NET451\ExpressMapper NET451.csproj", "{5E211506-6D4E-4CD8-B454-D02672CF948A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExpressMapper.Tests.Model", "ExpressMapper.Tests.Model\ExpressMapper.Tests.Model.csproj", "{9170A04C-8D4B-47A7-A6E3-7FC0F24244DD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExpressMapper.Tests NET451", "ExpressMapper.Tests NET451\ExpressMapper.Tests NET451.csproj", "{59DFA35C-AB10-48AD-B463-3F3E98206848}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExpressMapper NET40", "ExpressMapper NET40\ExpressMapper NET40.csproj", "{E701191E-BF2E-41B8-A4F0-3D8954E3DD58}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExpressMapper.Tests NET40", "ExpressMapper.Tests NET40\ExpressMapper.Tests NET40.csproj", "{C7A83FD8-079B-434F-A95B-46B2CF39BFE3}"
Expand All @@ -25,34 +19,24 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExpressMapper PCL NET45", "
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExpressMapper.Tests.Projections", "ExpressMapper.Tests.Projections\ExpressMapper.Tests.Projections.csproj", "{DD8BFECA-7F00-4AB2-B904-64682EA1C713}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ExpressMapper", "ExpressMapper NETCORE\ExpressMapper.xproj", "{969E6614-0489-4174-A735-CC66F51D8746}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ExpressMapper NETCORE", "ExpressMapper NETCORE\ExpressMapper NETCORE.xproj", "{969E6614-0489-4174-A735-CC66F51D8746}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ExpressMapper.Tests.Model NETCORE", "ExpressMapper.Tests.Model NETCORE\ExpressMapper.Tests.Model NETCORE.xproj", "{4A70832D-08CA-4937-A64B-D0E010242838}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ExpressMapper.Tests NETCORE", "ExpressMapper.Tests NETCORE\ExpressMapper.Tests NETCORE.xproj", "{58FDAB09-42F6-44C2-BC01-EBAFF4EBF765}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExpressMapper NET45", "ExpressMapper NET45\ExpressMapper NET45.csproj", "{5E211506-6D4E-4CD8-B454-D02672CF948A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{67AC5D64-8CA8-481F-AD23-5788755F4A33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{67AC5D64-8CA8-481F-AD23-5788755F4A33}.Debug|Any CPU.Build.0 = Debug|Any CPU
{67AC5D64-8CA8-481F-AD23-5788755F4A33}.Release|Any CPU.ActiveCfg = Release|Any CPU
{67AC5D64-8CA8-481F-AD23-5788755F4A33}.Release|Any CPU.Build.0 = Release|Any CPU
{5E211506-6D4E-4CD8-B454-D02672CF948A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5E211506-6D4E-4CD8-B454-D02672CF948A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5E211506-6D4E-4CD8-B454-D02672CF948A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5E211506-6D4E-4CD8-B454-D02672CF948A}.Release|Any CPU.Build.0 = Release|Any CPU
{9170A04C-8D4B-47A7-A6E3-7FC0F24244DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9170A04C-8D4B-47A7-A6E3-7FC0F24244DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9170A04C-8D4B-47A7-A6E3-7FC0F24244DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9170A04C-8D4B-47A7-A6E3-7FC0F24244DD}.Release|Any CPU.Build.0 = Release|Any CPU
{59DFA35C-AB10-48AD-B463-3F3E98206848}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{59DFA35C-AB10-48AD-B463-3F3E98206848}.Debug|Any CPU.Build.0 = Debug|Any CPU
{59DFA35C-AB10-48AD-B463-3F3E98206848}.Release|Any CPU.ActiveCfg = Release|Any CPU
{59DFA35C-AB10-48AD-B463-3F3E98206848}.Release|Any CPU.Build.0 = Release|Any CPU
{E701191E-BF2E-41B8-A4F0-3D8954E3DD58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E701191E-BF2E-41B8-A4F0-3D8954E3DD58}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E701191E-BF2E-41B8-A4F0-3D8954E3DD58}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -93,6 +77,10 @@ Global
{58FDAB09-42F6-44C2-BC01-EBAFF4EBF765}.Debug|Any CPU.Build.0 = Debug|Any CPU
{58FDAB09-42F6-44C2-BC01-EBAFF4EBF765}.Release|Any CPU.ActiveCfg = Release|Any CPU
{58FDAB09-42F6-44C2-BC01-EBAFF4EBF765}.Release|Any CPU.Build.0 = Release|Any CPU
{5E211506-6D4E-4CD8-B454-D02672CF948A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5E211506-6D4E-4CD8-B454-D02672CF948A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5E211506-6D4E-4CD8-B454-D02672CF948A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5E211506-6D4E-4CD8-B454-D02672CF948A}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down

0 comments on commit a968414

Please sign in to comment.