sharpdxを4.01に移行した

diff --git a/UWP/FooEditEngine.UWP/project.json b/UWP/FooEditEngine.UWP/project.json
index 79a48b8..725ed74 100644 (file)
--- a/UWP/FooEditEngine.UWP/project.json
+++ b/UWP/FooEditEngine.UWP/project.json
@@ -1,11 +1,11 @@
 {
   "dependencies": {
     "Microsoft.NETCore.UniversalWindowsPlatform": "5.1.0",
-    "SharpDX": "3.0.2",
-    "SharpDX.Direct2D1": "3.0.2",
-    "SharpDX.Direct3D11": "3.0.2",
-    "SharpDX.DXGI": "3.0.2",
-    "SharpDX.Mathematics": "3.0.2"
+    "SharpDX": "4.0.1",
+    "SharpDX.Direct2D1": "4.0.1",
+    "SharpDX.Direct3D11": "4.0.1",
+    "SharpDX.DXGI": "4.0.1",
+    "SharpDX.Mathematics": "4.0.1"
   },
   "frameworks": {
     "uap10.0.10586": {}

diff --git a/WPF/FooEditEngine/FooEditEngine.csproj b/WPF/FooEditEngine/FooEditEngine.csproj
index cac5cb9..4163531 100644 (file)
--- a/WPF/FooEditEngine/FooEditEngine.csproj
+++ b/WPF/FooEditEngine/FooEditEngine.csproj
@@ -40,23 +40,23 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="ReachFramework" />
-    <Reference Include="SharpDX, Version=3.0.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpDX.3.0.2\lib\net45\SharpDX.dll</HintPath>
+    <Reference Include="SharpDX, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpDX.4.0.1\lib\net45\SharpDX.dll</HintPath>
     </Reference>
-    <Reference Include="SharpDX.Direct2D1, Version=3.0.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpDX.Direct2D1.3.0.2\lib\net45\SharpDX.Direct2D1.dll</HintPath>
+    <Reference Include="SharpDX.Direct2D1, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpDX.Direct2D1.4.0.1\lib\net45\SharpDX.Direct2D1.dll</HintPath>
     </Reference>
-    <Reference Include="SharpDX.Direct3D11, Version=3.0.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpDX.Direct3D11.3.0.2\lib\net45\SharpDX.Direct3D11.dll</HintPath>
+    <Reference Include="SharpDX.Direct3D11, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpDX.Direct3D11.4.0.1\lib\net45\SharpDX.Direct3D11.dll</HintPath>
     </Reference>
-    <Reference Include="SharpDX.Direct3D9, Version=3.0.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpDX.Direct3D9.3.0.2\lib\net45\SharpDX.Direct3D9.dll</HintPath>
+    <Reference Include="SharpDX.Direct3D9, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpDX.Direct3D9.4.0.1\lib\net45\SharpDX.Direct3D9.dll</HintPath>
     </Reference>
-    <Reference Include="SharpDX.DXGI, Version=3.0.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpDX.DXGI.3.0.2\lib\net45\SharpDX.DXGI.dll</HintPath>
+    <Reference Include="SharpDX.DXGI, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpDX.DXGI.4.0.1\lib\net45\SharpDX.DXGI.dll</HintPath>
     </Reference>
-    <Reference Include="SharpDX.Mathematics, Version=3.0.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpDX.Mathematics.3.0.2\lib\net45\SharpDX.Mathematics.dll</HintPath>
+    <Reference Include="SharpDX.Mathematics, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpDX.Mathematics.4.0.1\lib\net45\SharpDX.Mathematics.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
@@ -101,6 +101,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="..\..\Core\Core.projitems" Label="Shared" />

diff --git a/WPF/FooEditEngine/packages.config b/WPF/FooEditEngine/packages.config
index 97c6dc5..59f9954 100644 (file)
--- a/WPF/FooEditEngine/packages.config
+++ b/WPF/FooEditEngine/packages.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SharpDX" version="3.0.2" targetFramework="net45" />
-  <package id="SharpDX.Direct2D1" version="3.0.2" targetFramework="net45" />
-  <package id="SharpDX.Direct3D11" version="3.0.2" targetFramework="net45" />
-  <package id="SharpDX.Direct3D9" version="3.0.2" targetFramework="net45" />
-  <package id="SharpDX.DXGI" version="3.0.2" targetFramework="net45" />
-  <package id="SharpDX.Mathematics" version="3.0.2" targetFramework="net45" />
+  <package id="SharpDX" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.Direct2D1" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.Direct3D11" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.Direct3D9" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.DXGI" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.Mathematics" version="4.0.1" targetFramework="net45" />
 </packages>
\ No newline at end of file

diff --git a/WPF/Test/Test.csproj b/WPF/Test/Test.csproj
index 12539bf..6a380eb 100644 (file)
--- a/WPF/Test/Test.csproj
+++ b/WPF/Test/Test.csproj
@@ -114,6 +114,9 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\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.

diff --git a/WPF/UnitTest/UnitTest.csproj b/WPF/UnitTest/UnitTest.csproj
index c274b4a..e6b693e 100644 (file)
--- a/WPF/UnitTest/UnitTest.csproj
+++ b/WPF/UnitTest/UnitTest.csproj
@@ -64,6 +64,9 @@
       <Name>FooEditEngine</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>

diff --git a/Windows/FooEditEngine/FooEditEngine.csproj b/Windows/FooEditEngine/FooEditEngine.csproj
index 6e47f3d..358c20e 100644 (file)
--- a/Windows/FooEditEngine/FooEditEngine.csproj
+++ b/Windows/FooEditEngine/FooEditEngine.csproj
@@ -38,17 +38,20 @@
     <DocumentationFile>bin\Release\FooEditEngine.Windows.XML</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="SharpDX, Version=3.0.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpDX.3.0.2\lib\net45\SharpDX.dll</HintPath>
+    <Reference Include="SharpDX, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpDX.4.0.1\lib\net45\SharpDX.dll</HintPath>
     </Reference>
-    <Reference Include="SharpDX.Direct2D1, Version=3.0.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpDX.Direct2D1.3.0.2\lib\net45\SharpDX.Direct2D1.dll</HintPath>
+    <Reference Include="SharpDX.Direct2D1, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpDX.Direct2D1.4.0.1\lib\net45\SharpDX.Direct2D1.dll</HintPath>
     </Reference>
-    <Reference Include="SharpDX.DXGI, Version=3.0.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpDX.DXGI.3.0.2\lib\net45\SharpDX.DXGI.dll</HintPath>
+    <Reference Include="SharpDX.Direct3D11, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpDX.Direct3D11.4.0.1\lib\net45\SharpDX.Direct3D11.dll</HintPath>
     </Reference>
-    <Reference Include="SharpDX.Mathematics, Version=3.0.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpDX.Mathematics.3.0.2\lib\net45\SharpDX.Mathematics.dll</HintPath>
+    <Reference Include="SharpDX.DXGI, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpDX.DXGI.4.0.1\lib\net45\SharpDX.DXGI.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.Mathematics, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpDX.Mathematics.4.0.1\lib\net45\SharpDX.Mathematics.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
@@ -66,6 +69,7 @@
     <Compile Include="WinIME.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="..\..\Core\Core.projitems" Label="Shared" />

diff --git a/Windows/FooEditEngine/packages.config b/Windows/FooEditEngine/packages.config
index 5d37ff0..871dd33 100644 (file)
--- a/Windows/FooEditEngine/packages.config
+++ b/Windows/FooEditEngine/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SharpDX" version="3.0.2" targetFramework="net45" />
-  <package id="SharpDX.Direct2D1" version="3.0.2" targetFramework="net45" />
-  <package id="SharpDX.Direct3D11" version="3.0.2" targetFramework="net45" />
-  <package id="SharpDX.DXGI" version="3.0.2" targetFramework="net45" />
-  <package id="SharpDX.Mathematics" version="3.0.2" targetFramework="net45" />
+  <package id="SharpDX" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.Direct2D1" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.Direct3D11" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.DXGI" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.Mathematics" version="4.0.1" targetFramework="net45" />
 </packages>
\ No newline at end of file

diff --git a/Windows/Test/Test.csproj b/Windows/Test/Test.csproj
index 45ed709..a692f9c 100644 (file)
--- a/Windows/Test/Test.csproj
+++ b/Windows/Test/Test.csproj
@@ -70,6 +70,7 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
+    <None Include="app.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>