summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsr55 <[email protected]>2010-06-19 22:23:16 +0000
committersr55 <[email protected]>2010-06-19 22:23:16 +0000
commit062472a97ec678cfe5221f41e1e698ecc5a89b3f (patch)
tree7f8275bf6f14d6afba094316467fd859bbb0266a
parentd4f4b39c00fe70a1bf12f2116609e22b272cd1b3 (diff)
WinGui:
- THe Application dll wasn't getting tagged with the svn revision git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3396 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj7
-rw-r--r--win/C#/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs.tmpl2
-rw-r--r--win/C#/HandBrakeCS.csproj12
3 files changed, 6 insertions, 15 deletions
diff --git a/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index 16a8432b4..94995c069 100644
--- a/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -83,6 +83,7 @@
<Compile Include="Parsing\Parser.cs" />
<Compile Include="Parsing\Subtitle.cs" />
<Compile Include="Parsing\Title.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
@@ -139,8 +140,8 @@
-->
<PropertyGroup>
<PreBuildEvent>
- subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs"
- subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs"
- </PreBuildEvent>
+ subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs"
+ subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs"
+ </PreBuildEvent>
</PropertyGroup>
</Project> \ No newline at end of file
diff --git a/win/C#/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs.tmpl b/win/C#/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs.tmpl
index e939dcfdf..840bd82df 100644
--- a/win/C#/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs.tmpl
+++ b/win/C#/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs.tmpl
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTitle("HandBrake")]
[assembly: AssemblyDescription("HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder.")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("HandBrake")]
+[assembly: AssemblyCompany("HandBrake Team")]
[assembly: AssemblyProduct("HandBrake")]
[assembly: AssemblyCopyright("Copyright © 2010")]
[assembly: AssemblyTrademark("")]
diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 405d1ba2b..5e0a123ff 100644
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -135,7 +135,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NightlyBuild|AnyCPU'">
<OutputPath>bin\NightlyBuild\</OutputPath>
- <Optimize>false</Optimize>
+ <Optimize>true</Optimize>
<DefineConstants>DEBUG;TRACE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NightlyBuild|x86'">
@@ -417,11 +417,6 @@
<None Include="Resources\General Preferences.png" />
</ItemGroup>
<ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
<Visible>False</Visible>
<ProductName>.NET Framework 2.0 %28x86%29</ProductName>
@@ -437,11 +432,6 @@
<ProductName>.NET Framework 3.5</ProductName>
<Install>true</Install>
</BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
<Visible>False</Visible>
<ProductName>Windows Installer 3.1</ProductName>