X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FHandBrakeCS.csproj;h=55e94b62ef9b4df548f356a86f4de847033c34b1;hb=3166f4bf518b12ef658ce4a249f9a265b16693bd;hp=75d4621e7c10303b577f2568c7d49f1be314b0c1;hpb=b464aff9adf8f57dc71826152aeb15292c786ab1;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 75d4621e..55e94b62 100644
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -19,7 +19,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <SignManifests>false</SignManifests>
     <PublishUrl>publish\</PublishUrl>
@@ -36,6 +36,7 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -177,7 +178,6 @@
     <Reference Include="WindowsBase, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <RequiredTargetFramework>3.0</RequiredTargetFramework>
     </Reference>
-    <Reference Include="WindowsFormsIntegration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Controls\AudioPanel.cs">
@@ -210,12 +210,6 @@
     <Compile Include="Controls\x264Panel.Designer.cs">
       <DependentUpon>x264Panel.cs</DependentUpon>
     </Compile>
-    <Compile Include="frmExceptionWindow.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmExceptionWindow.Designer.cs">
-      <DependentUpon>frmExceptionWindow.cs</DependentUpon>
-    </Compile>
     <Compile Include="Model\ActivityLogMode.cs" />
     <Compile Include="Model\QueryPictureSettingsMode.cs" />
     <Compile Include="Model\QueryEncodeMode.cs" />
@@ -238,12 +232,6 @@
     <Compile Include="frmAddPreset.Designer.cs">
       <DependentUpon>frmAddPreset.cs</DependentUpon>
     </Compile>
-    <Compile Include="frmDownload.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmDownload.Designer.cs">
-      <DependentUpon>frmDownload.cs</DependentUpon>
-    </Compile>
     <Compile Include="frmMain.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -262,35 +250,40 @@
     <Compile Include="frmQueue.Designer.cs">
       <DependentUpon>frmQueue.cs</DependentUpon>
     </Compile>
-    <Compile Include="frmUpdater.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmUpdater.designer.cs">
-      <DependentUpon>frmUpdater.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Functions\GrowlCommunicator.cs" />
     <Compile Include="Functions\PresetLoader.cs" />
     <Compile Include="Functions\QueryGenerator.cs" />
     <Compile Include="Functions\Main.cs" />
-    <Compile Include="Functions\System.cs" />
-    <Compile Include="Functions\UpdateCheckInformation.cs" />
-    <Compile Include="Functions\Win32.cs" />
     <Compile Include="frmActivityWindow.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="frmActivityWindow.Designer.cs">
       <DependentUpon>frmActivityWindow.cs</DependentUpon>
     </Compile>
-    <Compile Include="Model\AudioTrack.cs" />
     <Compile Include="Model\DriveInformation.cs" />
     <Compile Include="Model\SourceType.cs" />
-    <Compile Include="Model\Subtitle.cs" />
     <Compile Include="Presets\PlistPresetHandler.cs" />
     <Compile Include="Presets\Preset.cs" />
     <Compile Include="Presets\PresetsHandler.cs" />
-    <Compile Include="Functions\AppcastReader.cs" />
     <Compile Include="Functions\QueryParser.cs" />
     <Compile Include="Program.cs" />
+    <Compile Include="ToolWindows\BatchAdd.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ToolWindows\BatchAdd.Designer.cs">
+      <DependentUpon>BatchAdd.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ToolWindows\PreviewOverlay.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ToolWindows\PreviewOverlay.Designer.cs">
+      <DependentUpon>PreviewOverlay.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ToolWindows\TitleSpecificScan.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ToolWindows\TitleSpecificScan.Designer.cs">
+      <DependentUpon>TitleSpecificScan.cs</DependentUpon>
+    </Compile>
     <EmbeddedResource Include="Controls\AudioPanel.resx">
       <DependentUpon>AudioPanel.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -311,10 +304,6 @@
       <DependentUpon>x264Panel.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmExceptionWindow.resx">
-      <DependentUpon>frmExceptionWindow.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="frmPreview.resx">
       <DependentUpon>frmPreview.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -327,10 +316,6 @@
       <DependentUpon>frmAddPreset.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmDownload.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>frmDownload.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="frmMain.resx">
       <SubType>Designer</SubType>
       <DependentUpon>frmMain.cs</DependentUpon>
@@ -343,10 +328,6 @@
       <SubType>Designer</SubType>
       <DependentUpon>frmQueue.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmUpdater.resx">
-      <DependentUpon>frmUpdater.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="frmActivityWindow.resx">
       <DependentUpon>frmActivityWindow.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -356,15 +337,20 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmSplashScreen.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>frmSplashScreen.cs</DependentUpon>
-    </EmbeddedResource>
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
+    <EmbeddedResource Include="ToolWindows\BatchAdd.resx">
+      <DependentUpon>BatchAdd.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ToolWindows\PreviewOverlay.resx">
+      <DependentUpon>PreviewOverlay.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ToolWindows\TitleSpecificScan.resx">
+      <DependentUpon>TitleSpecificScan.cs</DependentUpon>
+    </EmbeddedResource>
     <None Include="app.config" />
     <None Include="Installer\MakeNightly.nsi.tmpl" />
     <None Include="Installer\MakeNightly.nsi" />
@@ -378,12 +364,6 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <Compile Include="frmSplashScreen.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmSplashScreen.Designer.cs">
-      <DependentUpon>frmSplashScreen.cs</DependentUpon>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Content Include="handbrakepineapple.ico" />
@@ -414,11 +394,15 @@
     <Content Include="Resources\window.png" />
     <None Include="Resources\save.png" />
     <None Include="Resources\stop.png" />
-    <None Include="Resources\SplashScreen.jpg" />
     <None Include="Resources\Movies.png" />
     <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>
@@ -434,6 +418,11 @@
       <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>
@@ -479,6 +468,10 @@
       <Project>{087A2BA8-BAC2-4577-A46F-07FF9D420016}</Project>
       <Name>HandBrake.ApplicationServices</Name>
     </ProjectReference>
+    <ProjectReference Include="HandBrake.Framework\HandBrake.Framework.csproj">
+      <Project>{49AD42C1-BF9B-4D78-A644-020878FAADE6}</Project>
+      <Name>HandBrake.Framework</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -488,14 +481,9 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-  <Import Project="$(ProgramFiles)\MSBuild\Microsoft\StyleCop\v4.3\Microsoft.StyleCop.targets" />
+  <Import Project="$(ProgramFiles)\MSBuild\Microsoft\StyleCop\v4.4\Microsoft.StyleCop.targets" />
   <PropertyGroup Condition=" '$(Configuration)' == 'Install' ">
     <PostBuildEvent>
-	cd ../../
-	copy Installer\Installer.nsi bin\Install /Y
-	copy handbrakepineapple.ico bin\Install /Y
-	xcopy doc bin\Install\doc /I /Y
-	cd bin\Install
 	makensis Installer.nsi
 	</PostBuildEvent>
   </PropertyGroup>