released v1.2.13

This commit is contained in:
morkt 2016-02-07 09:58:51 +04:00
parent 9b4e4a9089
commit 05837d28ba
8 changed files with 33 additions and 31 deletions

View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion ("1.2.16.641")] [assembly: AssemblyVersion ("1.2.17.706")]
[assembly: AssemblyFileVersion ("1.2.16.641")] [assembly: AssemblyFileVersion ("1.2.17.706")]

View File

@ -77,27 +77,23 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />
<Reference Include="Microsoft.WindowsAPICodePack, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Microsoft.WindowsAPICodePack">
<SpecificVersion>False</SpecificVersion> <HintPath>..\packages\WindowsAPICodePack-Core.1.1.1\lib\Microsoft.WindowsAPICodePack.dll</HintPath>
<HintPath>packages\WindowsAPICodePack-Core.1.1.1\lib\Microsoft.WindowsAPICodePack.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.WindowsAPICodePack.Shell, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Microsoft.WindowsAPICodePack.Shell">
<SpecificVersion>False</SpecificVersion> <HintPath>..\packages\WindowsAPICodePack-Shell.1.1.1\lib\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
<HintPath>packages\WindowsAPICodePack-Shell.1.1.1\lib\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
</Reference> </Reference>
<Reference Include="NAudio, Version=1.7.3.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="NAudio, Version=1.7.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\NAudio.1.7.3\lib\net35\NAudio.dll</HintPath> <HintPath>packages\NAudio.1.7.3\lib\net35\NAudio.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="Ookii.Dialogs.Wpf, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0c15020868fd6249, processorArchitecture=MSIL"> <Reference Include="Ookii.Dialogs.Wpf">
<SpecificVersion>False</SpecificVersion> <HintPath>..\packages\Ookii.Dialogs.1.0\lib\net35\Ookii.Dialogs.Wpf.dll</HintPath>
<HintPath>packages\Ookii.Dialogs.1.0\lib\net35\Ookii.Dialogs.Wpf.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Windows.Controls.Input.Toolkit, Version=3.5.40128.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Windows.Controls.Input.Toolkit">
<SpecificVersion>False</SpecificVersion> <HintPath>..\packages\WPFToolkit.3.5.50211.1\lib\System.Windows.Controls.Input.Toolkit.dll</HintPath>
<HintPath>packages\WPFToolkit.3.5.50211.1\lib\System.Windows.Controls.Input.Toolkit.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
@ -110,9 +106,8 @@
<Reference Include="WindowsBase" /> <Reference Include="WindowsBase" />
<Reference Include="PresentationCore" /> <Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" /> <Reference Include="PresentationFramework" />
<Reference Include="WPFToolkit, Version=3.5.40128.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="WPFToolkit">
<SpecificVersion>False</SpecificVersion> <HintPath>..\packages\WPFToolkit.3.5.50211.1\lib\WPFToolkit.dll</HintPath>
<HintPath>packages\WPFToolkit.3.5.50211.1\lib\WPFToolkit.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -290,7 +285,7 @@
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup> <PropertyGroup>
<PreBuildEvent>perl "$(SolutionDir)inc-revision.pl" "$(ProjectPath)" $(ConfigurationName) <PreBuildEvent>perl "$(SolutionDir)inc-revision.pl" "$(ProjectPath)" $(ConfigurationName) "$(SolutionDir)\"
exit 0</PreBuildEvent> exit 0</PreBuildEvent>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
@ -303,4 +298,4 @@ exit 0</PreBuildEvent>
<Target Name="AfterBuild"> <Target Name="AfterBuild">
</Target> </Target>
--> -->
</Project> </Project>

View File

@ -12,7 +12,7 @@ using System.Windows;
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany ("mørkt")] [assembly: AssemblyCompany ("mørkt")]
[assembly: AssemblyProduct("GARbro.GUI")] [assembly: AssemblyProduct("GARbro.GUI")]
[assembly: AssemblyCopyright ("Copyright © 2014-2015 mørkt")] [assembly: AssemblyCopyright("Copyright © 2014-2016 mørkt")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
@ -51,5 +51,5 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion ("1.2.12.0")] [assembly: AssemblyVersion ("1.2.13.1024")]
[assembly: AssemblyFileVersion ("1.2.12.0")] [assembly: AssemblyFileVersion ("1.2.13.1024")]

Binary file not shown.

View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion ("1.2.13.137")] [assembly: AssemblyVersion ("1.2.14.139")]
[assembly: AssemblyFileVersion ("1.2.13.137")] [assembly: AssemblyFileVersion ("1.2.14.139")]

View File

@ -20,22 +20,22 @@ sub match_version {
return $_[0] =~ /^(\d+)\.(\d+)(?:\.(\d+)\.(\d+))?/; return $_[0] =~ /^(\d+)\.(\d+)(?:\.(\d+)\.(\d+))?/;
} }
unless (1 == $#ARGV) { if ($#ARGV < 1) {
print "usage: inc-revision.pl PROJECT-FILE CONFIG\n"; print "usage: inc-revision.pl PROJECT-FILE CONFIG [ROOT-DIR]\n";
exit 0; exit 0;
} }
my ($project_path, $config) = @ARGV; my ($project_path, $config, $root_dir) = @ARGV;
my $project_dir = dirname ($project_path); my $project_dir = dirname ($project_path);
my $project_file = basename ($project_path); $root_dir //= $project_dir;
my $is_release = 'release' eq lc $config; my $is_release = 'release' eq lc $config;
chdir $project_dir or die "$project_dir: $!\n"; chdir $root_dir or die "$root_dir: $!\n";
my $git_exe = get_git_exe; my $git_exe = get_git_exe;
my $prop_dir = File::Spec->catfile ('.', 'Properties');
my $assembly_info = File::Spec->catfile ($prop_dir, 'AssemblyInfo.cs');
my $revision = `$git_exe rev-list HEAD --count .`; my $revision = `$git_exe rev-list HEAD --count .`;
die "git.exe failed\n" if $? != 0; die "git.exe failed\n" if $? != 0;
my $prop_dir = File::Spec->catfile ($project_dir, 'Properties');
my $assembly_info = File::Spec->catfile ($prop_dir, 'AssemblyInfo.cs');
chomp $revision; chomp $revision;
my $version_changed = 0; my $version_changed = 0;

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<repositories>
<repository path="..\ArcFormats\packages.config" />
<repository path="..\GameRes\packages.config" />
<repository path="..\GUI\packages.config" />
</repositories>

View File

@ -153,6 +153,7 @@ Folklore Jam<br/>
I/O<br/> I/O<br/>
Natsuiro Kouen ~Denpatou no Shita de Ai wo Kataru~<br/> Natsuiro Kouen ~Denpatou no Shita de Ai wo Kataru~<br/>
Onegai O-Hoshi-sama<br/> Onegai O-Hoshi-sama<br/>
Toriko Hime ~Hakudaku Mamire no Reijou~<br/>
Tsuma Youji<br/> Tsuma Youji<br/>
Tsuma Youji 2<br/> Tsuma Youji 2<br/>
Yume Miru Kusuri<br/> Yume Miru Kusuri<br/>