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

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 44b8113a..55e94b62 100644
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -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>
@@ -135,9 +136,13 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NightlyBuild|AnyCPU'">
     <OutputPath>bin\NightlyBuild\</OutputPath>
+    <Optimize>true</Optimize>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NightlyBuild|x86'">
     <OutputPath>bin\x86\NightlyBuild\</OutputPath>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <Optimize>true</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Growl.Connector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=980c2339411be384, processorArchitecture=x86">
@@ -173,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">
@@ -207,7 +211,9 @@
       <DependentUpon>x264Panel.cs</DependentUpon>
     </Compile>
     <Compile Include="Model\ActivityLogMode.cs" />
-    <Compile Include="Services\Encode.cs" />
+    <Compile Include="Model\QueryPictureSettingsMode.cs" />
+    <Compile Include="Model\QueryEncodeMode.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="frmPreview.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -226,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>
@@ -250,44 +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="Services\Scan.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="Services\Queue.cs" />
-    <Compile Include="Functions\AppcastReader.cs" />
     <Compile Include="Functions\QueryParser.cs" />
-    <Compile Include="Parsing\AudioTrack.cs" />
-    <Compile Include="Parsing\Chapter.cs" />
-    <Compile Include="Parsing\DVD.cs" />
-    <Compile Include="Parsing\Parser.cs" />
-    <Compile Include="Parsing\Subtitle.cs" />
-    <Compile Include="Parsing\Title.cs" />
     <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.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>
@@ -320,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>
@@ -336,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>
@@ -349,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" />
@@ -371,16 +364,10 @@
       <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>
-    <Compile Include="Model\Job.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="handbrakepineapple.ico" />
+    <None Include="Properties\AssemblyInfo.cs.tmpl" />
     <None Include="Resources\logo64.png" />
     <None Include="Resources\logo128.png" />
     <None Include="Resources\ActivityWindow.png" />
@@ -395,6 +382,7 @@
     <None Include="Resources\info16.png" />
     <None Include="Resources\folder.png" />
     <None Include="Resources\download.png" />
+    <None Include="Resources\ErrorX.png" />
     <Content Include="Resources\Output_Small.png" />
     <None Include="Resources\Pause.png" />
     <None Include="Resources\Play.png" />
@@ -406,7 +394,6 @@
     <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>
@@ -476,6 +463,16 @@
       <Isolated>False</Isolated>
     </COMReference>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="HandBrake.ApplicationServices\HandBrake.ApplicationServices.csproj">
+      <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. 
        Other similar extension points exist, see Microsoft.Common.targets.
@@ -484,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>
@@ -505,8 +497,10 @@
 	makensis MakeNightly.nsi
 	</PostBuildEvent>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'NightlyBuild' ">
-    <PreBuildEvent>subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs"
+  <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"
 subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Installer\MakeNightly.nsi.tmpl" "$(ProjectDir)Installer\MakeNightly.nsi"</PreBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file