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

diff --git a/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index 16a8432b42c42f7cf7f2227bfd4f7d16e7d3488f..94995c0690abd366cb26bcbaa7ca63014c43bc83 100644 (file)
--- 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" />\r
     <Compile Include="Parsing\Subtitle.cs" />\r
     <Compile Include="Parsing\Title.cs" />\r
+    <Compile Include="Properties\AssemblyInfo.cs" />\r
     <Compile Include="Properties\Resources.Designer.cs">\r
       <AutoGen>True</AutoGen>\r
       <DesignTime>True</DesignTime>\r
@@ -139,8 +140,8 @@
   -->\r
   <PropertyGroup>\r
     <PreBuildEvent>\r
-       subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs"\r
-       subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs"\r
-       </PreBuildEvent>\r
+      subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs"\r
+      subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs"\r
+    </PreBuildEvent>\r
   </PropertyGroup>\r
 </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 e939dcfdff028e570c1db6c52c2298664e91bd64..840bd82dfb3c808a0ac05570b7b8d6a0edcfb369 100644 (file)
--- 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")]\r
 [assembly: AssemblyDescription("HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder.")]\r
 [assembly: AssemblyConfiguration("")]\r
-[assembly: AssemblyCompany("HandBrake")]\r
+[assembly: AssemblyCompany("HandBrake Team")]\r
 [assembly: AssemblyProduct("HandBrake")]\r
 [assembly: AssemblyCopyright("Copyright ©  2010")]\r
 [assembly: AssemblyTrademark("")]\r

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 405d1ba2b24f5a668fd95add26e72d7f205b62fa..5e0a123ff5fa21266b44d20df31b198cc2c66810 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -135,7 +135,7 @@
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NightlyBuild|AnyCPU'">\r
     <OutputPath>bin\NightlyBuild\</OutputPath>\r
-    <Optimize>false</Optimize>\r
+    <Optimize>true</Optimize>\r
     <DefineConstants>DEBUG;TRACE</DefineConstants>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NightlyBuild|x86'">\r
@@ -417,11 +417,6 @@
     <None Include="Resources\General Preferences.png" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">\r
-      <Visible>False</Visible>\r
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>\r
-      <Install>false</Install>\r
-    </BootstrapperPackage>\r
     <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">\r
       <Visible>False</Visible>\r
       <ProductName>.NET Framework 2.0 %28x86%29</ProductName>\r
@@ -437,11 +432,6 @@
       <ProductName>.NET Framework 3.5</ProductName>\r
       <Install>true</Install>\r
     </BootstrapperPackage>\r
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">\r
-      <Visible>False</Visible>\r
-      <ProductName>.NET Framework 3.5 SP1</ProductName>\r
-      <Install>false</Install>\r
-    </BootstrapperPackage>\r
     <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">\r
       <Visible>False</Visible>\r
       <ProductName>Windows Installer 3.1</ProductName>\r