Skip to content

Commit 3dd65c8

Browse files
committed
Fixed Switch Attribute
1 parent 1882aca commit 3dd65c8

4 files changed

Lines changed: 9 additions & 10 deletions

File tree

src/libArgument/libArgument.Tests/libArgument.Tests.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,20 @@
2929
<ItemGroup>
3030
<Reference Include="System" />
3131
<Reference Include="nunit.framework">
32-
<HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
32+
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
3333
</Reference>
3434
</ItemGroup>
3535
<ItemGroup>
3636
<Compile Include="Test.cs" />
3737
</ItemGroup>
3838
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
39-
<ItemGroup>
40-
<None Include="packages.config" />
41-
</ItemGroup>
4239
<ItemGroup>
4340
<ProjectReference Include="..\libArgument\libArgument.csproj">
4441
<Project>{FE5B4B56-39AB-49C0-8274-8ADC348F4185}</Project>
4542
<Name>libArgument</Name>
4643
</ProjectReference>
4744
</ItemGroup>
45+
<ItemGroup>
46+
<None Include="packages.config" />
47+
</ItemGroup>
4848
</Project>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="NUnit" version="2.6.3" targetFramework="net45" />
3+
<package id="NUnit" version="2.6.4" targetFramework="net40" />
44
</packages>

src/libArgument/libArgument.userprefs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<Properties StartupItem="libArgument.Tests\libArgument.Tests.csproj">
22
<MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
3-
<MonoDevelop.Ide.Workbench ActiveDocument="libArgument\Properties\AssemblyInfo.cs">
3+
<MonoDevelop.Ide.Workbench ActiveDocument="libArgument\Attributes\CastAs.cs">
44
<Files>
5-
<File FileName="libArgument\ArgumentParser.cs" Line="123" Column="123" />
6-
<File FileName="libArgument.Tests\Test.cs" Line="4" Column="4" />
7-
<File FileName="libArgument\Properties\AssemblyInfo.cs" Line="35" Column="35" />
5+
<File FileName="libArgument\ArgumentParser.cs" Line="1" Column="1" />
6+
<File FileName="libArgument\Attributes\CastAs.cs" Line="3" Column="3" />
87
</Files>
98
</MonoDevelop.Ide.Workbench>
109
<MonoDevelop.Ide.DebuggingService.Breakpoints>

src/libArgument/libArgument/ArgumentParser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public static class ArgumentParser
2525
var attributes = field.GetCustomAttributes (true);
2626
var cast = attributes.FirstOrDefault (attrib => attrib as CastAs != null) as CastAs ?? new CastAs (CastingType.String);
2727
foreach (var attrib in attributes) {
28-
if (attrib as Switch != null) {
28+
if (attrib as Switch != null && (args.Contains ((attrib as Switch).FriendlyShort) || args.Contains ((attrib as Switch).FriendlyFull))) {
2929
field.SetValue (options, true);
3030
return;
3131
}

0 commit comments

Comments
 (0)