Skip to content

Commit b992ede

Browse files
HardySoftwareHardySoftware
committed
Switched to .Net 4.5 and hosting envrionment from google code to GitHub.
1 parent 779d11f commit b992ede

19 files changed

+61
-48
lines changed

‎HardySoft.CC/HardySoft.CC.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>HardySoft.CC</RootNamespace>
1212
<AssemblyName>HardySoft.CC</AssemblyName>
13-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<SccProjectName>
1616
</SccProjectName>
@@ -24,6 +24,7 @@
2424
</FileUpgradeFlags>
2525
<OldToolsVersion>3.5</OldToolsVersion>
2626
<UpgradeBackupLocation />
27+
<TargetFrameworkProfile />
2728
</PropertyGroup>
2829
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2930
<DebugSymbols>true</DebugSymbols>
@@ -34,6 +35,7 @@
3435
<ErrorReport>prompt</ErrorReport>
3536
<WarningLevel>4</WarningLevel>
3637
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
38+
<Prefer32Bit>false</Prefer32Bit>
3739
</PropertyGroup>
3840
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3941
<DebugType>pdbonly</DebugType>
@@ -43,6 +45,7 @@
4345
<ErrorReport>prompt</ErrorReport>
4446
<WarningLevel>4</WarningLevel>
4547
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
48+
<Prefer32Bit>false</Prefer32Bit>
4649
</PropertyGroup>
4750
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'NoUnity|AnyCPU' ">
4851
<DebugSymbols>true</DebugSymbols>
@@ -52,6 +55,7 @@
5255
<PlatformTarget>AnyCPU</PlatformTarget>
5356
<ErrorReport>prompt</ErrorReport>
5457
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
58+
<Prefer32Bit>false</Prefer32Bit>
5559
</PropertyGroup>
5660
<ItemGroup>
5761
<Reference Include="PresentationCore">

‎HardySoft.UI.BatchImageProcessor.Model/HardySoft.UI.BatchImageProcessor.Model.csproj

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>HardySoft.UI.BatchImageProcessor.Model</RootNamespace>
1212
<AssemblyName>HardySoft.UI.BatchImageProcessor.Model</AssemblyName>
13-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<SccProjectName>
1616
</SccProjectName>
@@ -24,6 +24,7 @@
2424
</FileUpgradeFlags>
2525
<OldToolsVersion>3.5</OldToolsVersion>
2626
<UpgradeBackupLocation />
27+
<TargetFrameworkProfile />
2728
</PropertyGroup>
2829
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2930
<DebugSymbols>true</DebugSymbols>
@@ -34,6 +35,7 @@
3435
<ErrorReport>prompt</ErrorReport>
3536
<WarningLevel>4</WarningLevel>
3637
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
38+
<Prefer32Bit>false</Prefer32Bit>
3739
</PropertyGroup>
3840
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3941
<DebugType>pdbonly</DebugType>
@@ -43,6 +45,7 @@
4345
<ErrorReport>prompt</ErrorReport>
4446
<WarningLevel>4</WarningLevel>
4547
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
48+
<Prefer32Bit>false</Prefer32Bit>
4649
</PropertyGroup>
4750
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'NoUnity|AnyCPU' ">
4851
<DebugSymbols>true</DebugSymbols>
@@ -52,6 +55,7 @@
5255
<PlatformTarget>AnyCPU</PlatformTarget>
5356
<ErrorReport>prompt</ErrorReport>
5457
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
58+
<Prefer32Bit>false</Prefer32Bit>
5559
</PropertyGroup>
5660
<ItemGroup>
5761
<Reference Include="Microsoft.Practices.EnterpriseLibrary.Common, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -78,6 +82,7 @@
7882
<Reference Include="System.Windows.Presentation">
7983
<RequiredTargetFramework>3.5</RequiredTargetFramework>
8084
</Reference>
85+
<Reference Include="System.Xaml" />
8186
<Reference Include="System.Xml.Linq">
8287
<RequiredTargetFramework>3.5</RequiredTargetFramework>
8388
</Reference>

