Skip to content

Commit c06cc07

Browse files
slebleuslebleu
committed
Version 1.79 of the source
1 parent e89564a commit c06cc07

File tree

9 files changed

+66
-44
lines changed

9 files changed

+66
-44
lines changed

‎src/FindAndReplace.App/FindAndReplace.App.csproj‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>FindAndReplace.App</RootNamespace>
1212
<AssemblyName>fnr</AssemblyName>
13-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<TargetFrameworkProfile>
1515
</TargetFrameworkProfile>
1616
<FileAlignment>512</FileAlignment>
@@ -57,7 +57,7 @@
5757
</PropertyGroup>
5858
<ItemGroup>
5959
<Reference Include="CommandLine, Version=1.9.71.2, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
60-
<HintPath>..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath>
60+
<HintPath>..\packages\CommandLineParser.1.9.71\lib\net40\CommandLine.dll</HintPath>
6161
</Reference>
6262
<Reference Include="System" />
6363
<Reference Include="System.Core" />
@@ -104,8 +104,12 @@
104104
<DependentUpon>Resources.resx</DependentUpon>
105105
<DesignTime>True</DesignTime>
106106
</Compile>
107-
<None Include="app.config" />
108-
<None Include="packages.config" />
107+
<None Include="app.config">
108+
<SubType>Designer</SubType>
109+
</None>
110+
<None Include="packages.config">
111+
<SubType>Designer</SubType>
112+
</None>
109113
<None Include="Properties\Settings.settings">
110114
<Generator>SettingsSingleFileGenerator</Generator>
111115
<LastGenOutput>Settings.Designer.cs</LastGenOutput>

‎src/FindAndReplace.App/MainForm.cs‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,15 @@ private void UpdateButtons(bool enabled)
266266

267267
private void DoFindWork()
268268
{
269-
_finder.Find();
269+
try
270+
{
271+
_finder.Find();
272+
}
273+
catch (Exception e)
274+
{
275+
MessageBox.Show(e.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
276+
OnFinderFileProcessed(this, new FinderEventArgs(new Finder.FindResultItem(), new Stats(), Status.Cancelled, _finder.IsSilent));
277+
}
270278
}
271279

272280
private void ShowResultPanel()
@@ -471,8 +479,16 @@ private void PrepareReplacerGrid()
471479

472480
private void DoReplaceWork()
473481
{
474-
_replacer.Replace();
475-
}
482+
try
483+
{
484+
_replacer.Replace();
485+
}
486+
catch (Exception e)
487+
{
488+
MessageBox.Show(e.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
489+
ReplaceFileProceed(this, new ReplacerEventArgs(new Replacer.ReplaceResultItem(), new Stats(), Status.Cancelled, _replacer.IsSilent));
490+
}
491+
}
476492

477493
private void ShowReplaceResult(Replacer.ReplaceResultItem replaceResultItem, Stats stats, Status status)
478494
{

‎src/FindAndReplace.App/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("1.7.8")]
35-
[assembly: AssemblyFileVersion("1.7.8")]
34+
[assembly: AssemblyVersion("1.7.9")]
35+
[assembly: AssemblyFileVersion("1.7.9")]

‎src/FindAndReplace.App/Properties/Resources.Designer.cs‎

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/FindAndReplace.App/Properties/Settings.Designer.cs‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/FindAndReplace.App/app.config‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
<?xml version="1.0"?>
22
<configuration>
33
<configSections>
4-
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
5-
<section name="FindAndReplace.App.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
4+
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5+
<section name="FindAndReplace.App.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
66
</sectionGroup>
77
</configSections>
8-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup><userSettings>
8+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup><userSettings>
99
<FindAndReplace.App.Properties.Settings>
1010
<setting name="Dir" serializeAs="String">
11-
<value />
11+
<value/>
1212
</setting>
1313
<setting name="IncludeSubDirectories" serializeAs="String">
1414
<value>False</value>
1515
</setting>
1616
<setting name="FileMask" serializeAs="String">
17-
<value />
17+
<value/>
1818
</setting>
1919
<setting name="ExcludeFileMask" serializeAs="String">
20-
<value />
20+
<value/>
2121
</setting>
2222
<setting name="ExcludeDir" serializeAs="String">
23-
<value />
23+
<value/>
2424
</setting>
2525
<setting name="FindText" serializeAs="String">
26-
<value />
26+
<value/>
2727
</setting>
2828
<setting name="IsCaseSensitive" serializeAs="String">
2929
<value>False</value>
@@ -41,13 +41,13 @@
4141
<value>False</value>
4242
</setting>
4343
<setting name="ReplaceText" serializeAs="String">
44-
<value />
44+
<value/>
4545
</setting>
4646
<setting name="UseEscapeChars" serializeAs="String">
4747
<value>False</value>
4848
</setting>
4949
<setting name="Encoding" serializeAs="String">
50-
<value />
50+
<value/>
5151
</setting>
5252
<setting name="IsKeepModifiedDate" serializeAs="String">
5353
<value>False</value>

‎src/FindAndReplace.App/packages.config‎

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="CommandLineParser" version="1.9.71" targetFramework="net45" />
3+
<package id="CommandLineParser" version="1.9.71" targetFramework="net40" />
44
</packages>

‎src/FindAndReplace/FindAndReplace.csproj‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>FindAndReplace</RootNamespace>
1212
<AssemblyName>FindAndReplace</AssemblyName>
13-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<TargetFrameworkProfile />
1616
<SccProjectName>SAK</SccProjectName>
@@ -39,7 +39,7 @@
3939
</PropertyGroup>
4040
<ItemGroup>
4141
<Reference Include="CommandLine, Version=1.9.71.2, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
42-
<HintPath>..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath>
42+
<HintPath>..\packages\CommandLineParser.1.9.71\lib\net40\CommandLine.dll</HintPath>
4343
</Reference>
4444
<Reference Include="System" />
4545
<Reference Include="System.Core" />
@@ -70,7 +70,9 @@
7070
</ProjectReference>
7171
</ItemGroup>
7272
<ItemGroup>
73-
<None Include="packages.config" />
73+
<None Include="packages.config">
74+
<SubType>Designer</SubType>
75+
</None>
7476
</ItemGroup>
7577
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7678
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎src/FindAndReplace/packages.config‎

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="CommandLineParser" version="1.9.71" targetFramework="net45" />
3+
<package id="CommandLineParser" version="1.9.71" targetFramework="net40" />
44
</packages>

0 commit comments

Comments
 (0)