Skip to content

Commit 2cdf910

Browse files
ig-sinicynig-sinicyn
committed
+ Blocks; + Experimental
1 parent 9570eeb commit 2cdf910

File tree

10 files changed

+71
-250
lines changed

10 files changed

+71
-250
lines changed

‎Build/Props/CodeJam.Targeting.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<PropertyGroup>
33
<CopyMeTargetFrameworks>net461;netcoreapp2.0;netstandard2.0;net472;net45;net40;net35</CopyMeTargetFrameworks>
44
<CopyMeTestTargetFrameworks>net461;netcoreapp2.0;net472;net45;net40;net35</CopyMeTestTargetFrameworks>
5+
<CopyMeMinimalTargetFrameworks>net461;netcoreapp2.0</CopyMeMinimalTargetFrameworks>
56
</PropertyGroup>
67

78
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">

‎CodeJam.Blocks.Tests/CodeJam.Blocks.Tests.csproj‎

Lines changed: 10 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,28 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\Build\CodeJam.Default.props" />
4-
<Import Project="..\..\Build\CodeJam.Targeting.props" />
3+
<Import Project="..\Build\Props\CodeJam.Default.props" />
4+
<Import Project="..\Build\Props\CodeJam.Targeting.props" />
55

66
<PropertyGroup>
7-
<AssemblyName>CodeJam.Blocks-Tests</AssemblyName>
7+
<AssemblyName>CodeJam.Blocks.Tests</AssemblyName>
88
<RootNamespace>CodeJam</RootNamespace>
99
<ProjectGuid>{2A52D7F6-AAFC-4AC4-9901-252C13D96E53}</ProjectGuid>
1010
<OutputType>Library</OutputType>
1111
<TargetFrameworks>net461;netcoreapp2.0;net472;net45;net40;net35</TargetFrameworks>
1212
</PropertyGroup>
1313

14-
<PropertyGroup Condition=" '$(Configuration)' != 'Publish' ">
15-
<TargetFrameworks>net461</TargetFrameworks>
16-
</PropertyGroup>
17-
18-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19-
<DebugSymbols>true</DebugSymbols>
20-
<DebugType>full</DebugType>
21-
<Optimize>false</Optimize>
22-
<OutputPath>bin\Debug\</OutputPath>
23-
<DefineConstants>$(DefineConstants);TRACE;DEBUG</DefineConstants>
24-
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26-
<DebugType>pdbonly</DebugType>
27-
<Optimize>true</Optimize>
28-
<OutputPath>bin\Release\</OutputPath>
29-
<DefineConstants>$(DefineConstants);TRACE</DefineConstants>
30-
</PropertyGroup>
31-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Publish|AnyCPU' ">
32-
<DebugType>pdbonly</DebugType>
33-
<Optimize>true</Optimize>
34-
<OutputPath>bin\Publish\</OutputPath>
35-
<DefineConstants>$(DefineConstants);TRACE</DefineConstants>
36-
</PropertyGroup>
37-
38-
<ItemGroup>
39-
<ProjectReference Include="..\src\CodeJam.Blocks.csproj" />
40-
</ItemGroup>
41-
<ItemGroup>
42-
<PackageReference Include="NUnit" Version="3.8.1" />
43-
<PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
44-
</ItemGroup>
4514
<ItemGroup Condition=" '$(TargetFramework)' != 'net35' AND '$(TargetFramework)' != 'net40'">
4615
<!-- Hack for NUnit test runner, see https://github.com/nunit/nunit3-vs-adapter/issues/325 -->
47-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
48-
<PackageReference Include="Mono.Cecil" Version="0.10.0-beta6" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
17+
</ItemGroup>
18+
19+
<ItemGroup>
20+
<PackageReference Include="NUnit" Version="3.11.0" />
21+
<PackageReference Include="NUnit3TestAdapter" Version="3.11.2" />
4922
</ItemGroup>
5023

5124
<ItemGroup>
52-
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
25+
<ProjectReference Include="..\CodeJam.Blocks\CodeJam.Blocks.csproj" />
5326
</ItemGroup>
5427

5528
</Project>

‎CodeJam.Blocks/CodeJam.Blocks.csproj‎

