Skip to content

Commit be4a03f

Browse files
author
RandomEngy
committed
Fixed a few Beta build issues and updated version numbers.
--HG-- branch : beta
1 parent 99fcadd commit be4a03f

8 files changed

Lines changed: 24 additions & 22 deletions

File tree

‎Installer/VidCoder-x64.iss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
[Setup]
55
AppName=VidCoder
6-
AppVerName=VidCoder 1.3.4 Beta (x64)
7-
AppVersion=1.3.4
6+
AppVerName=VidCoder 1.4.0 Beta (x64)
7+
AppVersion=1.4.0
88
AppPublisher=RandomEngy
99
AppPublisherURL=http://vidcoder.codeplex.com/
1010

@@ -16,7 +16,7 @@ Compression=lzma
1616
SolidCompression=yes
1717

1818
OutputDir=BuiltInstallers
19-
OutputBaseFilename=VidCoder-1.3.4-Beta-x64
19+
OutputBaseFilename=VidCoder-1.4.0-Beta-x64
2020

2121
AppId=VidCoder-x64
2222
UsePreviousAppDir=yes

‎Installer/VidCoder-x86.iss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
[Setup]
55
AppName=VidCoder
6-
AppVerName=VidCoder 1.3.4 Beta (x86)
7-
AppVersion=1.3.4
6+
AppVerName=VidCoder 1.4.0 Beta (x86)
7+
AppVersion=1.4.0
88
AppPublisher=RandomEngy
99
AppPublisherURL=http://vidcoder.codeplex.com/
1010

@@ -16,7 +16,7 @@ Compression=lzma
1616
SolidCompression=yes
1717

1818
OutputDir=BuiltInstallers
19-
OutputBaseFilename=VidCoder-1.3.4-Beta-x86
19+
OutputBaseFilename=VidCoder-1.4.0-Beta-x86
2020

2121
AppId=VidCoder
2222
UsePreviousAppDir=yes

‎Installer/latest-beta.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<UpdateInfo>
22
<Release>
3-
<Latest>1.3.4</Latest>
4-
<DownloadLocation>http://engy.us/VidCoder/VidCoder-1.3.4-Beta-x86.exe</DownloadLocation>
3+
<Latest>1.4.0</Latest>
4+
<DownloadLocation>http://engy.us/VidCoder/VidCoder-1.4.0-Beta-x86.exe</DownloadLocation>
55
<ChangelogLocation>http://vidcoder.codeplex.com/releases/view/91831</ChangelogLocation>
66
</Release>
77
<Release-x64>
8-
<Latest>1.3.4</Latest>
9-
<DownloadLocation>http://engy.us/VidCoder/VidCoder-1.3.4-Beta-x64.exe</DownloadLocation>
8+
<Latest>1.4.0</Latest>
9+
<DownloadLocation>http://engy.us/VidCoder/VidCoder-1.4.0-Beta-x64.exe</DownloadLocation>
1010
<ChangelogLocation>http://vidcoder.codeplex.com/releases/view/91831</ChangelogLocation>
1111
</Release-x64>
1212
</UpdateInfo>

