Skip to content

Commit b6ff1d4

Browse files
SteveWilkesSteveWilkes
authored
Net35 support (#71)
* Start of .NET 3.5 support, re: issue #66 * Implementing 3.5 support * Mapper compiling * .NET 3.5 unit tests building * 44 .NET 3.5 tests failing * Moving dictionary key checking and non-whole-number-numeric -> char support methods into public scope to support partial trust - extending partial trust test coverage 22 failing .NET 3.5 tests * Optimising ordered configured item collection addition - 18 failing .NET 3.5 tests * Optimising sorted list addition * Extending .NET 3.5 Ttype.IsBcl() check - 16 failing .NET 3.5 tests * Fixing .NET 3.5 Linq Lambda comparisons - 9 failing .NET 3.5 tests * Updating to ReadableExpressions v1.12.1
1 parent 846adf8 commit b6ff1d4

File tree

365 files changed

+2739
-673
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

365 files changed

+2739
-673
lines changed

‎AgileMapper.PerformanceTester/AgileMapper.PerformanceTester.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
<WarningLevel>4</WarningLevel>
3535
</PropertyGroup>
3636
<ItemGroup>
37-
<Reference Include="AgileObjects.NetStandardPolyfills, Version=1.3.0.0, Culture=neutral, PublicKeyToken=06131ac1c008ad4e, processorArchitecture=MSIL">
38-
<HintPath>..\packages\AgileObjects.NetStandardPolyfills.1.3.0\lib\net40\AgileObjects.NetStandardPolyfills.dll</HintPath>
37+
<Reference Include="AgileObjects.NetStandardPolyfills, Version=1.4.0.0, Culture=neutral, PublicKeyToken=06131ac1c008ad4e, processorArchitecture=MSIL">
38+
<HintPath>..\packages\AgileObjects.NetStandardPolyfills.1.4.0\lib\net40\AgileObjects.NetStandardPolyfills.dll</HintPath>
3939
</Reference>
40-
<Reference Include="AgileObjects.ReadableExpressions, Version=1.11.0.0, Culture=neutral, PublicKeyToken=9f54ad81db69da8e, processorArchitecture=MSIL">
41-
<HintPath>..\packages\AgileObjects.ReadableExpressions.1.11.0\lib\net40\AgileObjects.ReadableExpressions.dll</HintPath>
40+
<Reference Include="AgileObjects.ReadableExpressions, Version=1.12.1.0, Culture=neutral, PublicKeyToken=9f54ad81db69da8e, processorArchitecture=MSIL">
41+
<HintPath>..\packages\AgileObjects.ReadableExpressions.1.12.1\lib\net40\AgileObjects.ReadableExpressions.dll</HintPath>
4242
</Reference>
4343
<Reference Include="AutoMapper, Version=7.0.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
4444
<HintPath>..\packages\AutoMapper.7.0.1\lib\net45\AutoMapper.dll</HintPath>

‎AgileMapper.PerformanceTester/App.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
88
<dependentAssembly>
99
<assemblyIdentity name="AgileObjects.NetStandardPolyfills" publicKeyToken="06131ac1c008ad4e" culture="neutral" />
10-
<bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
10+
<bindingRedirect oldVersion="0.0.0.0-1.4.0.0" newVersion="1.4.0.0" />
1111
</dependentAssembly>
1212
</assemblyBinding>
1313
</runtime>

‎AgileMapper.PerformanceTester/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AgileObjects.NetStandardPolyfills" version="1.3.0" targetFramework="net452" />
4-
<package id="AgileObjects.ReadableExpressions" version="1.11.0" targetFramework="net452" />
3+
<package id="AgileObjects.NetStandardPolyfills" version="1.4.0" targetFramework="net452" />
4+
<package id="AgileObjects.ReadableExpressions" version="1.12.1" targetFramework="net452" />
55
<package id="AutoMapper" version="7.0.1" targetFramework="net452" />
66
<package id="Expressmapper" version="1.9.1" targetFramework="net452" />
77
<package id="Mapster" version="3.1.8" targetFramework="net452" />

‎AgileMapper.UnitTests.MoreTestClasses/AgileMapper.UnitTests.MoreTestClasses.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\common.props" />
33

44
<PropertyGroup>
5-
<TargetFramework>netstandard1.0</TargetFramework>
5+
<TargetFrameworks>net35;netstandard1.0</TargetFrameworks>
66
<AssemblyName>AgileObjects.AgileMapper.UnitTests.MoreTestClasses</AssemblyName>
77
<RootNamespace>AgileObjects.AgileMapper.UnitTests.MoreTestClasses</RootNamespace>
88
</PropertyGroup>

‎AgileMapper.UnitTests.Net35/AgileMapper.UnitTests.Net35.csproj‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<Import Project="..\common.props" />
5+
<PropertyGroup>
6+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8+
<ProjectGuid>{E0706509-4A4B-4C0D-A3B2-4A713FFC6ED4}</ProjectGuid>
9+
<OutputType>Library</OutputType>
10+
<AppDesignerFolder>Properties</AppDesignerFolder>
11+
<RootNamespace>AgileObjects.AgileMapper.UnitTests.Net35</RootNamespace>
12+
<AssemblyName>AgileObjects.AgileMapper.UnitTests.Net35</AssemblyName>
13+
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
14+
<FileAlignment>512</FileAlignment>
15+
</PropertyGroup>
16+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17+
<DebugSymbols>true</DebugSymbols>
18+
<DebugType>full</DebugType>
19+
<Optimize>false</Optimize>
20+
<OutputPath>bin\Debug\</OutputPath>
21+
<DefineConstants>TRACE;DEBUG;NET35</DefineConstants>
22+
<ErrorReport>prompt</ErrorReport>
23+
<WarningLevel>4</WarningLevel>
24+
</PropertyGroup>
25+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26+
<DebugType>pdbonly</DebugType>
27+
<Optimize>true</Optimize>
28+
<OutputPath>bin\Release\</OutputPath>
29+
<DefineConstants>TRACE;NET35</DefineConstants>
30+
<ErrorReport>prompt</ErrorReport>
31+
<WarningLevel>4</WarningLevel>
32+
</PropertyGroup>
33+
<ItemGroup>
34+
<Reference Include="AgileObjects.NetStandardPolyfills, Version=1.4.0.0, Culture=neutral, PublicKeyToken=06131ac1c008ad4e, processorArchitecture=MSIL">
35+
<HintPath>..\packages\AgileObjects.NetStandardPolyfills.1.4.0\lib\net35\AgileObjects.NetStandardPolyfills.dll</HintPath>
36+
</Reference>
37+
<Reference Include="AgileObjects.ReadableExpressions, Version=1.12.1.0, Culture=neutral, PublicKeyToken=9f54ad81db69da8e, processorArchitecture=MSIL">
38+
<HintPath>..\packages\AgileObjects.ReadableExpressions.1.12.1\lib\net35\AgileObjects.ReadableExpressions.dll</HintPath>
39+
</Reference>
40+
<Reference Include="Microsoft.Dynamic, Version=1.1.2.22, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
41+
<HintPath>..\packages\DynamicLanguageRuntime.1.1.2\lib\Net35\Microsoft.Dynamic.dll</HintPath>
42+
</Reference>
43+
<Reference Include="Microsoft.Scripting, Version=1.1.2.22, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
44+
<HintPath>..\packages\DynamicLanguageRuntime.1.1.2\lib\Net35\Microsoft.Scripting.dll</HintPath>
45+
</Reference>
46+
<Reference Include="Microsoft.Scripting.AspNet, Version=1.1.1.21, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
47+
<HintPath>..\packages\DynamicLanguageRuntime.1.1.2\lib\Net35\Microsoft.Scripting.AspNet.dll</HintPath>
48+
</Reference>
49+
<Reference Include="Microsoft.Scripting.Core, Version=1.1.2.22, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
50+
<HintPath>..\packages\DynamicLanguageRuntime.1.1.2\lib\Net35\Microsoft.Scripting.Core.dll</HintPath>
51+
</Reference>
52+
<Reference Include="Microsoft.Scripting.Metadata, Version=1.1.2.22, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
53+
<HintPath>..\packages\DynamicLanguageRuntime.1.1.2\lib\Net35\Microsoft.Scripting.Metadata.dll</HintPath>
54+
</Reference>
55+
<Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
56+
<HintPath>..\packages\NUnit.3.6.1\lib\net35\nunit.framework.dll</HintPath>
57+
</Reference>
58+
<Reference Include="System" />
59+
<Reference Include="System.Core" />
60+
<Reference Include="System.Xml.Linq" />
61+
<Reference Include="System.Data.DataSetExtensions" />
62+
<Reference Include="System.Data" />
63+
<Reference Include="System.Xml" />
64+
</ItemGroup>
65+
<ItemGroup>
66+
<Compile Include="..\AgileMapper.UnitTests\**\*.cs" Exclude="..\AgileMapper.UnitTests\obj\**\*.cs;..\AgileMapper.UnitTests\Dynamics\**\*.cs;..\AgileMapper.UnitTests\WhenUsingPartialTrust.cs;..\AgileMapper.UnitTests\WhenFlatteningToDynamics.cs;">
67+
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
68+
</Compile>
69+
</ItemGroup>
70+
<ItemGroup>
71+
<Compile Include="..\CommonAssemblyInfo.cs">
72+
<Link>Properties\CommonAssemblyInfo.cs</Link>
73+
</Compile>
74+
</ItemGroup>
75+
<ItemGroup>
76+
<None Include="packages.config" />
77+
</ItemGroup>
78+
<ItemGroup>
79+
<ProjectReference Include="..\AgileMapper.UnitTests.MoreTestClasses\AgileMapper.UnitTests.MoreTestClasses.csproj">
80+
<Project>{0d045f11-1cbb-4be1-b854-d7e5d348c2fe}</Project>
81+
<Name>AgileMapper.UnitTests.MoreTestClasses</Name>
82+
</ProjectReference>
83+
<ProjectReference Include="..\AgileMapper\AgileMapper.csproj">
84+
<Project>{147ddcce-cdd3-4dd0-8ba3-d3f2f239e161}</Project>
85+
<Name>AgileMapper</Name>
86+
</ProjectReference>
87+
</ItemGroup>
88+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
89+
</Project>

‎AgileMapper.UnitTests.Net35/packages.config‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="AgileObjects.NetStandardPolyfills" version="1.4.0" targetFramework="net35" />
4+
<package id="AgileObjects.ReadableExpressions" version="1.12.1" targetFramework="net35" />
5+
<package id="DynamicLanguageRuntime" version="1.1.2" targetFramework="net35" />
6+
<package id="NUnit" version="3.6.1" targetFramework="net35" />
7+
</packages>

‎AgileMapper.UnitTests.NetCore/AgileMapper.UnitTests.NetCore.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</ItemGroup>
3030

3131
<ItemGroup>
32-
<PackageReference Include="AgileObjects.NetStandardPolyfills" Version="1.3.0" />
32+
<PackageReference Include="AgileObjects.NetStandardPolyfills" Version="1.4.0" />
3333
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
3434
<PackageReference Include="xunit" Version="2.3.1" />
3535
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />

‎AgileMapper.UnitTests.NetCore2.1/AgileMapper.UnitTests.NetCore2.1.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</ItemGroup>
3030

3131
<ItemGroup>
32-
<PackageReference Include="AgileObjects.NetStandardPolyfills" Version="1.3.0" />
32+
<PackageReference Include="AgileObjects.NetStandardPolyfills" Version="1.4.0" />
3333
<PackageReference Include="Microsoft.Extensions.Primitives" Version="2.0.0" />
3434
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
3535
<PackageReference Include="xunit" Version="2.3.1" />

‎AgileMapper.UnitTests.NetCore2/AgileMapper.UnitTests.NetCore2.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</ItemGroup>
3030

3131
<ItemGroup>
32-
<PackageReference Include="AgileObjects.NetStandardPolyfills" Version="1.3.0" />
32+
<PackageReference Include="AgileObjects.NetStandardPolyfills" Version="1.4.0" />
3333
<PackageReference Include="Microsoft.Extensions.Primitives" Version="2.0.0" />
3434
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
3535
<PackageReference Include="xunit" Version="2.3.1" />

‎AgileMapper.UnitTests.NonParallel/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
66
<assemblyIdentity name="AgileObjects.NetStandardPolyfills" publicKeyToken="06131ac1c008ad4e" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
7+
<bindingRedirect oldVersion="0.0.0.0-1.4.0.0" newVersion="1.4.0.0" />
88
</dependentAssembly>
99
</assemblyBinding>
1010
</runtime>

0 commit comments

Comments
 (0)