Permalink
Browse files

all frameworks are supported in a single nuget

  • Loading branch information...
1 parent 0758bfe commit 916b9308916e02c73cbada095d753de66c26c8ec @adrianaisemberg committed Feb 12, 2012
Showing with 37,411 additions and 4,060 deletions.
  1. +19 −1 CLAP.sln
  2. +28 −11 CLAP/CLAP.csproj
  3. +4 −2 CLAP/FW2Stuff.cs
  4. +4 −0 CLAP/HelpGenerator.cs
  5. +4 −0 CLAP/MultiParser.cs
  6. BIN CLAP/Newtonsoft.Json/Newtonsoft.Json.dll
  7. BIN CLAP/Newtonsoft.Json/Newtonsoft.Json.pdb
  8. +4 −0 CLAP/ParametersExpressionValidator.cs
  9. +4 −0 CLAP/Parser.cs
  10. +4 −0 CLAP/ParserRunner.cs
  11. +2 −2 CLAP/Properties/AssemblyInfo.cs
  12. +21 −2 CLAP/Publish/pack.cmd
  13. +4 −0 CLAP/TypeValidator.cs
  14. +4 −0 CLAP/Utils.cs
  15. +4 −0 CLAP/ValuesFactory.cs
  16. +4 −0 CLAP/packages.config
  17. +21 −2 ConsoleTest/ConsoleTest.csproj
  18. +11 −5 Tests/Tests.csproj
  19. BIN packages/Newtonsoft.Json.4.0.8/lib/net20/Newtonsoft.Json.dll
  20. BIN packages/Newtonsoft.Json.4.0.8/lib/net20/Newtonsoft.Json.pdb
  21. +4,078 −4,035 {CLAP/Newtonsoft.Json → packages/Newtonsoft.Json.4.0.8/lib/net20}/Newtonsoft.Json.xml
  22. BIN packages/Newtonsoft.Json.4.0.8/lib/net35/Newtonsoft.Json.dll
  23. BIN packages/Newtonsoft.Json.4.0.8/lib/net35/Newtonsoft.Json.pdb
  24. +6,845 −0 packages/Newtonsoft.Json.4.0.8/lib/net35/Newtonsoft.Json.xml
  25. BIN packages/Newtonsoft.Json.4.0.8/lib/net40/Newtonsoft.Json.dll
  26. BIN packages/Newtonsoft.Json.4.0.8/lib/net40/Newtonsoft.Json.pdb
  27. +7,004 −0 packages/Newtonsoft.Json.4.0.8/lib/net40/Newtonsoft.Json.xml
  28. BIN packages/Newtonsoft.Json.4.0.8/lib/sl3-wp/Newtonsoft.Json.dll
  29. BIN packages/Newtonsoft.Json.4.0.8/lib/sl3-wp/Newtonsoft.Json.pdb
  30. +6,437 −0 packages/Newtonsoft.Json.4.0.8/lib/sl3-wp/Newtonsoft.Json.xml
  31. BIN packages/Newtonsoft.Json.4.0.8/lib/sl4-windowsphone71/Newtonsoft.Json.dll
  32. BIN packages/Newtonsoft.Json.4.0.8/lib/sl4-windowsphone71/Newtonsoft.Json.pdb
  33. +6,437 −0 packages/Newtonsoft.Json.4.0.8/lib/sl4-windowsphone71/Newtonsoft.Json.xml
  34. BIN packages/Newtonsoft.Json.4.0.8/lib/sl4/Newtonsoft.Json.dll
  35. BIN packages/Newtonsoft.Json.4.0.8/lib/sl4/Newtonsoft.Json.pdb
  36. +6,467 −0 packages/Newtonsoft.Json.4.0.8/lib/sl4/Newtonsoft.Json.xml
  37. +1 −0 packages/repositories.config
