Skip to content

Commit

Permalink
Experimental to netstandard 2
Browse files Browse the repository at this point in the history
  • Loading branch information
@ig-sinicyn
ig-sinicyn committed Sep 2, 2017
1 parent 829bdb0 commit f592812
Show file tree
Hide file tree
Showing 17 changed files with 619 additions and 393 deletions.
8 changes: 6 additions & 2 deletions Blocks/src/CodeJam.Blocks.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
<TargetFrameworks>net461</TargetFrameworks>

<PackageId>CodeJam.Blocks</PackageId>
<Title>CodeJam.Blocks Library</Title>
<Title>CodeJam.Blocks library</Title>
<Authors>Andrew Koryavchenko, Igor Sinicyn, Igor Tkachev, rameel</Authors>
<Product>CodeJam</Product>
<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>
<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>
<PackageLicenseUrl>https://github.com/rsdn/CodeJam/blob/master/LICENSE</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/rsdn/CodeJam</PackageProjectUrl>
<PackageIconUrl>https://raw.githubusercontent.com/rsdn/CodeJam/master/images/nuget/CodeJam.Blocks.Icon.png</PackageIconUrl>
Expand Down Expand Up @@ -120,6 +120,10 @@
<Compile Include="TableData\FixedWidthFormat.cs" />
<Compile Include="TableData\NamespaceDoc.cs" />
<Compile Include="TableData\TableDataParser.cs" />
<Content Include="Readme.txt">
<Pack>true</Pack>
<PackagePath>README.txt</PackagePath>
</Content>
</ItemGroup>
<ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
Expand Down
4 changes: 0 additions & 4 deletions Blocks/src/packages.config
View file

This file was deleted.

3 changes: 2 additions & 1 deletion Blocks/tests/CodeJam.Blocks-Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@
<ItemGroup>
<PackageReference Include="NUnit" Version="3.7.1" />
</ItemGroup>

<ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
</Project>
9 changes: 1 addition & 8 deletions CodeJam.sln
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

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

This file was deleted.

226 changes: 116 additions & 110 deletions Experimental/src/CodeJam.Experimental.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,111 +1,117 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{7BD77DA2-A731-400C-A88E-215FC592E6E3}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CodeJam</RootNamespace>
<AssemblyName>CodeJam.Experimental</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;JETBRAINS_ANNOTATIONS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;JETBRAINS_ANNOTATIONS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>..\..\Build\CodeJam.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Publish|AnyCPU'">
<OutputPath>bin\Publish\</OutputPath>
<DefineConstants>TRACE;JETBRAINS_ANNOTATIONS</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="CmdLine\CommandLineChecker.cs" />
<Compile Include="CmdLine\CommandLineHelper.cs" />
<Compile Include="CmdLine\Model\Checking\CmdLineRules.cs" />
<Compile Include="CmdLine\Model\Checking\CommandLineCheckException.cs" />
<Compile Include="CmdLine\Model\Checking\CommandQuantifier.cs" />
<Compile Include="CmdLine\Model\Checking\CommandRule.cs" />
<Compile Include="CmdLine\Model\Checking\OptionRule.cs" />
<Compile Include="CmdLine\Model\OptionType.cs" />
<Compile Include="CmdLine\OptionPrefix.cs" />
<Compile Include="CmdLine\Parser\CharInput.cs" />
<Compile Include="CmdLine\Parser\CmdLineNode.cs" />
<Compile Include="CmdLine\Parser\CmdLineNodeBase.cs" />
<Compile Include="CmdLine\Parser\CommandLineParser.cs" />
<Compile Include="CmdLine\Parser\CommandLineParser.Helpers.cs" />
<Compile Include="CmdLine\Parser\CommandNode.cs" />
<Compile Include="CmdLine\Parser\ICharInput.cs" />
<Compile Include="CmdLine\Parser\OptionNode.cs" />
<Compile Include="CmdLine\Parser\ParseResult.cs" />
<Compile Include="CmdLine\Parser\ParsingException.cs" />
<Compile Include="CmdLine\Parser\QuotedOrNonquotedValueNode.cs" />
<Compile Include="CmdLine\PrintUsageSettings.cs" />
<Compile Include="CmdLine\UsagePrinter.cs" />
<Compile Include="Collections\DisjointSets.cs" />
<Compile Include="Collections\DisjointSetsBase.cs" />
<Compile Include="Collections\DisjointSetsT.cs" />
<Compile Include="Parsing\BinaryOperator.cs" />
<Compile Include="Parsing\CharReader.cs" />
<Compile Include="Parsing\ExpressionDefinition.cs" />
<Compile Include="Parsing\Operator.cs" />
<Compile Include="Parsing\ParseHelper.cs" />
<Compile Include="Parsing\Parser.cs" />
<Compile Include="Parsing\PostfixUnaryOperator.cs" />
<Compile Include="Parsing\PrefixUnaryOperator.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Main\src\CodeJam.Main.csproj">
<Project>{2f2046cc-fb47-4318-b335-5a82b04b6c40}</Project>
<Name>CodeJam.Main</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="..\..\Build\CodeJam.Default.props" />
<Import Project="..\..\Build\CodeJam.Targeting.props" />

