Skip to content

Commit 2c1b7b8

Browse files
committed
Fix #203 - fix InvalidOperationException thrown from Pager on Mono
1 parent 2a376df commit 2c1b7b8

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

src/CommandLineUtils/IO/Pager.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,9 @@ private Process CreateWriter()
131131
FileName = "less",
132132
Arguments = ArgumentEscaper.EscapeAndConcatenate(args),
133133
RedirectStandardInput = true,
134+
#if NET45
135+
UseShellExecute = false,
136+
#endif
134137
}
135138
};
136139

@@ -139,7 +142,7 @@ private Process CreateWriter()
139142
process.Start();
140143
return process;
141144
}
142-
catch (Win32Exception ex)
145+
catch (Exception ex)
143146
{
144147
if (DotNetCliContext.IsGlobalVerbose())
145148
{

version.props

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
<Project>
22
<PropertyGroup>
3-
<VersionPrefix>2.3.0</VersionPrefix>
4-
<VersionSuffix>rtm</VersionSuffix>
3+
<VersionPrefix>2.3.1</VersionPrefix>
4+
<VersionSuffix>build</VersionSuffix>
55
<PackageVersion Condition="'$(APPVEYOR_REPO_TAG)' == 'true' AND '$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix)</PackageVersion>
66
<PackageVersion Condition="'$(APPVEYOR_REPO_TAG)' == 'true' AND '$(VersionSuffix)' == 'rtm'">$(VersionPrefix)</PackageVersion>
77

88
<BuildNumber Condition=" '$(BuildNumber)' == '' ">$(APPVEYOR_BUILD_NUMBER)</BuildNumber>
99
<BuildNumber Condition=" '$(BuildNumber)' == '' ">0</BuildNumber>
1010
<FileVersion>$(VersionPrefix).$(BuildNumber)</FileVersion>
1111
<VersionSuffix Condition=" '$(VersionSuffix)' != '' ">$(VersionSuffix).$(BuildNumber)</VersionSuffix>
12+
<RepositoryCommit>$(APPVEYOR_REPO_COMMIT)</RepositoryCommit>
13+
<InformationalVersion Condition="'$(RepositoryCommit)' != ''">$(PackageVersion)+$(RepositoryCommit)</InformationalVersion>
1214
</PropertyGroup>
13-
14-
<ItemGroup>
15-
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
16-
<_Parameter1>BuildNumber</_Parameter1>
17-
<_Parameter2>$(BuildNumber)</_Parameter2>
18-
</AssemblyAttribute>
19-
</ItemGroup>
2015
</Project>

0 commit comments

Comments
 (0)