Skip to content

Commit

Permalink
Merge pull request #1 from StefH/master
Browse files Browse the repository at this point in the history 
Added support for more frameworks
  • Loading branch information
@StefH
StefH committed Jan 10, 2016
2 parents 4b3bb2b + 9fb552e commit db88b22
Show file tree
Hide file tree
Showing 21 changed files with 16,111 additions and 66 deletions.
26 changes: 4 additions & 22 deletions CommandLineParser/CommandLineParser_ASPNET5/CommandLineParser/CommandLineParser.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 14
VisualStudioVersion = 14.0.22609.0
VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{73FCE9C7-48AB-4261-998D-12CB868B0E12}"
EndProject
Expand All @@ -10,11 +10,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
global.json = global.json
EndProjectSection
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CommandLineParser", "src\CommandLineParser\CommandLineParser.kproj", "{B2ABAB5C-24EF-4A0F-8F2E-51C3FE868229}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CommandLineParser", "src\CommandLineParser\CommandLineParser.xproj", "{B2ABAB5C-24EF-4A0F-8F2E-51C3FE868229}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ParserTest", "src\ParserTest\ParserTest.kproj", "{E1B36B40-0134-46C4-922B-7EC1FF6CD90F}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ParserTest", "src\ParserTest\ParserTest.xproj", "{E1B36B40-0134-46C4-922B-7EC1FF6CD90F}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Tests", "src\Tests\Tests.kproj", "{0B8343A5-3DC9-41C5-8FED-9D832127D15B}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Tests", "src\Tests\Tests.xproj", "{0B8343A5-3DC9-41C5-8FED-9D832127D15B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -43,22 +43,4 @@ Global
{E1B36B40-0134-46C4-922B-7EC1FF6CD90F} = {73FCE9C7-48AB-4261-998D-12CB868B0E12}
{0B8343A5-3DC9-41C5-8FED-9D832127D15B} = {73FCE9C7-48AB-4261-998D-12CB868B0E12}
EndGlobalSection
GlobalSection(TeamFoundationVersionControl) = preSolution
SccNumberOfProjects = 4
SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
SccTeamFoundationServer = https://tfs.codeplex.com/tfs/tfs10
SccLocalPath0 = .
SccProjectUniqueName1 = src\\CommandLineParser\\CommandLineParser.kproj
SccProjectTopLevelParentUniqueName1 = CommandLineParser.sln
SccProjectName1 = src/CommandLineParser
SccLocalPath1 = src\\CommandLineParser
SccProjectUniqueName2 = src\\ParserTest\\ParserTest.kproj
SccProjectTopLevelParentUniqueName2 = CommandLineParser.sln
SccProjectName2 = src/ParserTest
SccLocalPath2 = src\\ParserTest
SccProjectUniqueName3 = src\\Tests\\Tests.kproj
SccProjectTopLevelParentUniqueName3 = CommandLineParser.sln
SccProjectName3 = src/Tests
SccLocalPath3 = src\\Tests
EndGlobalSection
EndGlobal
4 changes: 2 additions & 2 deletions CommandLineParser/CommandLineParser_ASPNET5/CommandLineParser/global.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
{
"sources": [ "src", "test" ],
"sdk": {
"version": "1.0.0-beta3"
"version": "1.0.0-rc1-update1"
}
}
2 changes: 1 addition & 1 deletion ...er/CommandLineParser_ASPNET5/CommandLineParser/src/CommandLineParser/CommandLineParser.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using CommandLineParser.Exceptions;
using CommandLineParser.Validation;

#if ASPNETCORE50
#if DNXCORE50
using ReflectionBridge.Extensions;
#endif

Expand Down
31 changes: 31 additions & 0 deletions ...CommandLineParser_ASPNET5/CommandLineParser/src/CommandLineParser/CommandLineParser.xproj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>b2abab5c-24ef-4a0f-8f2e-51c3fe868229</ProjectGuid>
<RootNamespace>CommandLineParser</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
<SccProjectName>SAK</SccProjectName>
<SccProvider>SAK</SccProvider>
<SccAuxPath>SAK</SccAuxPath>
<SccLocalPath>SAK</SccLocalPath>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<AssemblyName>CommandLineParser</AssemblyName>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
60 changes: 60 additions & 0 deletions ...neParser/CommandLineParser_ASPNET5/CommandLineParser/src/CommandLineParser/frameworks.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
+-----------------------------+-----------------------------------------------+---------------------------------------------------------------------+
| Name | Abbr | Description |
+-----------------------------+-----------------------------------------------+---------------------------------------------------------------------+
| .NET Framework | net | Standard .NET BCL on Windows Desktop and Server. |
| | net11 | |
| | net20 | |
| | net35 | |
| | net40 | |
| | net403 | |
| | net45 | |
| | net451 | |
| | net452 | |
| | net46 | |
| | net461 | |
+-----------------------------+-----------------------------------------------+---------------------------------------------------------------------+
| .NET Core | netcore | .NET Core Framework used in Windows Store Development |
| | netcore (equivalent to netcore45) | |
| | netcore45 (equivalent to win8) | |
| | netcore451 (equivalent to win81) | |
| | netcore50 | |
+-----------------------------+-----------------------------------------------+---------------------------------------------------------------------+
| .NET MicroFramework | netmf | Support for [.NET MicroFramework](http://netmf.github.io/) projects |
+-----------------------------+-----------------------------------------------+---------------------------------------------------------------------+
| Windows | win | Frameworks to support Windows Store Development |
| | win (equivalent to win8) | |
| | win8 (equivalent to netcore45) | |
| | win81 (equivalent to netcore451) | |
| | win10 -- not supported by Windows 10 Platform | |
+-----------------------------+-----------------------------------------------+---------------------------------------------------------------------+
| Silverlight | sl | Support for the Silverlight frameworks |
| | sl4 | |
| | sl5 | |
+-----------------------------+-----------------------------------------------+---------------------------------------------------------------------+
| Windows Phone | wp | Windows Phone application support |
| | wp (equivalent to wp7) | |
| | wp7 | |
| | wp75 | |
| | wp8 | |
| | wp81 | |
| | wpa81 | |
+-----------------------------+-----------------------------------------------+---------------------------------------------------------------------+
| DNX | dnx | ASP.NET server-side framework support (Windows only) |
| | dnx (equivalent to dnx45) | |
| | dnx45 | |
| | dnx451 | |
| | dnx452 | |
+-----------------------------+-----------------------------------------------+---------------------------------------------------------------------+
| DNX Core | dnxcore | Core CLR framework support |
| | dnxcore (equivalent to dnxcore50) | |
| | dnxcore50 | |
+-----------------------------+-----------------------------------------------+---------------------------------------------------------------------+
| Universal Windows Platform | uap | Support for Windows 10 Universal Application Platform |
| | uap (equivalent to uap10) | |
| | uap10 | |
+-----------------------------+-----------------------------------------------+---------------------------------------------------------------------+
| Deprecated Frameworks | aspnet50 | |
| aspnetcore50 | | |
| winrt | | |
| | | |
+-----------------------------+-----------------------------------------------+---------------------------------------------------------------------+
52 changes: 28 additions & 24 deletions ...LineParser/CommandLineParser_ASPNET5/CommandLineParser/src/CommandLineParser/project.json
View file
Original file line number Diff line number Diff line change
@@ -1,55 +1,59 @@
{
// NuGet settings
"version": "2.7.0.0-*",
"authors": [ "Trupik", "NTTAKR", "Stef Heyenrath" ],
"owners": [ "Stef Heyenrath" ],
"description": "CommandLine Parser Library lets you easily define strongly typed command line arguments, allows automatic parsing of command line arguments and mapping the values to properites of your objects.",
"summary": "CommandLine Parser Library lets you easily define strongly typed command line arguments, allows automatic parsing of command line arguments and mapping the values to properites of your objects.",
"tags": [ "commandline", "parse", "validate", "args", "arguments" ],
"projectUrl": "https://commandlineparser.codeplex.com",
"projectUrl": "https://github.com/j-maly/CommandLineParser/",
"tooling": {
"defaultNamespace": "CommandLineParser"
},
"releasenotes": "AspNet v5",
// NuGet settings

"dependencies": {
"ReflectionBridge": "0.0.3"
"ReflectionBridge": "0.0.6"
},

"compilationOptions": {
"define": [ "REFLECTIONBRIDGE" ]
},

"frameworks": {
"net20": {
},
"net35": {
},
"net40": {
"frameworkAssemblies": {
"System.Data": "4.0.0.0",
"System.Xml": "4.0.0.0"
}
},
"net45": {
"frameworkAssemblies": {
"System.Data": "4.0.0.0",
"System.Xml": "4.0.0.0",
"System.IO": "4.0.0.0"
}
},
"aspnet50": {
"net451": {
},
"aspnetcore50": {
"net452": {
},
"dnx451": {
},
"dnx452": {
},
"dnxcore5": {
"dependencies": {
"System.Runtime": "4.0.20-beta-22523",
"System.Runtime.Extensions": "4.0.10-beta-22605",
"System.Runtime.Serialization.Primitives": "4.0.0-beta-22605",
"Microsoft.CSharp": "4.0.1-beta-*",

"System.Runtime": "4.0.21-beta-*",
"System.Runtime.Extensions": "4.0.11-beta-*",
"System.Runtime.Serialization.Primitives": "4.0.11-beta-*",

"System.Console": "4.0.0-beta-22605",
"System.Console": "4.0.0-beta-*",

"System.IO": "4.0.10-beta-22605",
"System.IO.FileSystem": "4.0.0-beta-22605",
"System.IO": "4.0.11-beta-*",
"System.IO.FileSystem": "4.0.1-beta-*",

"System.Globalization": "4.0.10-beta-22605",
"System.Globalization": "4.0.10",

"System.Resources.ResourceManager": "4.0.0-beta-22605",
"System.Resources.ResourceManager": "4.0.1-beta-23409",

"System.Text.RegularExpressions": "4.0.10-beta-22605"
"System.Text.RegularExpressions": "4.0.11-beta-*"
}
}
}
Expand Down
Loading

0 comments on commit db88b22

Please sign in to comment.