Lines changed: 9 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,43 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\Build\CodeJam.Default.props" />
4-
<Import Project="..\..\Build\CodeJam.Targeting.props" />
3+
<Import Project="..\Build\Props\CodeJam.Default.props" />
4+
<Import Project="..\Build\Props\CodeJam.Targeting.props" />
5+
<Import Project="..\Build\Props\CodeJam.Nuspec.props" />
56

67
<PropertyGroup>
78
<AssemblyName>CodeJam.Blocks</AssemblyName>
89
<RootNamespace>CodeJam</RootNamespace>
910
<ProjectGuid>{0DFF0859-2400-4487-83AD-0ED10203D6D9}</ProjectGuid>
10-
<EnableDefaultItems>false</EnableDefaultItems>
1111
<OutputType>Library</OutputType>
1212
<TargetFrameworks>net461;netcoreapp2.0;netstandard2.0;net472;net45;net40;net35</TargetFrameworks>
1313

1414
<PackageId>CodeJam.Blocks</PackageId>
1515
<Title>CodeJam.Blocks library</Title>
16-
<Authors>Andrew Koryavchenko, Igor Sinicyn, Igor Tkachev, rameel</Authors>
16+
<Authors>Andrew Koryavchenko, Igor Tkachev, rameel</Authors>
1717
<Product>CodeJam</Product>
1818
<Description>CodeJam.Blocks is a set of basic blocks aimed to easy creation of infrastructure serviceas such as mappers, DI service providers et cetera.</Description>
19-
<PackageLicenseUrl>https://github.com/rsdn/CodeJam/blob/master/LICENSE</PackageLicenseUrl>
2019
<PackageProjectUrl>https://github.com/rsdn/CodeJam</PackageProjectUrl>
20+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
2121
<PackageIconUrl>https://raw.githubusercontent.com/rsdn/CodeJam/master/images/nuget/CodeJam.Blocks.Icon.png</PackageIconUrl>
2222
<PackageTags>mapper services csv</PackageTags>
2323
</PropertyGroup>
2424

25-
<PropertyGroup Condition=" '$(Configuration)' == 'Publish' ">
26-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
27-
</PropertyGroup>
28-
<PropertyGroup Condition=" '$(Configuration)' != 'Publish' ">
29-
<TargetFrameworks>net461</TargetFrameworks>
30-
</PropertyGroup>
31-
32-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
33-
<DebugSymbols>true</DebugSymbols>
34-
<DebugType>full</DebugType>
35-
<Optimize>false</Optimize>
36-
<OutputPath>bin\Debug\</OutputPath>
37-
<DefineConstants>$(DefineConstants);TRACE;DEBUG</DefineConstants>
38-
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(ProjectName).xml</DocumentationFile>
39-
</PropertyGroup>
40-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
41-
<DebugType>pdbonly</DebugType>
42-
<Optimize>true</Optimize>
43-
<OutputPath>bin\Release\</OutputPath>
44-
<DefineConstants>$(DefineConstants);TRACE</DefineConstants>
45-
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(ProjectName).xml</DocumentationFile>
46-
</PropertyGroup>
47-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Publish|AnyCPU' ">
48-
<DebugType>pdbonly</DebugType>
49-
<Optimize>true</Optimize>
50-
<OutputPath>bin\Publish\</OutputPath>
51-
<DefineConstants>$(DefineConstants);TRACE</DefineConstants>
52-
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(ProjectName).xml</DocumentationFile>
53-
</PropertyGroup>
54-
25+
<!-- #region Targeting -->
5526
<ItemGroup Condition=" '$(TargetFramework)' == 'net35'">
5627
<AssemblyAttribute Include="System.Runtime.Versioning.TargetFrameworkAttribute">
5728
<_Parameter1>.NETFramework,Version=v3.5</_Parameter1>
5829
</AssemblyAttribute>
5930
</ItemGroup>
31+
<!-- #endregion -->
6032

6133
<ItemGroup>
62-
<ProjectReference Include="..\..\Main\src\CodeJam.Main.csproj" />
34+
<ProjectReference Include="..\CodeJam.Main\CodeJam.Main.csproj" />
6335
</ItemGroup>
6436

