Skip to content

Commit

Permalink
Version 1.79 of the source
Browse files Browse the repository at this point in the history
  • Loading branch information
@slebleu
slebleu committed Jun 12, 2018
1 parent e89564a commit c06cc07
Show file tree
Hide file tree
Showing 9 changed files with 66 additions and 44 deletions.
12 changes: 8 additions & 4 deletions src/FindAndReplace.App/FindAndReplace.App.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FindAndReplace.App</RootNamespace>
<AssemblyName>fnr</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
Expand Down Expand Up @@ -57,7 +57,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="CommandLine, Version=1.9.71.2, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
<HintPath>..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath>
<HintPath>..\packages\CommandLineParser.1.9.71\lib\net40\CommandLine.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -104,8 +104,12 @@
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<None Include="app.config" />
<None Include="packages.config" />
<None Include="app.config">
<SubType>Designer</SubType>
</None>
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
Expand Down
22 changes: 19 additions & 3 deletions src/FindAndReplace.App/MainForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,15 @@ private void UpdateButtons(bool enabled)

private void DoFindWork()
{
_finder.Find();
try
{
_finder.Find();
}
catch (Exception e)
{
MessageBox.Show(e.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
OnFinderFileProcessed(this, new FinderEventArgs(new Finder.FindResultItem(), new Stats(), Status.Cancelled, _finder.IsSilent));
}
}

private void ShowResultPanel()
Expand Down Expand Up @@ -471,8 +479,16 @@ private void PrepareReplacerGrid()

private void DoReplaceWork()
{
_replacer.Replace();
}
try
{
_replacer.Replace();
}
catch (Exception e)
{
MessageBox.Show(e.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
ReplaceFileProceed(this, new ReplacerEventArgs(new Replacer.ReplaceResultItem(), new Stats(), Status.Cancelled, _replacer.IsSilent));
}
}

private void ShowReplaceResult(Replacer.ReplaceResultItem replaceResultItem, Stats stats, Status status)
{
Expand Down
4 changes: 2 additions & 2 deletions src/FindAndReplace.App/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,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("1.7.8")]
[assembly: AssemblyFileVersion("1.7.8")]
[assembly: AssemblyVersion("1.7.9")]
[assembly: AssemblyFileVersion("1.7.9")]
30 changes: 15 additions & 15 deletions src/FindAndReplace.App/Properties/Resources.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions src/FindAndReplace.App/Properties/Settings.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions src/FindAndReplace.App/app.config
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
<?xml version="1.0"?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="FindAndReplace.App.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="FindAndReplace.App.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup>
</configSections>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup><userSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup><userSettings>
<FindAndReplace.App.Properties.Settings>
<setting name="Dir" serializeAs="String">
<value />
<value/>
</setting>
<setting name="IncludeSubDirectories" serializeAs="String">
<value>False</value>
</setting>
<setting name="FileMask" serializeAs="String">
<value />
<value/>
</setting>
<setting name="ExcludeFileMask" serializeAs="String">
<value />
<value/>
</setting>
<setting name="ExcludeDir" serializeAs="String">
<value />
<value/>
</setting>
<setting name="FindText" serializeAs="String">
<value />
<value/>
</setting>
<setting name="IsCaseSensitive" serializeAs="String">
<value>False</value>
Expand All @@ -41,13 +41,13 @@
<value>False</value>
</setting>
<setting name="ReplaceText" serializeAs="String">
<value />
<value/>
</setting>
<setting name="UseEscapeChars" serializeAs="String">
<value>False</value>
</setting>
<setting name="Encoding" serializeAs="String">
<value />
<value/>
</setting>
<setting name="IsKeepModifiedDate" serializeAs="String">
<value>False</value>
Expand Down
2 changes: 1 addition & 1 deletion src/FindAndReplace.App/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CommandLineParser" version="1.9.71" targetFramework="net45" />
<package id="CommandLineParser" version="1.9.71" targetFramework="net40" />
</packages>
8 changes: 5 additions & 3 deletions src/FindAndReplace/FindAndReplace.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FindAndReplace</RootNamespace>
<AssemblyName>FindAndReplace</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<SccProjectName>SAK</SccProjectName>
Expand Down Expand Up @@ -39,7 +39,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="CommandLine, Version=1.9.71.2, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
<HintPath>..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath>
<HintPath>..\packages\CommandLineParser.1.9.71\lib\net40\CommandLine.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -70,7 +70,9 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
2 changes: 1 addition & 1 deletion src/FindAndReplace/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CommandLineParser" version="1.9.71" targetFramework="net45" />
<package id="CommandLineParser" version="1.9.71" targetFramework="net40" />
</packages>

0 comments on commit c06cc07

Please sign in to comment.