‎HardySoft.UI.BatchImageProcessor.Presenter/HardySoft.UI.BatchImageProcessor.Presenter.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>HardySoft.UI.BatchImageProcessor.Presenter</RootNamespace>
1212
<AssemblyName>HardySoft.UI.BatchImageProcessor.Presenter</AssemblyName>
13-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<SccProjectName>
1616
</SccProjectName>
@@ -26,6 +26,7 @@
2626
<UpgradeBackupLocation />
2727
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
2828
<RestorePackages>true</RestorePackages>
29+
<TargetFrameworkProfile />
2930
</PropertyGroup>
3031
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3132
<DebugSymbols>true</DebugSymbols>
@@ -37,6 +38,7 @@
3738
<WarningLevel>4</WarningLevel>
3839
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
3940
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
41+
<Prefer32Bit>false</Prefer32Bit>
4042
</PropertyGroup>
4143
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
4244
<DebugType>pdbonly</DebugType>
@@ -47,6 +49,7 @@
4749
<WarningLevel>4</WarningLevel>
4850
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
4951
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
52+
<Prefer32Bit>false</Prefer32Bit>
5053
</PropertyGroup>
5154
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'NoUnity|AnyCPU' ">
5255
<DebugSymbols>true</DebugSymbols>
@@ -56,6 +59,7 @@
5659
<PlatformTarget>AnyCPU</PlatformTarget>
5760
<ErrorReport>prompt</ErrorReport>
5861
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
62+
<Prefer32Bit>false</Prefer32Bit>
5963
</PropertyGroup>
6064
<ItemGroup>
6165
<Reference Include="AForge">

‎HardySoft.UI.BatchImageProcessor.View/HardySoft.UI.BatchImageProcessor.View.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>HardySoft.UI.BatchImageProcessor.View</RootNamespace>
1212
<AssemblyName>HardySoft.UI.BatchImageProcessor.View</AssemblyName>
13-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<SccProjectName>
1616
</SccProjectName>
@@ -24,6 +24,7 @@
2424
</FileUpgradeFlags>
2525
<OldToolsVersion>3.5</OldToolsVersion>
2626
<UpgradeBackupLocation />
27+
<TargetFrameworkProfile />
2728
</PropertyGroup>
2829
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2930
<DebugSymbols>true</DebugSymbols>
@@ -34,6 +35,7 @@
3435
<ErrorReport>prompt</ErrorReport>
3536
<WarningLevel>4</WarningLevel>
3637
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
38+
<Prefer32Bit>false</Prefer32Bit>
3739
</PropertyGroup>
3840
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3941
<DebugType>pdbonly</DebugType>
@@ -43,6 +45,7 @@
4345
<ErrorReport>prompt</ErrorReport>
4446
<WarningLevel>4</WarningLevel>
4547
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
48+
<Prefer32Bit>false</Prefer32Bit>
4649
</PropertyGroup>
4750
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'NoUnity|AnyCPU' ">
4851
<DebugSymbols>true</DebugSymbols>
@@ -52,6 +55,7 @@
5255
<PlatformTarget>AnyCPU</PlatformTarget>
5356
<ErrorReport>prompt</ErrorReport>
5457
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
58+
<Prefer32Bit>false</Prefer32Bit>
5559
</PropertyGroup>
5660
<ItemGroup>
5761
<Reference Include="System" />

‎HardySoft.UI.BatchImageProcessor/About.xaml

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -84,26 +84,12 @@
8484
Text="{Binding Path=AssemblyCompany, Mode=OneWay}" />
8585

8686
<TextBlock Grid.Column="1" Grid.Row="4"
87-
VerticalAlignment="Top"
88-
Margin="10, 0, 10, 0"
89-
Style="{DynamicResource ConfigSectionLabel}"
90-
Text="{HSMarks:ResourceExtension Label_Email}" />
91-
92-
<TextBlock Grid.Column="2" Grid.Row="4">
93-
<Hyperlink Style="{DynamicResource AboutWindowHyperlink}"
94-
NavigateUri="mailto:[email protected]"
95-
RequestNavigate="hyperlink_RequestNavigate">
96-
[email protected]
97-
</Hyperlink>
98-
</TextBlock>
99-
100-
<TextBlock Grid.Column="1" Grid.Row="5"
10187
VerticalAlignment="Top"
10288
Margin="10, 0, 10, 0"
10389
Style="{DynamicResource ConfigSectionLabel}"
10490
Text="{HSMarks:ResourceExtension Label_ProductURL}" />
10591