View
@@ -15,6 +15,9 @@ Global
Release|Any CPU = Release|Any CPU
Release|Mixed Platforms = Release|Mixed Platforms
Release|x86 = Release|x86
+ Release20|Any CPU = Release20|Any CPU
+ Release20|Mixed Platforms = Release20|Mixed Platforms
+ Release20|x86 = Release20|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{AE79CD7B-DFFC-4156-913E-63F70A31B7C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -27,18 +30,28 @@ Global
{AE79CD7B-DFFC-4156-913E-63F70A31B7C1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{AE79CD7B-DFFC-4156-913E-63F70A31B7C1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{AE79CD7B-DFFC-4156-913E-63F70A31B7C1}.Release|x86.ActiveCfg = Release|Any CPU
+ {AE79CD7B-DFFC-4156-913E-63F70A31B7C1}.Release20|Any CPU.ActiveCfg = Release20|Any CPU
+ {AE79CD7B-DFFC-4156-913E-63F70A31B7C1}.Release20|Any CPU.Build.0 = Release20|Any CPU
+ {AE79CD7B-DFFC-4156-913E-63F70A31B7C1}.Release20|Mixed Platforms.ActiveCfg = Release20|Any CPU
+ {AE79CD7B-DFFC-4156-913E-63F70A31B7C1}.Release20|Mixed Platforms.Build.0 = Release20|Any CPU
+ {AE79CD7B-DFFC-4156-913E-63F70A31B7C1}.Release20|x86.ActiveCfg = Release20|Any CPU
{678F4788-6950-4FE2-B471-99AB9E5B4BE9}.Debug|Any CPU.ActiveCfg = Debug|x86
{678F4788-6950-4FE2-B471-99AB9E5B4BE9}.Debug|Any CPU.Build.0 = Debug|x86
{678F4788-6950-4FE2-B471-99AB9E5B4BE9}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{678F4788-6950-4FE2-B471-99AB9E5B4BE9}.Debug|Mixed Platforms.Build.0 = Debug|x86
{678F4788-6950-4FE2-B471-99AB9E5B4BE9}.Debug|x86.ActiveCfg = Debug|x86
{678F4788-6950-4FE2-B471-99AB9E5B4BE9}.Debug|x86.Build.0 = Debug|x86
{678F4788-6950-4FE2-B471-99AB9E5B4BE9}.Release|Any CPU.ActiveCfg = Release|x86
- {678F4788-6950-4FE2-B471-99AB9E5B4BE9}.Release|Any CPU.Build.0 = Release|x86
{678F4788-6950-4FE2-B471-99AB9E5B4BE9}.Release|Mixed Platforms.ActiveCfg = Release|x86
{678F4788-6950-4FE2-B471-99AB9E5B4BE9}.Release|Mixed Platforms.Build.0 = Release|x86
{678F4788-6950-4FE2-B471-99AB9E5B4BE9}.Release|x86.ActiveCfg = Release|x86
{678F4788-6950-4FE2-B471-99AB9E5B4BE9}.Release|x86.Build.0 = Release|x86
+ {678F4788-6950-4FE2-B471-99AB9E5B4BE9}.Release20|Any CPU.ActiveCfg = Release20|x86
+ {678F4788-6950-4FE2-B471-99AB9E5B4BE9}.Release20|Any CPU.Build.0 = Release20|x86
+ {678F4788-6950-4FE2-B471-99AB9E5B4BE9}.Release20|Mixed Platforms.ActiveCfg = Release20|x86
+ {678F4788-6950-4FE2-B471-99AB9E5B4BE9}.Release20|Mixed Platforms.Build.0 = Release20|x86
+ {678F4788-6950-4FE2-B471-99AB9E5B4BE9}.Release20|x86.ActiveCfg = Release20|x86
+ {678F4788-6950-4FE2-B471-99AB9E5B4BE9}.Release20|x86.Build.0 = Release20|x86
{63D887CB-655A-4FA1-A8B8-38A28613A707}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{63D887CB-655A-4FA1-A8B8-38A28613A707}.Debug|Any CPU.Build.0 = Debug|Any CPU
{63D887CB-655A-4FA1-A8B8-38A28613A707}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -49,6 +62,11 @@ Global
{63D887CB-655A-4FA1-A8B8-38A28613A707}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{63D887CB-655A-4FA1-A8B8-38A28613A707}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{63D887CB-655A-4FA1-A8B8-38A28613A707}.Release|x86.ActiveCfg = Release|Any CPU
+ {63D887CB-655A-4FA1-A8B8-38A28613A707}.Release20|Any CPU.ActiveCfg = Release20|Any CPU
+ {63D887CB-655A-4FA1-A8B8-38A28613A707}.Release20|Any CPU.Build.0 = Release20|Any CPU
+ {63D887CB-655A-4FA1-A8B8-38A28613A707}.Release20|Mixed Platforms.ActiveCfg = Release20|Any CPU
+ {63D887CB-655A-4FA1-A8B8-38A28613A707}.Release20|Mixed Platforms.Build.0 = Release20|Any CPU
+ {63D887CB-655A-4FA1-A8B8-38A28613A707}.Release20|x86.ActiveCfg = Release20|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
View
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CLAP</RootNamespace>
<AssemblyName>CLAP</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
@@ -39,7 +39,7 @@
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<DocumentationFile>bin\Debug\CLAP.XML</DocumentationFile>
- <NoWarn>1591,1685</NoWarn>
+ <NoWarn>1591</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -50,14 +50,31 @@
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<DocumentationFile>bin\Release\CLAP.XML</DocumentationFile>
- <NoWarn>1591,1685</NoWarn>
+ <NoWarn>1591</NoWarn>
</PropertyGroup>
<PropertyGroup>
- <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release20|AnyCPU'">
+ <OutputPath>bin\Release20\</OutputPath>
+ <DefineConstants>TRACE;FW2</DefineConstants>
+ <DocumentationFile>bin\Release20\CLAP.XML</DocumentationFile>
+ <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <Optimize>true</Optimize>
+ <NoWarn>1591</NoWarn>
+ <DebugType>pdbonly</DebugType>
+ <PlatformTarget>AnyCPU</PlatformTarget>
+ <CodeAnalysisLogFile>bin\Release20\CLAP.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+ <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+ <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+ <ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Newtonsoft.Json, Version=4.0.7.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>Newtonsoft.Json\Newtonsoft.Json.dll</HintPath>
+ <Reference Condition="'$(Configuration)' != 'Release20'" Include="Newtonsoft.Json, Version=4.0.8.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <HintPath>..\packages\Newtonsoft.Json.4.0.8\lib\net35\Newtonsoft.Json.dll</HintPath>
+ </Reference>
+ <Reference Condition="'$(Configuration)' == 'Release20'" Include="Newtonsoft.Json, Version=4.0.8.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <HintPath>..\packages\Newtonsoft.Json.4.0.8\lib\net20\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -112,13 +129,13 @@
<Compile Include="ValuesFactory.cs" />
<Compile Include="VerbAttribute.cs" />
</ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
- <PostBuildEvent>rd /q /s $(ProjectDir)Publish\merged_$(ConfigurationName)
-md $(ProjectDir)Publish\merged_$(ConfigurationName)
-$(ProjectDir)Publish\ilmerge /out:$(ProjectDir)Publish\merged_$(ConfigurationName)\CLAP.dll /internalize $(TargetPath) $(TargetDir)Newtonsoft.Json.dll
-copy $(TargetDir)CLAP.xml $(ProjectDir)Publish\merged_$(ConfigurationName)
-copy $(TargetDir)CLAP.pdb $(ProjectDir)Publish\merged_$(ConfigurationName)</PostBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
<!-- 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.
View
@@ -1,4 +1,5 @@
-using System;
+#if FW2
+using System;
using System.Collections;
using System.Collections.Generic;
@@ -288,4 +289,5 @@ namespace System.Runtime.CompilerServices
internal class ExtensionAttribute : Attribute
{
}
-}
+}
+#endif
View
@@ -2,6 +2,10 @@
using System.Reflection;
using System.Text;
+#if !FW2
+using System.Linq;
+#endif
+
namespace CLAP
{
internal static class HelpGenerator
View
@@ -1,6 +1,10 @@
using System;
using System.Diagnostics;
+#if !FW2
+using System.Linq;
+#endif
+
namespace CLAP
{
/// <summary>
Binary file not shown.
Binary file not shown.
@@ -1,5 +1,9 @@
using System.Data;
+#if !FW2
+using System.Linq;
+#endif
+
namespace CLAP
{
/// <summary>
View
@@ -1,6 +1,10 @@
using System;
using System.Diagnostics;
+#if !FW2
+using System.Linq;
+#endif
+
namespace CLAP
{
/// <summary>
View
@@ -4,6 +4,10 @@
using System.Reflection;
using CLAP.Interception;
+#if !FW2
+using System.Linq;
+#endif
+
namespace CLAP
{
internal class ParserRunner
@@ -29,5 +29,5 @@
// 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("3.5.4.0")]
-[assembly: AssemblyFileVersion("3.5.4.0")]
+[assembly: AssemblyVersion("3.5.7.0")]
+[assembly: AssemblyFileVersion("3.5.7.0")]
View
@@ -1,8 +1,27 @@
@echo off
set PACKPATH=%~dp0_nuget_pack
rd /q /s %PACKPATH%
-md %PACKPATH%\lib\net20
-copy %~dp0merged_Release\CLAP.??? %PACKPATH%\lib\net20
+
+set TEMP_LIB=%PACKPATH%\_lib\net20
+set LIB=%PACKPATH%\lib\net20
+md %TEMP_LIB%
+md %LIB%
+copy %~dp0..\bin\Release20\CLAP.??? %TEMP_LIB%
+copy %~dp0..\bin\Release20\Newtonsoft.Json.??? %TEMP_LIB%
+ilmerge /out:%LIB%\CLAP.dll /internalize %TEMP_LIB%\CLAP.Dll %TEMP_LIB%\Newtonsoft.Json.dll
+copy %TEMP_LIB%\CLAP.xml %LIB%
+
+set TEMP_LIB=%PACKPATH%\_lib\net35
+set LIB=%PACKPATH%\lib\net35
+md %TEMP_LIB%
+md %LIB%
+copy %~dp0..\bin\Release\CLAP.??? %TEMP_LIB%
+copy %~dp0..\bin\Release\Newtonsoft.Json.??? %TEMP_LIB%
+ilmerge /out:%LIB%\CLAP.dll /internalize %TEMP_LIB%\CLAP.Dll %TEMP_LIB%\Newtonsoft.Json.dll
+copy %TEMP_LIB%\CLAP.xml %LIB%
+
+rd /q /s %PACKPATH%\_lib
+
copy %~dp0CLAP.nuspec %PACKPATH%
getver %PACKPATH%\lib\net20\CLAP.dll > _ver
View
@@ -2,6 +2,10 @@
using System.Diagnostics;
using System.Reflection;
+#if !FW2
+using System.Linq;
+#endif
+
namespace CLAP
{
internal static class TypeValidator
View
@@ -2,6 +2,10 @@
using System.Collections.Generic;
using System.Reflection;
+#if !FW2
+using System.Linq;
+#endif
+
namespace CLAP
{
internal static class Utils
View
@@ -4,6 +4,10 @@
using System.Reflection;
using CLAP.Interception;
+#if !FW2
+using System.Linq;
+#endif
+
namespace CLAP
{
internal static class ValuesFactory
View
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="Newtonsoft.Json" version="4.0.8" />
+</packages>
@@ -39,7 +39,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- <NoWarn>1685</NoWarn>
+ <NoWarn></NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<PlatformTarget>x86</PlatformTarget>
@@ -50,7 +50,26 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- <NoWarn>1685</NoWarn>
+ <NoWarn></NoWarn>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release20|x86'">
+ <OutputPath>bin\x86\Release20\</OutputPath>
+ <DefineConstants>TRACE;FW2</DefineConstants>
+ <Optimize>true</Optimize>
+ <NoWarn>
+ </NoWarn>
+ <DebugType>pdbonly</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <CodeAnalysisLogFile>bin\Release\myexe.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+ <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+ <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+ <ErrorReport>prompt</ErrorReport>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+ <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
+ <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+ <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+ <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
View
@@ -45,7 +45,8 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- <NoWarn>1685</NoWarn>
+ <NoWarn>
+ </NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -55,12 +56,15 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- <NoWarn>1685</NoWarn>
+ <NoWarn>
+ </NoWarn>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseFW2|AnyCPU'">
- <OutputPath>bin\ReleaseFW2\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release20|AnyCPU'">
+ <OutputPath>bin\Release20\</OutputPath>
+ <DefineConstants>TRACE;FW2</DefineConstants>
<Optimize>true</Optimize>
+ <NoWarn>
+ </NoWarn>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<CodeAnalysisLogFile>bin\Release\Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
@@ -70,6 +74,8 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+ <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+ <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
</PropertyGroup>
<ItemGroup>
<Reference Include="Moq, Version=4.0.10827.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
Binary file not shown.
Binary file not shown.
Oops, something went wrong.

0 comments on commit 916b930

Please sign in to comment.