Skip to content

Commit

Permalink
Removed Win8 / WP8 from NuGet definitions (MonoGame#5951)
Browse files Browse the repository at this point in the history
Updated NuGet Sharp DX dependencies to 4.0.1
  • Loading branch information
SimonDarksideJ authored and nkast committed Jun 26, 2018
1 parent 21dfa58 commit cd23dbd
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 59 deletions.
66 changes: 22 additions & 44 deletions NuGetPackages/MonoGame.Framework.DX.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,41 +20,32 @@ This package also includes the Portable version of MonoGame for use in Bait and
<language>en-US</language>
<dependencies>
<group targetFramework="UAP10.0">
<dependency id="SharpDX" version="3.1.1" />
<dependency id="SharpDX.Direct2D1" version="3.1.1" />
<dependency id="SharpDX.Direct3D11" version="3.1.1" />
<dependency id="SharpDX.DXGI" version="3.1.1" />
<dependency id="SharpDX.XAudio2" version="3.1.1" />
<dependency id="SharpDX.MediaFoundation" version="3.1.1" />
<dependency id="SharpDX.XInput" version="3.1.1" />
<dependency id="SharpDX" version="4.0.1" />
<dependency id="SharpDX.Direct2D1" version="4.0.1" />
<dependency id="SharpDX.Direct3D11" version="4.0.1" />
<dependency id="SharpDX.DXGI" version="4.0.1" />
<dependency id="SharpDX.XAudio2" version="4.0.1" />
<dependency id="SharpDX.MediaFoundation" version="4.0.1" />
<dependency id="SharpDX.XInput" version="4.0.1" />
</group>
<group targetFramework=".NETCore4.5.1">
<dependency id="SharpDX" version="3.1.1" />
<dependency id="SharpDX.Direct2D1" version="3.1.1" />
<dependency id="SharpDX.Direct3D11" version="3.1.1" />
<dependency id="SharpDX.DXGI" version="3.1.1" />
<dependency id="SharpDX.XAudio2" version="3.1.1" />
<dependency id="SharpDX.MediaFoundation" version="3.1.1" />
<dependency id="SharpDX.XInput" version="3.1.1" />
</group>
<group targetFramework="WindowsPhoneApp8.1">
<dependency id="SharpDX" version="3.1.1" />
<dependency id="SharpDX.Direct2D1" version="3.1.1" />
<dependency id="SharpDX.Direct3D11" version="3.1.1" />
<dependency id="SharpDX.DXGI" version="3.1.1" />
<dependency id="SharpDX.XAudio2" version="3.1.1" />
<dependency id="SharpDX.MediaFoundation" version="3.1.1" />
<dependency id="SharpDX.XInput" version="3.1.1" />
<dependency id="SharpDX" version="4.0.1" />
<dependency id="SharpDX.Direct2D1" version="4.0.1" />
<dependency id="SharpDX.Direct3D11" version="4.0.1" />
<dependency id="SharpDX.DXGI" version="4.0.1" />
<dependency id="SharpDX.XAudio2" version="4.0.1" />
<dependency id="SharpDX.MediaFoundation" version="4.0.1" />
<dependency id="SharpDX.XInput" version="4.0.1" />
</group>
<group targetFramework=".NETFramework4.5">
<dependency id="SharpDX" version="3.1.1" />
<dependency id="SharpDX.Direct2D1" version="3.1.1" />
<dependency id="SharpDX.Direct3D11" version="3.1.1" />
<dependency id="SharpDX.DXGI" version="3.1.1" />
<dependency id="SharpDX.XAudio2" version="3.1.1" />
<dependency id="SharpDX.MediaFoundation" version="3.1.1" />
<dependency id="SharpDX.XInput" version="3.1.1" />
<dependency id="SharpDX.Direct3D9" version="3.1.1" />
<dependency id="SharpDX" version="4.0.1" />
<dependency id="SharpDX.Direct2D1" version="4.0.1" />
<dependency id="SharpDX.Direct3D11" version="4.0.1" />
<dependency id="SharpDX.DXGI" version="4.0.1" />
<dependency id="SharpDX.XAudio2" version="4.0.1" />
<dependency id="SharpDX.MediaFoundation" version="4.0.1" />
<dependency id="SharpDX.XInput" version="4.0.1" />
<dependency id="SharpDX.Direct3D9" version="4.0.1" />
</group>
</dependencies>
</metadata>
Expand All @@ -66,19 +57,6 @@ This package also includes the Portable version of MonoGame for use in Bait and
<file src="WindowsUniversal\AnyCPU\Release\MonoGame.Framework.pri" target="lib\uap10.0\MonoGame.Framework.pri" />
<file src="WindowsUniversal\AnyCPU\Release\MonoGame.Framework.xml" target="lib\uap10.0\MonoGame.Framework.xml" />
<file src="WindowsUniversal\AnyCPU\Release\MonoGame.Framework.xr.xml" target="lib\uap10.0\MonoGame.Framework/MonoGame.Framework.xr.xml" />
<!-- Windows 8.1 -->
<file src="..\..\NuGetPackages\build\Windows8\MonoGame.Framework.Windows8.targets" target="build\netcore451\MonoGame.Framework.Windows8.targets" />
<file src="Windows8\AnyCPU\Release\Themes\Generic.xaml" target="lib\netcore451\MonoGame.Framework\Themes\Generic.xaml" />
<file src="Windows8\AnyCPU\Release\MonoGame.Framework.dll" target="lib\netcore451\MonoGame.Framework.dll" />
<file src="Windows8\AnyCPU\Release\MonoGame.Framework.xml" target="lib\netcore451\MonoGame.Framework.xml" />
<file src="Windows8\AnyCPU\Release\MonoGame.Framework.pri" target="lib\netcore451\MonoGame.Framework.pri" />
<!-- Windows Phone 8.1 -->
<file src="..\..\NuGetPackages\build\WindowsPhone81\MonoGame.Framework.WindowsPhone81.targets" target="build\wpa81\MonoGame.Framework.WindowsPhone81.targets" />
<file src="WindowsPhone81\AnyCPU\Release\Themes\generic.xbf" target="lib\wpa81\MonoGame.Framework\Themes\generic.xbf" />
<file src="WindowsPhone81\AnyCPU\Release\MonoGame.Framework.xr.xml" target="lib\wpa81\MonoGame.Framework\MonoGame.Framework.xr.xml" />
<file src="WindowsPhone81\AnyCPU\Release\MonoGame.Framework.dll" target="lib\wpa81/MonoGame.Framework.dll" />
<file src="WindowsPhone81\AnyCPU\Release\MonoGame.Framework.xml" target="lib\wpa81/MonoGame.Framework.xml" />
<file src="WindowsPhone81\AnyCPU\Release\MonoGame.Framework.pri" target="lib\wpa81/MonoGame.Framework.pri" />
<!-- Windows Desktop -->
<file src="..\..\NuGetPackages\build\WindowsDX\MonoGame.Framework.WindowsDX.targets" target="build\net45\MonoGame.Framework.WindowsDX.targets" />
<file src="Windows\AnyCPU\Release\MonoGame.Framework.dll" target="lib\net45\MonoGame.Framework.dll" />
Expand Down
16 changes: 8 additions & 8 deletions NuGetPackages/MonoGame.Framework.WindowsDX.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ This package provides you with MonoGame Framework that uses DirectX for renderin
<language>en-US</language>
<dependencies>
<group targetFramework=".NETFramework4.5">
<dependency id="SharpDX" version="3.1.1" />
<dependency id="SharpDX.Direct2D1" version="3.1.1" />
<dependency id="SharpDX.Direct3D11" version="3.1.1" />
<dependency id="SharpDX.DXGI" version="3.1.1" />
<dependency id="SharpDX.XAudio2" version="3.1.1" />
<dependency id="SharpDX.MediaFoundation" version="3.1.1" />
<dependency id="SharpDX.XInput" version="3.1.1" />
<dependency id="SharpDX.Direct3D9" version="3.1.1" />
<dependency id="SharpDX" version="4.0.1" />
<dependency id="SharpDX.Direct2D1" version="4.0.1" />
<dependency id="SharpDX.Direct3D11" version="4.0.1" />
<dependency id="SharpDX.DXGI" version="4.0.1" />
<dependency id="SharpDX.XAudio2" version="4.0.1" />
<dependency id="SharpDX.MediaFoundation" version="4.0.1" />
<dependency id="SharpDX.XInput" version="4.0.1" />
<dependency id="SharpDX.Direct3D9" version="4.0.1" />
</group>
</dependencies>
</metadata>
Expand Down
14 changes: 7 additions & 7 deletions NuGetPackages/MonoGame.Framework.WindowsUniversal.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ This package provides you with MonoGame Framework that works on Windows 10, Wind
<language>en-US</language>
<dependencies>
<group targetFramework=".NETCore0.0">
<dependency id="SharpDX" version="3.1.1" />
<dependency id="SharpDX.Direct2D1" version="3.1.1" />
<dependency id="SharpDX.Direct3D11" version="3.1.1" />
<dependency id="SharpDX.DXGI" version="3.1.1" />
<dependency id="SharpDX.XAudio2" version="3.1.1" />
<dependency id="SharpDX.MediaFoundation" version="3.1.1" />
<dependency id="SharpDX.XInput" version="3.1.1" />
<dependency id="SharpDX" version="4.0.1" />
<dependency id="SharpDX.Direct2D1" version="4.0.1" />
<dependency id="SharpDX.Direct3D11" version="4.0.1" />
<dependency id="SharpDX.DXGI" version="4.0.1" />
<dependency id="SharpDX.XAudio2" version="4.0.1" />
<dependency id="SharpDX.MediaFoundation" version="4.0.1" />
<dependency id="SharpDX.XInput" version="4.0.1" />
</group>
</dependencies>
</metadata>
Expand Down

0 comments on commit cd23dbd

Please sign in to comment.