Skip to content

Commit f592812

Browse files
ig-sinicynig-sinicyn
committed
Experimental to netstandard 2
1 parent 829bdb0 commit f592812

17 files changed

+619
-393
lines changed

‎Blocks/src/CodeJam.Blocks.csproj

+6-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
<TargetFrameworks>net461</TargetFrameworks>
1414

1515
<PackageId>CodeJam.Blocks</PackageId>
16-
<Title>CodeJam.Blocks Library</Title>
16+
<Title>CodeJam.Blocks library</Title>
1717
<Authors>Andrew Koryavchenko, Igor Sinicyn, Igor Tkachev, rameel</Authors>
1818
<Product>CodeJam</Product>
19-
<Description>CodeJam is a set of handy reusable .NET components that can simplify your daily work and save your time when you copy and paste your favorite helper methods and classes from one project to another.</Description>
19+
<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>
2020
<PackageLicenseUrl>https://github.com/rsdn/CodeJam/blob/master/LICENSE</PackageLicenseUrl>
2121
<PackageProjectUrl>https://github.com/rsdn/CodeJam</PackageProjectUrl>
2222
<PackageIconUrl>https://raw.githubusercontent.com/rsdn/CodeJam/master/images/nuget/CodeJam.Blocks.Icon.png</PackageIconUrl>
@@ -120,6 +120,10 @@
120120
<Compile Include="TableData\FixedWidthFormat.cs" />
121121
<Compile Include="TableData\NamespaceDoc.cs" />
122122
<Compile Include="TableData\TableDataParser.cs" />
123+
<Content Include="Readme.txt">
124+
<Pack>true</Pack>
125+
<PackagePath>README.txt</PackagePath>
126+
</Content>
123127
</ItemGroup>
124128
<ItemGroup>
125129
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />

‎Blocks/src/packages.config

-4
This file was deleted.

‎Blocks/tests/CodeJam.Blocks-Tests.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,9 @@
5151
<ItemGroup>
5252
<PackageReference Include="NUnit" Version="3.7.1" />
5353
</ItemGroup>
54-
54+
5555
<ItemGroup>
56+
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
5657
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
5758
</ItemGroup>
5859
</Project>

‎CodeJam.sln

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26730.10
4+
VisualStudioVersion = 15.0.26730.8
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeJam.Main", "Main\src\CodeJam.Main.csproj", "{2F2046CC-FB47-4318-B335-5A82B04B6C40}"
77
EndProject
@@ -49,12 +49,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeJam.PerfTests", "PerfTe
4949
EndProject
5050
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeJam.PerfTests-Tests.NUnit", "PerfTests\tests-nUnit\CodeJam.PerfTests-Tests.NUnit.csproj", "{15F5BFE8-8B7C-4DF6-9E31-48A4BF9FED1C}"
5151
EndProject
52-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{A33D991A-5E90-434F-BC8A-709ADD5DB0C2}"
53-
ProjectSection(SolutionItems) = preProject
54-
Experimental\nuget\CodeJam.Experimental.nuspec = Experimental\nuget\CodeJam.Experimental.nuspec
55-
Experimental\nuget\Readme.txt = Experimental\nuget\Readme.txt
56-
EndProjectSection
57-
EndProject
5852
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeJam.PerfTests.NUnit", "PerfTests\src-NUnit\CodeJam.PerfTests.NUnit.csproj", "{8ABF1A06-4643-49D6-A546-B7473DB10102}"
5953
EndProject
6054
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeJam.PerfTests.xUnit", "PerfTests\src-xUnit\CodeJam.PerfTests.xUnit.csproj", "{92C6E5F8-FFEE-4269-92D7-BB9CFEB63D4B}"
@@ -233,7 +227,6 @@ Global
233227
{00E3881C-3D4D-4AE3-B1B4-CDCDC99F7E51} = {D56CF63D-0A29-4F5A-8E2C-0DAF338119EE}
234228
{1D650545-A151-4211-8C29-C38A939403A6} = {F9C61696-C38B-4D6A-84C8-BED1DDC7A52E}
235229
{15F5BFE8-8B7C-4DF6-9E31-48A4BF9FED1C} = {F9C61696-C38B-4D6A-84C8-BED1DDC7A52E}
236-
{A33D991A-5E90-434F-BC8A-709ADD5DB0C2} = {D56CF63D-0A29-4F5A-8E2C-0DAF338119EE}
237230
{8ABF1A06-4643-49D6-A546-B7473DB10102} = {F9C61696-C38B-4D6A-84C8-BED1DDC7A52E}
238231
{92C6E5F8-FFEE-4269-92D7-BB9CFEB63D4B} = {F9C61696-C38B-4D6A-84C8-BED1DDC7A52E}
239232
{F70A32D4-EE5D-477F-965C-428119D4CD39} = {F9C61696-C38B-4D6A-84C8-BED1DDC7A52E}