‎VidCoder.sln‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,16 @@ Global
3939
{63452895-7AA1-45EC-A0D8-3F30CCFA6D0D}.Debug|x86.Build.0 = Debug|x86
4040
{63452895-7AA1-45EC-A0D8-3F30CCFA6D0D}.Debug-Beta|x64.ActiveCfg = Debug|x64
4141
{63452895-7AA1-45EC-A0D8-3F30CCFA6D0D}.Debug-Beta|x64.Build.0 = Debug|x64
42-
{63452895-7AA1-45EC-A0D8-3F30CCFA6D0D}.Debug-Beta|x86.ActiveCfg = Debug|x64
42+
{63452895-7AA1-45EC-A0D8-3F30CCFA6D0D}.Debug-Beta|x86.ActiveCfg = Debug|x86
43+
{63452895-7AA1-45EC-A0D8-3F30CCFA6D0D}.Debug-Beta|x86.Build.0 = Debug|x86
4344
{63452895-7AA1-45EC-A0D8-3F30CCFA6D0D}.Release|x64.ActiveCfg = Release|x64
4445
{63452895-7AA1-45EC-A0D8-3F30CCFA6D0D}.Release|x64.Build.0 = Release|x64
4546
{63452895-7AA1-45EC-A0D8-3F30CCFA6D0D}.Release|x86.ActiveCfg = Release|x86
4647
{63452895-7AA1-45EC-A0D8-3F30CCFA6D0D}.Release|x86.Build.0 = Release|x86
4748
{63452895-7AA1-45EC-A0D8-3F30CCFA6D0D}.Release-Beta|x64.ActiveCfg = Release|x64
4849
{63452895-7AA1-45EC-A0D8-3F30CCFA6D0D}.Release-Beta|x64.Build.0 = Release|x64
49-
{63452895-7AA1-45EC-A0D8-3F30CCFA6D0D}.Release-Beta|x86.ActiveCfg = Release|x64
50+
{63452895-7AA1-45EC-A0D8-3F30CCFA6D0D}.Release-Beta|x86.ActiveCfg = Release|x86
51+
{63452895-7AA1-45EC-A0D8-3F30CCFA6D0D}.Release-Beta|x86.Build.0 = Release|x86
5052
EndGlobalSection
5153
GlobalSection(SolutionProperties) = preSolution
5254
HideSolutionNode = FALSE

‎VidCoder/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("1.3.4.0")]
55-
[assembly: AssemblyFileVersion("1.3.4.0")]
54+
[assembly: AssemblyVersion("1.4.0.0")]
55+
[assembly: AssemblyFileVersion("1.4.0.0")]

‎VidCoder/VidCoder.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -687,12 +687,6 @@
687687
<Resource Include="VidCoder_icon.ico" />
688688
<Resource Include="Icons\win7foldericon.png" />
689689
</ItemGroup>
690-
<ItemGroup>
691-
<ProjectReference Include="..\VidCoderWorker\VidCoderWorker.csproj">
692-
<Project>{63452895-7AA1-45EC-A0D8-3F30CCFA6D0D}</Project>
693-
<Name>VidCoderWorker</Name>
694-
</ProjectReference>
695-
</ItemGroup>
696690
<ItemGroup>
697691
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
698692
<Visible>False</Visible>
@@ -710,6 +704,12 @@
710704
<Install>true</Install>
711705
</BootstrapperPackage>
712706
</ItemGroup>
707+
<ItemGroup>
708+
<ProjectReference Include="..\VidCoderWorker\VidCoderWorker.csproj">
709+
<Project>{63452895-7AA1-45EC-A0D8-3F30CCFA6D0D}</Project>
710+
<Name>VidCoderWorker</Name>
711+
</ProjectReference>
712+
</ItemGroup>
713713
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
714714
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
715715
Other similar extension points exist, see Microsoft.Common.targets.

‎VidCoder/View/AboutDialog.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<TextBlock HorizontalAlignment="Left" Name="versionLabel" Text="Version" VerticalAlignment="Top" />
1515
<TextBlock Text="{Binding Version}" Margin="5,0,0,0" Name="versionText" />
1616
</StackPanel>
17-
<TextBlock Height="23" HorizontalAlignment="Left" Margin="171,79,0,0" Name="textBlock3" Text="Based on HandBrake 0.9.8 (svn 4869)" VerticalAlignment="Top" />
17+
<TextBlock Height="23" HorizontalAlignment="Left" Margin="171,79,0,0" Name="textBlock3" Text="Based on HandBrake (svn 4937)" VerticalAlignment="Top" />
1818
<TextBlock Height="23" HorizontalAlignment="Left" Margin="171,108,0,0" Name="textBlock2" Text="© 2010-2012 VidCoder Developers" VerticalAlignment="Top" />
1919
<Label Content="License:" Height="28" HorizontalAlignment="Left" Margin="12,138,0,0" Name="label1" VerticalAlignment="Top" />
2020

‎build.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function UpdateIssFile($fileName, $version, $beta)
2424
}
2525

2626
# Master switch for if this branch is beta
27-
$beta = $false
27+
$beta = $true
2828

2929
if ($beta)
3030
{

0 commit comments

Comments
 (0)