diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 4f87dce747..d7da76aede 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,6 @@ +#### 2.63.4 - 04.05.2016 +* Implemented support for NativeReference - https://github.com/fsprojects/Paket/issues/1658 + #### 2.63.3 - 04.05.2016 * Added monoandroid60 to be matched as Some MonoAndroid - https://github.com/fsprojects/Paket/pull/1659 diff --git a/integrationtests/scenarios/i001467-cpp-native/before/MyClassLibrary/PaketTest.vcxprojtemplate b/integrationtests/scenarios/i001467-cpp-native/before/MyClassLibrary/PaketTest.vcxprojtemplate index 76a148634a..4df421163c 100644 --- a/integrationtests/scenarios/i001467-cpp-native/before/MyClassLibrary/PaketTest.vcxprojtemplate +++ b/integrationtests/scenarios/i001467-cpp-native/before/MyClassLibrary/PaketTest.vcxprojtemplate @@ -1,4 +1,4 @@ - + @@ -117,239 +117,239 @@ - + ..\packages\cpprestsdk.v120.winapp.msvcstl.dyn.rt-dyn\lib\native\v120\winapp\msvcstl\dyn\rt-dyn\arm\Debug\cpprest120d_app_2_7.dll True True - + - + ..\packages\cpprestsdk.v120.winapp.msvcstl.dyn.rt-dyn\lib\native\v120\winapp\msvcstl\dyn\rt-dyn\x64\Debug\cpprest120d_app_2_7.dll True True - + - + ..\packages\cpprestsdk.v120.winapp.msvcstl.dyn.rt-dyn\lib\native\v120\winapp\msvcstl\dyn\rt-dyn\x86\Release\cpprest120_app_2_7.dll True True - + - + ..\packages\cpprestsdk.v120.winapp.msvcstl.dyn.rt-dyn\lib\native\v120\winapp\msvcstl\dyn\rt-dyn\arm\Release\cpprest120_app_2_7.dll True True - + - + ..\packages\cpprestsdk.v120.winapp.msvcstl.dyn.rt-dyn\lib\native\v120\winapp\msvcstl\dyn\rt-dyn\x64\Release\cpprest120_app_2_7.dll True True - + - + ..\packages\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn\lib\native\v120\windesktop\msvcstl\dyn\rt-dyn\x64\Debug\cpprest120d_2_7.dll True True - + - + ..\packages\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn\lib\native\v120\windesktop\msvcstl\dyn\rt-dyn\x86\Release\cpprest120_2_7.dll True True - + - + ..\packages\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn\lib\native\v120\windesktop\msvcstl\dyn\rt-dyn\x64\Release\cpprest120_2_7.dll True True - + - + ..\packages\cpprestsdk.v120.winphone.msvcstl.dyn.rt-dyn\lib\native\v120\winphone\msvcstl\dyn\rt-dyn\arm\Debug\cpprest120d_wp81_2_7.dll True True - + - + ..\packages\cpprestsdk.v120.winphone.msvcstl.dyn.rt-dyn\lib\native\v120\winphone\msvcstl\dyn\rt-dyn\x86\Release\cpprest120_wp81_2_7.dll True True - + - + ..\packages\cpprestsdk.v120.winphone.msvcstl.dyn.rt-dyn\lib\native\v120\winphone\msvcstl\dyn\rt-dyn\arm\Release\cpprest120_wp81_2_7.dll True True - + - + ..\packages\cpprestsdk.v120.winphonesl.msvcstl.dyn.rt-dyn\lib\native\v120\winphonesl\msvcstl\dyn\rt-dyn\arm\Debug\cpprest120d_wps81_2_7.dll True True - + - + ..\packages\cpprestsdk.v120.winphonesl.msvcstl.dyn.rt-dyn\lib\native\v120\winphonesl\msvcstl\dyn\rt-dyn\x86\Release\cpprest120_wps81_2_7.dll True True - + - + ..\packages\cpprestsdk.v120.winphonesl.msvcstl.dyn.rt-dyn\lib\native\v120\winphonesl\msvcstl\dyn\rt-dyn\arm\Release\cpprest120_wps81_2_7.dll True True - + - + ..\packages\cpprestsdk.v120.winxp.msvcstl.dyn.rt-dyn\lib\native\v120\winxp\msvcstl\dyn\rt-dyn\x64\Debug\cpprest120d_xp_2_7.dll True True - + - + ..\packages\cpprestsdk.v120.winxp.msvcstl.dyn.rt-dyn\lib\native\v120\winxp\msvcstl\dyn\rt-dyn\x86\Release\cpprest120_xp_2_7.dll True True - + - + ..\packages\cpprestsdk.v120.winxp.msvcstl.dyn.rt-dyn\lib\native\v120\winxp\msvcstl\dyn\rt-dyn\x64\Release\cpprest120_xp_2_7.dll True True - + - + ..\packages\cpprestsdk.v140.winapp.msvcstl.dyn.rt-dyn\lib\native\v140\winapp\msvcstl\dyn\rt-dyn\arm\Debug\cpprest140d_uwp_2_7.dll True True - + - + ..\packages\cpprestsdk.v140.winapp.msvcstl.dyn.rt-dyn\lib\native\v140\winapp\msvcstl\dyn\rt-dyn\x64\Debug\cpprest140d_uwp_2_7.dll True True - + - + ..\packages\cpprestsdk.v140.winapp.msvcstl.dyn.rt-dyn\lib\native\v140\winapp\msvcstl\dyn\rt-dyn\x86\Release\cpprest140_uwp_2_7.dll True True - + - + ..\packages\cpprestsdk.v140.winapp.msvcstl.dyn.rt-dyn\lib\native\v140\winapp\msvcstl\dyn\rt-dyn\arm\Release\cpprest140_uwp_2_7.dll True True - + - + ..\packages\cpprestsdk.v140.winapp.msvcstl.dyn.rt-dyn\lib\native\v140\winapp\msvcstl\dyn\rt-dyn\x64\Release\cpprest140_uwp_2_7.dll True True - + - + ..\packages\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn\lib\native\v140\windesktop\msvcstl\dyn\rt-dyn\x64\Debug\cpprest140d_2_7.dll True True - + - + ..\packages\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn\lib\native\v140\windesktop\msvcstl\dyn\rt-dyn\x86\Release\cpprest140_2_7.dll True True - + - + ..\packages\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn\lib\native\v140\windesktop\msvcstl\dyn\rt-dyn\x64\Release\cpprest140_2_7.dll True True - + diff --git a/src/Paket.Core/ProjectFile.fs b/src/Paket.Core/ProjectFile.fs index f7694375cf..1cb4e364f1 100644 --- a/src/Paket.Core/ProjectFile.fs +++ b/src/Paket.Core/ProjectFile.fs @@ -718,9 +718,10 @@ module ProjectFile = | Reference.Library lib -> let fi = FileInfo (normalizePath lib) - createNode "Reference" project + let relativePath = createRelativePath project.FileName fi.FullName + if relativePath.Contains @"\native\" then createNode "NativeReference" project else createNode "Reference" project |> addAttribute "Include" (fi.Name.Replace(fi.Extension,"")) - |> addChild (createNodeSet "HintPath" (createRelativePath project.FileName fi.FullName) project) + |> addChild (createNodeSet "HintPath" relativePath project) |> addChild (createNodeSet "Private" (if copyLocal then "True" else "False") project) |> addChild (createNodeSet "Paket" "True" project) |> itemGroup.AppendChild diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj index 4ecd158bd4..17447658a9 100644 --- a/src/Paket/Paket.fsproj +++ b/src/Paket/Paket.fsproj @@ -45,7 +45,7 @@ install D:\code\tempp update - D:\code\kestrel-classic + D:\temp\ConsoleApplication1 11