6537
<ItemGroup>
66-
<Compile Include="..\..\Build\Jetbrains.Annotations.cs">
38+
<Compile Include="..\Build\Jetbrains.Annotations.cs">
6739
<Link>Properties\Jetbrains.Annotations.cs</Link>
6840
</Compile>
69-
<Compile Include="Mapping\CodeJamConvertException.cs" />
70-
<Compile Include="Mapping\CodeJamMappingException.cs" />
71-
<Compile Include="Mapping\ConvertBuilder.cs" />
72-
<Compile Include="Mapping\Converter.cs" />
73-
<Compile Include="Mapping\ConvertInfo.cs" />
74-
<Compile Include="Mapping\ConvertT.cs" />
75-
<Compile Include="Mapping\ConvertTo.cs" />
76-
<Compile Include="Mapping\DefaultValue.cs" />
77-
<Compile Include="Mapping\DefaultValueExpression.cs" />
78-
<Compile Include="Mapping\DefaultValueT.cs" />
79-
<Compile Include="Mapping\ExpressionBuilder.cs" />
80-
<Compile Include="Mapping\IGenericInfoProvider.cs" />
81-
<Compile Include="Mapping\IMapperBuilder.cs" />
82-
<Compile Include="Mapping\Map.cs" />
83-
<Compile Include="Mapping\Mapper.cs" />
84-
<Compile Include="Mapping\MapperBuilder.cs" />
85-
<Compile Include="Mapping\MappingSchema.cs" />
86-
<Compile Include="Mapping\MappingSchemaInfo.cs" />
87-
<Compile Include="Mapping\MapValue.cs" />
88-
<Compile Include="Mapping\MapValueAttribute.cs" />
89-
<Compile Include="Mapping\NamespaceDoc.cs" />
90-
<Compile Include="Mapping\ScalarTypeAttribute.cs" />
91-
<Compile Include="Metadata\AttributeInfo.cs" />
92-
<Compile Include="Metadata\AttributeReader.cs" />
93-
<Compile Include="Metadata\IMetadataReader.cs" />
94-
<Compile Include="Metadata\MetadataException.cs" />
95-
<Compile Include="Metadata\MetadataReader.cs" />
96-
<Compile Include="Metadata\MetaMemberInfo.cs" />
97-
<Compile Include="Metadata\MetaTypeInfo.cs" />
98-
<Compile Include="Metadata\NamespaceDoc.cs" />
99-
<Compile Include="Metadata\XmlAttributeReader.cs" />
100-
<Compile Include="Properties\AssemblyInfo.cs" />
101-
<Compile Include="Services\IServicePublisher.cs" />
102-
<Compile Include="Services\NamespaceDoc.cs" />
103-
<Compile Include="Services\ServiceContainer.cs" />
104-
<Compile Include="Services\ServiceProviderHelper.cs" />
105-
<Compile Include="TableData\CsvFormat.cs" />
106-
<Compile Include="TableData\DataLine.cs" />
107-
<Compile Include="TableData\FixedWidthFormat.cs" />
108-
<Compile Include="TableData\NamespaceDoc.cs" />
109-
<Compile Include="TableData\TableDataParser.cs" />
11041
<Content Include="Readme.txt">
11142
<Pack>true</Pack>
11243
<PackagePath>Readme.txt</PackagePath>