‎Experimental/nuget/CodeJam.Experimental.nuspec

-18
This file was deleted.

‎Experimental/src/CodeJam.Experimental.csproj

+116-110
Original file line numberDiff line numberDiff line change
@@ -1,111 +1,117 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4-
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{7BD77DA2-A731-400C-A88E-215FC592E6E3}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>CodeJam</RootNamespace>
11-
<AssemblyName>CodeJam.Experimental</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<TargetFrameworkProfile />
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;JETBRAINS_ANNOTATIONS</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;JETBRAINS_ANNOTATIONS</DefineConstants>
30-
<ErrorReport>prompt</ErrorReport>
31-
<WarningLevel>4</WarningLevel>
32-
</PropertyGroup>
33-
<PropertyGroup>
34-
<SignAssembly>true</SignAssembly>
35-
</PropertyGroup>
36-
<PropertyGroup>
37-
<AssemblyOriginatorKeyFile>..\..\Build\CodeJam.snk</AssemblyOriginatorKeyFile>
38-
</PropertyGroup>
39-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Publish|AnyCPU'">
40-
<OutputPath>bin\Publish\</OutputPath>
41-
<DefineConstants>TRACE;JETBRAINS_ANNOTATIONS</DefineConstants>
42-
<Optimize>true</Optimize>
43-
<DebugType>pdbonly</DebugType>
44-
<PlatformTarget>AnyCPU</PlatformTarget>
45-
<ErrorReport>prompt</ErrorReport>
46-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
47-
</PropertyGroup>
48-
<ItemGroup>
49-
<Reference Include="System" />
50-
<Reference Include="System.Core" />
51-
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
52-
<HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
53-
</Reference>
54-
</ItemGroup>
55-
<ItemGroup>
56-
<Compile Include="CmdLine\CommandLineChecker.cs" />
57-
<Compile Include="CmdLine\CommandLineHelper.cs" />
58-
<Compile Include="CmdLine\Model\Checking\CmdLineRules.cs" />
59-
<Compile Include="CmdLine\Model\Checking\CommandLineCheckException.cs" />
60-
<Compile Include="CmdLine\Model\Checking\CommandQuantifier.cs" />
61-
<Compile Include="CmdLine\Model\Checking\CommandRule.cs" />
62-
<Compile Include="CmdLine\Model\Checking\OptionRule.cs" />
63-
<Compile Include="CmdLine\Model\OptionType.cs" />
64-
<Compile Include="CmdLine\OptionPrefix.cs" />
65-
<Compile Include="CmdLine\Parser\CharInput.cs" />
66-
<Compile Include="CmdLine\Parser\CmdLineNode.cs" />
67-
<Compile Include="CmdLine\Parser\CmdLineNodeBase.cs" />
68-
<Compile Include="CmdLine\Parser\CommandLineParser.cs" />
69-
<Compile Include="CmdLine\Parser\CommandLineParser.Helpers.cs" />
70-
<Compile Include="CmdLine\Parser\CommandNode.cs" />
71-
<Compile Include="CmdLine\Parser\ICharInput.cs" />
72-
<Compile Include="CmdLine\Parser\OptionNode.cs" />
73-
<Compile Include="CmdLine\Parser\ParseResult.cs" />
74-
<Compile Include="CmdLine\Parser\ParsingException.cs" />
75-
<Compile Include="CmdLine\Parser\QuotedOrNonquotedValueNode.cs" />
76-
<Compile Include="CmdLine\PrintUsageSettings.cs" />
77-
<Compile Include="CmdLine\UsagePrinter.cs" />
78-
<Compile Include="Collections\DisjointSets.cs" />
79-
<Compile Include="Collections\DisjointSetsBase.cs" />
80-
<Compile Include="Collections\DisjointSetsT.cs" />
81-
<Compile Include="Parsing\BinaryOperator.cs" />
82-
<Compile Include="Parsing\CharReader.cs" />
83-
<Compile Include="Parsing\ExpressionDefinition.cs" />
84-
<Compile Include="Parsing\Operator.cs" />
85-
<Compile Include="Parsing\ParseHelper.cs" />
86-
<Compile Include="Parsing\Parser.cs" />
87-
<Compile Include="Parsing\PostfixUnaryOperator.cs" />
88-
<Compile Include="Parsing\PrefixUnaryOperator.cs" />
89-
<Compile Include="Properties\AssemblyInfo.cs" />
90-
</ItemGroup>
91-
<ItemGroup>
92-
<ProjectReference Include="..\..\Main\src\CodeJam.Main.csproj">
93-
<Project>{2f2046cc-fb47-4318-b335-5a82b04b6c40}</Project>
94-
<Name>CodeJam.Main</Name>
95-
</ProjectReference>
96-
</ItemGroup>
97-
<ItemGroup>
98-
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
99-
</ItemGroup>
100-
<ItemGroup>
101-
<None Include="packages.config" />
102-
</ItemGroup>
103-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
104-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
105-
Other similar extension points exist, see Microsoft.Common.targets.
106-
<Target Name="BeforeBuild">
107-
</Target>
108-
<Target Name="AfterBuild">
109-
</Target>
110-
-->
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<Import Project="..\..\Build\CodeJam.Default.props" />
4+
<Import Project="..\..\Build\CodeJam.Targeting.props" />
5+
6+
<PropertyGroup>
7+
<AssemblyName>CodeJam.Experimental</AssemblyName>
8+
<RootNamespace>CodeJam</RootNamespace>
9+
<ProjectGuid>{7BD77DA2-A731-400C-A88E-215FC592E6E3}</ProjectGuid>
10+
<EnableDefaultItems>false</EnableDefaultItems>
11+
<OutputType>Library</OutputType>
12+
<FileAlignment>512</FileAlignment>
13+
<TargetFrameworks>net461</TargetFrameworks>
14+
15+
<PackageId>CodeJam.Experimental</PackageId>
16+
<Title>CodeJam.Experimental library</Title>
17+
<Authors>Andrew Koryavchenko, Igor Sinicyn, Igor Tkachev, rameel</Authors>
18+
<Product>CodeJam.Experimental</Product>
19+
<Description>CodeJam.Experimental contains preview version of features to be included in future releases of CodeJam.</Description>
20+
<PackageLicenseUrl>https://github.com/rsdn/CodeJam/blob/master/LICENSE</PackageLicenseUrl>
21+
<PackageProjectUrl>https://github.com/rsdn/CodeJam</PackageProjectUrl>
22+
<PackageIconUrl>https://raw.githubusercontent.com/rsdn/CodeJam/master/images/nuget/CodeJam.Main.Experimental.Icon.png</PackageIconUrl>
23+
<RepositoryUrl>https://github.com/rsdn/CodeJam</RepositoryUrl>
24+
<RepositoryType>git</RepositoryType>
25+
<PackageTags>extension experimental</PackageTags>
26+
27+
<Company>RSDN.ru</Company>
28+
<Copyright>RSDN.ru, 2017</Copyright>
29+
<RepositoryUrl>https://github.com/rsdn/CodeJam</RepositoryUrl>
30+
<RepositoryType>git</RepositoryType>
31+
</PropertyGroup>
32+
33+
<PropertyGroup Condition=" '$(Configuration)' == 'Publish' ">
34+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
35+
<TargetFrameworks>net461</TargetFrameworks>
36+
</PropertyGroup>
37+
38+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
39+
<LangVersion>latest</LangVersion>
40+
<DebugSymbols>true</DebugSymbols>
41+
<DebugType>full</DebugType>
42+
<Optimize>false</Optimize>
43+
<OutputPath>bin\Debug\</OutputPath>
44+
<DefineConstants>$(DefineConstants);TRACE;DEBUG</DefineConstants>
45+
<ErrorReport>prompt</ErrorReport>
46+
<WarningLevel>4</WarningLevel>
47+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
48+
</PropertyGroup>
49+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
50+
<LangVersion>latest</LangVersion>
51+
<DebugType>pdbonly</DebugType>
52+
<Optimize>true</Optimize>
53+
<OutputPath>bin\Release\</OutputPath>
54+
<DefineConstants>$(DefineConstants);TRACE</DefineConstants>
55+
<ErrorReport>prompt</ErrorReport>
56+
<WarningLevel>4</WarningLevel>
57+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
58+
</PropertyGroup>
59+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Publish|AnyCPU' ">
60+
<LangVersion>latest</LangVersion>
61+
<DebugType>pdbonly</DebugType>
62+
<Optimize>true</Optimize>
63+
<OutputPath>bin\Publish\</OutputPath>
64+
<DefineConstants>$(DefineConstants);TRACE1</DefineConstants>
65+
<ErrorReport>prompt</ErrorReport>
66+
<WarningLevel>4</WarningLevel>
67+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
68+
</PropertyGroup>
69+
70+
<ItemGroup>
71+
<ProjectReference Include="..\..\Main\src\CodeJam.Main.csproj" />
72+
</ItemGroup>
73+
74+
<ItemGroup>
75+
<Compile Include="CmdLine\CommandLineChecker.cs" />
76+
<Compile Include="CmdLine\CommandLineHelper.cs" />
77+
<Compile Include="CmdLine\Model\Checking\CmdLineRules.cs" />
78+
<Compile Include="CmdLine\Model\Checking\CommandLineCheckException.cs" />
79+
<Compile Include="CmdLine\Model\Checking\CommandQuantifier.cs" />
80+
<Compile Include="CmdLine\Model\Checking\CommandRule.cs" />
81+
<Compile Include="CmdLine\Model\Checking\OptionRule.cs" />
82+
<Compile Include="CmdLine\Model\OptionType.cs" />
83+
<Compile Include="CmdLine\OptionPrefix.cs" />
84+
<Compile Include="CmdLine\Parser\CharInput.cs" />
85+
<Compile Include="CmdLine\Parser\CmdLineNode.cs" />
86+
<Compile Include="CmdLine\Parser\CmdLineNodeBase.cs" />
87+
<Compile Include="CmdLine\Parser\CommandLineParser.cs" />
88+
<Compile Include="CmdLine\Parser\CommandLineParser.Helpers.cs" />
89+
<Compile Include="CmdLine\Parser\CommandNode.cs" />
90+
<Compile Include="CmdLine\Parser\ICharInput.cs" />
91+
<Compile Include="CmdLine\Parser\OptionNode.cs" />
92+
<Compile Include="CmdLine\Parser\ParseResult.cs" />
93+
<Compile Include="CmdLine\Parser\ParsingException.cs" />
94+
<Compile Include="CmdLine\Parser\QuotedOrNonquotedValueNode.cs" />
95+
<Compile Include="CmdLine\PrintUsageSettings.cs" />
96+
<Compile Include="CmdLine\UsagePrinter.cs" />
97+
<Compile Include="Collections\DisjointSets.cs" />
98+
<Compile Include="Collections\DisjointSetsBase.cs" />
99+
<Compile Include="Collections\DisjointSetsT.cs" />
100+
<Compile Include="Parsing\BinaryOperator.cs" />
101+
<Compile Include="Parsing\CharReader.cs" />
102+
<Compile Include="Parsing\ExpressionDefinition.cs" />
103+
<Compile Include="Parsing\Operator.cs" />
104+
<Compile Include="Parsing\ParseHelper.cs" />
105+
<Compile Include="Parsing\Parser.cs" />
106+
<Compile Include="Parsing\PostfixUnaryOperator.cs" />
107+
<Compile Include="Parsing\PrefixUnaryOperator.cs" />
108+
<Compile Include="Properties\AssemblyInfo.cs" />
109+
<Content Include="Readme.txt">
110+
<Pack>true</Pack>
111+
<PackagePath>README.txt</PackagePath>
112+
</Content>
113+
</ItemGroup>
114+
<ItemGroup>
115+
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
116+
</ItemGroup>
111117
</Project>

