Browse Source

Use SharpDX from nuget. Fix build error for WindowsDX build..

Building Aether.Animation against MG SDK 3.7 & 3.7.1 fails because those
versions ship with a mixure of .NetFramework4.0 and Net Standard1.1
builds of SharpDX.
Nikos Kastellanos 5 years ago
parent
commit
045ba76212

+ 6 - 2
Animation/Aether.Animation.W10.csproj

@@ -142,11 +142,15 @@
       <Private>False</Private>
       <Private>False</Private>
     </Reference>
     </Reference>
     <Reference Include="SharpDX">
     <Reference Include="SharpDX">
-      <HintPath>$(MSBuildExtensionsPath)\..\MonoGame\v3.0\Assemblies\WindowsUniversal\SharpDX.dll</HintPath>
+      <HintPath>..\packages\SharpDX.4.0.1\lib\uap10.0\SharpDX.dll</HintPath>
       <Private>False</Private>
       <Private>False</Private>
     </Reference>
     </Reference>
     <Reference Include="SharpDX.Direct3D11">
     <Reference Include="SharpDX.Direct3D11">
-      <HintPath>$(MSBuildExtensionsPath)\..\MonoGame\v3.0\Assemblies\WindowsUniversal\SharpDX.Direct3D11.dll</HintPath>
+      <HintPath>..\packages\SharpDX.Direct3D11.4.0.1\lib\uap10.0\SharpDX.Direct3D11.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="SharpDX.DXGI">
+      <HintPath>..\packages\SharpDX.DXGI.4.0.1\lib\uap10.0\SharpDX.DXGI.dll</HintPath>
       <Private>False</Private>
       <Private>False</Private>
     </Reference>
     </Reference>
   </ItemGroup>
   </ItemGroup>

+ 8 - 4
Animation/Aether.Animation.WINDOWS.MG.csproj

@@ -40,12 +40,16 @@
       <HintPath>..\packages\MonoGame.Framework.Portable.3.2.99.1-Beta\lib\portable-net40+sl40+win+wp80\MonoGame.Framework.dll</HintPath>
       <HintPath>..\packages\MonoGame.Framework.Portable.3.2.99.1-Beta\lib\portable-net40+sl40+win+wp80\MonoGame.Framework.dll</HintPath>
       <Private>False</Private>
       <Private>False</Private>
     </Reference>
     </Reference>
-    <Reference Include="SharpDX">
-      <HintPath>C:\Program Files (x86)\MonoGame\v3.0\Assemblies\Windows\SharpDX.dll</HintPath>
+    <Reference Include="SharpDX, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpDX.4.0.1\lib\net40\SharpDX.dll</HintPath>
       <Private>False</Private>
       <Private>False</Private>
     </Reference>
     </Reference>
-    <Reference Include="SharpDX.Direct3D11">
-      <HintPath>C:\Program Files (x86)\MonoGame\v3.0\Assemblies\Windows\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\net40\SharpDX.Direct3D11.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="SharpDX.DXGI, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpDX.DXGI.4.0.1\lib\net40\SharpDX.DXGI.dll</HintPath>
       <Private>False</Private>
       <Private>False</Private>
     </Reference>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System" />

+ 3 - 0
Animation/packages.config

@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
 <packages>
   <package id="MonoGame.Framework.Portable" version="3.2.99.1-Beta" targetFramework="portable-net45+win+wp80+MonoAndroid10+xamarinios10+MonoTouch10" />
   <package id="MonoGame.Framework.Portable" version="3.2.99.1-Beta" targetFramework="portable-net45+win+wp80+MonoAndroid10+xamarinios10+MonoTouch10" />
+  <package id="SharpDX" version="4.0.1" targetFramework="net40" />
+  <package id="SharpDX.Direct3D11" version="4.0.1" targetFramework="net40" />
+  <package id="SharpDX.DXGI" version="4.0.1" targetFramework="net40" />
 </packages>
 </packages>