‎CodeJam.Blocks/Mapping/MappingSchema.cs‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,7 @@ public Expression<Func<TFrom,TTo>> GetConvertExpression<TFrom,TTo>()
235235
/// <param name="checkNull">If <i>true</i>, created expression checks input value for <i>null</i>.</param>
236236
/// <param name="createDefault">If <i>true</i>, new expression is created.</param>
237237
/// <returns>Convert expression.</returns>
238-
[CanBeNull]
239-
public LambdaExpression TryGetConvertExpression(
238+
public LambdaExpression GetConvertExpression(
240239
[NotNull] Type from,
241240
[NotNull] Type to,
242241
bool checkNull = true,
@@ -249,16 +248,6 @@ public LambdaExpression TryGetConvertExpression(
249248
return li == null ? null : (LambdaExpression)ReduceDefaultValue(checkNull ? li.CheckNullLambda : li.Lambda);
250249
}
251250

252-
static bool Do(
253-
int x, out string y,
254-
bool checkNull = true,
255-
bool createDefault = true)
256-
{
257-
y = "";
258-
return true;
259-
260-
}
261-
262251
/// <summary>
263252
/// Returns converter from a value of type <i>TFrom</i> to <i>TTo</i>.
264253
/// </summary>

‎CodeJam.Blocks/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// The following GUID is for the ID of the typelib if this project is exposed to COM
1111
[assembly: Guid("0dff0859-2400-4487-83ad-0ed10203d6d9")]
1212

13-
[assembly: InternalsVisibleTo("CodeJam.Blocks-Tests, PublicKey=" +
13+
[assembly: InternalsVisibleTo("CodeJam.Blocks.Tests, PublicKey=" +
1414
"00240000048000009400000006020000002400005253413100040000010001000de1c523b74719" +
1515
"e2f54eed3a5512cfedfa78ccfef5c1d196e9a6b09522e7a833ab027deff5462ab26b5d5b51ed42" +
1616
"10c889d2177f16f3678dfe65ba202f7b142b3d37e7500df14f86a616b111989b58029fc1ad8932" +

‎CodeJam.Experimental.Tests/CodeJam.Experimental.Tests.csproj‎

Lines changed: 11 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,30 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\Build\CodeJam.Default.props" />
4-
<Import Project="..\..\Build\CodeJam.Targeting.props" />
3+
<Import Project="..\Build\Props\CodeJam.Default.props" />
4+
<Import Project="..\Build\Props\CodeJam.Targeting.props" />
55

66
<PropertyGroup>
7-
<AssemblyName>CodeJam.Experimental-Tests</AssemblyName>
7+
<AssemblyName>CodeJam.Experimental.Tests</AssemblyName>
88
<RootNamespace>CodeJam</RootNamespace>
99
<ProjectGuid>{F6F97573-4D26-4217-89F6-819DF96FCB4A}</ProjectGuid>
1010
<OutputType>Library</OutputType>
1111
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
12-
</PropertyGroup>
13-
14-
<PropertyGroup Condition=" '$(Configuration)' != 'Publish' ">
15-
<TargetFrameworks>net461</TargetFrameworks>
16-
</PropertyGroup>
17-
18-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19-
<DebugSymbols>true</DebugSymbols>
20-
<DebugType>full</DebugType>
21-
<Optimize>false</Optimize>
22-
<OutputPath>bin\Debug\</OutputPath>
23-
<DefineConstants>$(DefineConstants);TRACE;DEBUG</DefineConstants>
24-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<DebugType>pdbonly</DebugType>
28-
<Optimize>true</Optimize>
29-
<OutputPath>bin\Release\</OutputPath>
30-
<DefineConstants>$(DefineConstants);TRACE</DefineConstants>
31-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
32-
</PropertyGroup>
33-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Publish|AnyCPU' ">
34-
<DebugType>pdbonly</DebugType>
35-
<Optimize>true</Optimize>
36-
<OutputPath>bin\Publish\</OutputPath>
37-
<DefineConstants>$(DefineConstants);TRACE</DefineConstants>
3812
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
3913
</PropertyGroup>
4014

41-
<ItemGroup>
42-
<ProjectReference Include="..\..\Main\src\CodeJam.Main.csproj" />
43-
<ProjectReference Include="..\src\CodeJam.Experimental.csproj" />
44-
</ItemGroup>
45-
<ItemGroup>
46-
<PackageReference Include="NUnit" Version="3.8.1" />
47-
<PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
48-
</ItemGroup>
4915
<ItemGroup Condition=" '$(TargetFramework)' != 'net35' AND '$(TargetFramework)' != 'net40'">
5016
<!-- Hack for NUnit test runner, see https://github.com/nunit/nunit3-vs-adapter/issues/325 -->
51-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
52-
<PackageReference Include="Mono.Cecil" Version="0.10.0-beta6" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
18+
</ItemGroup>
19+
20+
<ItemGroup>
21+
<PackageReference Include="NUnit" Version="3.11.0" />
22+
<PackageReference Include="NUnit3TestAdapter" Version="3.11.2" />
5323
</ItemGroup>
5424

5525
<ItemGroup>
56-
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
26+
<ProjectReference Include="..\CodeJam.Main\CodeJam.Main.csproj" />
27+
<ProjectReference Include="..\CodeJam.Experimental\CodeJam.Experimental.csproj" />
5728
</ItemGroup>
5829

5930
</Project>

0 commit comments

Comments
 (0)