106-
<StackPanel Grid.Column="2" Grid.Row="5">
92+
<StackPanel Grid.Column="2" Grid.Row="4">
10793
<!--<TextBlock>
10894
<Hyperlink x:Name="hMSDNCode"
10995
Style="{StaticResource AboutWindowHyperlink}"
@@ -113,7 +99,7 @@
11399
</Hyperlink>
114100
</TextBlock>-->
115101
<TextBlock>
116-
<Hyperlink x:Name="hGoogleCode"
102+
<Hyperlink x:Name="hGitHubCode"
117103
Style="{DynamicResource AboutWindowHyperlink}"
118104
NavigateUri="{Binding Path=ApplicationUrl, Mode=OneWay}"
119105
RequestNavigate="hyperlink_RequestNavigate">
@@ -123,7 +109,7 @@
123109
</StackPanel>
124110

125111
<TextBlock x:Name="tbSystemInfo"
126-
Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="3"
112+
Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3"
127113
VerticalAlignment="Top"
128114
Margin="10, 0, 10, 0"
129115
Style="{DynamicResource ConfigSectionLabel}"

‎HardySoft.UI.BatchImageProcessor/App.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<configuration>
33
<configSections>
44
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5-
<section name="HardySoft.UI.BatchImageProcessor.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
5+
<section name="HardySoft.UI.BatchImageProcessor.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
66
</sectionGroup>
77
</configSections>
88
<userSettings>
@@ -16,6 +16,6 @@
1616
</HardySoft.UI.BatchImageProcessor.Properties.Settings>
1717
</userSettings>
1818
<startup useLegacyV2RuntimeActivationPolicy="true">
19-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
19+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
2020
</startup>
21-
</configuration>
21+
</configuration>