<PropertyGroup>
<AssemblyName>CodeJam.Experimental</AssemblyName>
<RootNamespace>CodeJam</RootNamespace>
<ProjectGuid>{7BD77DA2-A731-400C-A88E-215FC592E6E3}</ProjectGuid>
<EnableDefaultItems>false</EnableDefaultItems>
<OutputType>Library</OutputType>
<FileAlignment>512</FileAlignment>
<TargetFrameworks>net461</TargetFrameworks>

<PackageId>CodeJam.Experimental</PackageId>
<Title>CodeJam.Experimental library</Title>
<Authors>Andrew Koryavchenko, Igor Sinicyn, Igor Tkachev, rameel</Authors>
<Product>CodeJam.Experimental</Product>
<Description>CodeJam.Experimental contains preview version of features to be included in future releases of CodeJam.</Description>
<PackageLicenseUrl>https://github.com/rsdn/CodeJam/blob/master/LICENSE</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/rsdn/CodeJam</PackageProjectUrl>
<PackageIconUrl>https://raw.githubusercontent.com/rsdn/CodeJam/master/images/nuget/CodeJam.Main.Experimental.Icon.png</PackageIconUrl>
<RepositoryUrl>https://github.com/rsdn/CodeJam</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>extension experimental</PackageTags>

<Company>RSDN.ru</Company>
<Copyright>RSDN.ru, 2017</Copyright>
<RepositoryUrl>https://github.com/rsdn/CodeJam</RepositoryUrl>
<RepositoryType>git</RepositoryType>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Publish' ">
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<TargetFrameworks>net461</TargetFrameworks>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<LangVersion>latest</LangVersion>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>$(DefineConstants);TRACE;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<LangVersion>latest</LangVersion>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>$(DefineConstants);TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Publish|AnyCPU' ">
<LangVersion>latest</LangVersion>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Publish\</OutputPath>
<DefineConstants>$(DefineConstants);TRACE1</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\Main\src\CodeJam.Main.csproj" />
</ItemGroup>

<ItemGroup>
<Compile Include="CmdLine\CommandLineChecker.cs" />
<Compile Include="CmdLine\CommandLineHelper.cs" />
<Compile Include="CmdLine\Model\Checking\CmdLineRules.cs" />
<Compile Include="CmdLine\Model\Checking\CommandLineCheckException.cs" />
<Compile Include="CmdLine\Model\Checking\CommandQuantifier.cs" />
<Compile Include="CmdLine\Model\Checking\CommandRule.cs" />
<Compile Include="CmdLine\Model\Checking\OptionRule.cs" />
<Compile Include="CmdLine\Model\OptionType.cs" />
<Compile Include="CmdLine\OptionPrefix.cs" />
<Compile Include="CmdLine\Parser\CharInput.cs" />
<Compile Include="CmdLine\Parser\CmdLineNode.cs" />
<Compile Include="CmdLine\Parser\CmdLineNodeBase.cs" />
<Compile Include="CmdLine\Parser\CommandLineParser.cs" />
<Compile Include="CmdLine\Parser\CommandLineParser.Helpers.cs" />
<Compile Include="CmdLine\Parser\CommandNode.cs" />
<Compile Include="CmdLine\Parser\ICharInput.cs" />
<Compile Include="CmdLine\Parser\OptionNode.cs" />
<Compile Include="CmdLine\Parser\ParseResult.cs" />
<Compile Include="CmdLine\Parser\ParsingException.cs" />
<Compile Include="CmdLine\Parser\QuotedOrNonquotedValueNode.cs" />
<Compile Include="CmdLine\PrintUsageSettings.cs" />
<Compile Include="CmdLine\UsagePrinter.cs" />
<Compile Include="Collections\DisjointSets.cs" />
<Compile Include="Collections\DisjointSetsBase.cs" />
<Compile Include="Collections\DisjointSetsT.cs" />
<Compile Include="Parsing\BinaryOperator.cs" />
<Compile Include="Parsing\CharReader.cs" />
<Compile Include="Parsing\ExpressionDefinition.cs" />
<Compile Include="Parsing\Operator.cs" />
<Compile Include="Parsing\ParseHelper.cs" />
<Compile Include="Parsing\Parser.cs" />
<Compile Include="Parsing\PostfixUnaryOperator.cs" />
<Compile Include="Parsing\PrefixUnaryOperator.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Content Include="Readme.txt">
<Pack>true</Pack>
<PackagePath>README.txt</PackagePath>
</Content>
</ItemGroup>
<ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
</Project>
28 changes: 1 addition & 27 deletions Experimental/src/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,6 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("CodeJam.Experimental")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("CodeJam.Experimental")]
[assembly: AssemblyCopyright("Copyright © 2016")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
Expand All @@ -22,19 +9,6 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("7bd77da2-a731-400c-a88e-215fc592e6e3")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

[assembly: InternalsVisibleTo("CodeJam.Experimental-Tests, PublicKey=" +
"00240000048000009400000006020000002400005253413100040000010001000de1c523b74719" +
"e2f54eed3a5512cfedfa78ccfef5c1d196e9a6b09522e7a833ab027deff5462ab26b5d5b51ed42" +
Expand Down
0 Experimental/nuget/Readme.txt → Experimental/src/Readme.txt
View file
File renamed without changes.
4 changes: 0 additions & 4 deletions Experimental/src/packages.config
View file

This file was deleted.

Loading

0 comments on commit f592812

Please sign in to comment.