VS2012に移行した

diff --git a/CompleteEraser/CompleteEraser.csproj b/CompleteEraser/CompleteEraser.csproj
index bc2e881..0a8a304 100644 (file)
--- a/CompleteEraser/CompleteEraser.csproj
+++ b/CompleteEraser/CompleteEraser.csproj
@@ -10,8 +10,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>\r
     <RootNamespace>CompleteEraser</RootNamespace>\r
     <AssemblyName>CompleteEraser</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>\r
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
+    <TargetFrameworkProfile>\r
+    </TargetFrameworkProfile>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">\r
@@ -23,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
+    <Prefer32Bit>false</Prefer32Bit>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">\r
     <PlatformTarget>x86</PlatformTarget>\r
@@ -32,6 +34,7 @@
     <DefineConstants>TRACE</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
+    <Prefer32Bit>false</Prefer32Bit>\r
   </PropertyGroup>\r
   <ItemGroup>\r
     <Reference Include="System" />\r

diff --git a/CompleteEraser/Properties/Resources.Designer.cs b/CompleteEraser/Properties/Resources.Designer.cs
index a452675..ab9de94 100644 (file)
--- a/CompleteEraser/Properties/Resources.Designer.cs
+++ b/CompleteEraser/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------\r
 // <auto-generated>\r
 //     このコードはツールによって生成されました。\r
-//     ランタイム バージョン:4.0.30319.468\r
+//     ランタイム バージョン:4.0.30319.17929\r
 //\r
 //     このファイルへの変更は、以下の状況下で不正な動作の原因になったり、\r
 //     コードが再生成されるときに損失したりします。\r

diff --git a/CompleteEraser/Properties/Settings.Designer.cs b/CompleteEraser/Properties/Settings.Designer.cs
index 0b0bd4d..4fa4e4f 100644 (file)
--- a/CompleteEraser/Properties/Settings.Designer.cs
+++ b/CompleteEraser/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------\r
 // <auto-generated>\r
 //     このコードはツールによって生成されました。\r
-//     ランタイム バージョン:4.0.30319.488\r
+//     ランタイム バージョン:4.0.30319.17929\r
 //\r
 //     このファイルへの変更は、以下の状況下で不正な動作の原因になったり、\r
 //     コードが再生成されるときに損失したりします。\r
@@ -12,7 +12,7 @@ namespace CompleteEraser.Properties {
     \r
     \r
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]\r
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]\r
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]\r
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {\r
         \r
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));\r

diff --git a/CompleteEraser/app.config b/CompleteEraser/app.config
index 8a4b467..b5f1c5c 100644 (file)
--- a/CompleteEraser/app.config
+++ b/CompleteEraser/app.config
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" ?>\r
+<?xml version="1.0"?>\r
 <configuration>\r
     <configSections>\r
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >\r
-            <section name="CompleteEraser.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />\r
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+            <section name="CompleteEraser.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>\r
         </sectionGroup>\r
     </configSections>\r
     <userSettings>\r
@@ -18,4 +18,4 @@
             </setting>\r
         </CompleteEraser.Properties.Settings>\r
     </userSettings>\r
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>\r

diff --git a/ShellExtension/ShellExtension.vcxproj b/ShellExtension/ShellExtension.vcxproj
index 49a63a3..36cab60 100644 (file)
--- a/ShellExtension/ShellExtension.vcxproj
+++ b/ShellExtension/ShellExtension.vcxproj
@@ -27,6 +27,7 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>\r
     <UseDebugLibraries>true</UseDebugLibraries>\r
     <CharacterSet>Unicode</CharacterSet>\r
+    <PlatformToolset>v110</PlatformToolset>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
     <ConfigurationType>DynamicLibrary</ConfigurationType>\r
@@ -34,18 +35,21 @@
     <CharacterSet>Unicode</CharacterSet>\r
     <UseOfAtl>false</UseOfAtl>\r
     <UseOfMfc>false</UseOfMfc>\r
+    <PlatformToolset>v110</PlatformToolset>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
     <ConfigurationType>DynamicLibrary</ConfigurationType>\r
     <UseDebugLibraries>false</UseDebugLibraries>\r
     <WholeProgramOptimization>true</WholeProgramOptimization>\r
     <CharacterSet>Unicode</CharacterSet>\r
+    <PlatformToolset>v110</PlatformToolset>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
     <ConfigurationType>DynamicLibrary</ConfigurationType>\r
     <UseDebugLibraries>false</UseDebugLibraries>\r
     <WholeProgramOptimization>true</WholeProgramOptimization>\r
     <CharacterSet>Unicode</CharacterSet>\r
+    <PlatformToolset>v110</PlatformToolset>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <ImportGroup Label="ExtensionSettings">\r