‎HardySoft.UI.BatchImageProcessor/Classes/AssembyInformation.cs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,13 @@ public string ApplicationUrl {
122122
/// </returns>
123123
public static Version GetLatestVersion() {
124124
try {
125-
WebRequest request = WebRequest.Create("http://code.google.com/p/batch-image-watermark-processor/wiki/CurrentVersion");
125+
WebRequest request = WebRequest.Create("https://github.com/hardywang/batch-image-watermark-processor/blob/wiki/CurrentVersion.md");
126126
HttpWebResponse response = (HttpWebResponse)request.GetResponse();
127127
Stream dataStream = response.GetResponseStream();
128128
StreamReader reader = new StreamReader(dataStream);
129129
string responseFromServer = reader.ReadToEnd();
130130

131-
Regex reg = new Regex(@"&gt;&gt;&gt;([\d]+\.[\d]+\.[\d]+\.[\d]+)?&lt;&lt;&lt;");
131+
Regex reg = new Regex(@"{Current Version Begins}([\d]+\.[\d]+\.[\d]+\.[\d]+)?{Current Version Ends}");
132132
MatchCollection matches = reg.Matches(responseFromServer);
133133

134134
Version v = null;
@@ -137,17 +137,15 @@ public static Version GetLatestVersion() {
137137
for (int i = 0; i < matches.Count; i++) {
138138
Match m = matches[i];
139139
string foundVersion = m.Value;
140-
foundVersion = foundVersion.Replace("&gt;", "");
141-
foundVersion = foundVersion.Replace(">", "");
142-
foundVersion = foundVersion.Replace("&lt;", "");
143-
foundVersion = foundVersion.Replace("<", "");
140+
foundVersion = foundVersion.Replace("{Current Version Begins}", "");
141+
foundVersion = foundVersion.Replace("{Current Version Ends}", "");
144142

145143
v = new Version(foundVersion);
146144
}
147145
}
148146

149147
return v;
150-
} catch {
148+
} catch (Exception ex) {
151149
return null;
152150
}
153151
}

‎HardySoft.UI.BatchImageProcessor/Controls/MainInterfaceControl.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,7 @@ private void HelpCommand_CanExecute(object sender, CanExecuteRoutedEventArgs e)
822822

823823
#region Discuss forum command
824824
private void DiscussCommand_Executed(object sender, ExecutedRoutedEventArgs e) {
825-
System.Diagnostics.Process.Start("http://groups.google.com/group/sea-turtle-batch-image-processor");
825+
System.Diagnostics.Process.Start("https://github.com/hardywang/batch-image-watermark-processor/issues");
826826
}
827827
#endregion
828828

‎HardySoft.UI.BatchImageProcessor/HardySoft.UI.BatchImageProcessor.csproj

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>HardySoft.UI.BatchImageProcessor</RootNamespace>
1212
<AssemblyName>SeaTurtle</AssemblyName>
13-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1616
<WarningLevel>4</WarningLevel>
@@ -42,6 +42,7 @@
4242
</FileUpgradeFlags>
4343
<OldToolsVersion>3.5</OldToolsVersion>
4444
<UpgradeBackupLocation />
45+
<TargetFrameworkProfile />
4546
</PropertyGroup>
4647
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
4748
<DebugSymbols>true</DebugSymbols>
@@ -52,6 +53,7 @@
5253
<ErrorReport>prompt</ErrorReport>
5354
<WarningLevel>4</WarningLevel>
5455
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
56+
<Prefer32Bit>false</Prefer32Bit>
5557
</PropertyGroup>
5658
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
5759
<DebugType>pdbonly</DebugType>
@@ -61,6 +63,7 @@
6163
<ErrorReport>prompt</ErrorReport>
6264
<WarningLevel>4</WarningLevel>
6365
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
66+
<Prefer32Bit>false</Prefer32Bit>
6467
</PropertyGroup>
6568
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'NoUnity|AnyCPU' ">
6669
<DebugSymbols>true</DebugSymbols>
@@ -70,6 +73,7 @@
7073
<PlatformTarget>AnyCPU</PlatformTarget>
7174
<ErrorReport>prompt</ErrorReport>
7275
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
76+
<Prefer32Bit>false</Prefer32Bit>
7377
</PropertyGroup>
7478
<ItemGroup>
7579
<Reference Include="Microsoft.Practices.EnterpriseLibrary.Validation, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -95,6 +99,7 @@
9599
</Reference>
96100
<Reference Include="System.Drawing" />
97101
<Reference Include="System.Windows.Forms" />
102+
<Reference Include="System.Xaml" />
98103
<Reference Include="System.Xml.Linq">
99104
<RequiredTargetFramework>3.5</RequiredTargetFramework>
100105
</Reference>
@@ -340,12 +345,19 @@
340345
<Generator>ResXFileCodeGenerator</Generator>
341346
<LastGenOutput>HelpContent.zh-CN.Designer.cs</LastGenOutput>
342347
</EmbeddedResource>
343-
<EmbeddedResource Include="Resources\LanguageContent.fr-FR.resx" />
344-
<EmbeddedResource Include="Resources\LanguageContent.it-IT.resx" />
345-
<EmbeddedResource Include="Resources\LanguageContent.ru-RU.resx" />
348+
<EmbeddedResource Include="Resources\LanguageContent.fr-FR.resx">
349+
<SubType>Designer</SubType>
350+
</EmbeddedResource>
351+
<EmbeddedResource Include="Resources\LanguageContent.it-IT.resx">
352+
<SubType>Designer</SubType>
353+
</EmbeddedResource>
354+
<EmbeddedResource Include="Resources\LanguageContent.ru-RU.resx">
355+
<SubType>Designer</SubType>
356+
</EmbeddedResource>
346357
<EmbeddedResource Include="Resources\LanguageContent.zh-CN.resx">
347358
<Generator>ResXFileCodeGenerator</Generator>
348359
<LastGenOutput>LanguageContent.zh-CN.Designer.cs</LastGenOutput>
360+
<SubType>Designer</SubType>
349361
</EmbeddedResource>
350362
<EmbeddedResource Include="Resources\HelpContent.resx">
351363
<Generator>ResXFileCodeGenerator</Generator>

‎HardySoft.UI.BatchImageProcessor/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
[assembly: AssemblyConfiguration("")]
1313
[assembly: AssemblyCompany("Hardy Software")]
1414
[assembly: AssemblyProduct("Sea Turtle Batch Image Processor")]
15-
[assembly: AssemblyCopyright("Copyright © Hardy Software 2000 - 2013")]
15+
[assembly: AssemblyCopyright("Copyright © Hardy Software 2000 - 2015")]
1616
[assembly: AssemblyTrademark("")]
1717
[assembly: AssemblyCulture("")]
1818

‎HardySoft.UI.BatchImageProcessor/Properties/Settings.Designer.cs

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

‎HardySoft.UI.BatchImageProcessor/Resources/HelpContent.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)