Updated packages + DirectX package

agrueso · Oct 24, 2014 · 4b0ec69 · 4b0ec69
1 parent 19f06d5
commit 4b0ec69
Show file tree

Hide file tree

Showing 11 changed files with 2,043 additions and 9 deletions.
diff --git a/.nuget/WindowsAPICodePack-Core.1.1.nuspec → .nuget/WindowsAPICodePack-Core.nuspec b/.nuget/WindowsAPICodePack-Core.1.1.nuspec → .nuget/WindowsAPICodePack-Core.nuspec
diff --git a/.nuget/WindowsAPICodePack-DirectX.nuspec b/.nuget/WindowsAPICodePack-DirectX.nuspec
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <metadata>
+        <id>WindowsAPICodePack-DirectX</id>
+        <version>1.1</version>
+        <title>Windows API Code Pack - DirectX</title>
+        <authors>Aybe</authors>
+        <owners>Microsoft</owners>
+        <licenseUrl>http://code.msdn.microsoft.com/WindowsAPICodePack/Project/License.aspx</licenseUrl>
+        <projectUrl>http://archive.msdn.microsoft.com/WindowsAPICodePack</projectUrl>
+        <requireLicenseAcceptance>true</requireLicenseAcceptance>
+        <description>DirectX library for Windows API Code Pack</description>
+        <summary>Windows® API Code Pack for Microsoft® .NET Framework provides a source code library that can be used to access some features of Windows 7 and Windows Vista from managed code.</summary>
+        <language>en-US</language>
+        <tags>WindowsAPICodePack</tags>
+    </metadata>
+    <files>
+        <file src="..\source\WindowsAPICodePack\DirectX\x64\Release\Microsoft.WindowsAPICodePack.DirectX.dll" target="bin\x64\Microsoft.WindowsAPICodePack.DirectX.dll" />
+        <file src="..\source\WindowsAPICodePack\DirectX\Release\Microsoft.WindowsAPICodePack.DirectX.dll" target="bin\x86\Microsoft.WindowsAPICodePack.DirectX.dll" />
+        <file src="WindowsAPICodePack-DirectX.targets" target="build\WindowsAPICodePack-DirectX.targets" />
+        <file src="..\source\WindowsAPICodePack\DirectX\Release\Microsoft.WindowsAPICodePack.DirectX.dll" target="lib\Microsoft.WindowsAPICodePack.DirectX.dll" />
+    </files>
+</package>
diff --git a/.nuget/WindowsAPICodePack-DirectX.targets b/.nuget/WindowsAPICodePack-DirectX.targets
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+	<PropertyGroup>
+		<BuildDependsOn>
+        CopyDirectX;
+        $(BuildDependsOn);
+		</BuildDependsOn>
+	</PropertyGroup>
+
+	<Target Name="CopyDirectX">
+		<Error Condition=" '$(Platform)' == 'anycpu' " Text="Microsoft.WindowsAPICodePack.DirectX does not work under AnyCPU platform !" />
+		<Message Text="Copying DirectX DLL for $(Platform) platform" Importance="High" />
+		<Copy SourceFiles="..\packages\WindowsAPICodePack-DirectX.1.1\bin\x86\Microsoft.WindowsAPICodePack.DirectX.dll" Condition=" '$(Platform)' == 'x86' " DestinationFolder="..\packages\WindowsAPICodePack-DirectX.1.1\lib" />
+		<Copy SourceFiles="..\packages\WindowsAPICodePack-DirectX.1.1\bin\x64\Microsoft.WindowsAPICodePack.DirectX.dll" Condition=" '$(Platform)' == 'x64' " DestinationFolder="..\packages\WindowsAPICodePack-DirectX.1.1\lib" />
+	</Target>
+
+</Project>
diff --git a/...ack-ExtendedLinguisticServices.1.1.nuspec → ...odePack-ExtendedLinguisticServices.nuspec b/...ack-ExtendedLinguisticServices.1.1.nuspec → ...odePack-ExtendedLinguisticServices.nuspec
diff --git a/.nuget/WindowsAPICodePack-Sensors.1.1.nuspec → .nuget/WindowsAPICodePack-Sensors.nuspec b/.nuget/WindowsAPICodePack-Sensors.1.1.nuspec → .nuget/WindowsAPICodePack-Sensors.nuspec
diff --git a/.nuget/WindowsAPICodePack-Shell.1.1.nuspec → .nuget/WindowsAPICodePack-Shell.nuspec b/.nuget/WindowsAPICodePack-Shell.1.1.nuspec → .nuget/WindowsAPICodePack-Shell.nuspec
diff --git a/...owsAPICodePack-ShellExtensions.1.1.nuspec → ...WindowsAPICodePack-ShellExtensions.nuspec b/...owsAPICodePack-ShellExtensions.1.1.nuspec → ...WindowsAPICodePack-ShellExtensions.nuspec
diff --git a/.nuget/build.bat b/.nuget/build.bat
@@ -2,8 +2,11 @@
 cls
 call clean.bat
 echo Building NuGet packages ...
-nuget pack WindowsAPICodePack-Core.1.1.nuspec -NoPackageAnalysis
-nuget pack WindowsAPICodePack-ExtendedLinguisticServices.1.1.nuspec -NoPackageAnalysis
-nuget pack WindowsAPICodePack-Sensors.1.1.nuspec -NoPackageAnalysis
-nuget pack WindowsAPICodePack-Shell.1.1.nuspec -NoPackageAnalysis
-nuget pack WindowsAPICodePack-ShellExtensions.1.1.nuspec -NoPackageAnalysis
+nuget pack WindowsAPICodePack-Core.nuspec -NoPackageAnalysis
+nuget pack WindowsAPICodePack-ExtendedLinguisticServices.nuspec -NoPackageAnalysis
+nuget pack WindowsAPICodePack-Sensors.nuspec -NoPackageAnalysis
+nuget pack WindowsAPICodePack-Shell.nuspec -NoPackageAnalysis
+nuget pack WindowsAPICodePack-ShellExtensions.nuspec -NoPackageAnalysis
+nuget pack WindowsAPICodePack-DirectX.nuspec -NoPackageAnalysis
+REM nuget pack WindowsAPICodePack-DirectX.1.1-x64.nuspec -NoPackageAnalysis
+REM nuget pack WindowsAPICodePack-DirectX.1.1-x86.nuspec -NoPackageAnalysis
diff --git a/source/WindowsAPICodePack/DirectX/DirectX.sln b/source/WindowsAPICodePack/DirectX/DirectX.sln
@@ -1,10 +1,11 @@
 
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.WindowsAPICodePack.DirectX", "DirectX\DirectX.vcproj", "{446B1E21-65A1-4F56-AA2C-D2E24058B2B8}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.30723.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.WindowsAPICodePack.DirectX", "DirectX\DirectX.vcxproj", "{446B1E21-65A1-4F56-AA2C-D2E24058B2B8}"
 EndProject
 Global
-
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug with FxCop|Win32 = Debug with FxCop|Win32
 		Debug with FxCop|x64 = Debug with FxCop|x64

diff --git a/source/WindowsAPICodePack/DirectX/DirectX/DirectX.vcxproj b/source/WindowsAPICodePack/DirectX/DirectX/DirectX.vcxproj