‎Experimental/src/Properties/AssemblyInfo.cs

+1-27
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,6 @@
1-
using System.Reflection;
2-
using System.Runtime.CompilerServices;
1+
using System.Runtime.CompilerServices;
32
using System.Runtime.InteropServices;
43

5-
// General Information about an assembly is controlled through the following
6-
// set of attributes. Change these attribute values to modify the information
7-
// associated with an assembly.
8-
[assembly: AssemblyTitle("CodeJam.Experimental")]
9-
[assembly: AssemblyDescription("")]
10-
[assembly: AssemblyConfiguration("")]
11-
[assembly: AssemblyCompany("")]
12-
[assembly: AssemblyProduct("CodeJam.Experimental")]
13-
[assembly: AssemblyCopyright("Copyright © 2016")]
14-
[assembly: AssemblyTrademark("")]
15-
[assembly: AssemblyCulture("")]
16-
174
// Setting ComVisible to false makes the types in this assembly not visible
185
// to COM components. If you need to access a type in this assembly from
196
// COM, set the ComVisible attribute to true on that type.
@@ -22,19 +9,6 @@
229
// The following GUID is for the ID of the typelib if this project is exposed to COM
2310
[assembly: Guid("7bd77da2-a731-400c-a88e-215fc592e6e3")]
2411

25-
// Version information for an assembly consists of the following four values:
26-
//
27-
// Major Version
28-
// Minor Version
29-
// Build Number
30-
// Revision
31-
//
32-
// You can specify all the values or you can default the Build and Revision Numbers
33-
// by using the '*' as shown below:
34-
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]
37-
3812
[assembly: InternalsVisibleTo("CodeJam.Experimental-Tests, PublicKey=" +
3913
"00240000048000009400000006020000002400005253413100040000010001000de1c523b74719" +
4014
"e2f54eed3a5512cfedfa78ccfef5c1d196e9a6b09522e7a833ab027deff5462ab26b5d5b51ed42" +

‎Experimental/nuget/Readme.txt ‎Experimental/src/Readme.txt

File renamed without changes.

‎Experimental/src/packages.config

-4
This file was deleted.

0 commit comments

Comments
 (0)