diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 85f605a61d..ce4915970d 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,12 @@ +#### 5.180.1 - 2018-09-1 +* BUGFIX: Paket pack with `--template` failed trying to load the dependencies of templates who should be ignored instead - https://github.com/fsprojects/Paket/pull/3363 + +#### 5.180.0 - 2018-09-17 +* Added .NETCoreApp2.2 moniker + +#### 5.179.1 - 2018-09-14 +* BUGFIX: Fixed potential race condition when redirecting output - https://github.com/fsprojects/Paket/pull/3359 + #### 5.179.0 - 2018-09-12 * Added NuGet packaging output details to paket pack output - https://github.com/fsprojects/Paket/pull/3357 diff --git a/docs/content/http-dependencies.md b/docs/content/http-dependencies.md index 1f3bf293e7..34eccace14 100644 --- a/docs/content/http-dependencies.md +++ b/docs/content/http-dependencies.md @@ -31,6 +31,21 @@ File: test1.fs This will reference the linked file directly into your project. By default the linked file will be visible under `paket-files` directory in project. +## Referencing a zip file + +If you reference a zip file it will be unzipped relative to the downloaded zip file. + +The reference + +``` +http file:///c:/projects/library.zip library/library.zip +``` + +will: + +- write the zip file to `paket-files/localhost/library/library.zip` +- unzip the content to `paket-files/localhost/library` + ## Build action conventions The build action is determined depending on the file extension: @@ -87,3 +102,5 @@ If you want to update a file you need to use the Using [groups](groups.html) for HTTP-dependent files can be helpful to reduce the number of files that are reinstalled. + +## diff --git a/integrationtests/Paket.IntegrationTests/PackSpecs.fs b/integrationtests/Paket.IntegrationTests/PackSpecs.fs index 5b2079e99c..bc0c44ca15 100644 --- a/integrationtests/Paket.IntegrationTests/PackSpecs.fs +++ b/integrationtests/Paket.IntegrationTests/PackSpecs.fs @@ -692,3 +692,10 @@ let ``#4003 dotnet pack of a global tool with p2p``() = // Problably not as "packaged" console applications have this dependency by default, see https://www.nuget.org/packages/dotnet-mergenupkg nuspec.Dependencies.Value.Length |> shouldEqual 0 + +[] +let ``#4010-pack-template-only``() = + let scenario = "i004010-pack-template-only" + let outPath = Path.Combine(scenarioTempPath scenario, "out") + let templatePath = Path.Combine(scenarioTempPath scenario, "PaketBug", "paket.template") + paket (sprintf """pack --template "%s" "%s" --version 1.2.3 """ templatePath outPath) scenario |> ignore diff --git a/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj b/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj index aa767eb03b..7f233b7a4d 100644 --- a/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj +++ b/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj @@ -54,7 +54,7 @@ <__paket__NUnit3TestAdapter_props>net35\NUnit3TestAdapter - + <__paket__NUnit3TestAdapter_props>netcoreapp1.0\NUnit3TestAdapter @@ -62,7 +62,7 @@ - + <__paket__NETStandard_Library_targets>netstandard2.0\NETStandard.Library @@ -144,7 +144,7 @@ - + ..\..\packages\Chessie\lib\netstandard1.6\Chessie.dll @@ -164,7 +164,7 @@ - + ..\..\packages\FSharp.Core\lib\netstandard1.6\FSharp.Core.dll @@ -255,7 +255,7 @@ - + ..\..\packages\Microsoft.DotNet.InternalAbstractions.1.0.0\lib\netstandard1.3\Microsoft.DotNet.InternalAbstractions.dll @@ -275,7 +275,7 @@ - + ..\..\packages\Microsoft.Win32.Primitives\ref\netstandard1.3\Microsoft.Win32.Primitives.dll @@ -369,7 +369,7 @@ - + ..\..\packages\Newtonsoft.Json\lib\netstandard1.3\Newtonsoft.Json.dll @@ -448,7 +448,7 @@ - + ..\..\packages\NUnit\lib\netstandard1.6\nunit.framework.dll @@ -477,7 +477,7 @@ - + ..\..\packages\System.AppContext\lib\netstandard1.6\System.AppContext.dll @@ -486,7 +486,7 @@ - + ..\..\packages\System.AppContext\ref\netstandard1.6\System.AppContext.dll @@ -544,7 +544,7 @@ - + ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll @@ -564,7 +564,7 @@ - + ..\..\packages\System.Collections.Concurrent\lib\netstandard1.3\System.Collections.Concurrent.dll @@ -573,7 +573,7 @@ - + ..\..\packages\System.Collections.Concurrent\ref\netstandard1.3\System.Collections.Concurrent.dll @@ -584,7 +584,7 @@ - + ..\..\packages\System.Collections.NonGeneric\lib\netstandard1.3\System.Collections.NonGeneric.dll @@ -593,7 +593,7 @@ - + ..\..\packages\System.Collections.NonGeneric\ref\netstandard1.3\System.Collections.NonGeneric.dll @@ -604,7 +604,7 @@ - + ..\..\packages\System.Collections.Specialized\lib\netstandard1.3\System.Collections.Specialized.dll @@ -613,7 +613,7 @@ - + ..\..\packages\System.Collections.Specialized\ref\netstandard1.3\System.Collections.Specialized.dll @@ -624,7 +624,7 @@ - + ..\..\packages\System.ComponentModel\ref\netstandard1.0\System.ComponentModel.dll @@ -633,7 +633,7 @@ - + ..\..\packages\System.ComponentModel\lib\netstandard1.3\System.ComponentModel.dll @@ -644,7 +644,7 @@ - + ..\..\packages\System.ComponentModel.EventBasedAsync.4.3.0\lib\netstandard1.3\System.ComponentModel.EventBasedAsync.dll @@ -653,7 +653,7 @@ - + ..\..\packages\System.ComponentModel.EventBasedAsync.4.3.0\ref\netstandard1.3\System.ComponentModel.EventBasedAsync.dll @@ -664,7 +664,7 @@ - + ..\..\packages\System.ComponentModel.Primitives\lib\netstandard1.0\System.ComponentModel.Primitives.dll @@ -673,7 +673,7 @@ - + ..\..\packages\System.ComponentModel.Primitives\ref\netstandard1.0\System.ComponentModel.Primitives.dll @@ -702,7 +702,7 @@ - + ..\..\packages\System.ComponentModel.TypeConverter\lib\netstandard1.5\System.ComponentModel.TypeConverter.dll @@ -711,7 +711,7 @@ - + ..\..\packages\System.ComponentModel.TypeConverter\ref\netstandard1.5\System.ComponentModel.TypeConverter.dll @@ -731,7 +731,7 @@ - + ..\..\packages\System.Console\ref\netstandard1.3\System.Console.dll @@ -751,7 +751,7 @@ - + ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll @@ -771,7 +771,7 @@ - + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll @@ -782,7 +782,7 @@ - + ..\..\packages\System.Diagnostics.Process\ref\netstandard1.4\System.Diagnostics.Process.dll @@ -793,7 +793,7 @@ - + ..\..\packages\System.Diagnostics.Tools\ref\netstandard1.0\System.Diagnostics.Tools.dll @@ -831,7 +831,7 @@ - + ..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.dll @@ -842,7 +842,7 @@ - + ..\..\packages\System.Dynamic.Runtime\lib\netstandard1.3\System.Dynamic.Runtime.dll @@ -851,7 +851,7 @@ - + ..\..\packages\System.Dynamic.Runtime\ref\netstandard1.3\System.Dynamic.Runtime.dll @@ -871,7 +871,7 @@ - + ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll @@ -891,7 +891,7 @@ - + ..\..\packages\System.Globalization.Calendars\ref\netstandard1.3\System.Globalization.Calendars.dll @@ -902,7 +902,7 @@ - + ..\..\packages\System.Globalization.Extensions\ref\netstandard1.3\System.Globalization.Extensions.dll @@ -931,7 +931,7 @@ - + ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll @@ -951,7 +951,7 @@ - + ..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll @@ -1000,7 +1000,7 @@ - + ..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll @@ -1020,7 +1020,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\lib\netstandard1.3\System.IO.FileSystem.Primitives.dll @@ -1029,7 +1029,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\ref\netstandard1.3\System.IO.FileSystem.Primitives.dll @@ -1049,7 +1049,7 @@ - + ..\..\packages\System.Linq\lib\netstandard1.6\System.Linq.dll @@ -1058,7 +1058,7 @@ - + ..\..\packages\System.Linq\ref\netstandard1.6\System.Linq.dll @@ -1087,7 +1087,7 @@ - + ..\..\packages\System.Linq.Expressions\lib\netstandard1.6\System.Linq.Expressions.dll @@ -1096,7 +1096,7 @@ - + ..\..\packages\System.Linq.Expressions\ref\netstandard1.6\System.Linq.Expressions.dll @@ -1107,7 +1107,7 @@ - + ..\..\packages\System.Linq.Queryable\ref\netstandard1.0\System.Linq.Queryable.dll @@ -1116,7 +1116,7 @@ - + ..\..\packages\System.Linq.Queryable\lib\netstandard1.3\System.Linq.Queryable.dll @@ -1143,7 +1143,7 @@ - + ..\..\packages\System.Net.Http\ref\netstandard1.3\System.Net.Http.dll @@ -1172,7 +1172,7 @@ - + ..\..\packages\System.Net.Primitives\ref\netstandard1.3\System.Net.Primitives.dll @@ -1183,7 +1183,7 @@ - + ..\..\packages\System.Net.Requests\ref\netstandard1.3\System.Net.Requests.dll @@ -1214,7 +1214,7 @@ - + ..\..\packages\System.Net.WebHeaderCollection\lib\netstandard1.3\System.Net.WebHeaderCollection.dll @@ -1223,7 +1223,7 @@ - + ..\..\packages\System.Net.WebHeaderCollection\ref\netstandard1.3\System.Net.WebHeaderCollection.dll @@ -1243,7 +1243,7 @@ - + ..\..\packages\System.ObjectModel\lib\netstandard1.3\System.ObjectModel.dll @@ -1252,7 +1252,7 @@ - + ..\..\packages\System.ObjectModel\ref\netstandard1.3\System.ObjectModel.dll @@ -1281,7 +1281,7 @@ - + ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll @@ -1292,7 +1292,7 @@ - + ..\..\packages\System.Reflection.Emit\ref\netstandard1.1\System.Reflection.Emit.dll @@ -1301,7 +1301,7 @@ - + ..\..\packages\System.Reflection.Emit\lib\netstandard1.3\System.Reflection.Emit.dll @@ -1312,7 +1312,7 @@ - + ..\..\packages\System.Reflection.Emit.ILGeneration\ref\netstandard1.0\System.Reflection.Emit.ILGeneration.dll @@ -1321,7 +1321,7 @@ - + ..\..\packages\System.Reflection.Emit.ILGeneration\lib\netstandard1.3\System.Reflection.Emit.ILGeneration.dll @@ -1332,7 +1332,7 @@ - + ..\..\packages\System.Reflection.Emit.Lightweight\ref\netstandard1.0\System.Reflection.Emit.Lightweight.dll @@ -1341,7 +1341,7 @@ - + ..\..\packages\System.Reflection.Emit.Lightweight\lib\netstandard1.3\System.Reflection.Emit.Lightweight.dll @@ -1352,7 +1352,7 @@ - + ..\..\packages\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.dll @@ -1363,7 +1363,7 @@ - + ..\..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.dll @@ -1439,7 +1439,7 @@ - + ..\..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.dll @@ -1477,7 +1477,7 @@ - + ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll @@ -1506,7 +1506,7 @@ - + ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll @@ -1517,7 +1517,7 @@ - + ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll @@ -1528,7 +1528,7 @@ - + ..\..\packages\System.Runtime.InteropServices\ref\netcoreapp1.1\System.Runtime.InteropServices.dll @@ -1584,7 +1584,7 @@ - + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\lib\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1593,7 +1593,7 @@ - + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\ref\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1622,7 +1622,7 @@ - + ..\..\packages\System.Runtime.Loader\lib\netstandard1.5\System.Runtime.Loader.dll @@ -1631,7 +1631,7 @@ - + ..\..\packages\System.Runtime.Loader\ref\netstandard1.5\System.Runtime.Loader.dll @@ -1642,7 +1642,7 @@ - + ..\..\packages\System.Runtime.Numerics\ref\netstandard1.1\System.Runtime.Numerics.dll @@ -1651,7 +1651,7 @@ - + ..\..\packages\System.Runtime.Numerics\lib\netstandard1.3\System.Runtime.Numerics.dll @@ -1662,7 +1662,7 @@ - + ..\..\packages\System.Runtime.Serialization.Formatters\ref\netstandard1.3\System.Runtime.Serialization.Formatters.dll @@ -1671,7 +1671,7 @@ - + ..\..\packages\System.Runtime.Serialization.Formatters\lib\netstandard1.4\System.Runtime.Serialization.Formatters.dll @@ -1691,7 +1691,7 @@ - + ..\..\packages\System.Runtime.Serialization.Primitives\lib\netstandard1.3\System.Runtime.Serialization.Primitives.dll @@ -1700,7 +1700,7 @@ - + ..\..\packages\System.Runtime.Serialization.Primitives\ref\netstandard1.3\System.Runtime.Serialization.Primitives.dll @@ -1731,7 +1731,7 @@ - + ..\..\packages\System.Security.Claims\lib\netstandard1.3\System.Security.Claims.dll @@ -1740,7 +1740,7 @@ - + ..\..\packages\System.Security.Claims\ref\netstandard1.3\System.Security.Claims.dll @@ -1778,7 +1778,7 @@ - + ..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll @@ -1827,7 +1827,7 @@ - + ..\..\packages\System.Security.Cryptography.Csp\ref\netstandard1.3\System.Security.Cryptography.Csp.dll @@ -1847,7 +1847,7 @@ - + ..\..\packages\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.dll @@ -1905,7 +1905,7 @@ - + ..\..\packages\System.Security.Cryptography.Primitives\lib\netstandard1.3\System.Security.Cryptography.Primitives.dll @@ -1914,7 +1914,7 @@ - + ..\..\packages\System.Security.Cryptography.Primitives\ref\netstandard1.3\System.Security.Cryptography.Primitives.dll @@ -1943,7 +1943,7 @@ - + ..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.4\System.Security.Cryptography.X509Certificates.dll @@ -1954,7 +1954,7 @@ - + ..\..\packages\System.Security.Principal\lib\netstandard1.0\System.Security.Principal.dll @@ -1963,7 +1963,7 @@ - + ..\..\packages\System.Security.Principal\ref\netstandard1.0\System.Security.Principal.dll @@ -2021,7 +2021,7 @@ - + ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll @@ -2041,7 +2041,7 @@ - + ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll @@ -2108,7 +2108,7 @@ - + ..\..\packages\System.Threading\lib\netstandard1.3\System.Threading.dll @@ -2117,7 +2117,7 @@ - + ..\..\packages\System.Threading\ref\netstandard1.3\System.Threading.dll @@ -2137,7 +2137,7 @@ - + ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll @@ -2168,7 +2168,7 @@ - + ..\..\packages\System.Threading.Tasks.Parallel\ref\netstandard1.1\System.Threading.Tasks.Parallel.dll @@ -2177,7 +2177,7 @@ - + ..\..\packages\System.Threading.Tasks.Parallel\lib\netstandard1.3\System.Threading.Tasks.Parallel.dll @@ -2188,7 +2188,7 @@ - + ..\..\packages\System.Threading.Thread\lib\netstandard1.3\System.Threading.Thread.dll @@ -2197,7 +2197,7 @@ - + ..\..\packages\System.Threading.Thread\ref\netstandard1.3\System.Threading.Thread.dll @@ -2208,7 +2208,7 @@ - + ..\..\packages\System.Threading.ThreadPool\lib\netstandard1.3\System.Threading.ThreadPool.dll @@ -2217,7 +2217,7 @@ - + ..\..\packages\System.Threading.ThreadPool\ref\netstandard1.3\System.Threading.ThreadPool.dll @@ -2257,7 +2257,7 @@ - + ..\..\packages\System.Xml.ReaderWriter\lib\netstandard1.3\System.Xml.ReaderWriter.dll @@ -2266,7 +2266,7 @@ - + ..\..\packages\System.Xml.ReaderWriter\ref\netstandard1.3\System.Xml.ReaderWriter.dll @@ -2286,7 +2286,7 @@ - + ..\..\packages\System.Xml.XDocument\lib\netstandard1.3\System.Xml.XDocument.dll @@ -2295,7 +2295,7 @@ - + ..\..\packages\System.Xml.XDocument\ref\netstandard1.3\System.Xml.XDocument.dll @@ -2306,7 +2306,7 @@ - + ..\..\packages\System.Xml.XmlDocument\lib\netstandard1.3\System.Xml.XmlDocument.dll @@ -2315,7 +2315,7 @@ - + ..\..\packages\System.Xml.XmlDocument\ref\netstandard1.3\System.Xml.XmlDocument.dll @@ -2326,7 +2326,7 @@ - + ..\..\packages\System.Xml.XPath.4.3\lib\netstandard1.3\System.Xml.XPath.dll @@ -2335,7 +2335,7 @@ - + ..\..\packages\System.Xml.XPath.4.3\ref\netstandard1.3\System.Xml.XPath.dll @@ -2346,7 +2346,7 @@ - + ..\..\packages\System.Xml.XPath.XmlDocument.4.3\lib\netstandard1.3\System.Xml.XPath.XmlDocument.dll @@ -2355,7 +2355,7 @@ - + ..\..\packages\System.Xml.XPath.XmlDocument.4.3\ref\netstandard1.3\System.Xml.XPath.XmlDocument.dll diff --git a/integrationtests/scenarios/i001333-dup-refs/before/ConsoleApplication1/ConsoleApplication1.fsprojtemplate b/integrationtests/scenarios/i001333-dup-refs/before/ConsoleApplication1/ConsoleApplication1.fsprojtemplate index d7a6bd5621..cb6bff80c7 100644 --- a/integrationtests/scenarios/i001333-dup-refs/before/ConsoleApplication1/ConsoleApplication1.fsprojtemplate +++ b/integrationtests/scenarios/i001333-dup-refs/before/ConsoleApplication1/ConsoleApplication1.fsprojtemplate @@ -89,7 +89,7 @@ - + ..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll @@ -139,7 +139,7 @@ - + ..\packages\FSharp.Data\lib\portable-net45+netcore45\FSharp.Data.dll @@ -359,7 +359,7 @@ - + ..\packages\Zlib.Portable\lib\portable-net4+sl5+wp8+win8+wpa81+MonoTouch+MonoAndroid\Zlib.Portable.dll diff --git a/integrationtests/scenarios/i001467-cpp/before/MyClassLibrary/ConsoleApplication1/ConsoleApplication1.vcxprojtemplate b/integrationtests/scenarios/i001467-cpp/before/MyClassLibrary/ConsoleApplication1/ConsoleApplication1.vcxprojtemplate index 8286968703..93093cf883 100644 --- a/integrationtests/scenarios/i001467-cpp/before/MyClassLibrary/ConsoleApplication1/ConsoleApplication1.vcxprojtemplate +++ b/integrationtests/scenarios/i001467-cpp/before/MyClassLibrary/ConsoleApplication1/ConsoleApplication1.vcxprojtemplate @@ -146,7 +146,7 @@ - + ..\..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81+dnxcore50\Newtonsoft.Json.dll diff --git a/integrationtests/scenarios/i001578-transitive-ref/before/TestPaketDotNet/TestPaketDotNet.csprojtemplate b/integrationtests/scenarios/i001578-transitive-ref/before/TestPaketDotNet/TestPaketDotNet.csprojtemplate index 6e7c274806..3e2450eb11 100644 --- a/integrationtests/scenarios/i001578-transitive-ref/before/TestPaketDotNet/TestPaketDotNet.csprojtemplate +++ b/integrationtests/scenarios/i001578-transitive-ref/before/TestPaketDotNet/TestPaketDotNet.csprojtemplate @@ -122,7 +122,7 @@ - + ..\packages\Octokit\lib\portable-net45+wp80+win+wpa81\Octokit.dll diff --git a/integrationtests/scenarios/i002335-razorengine/before/MyClassLibrary/MyClassLibrary/MyClassLibrary.csprojtemplate b/integrationtests/scenarios/i002335-razorengine/before/MyClassLibrary/MyClassLibrary/MyClassLibrary.csprojtemplate index a4725dbbef..10620f66c7 100644 --- a/integrationtests/scenarios/i002335-razorengine/before/MyClassLibrary/MyClassLibrary/MyClassLibrary.csprojtemplate +++ b/integrationtests/scenarios/i002335-razorengine/before/MyClassLibrary/MyClassLibrary/MyClassLibrary.csprojtemplate @@ -396,7 +396,7 @@ - + ..\..\packages\razor4\Microsoft.AspNetCore.Razor\lib\netstandard1.3\Microsoft.AspNetCore.Razor.dll @@ -419,7 +419,7 @@ - + ..\..\packages\razor4\Microsoft.Win32.Primitives\ref\netstandard1.3\Microsoft.Win32.Primitives.dll @@ -473,7 +473,7 @@ - + ..\..\packages\razor4\System.AppContext\lib\netstandard1.6\System.AppContext.dll @@ -482,7 +482,7 @@ - + ..\..\packages\razor4\System.AppContext\ref\netstandard1.6\System.AppContext.dll @@ -493,7 +493,7 @@ - + ..\..\packages\razor4\System.Buffers\lib\netstandard1.1\System.Buffers.dll @@ -504,7 +504,7 @@ - + ..\..\packages\razor4\System.Collections\ref\netstandard1.3\System.Collections.dll @@ -515,7 +515,7 @@ - + ..\..\packages\razor4\System.Collections.Concurrent\lib\netstandard1.3\System.Collections.Concurrent.dll @@ -524,7 +524,7 @@ - + ..\..\packages\razor4\System.Collections.Concurrent\ref\netstandard1.3\System.Collections.Concurrent.dll @@ -553,7 +553,7 @@ - + ..\..\packages\razor4\System.Console\ref\netstandard1.3\System.Console.dll @@ -564,7 +564,7 @@ - + ..\..\packages\razor4\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll @@ -593,7 +593,7 @@ - + ..\..\packages\razor4\System.Diagnostics.DiagnosticSource\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll @@ -604,7 +604,7 @@ - + ..\..\packages\razor4\System.Diagnostics.Tools\ref\netstandard1.0\System.Diagnostics.Tools.dll @@ -642,7 +642,7 @@ - + ..\..\packages\razor4\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.dll @@ -653,7 +653,7 @@ - + ..\..\packages\razor4\System.Globalization\ref\netstandard1.3\System.Globalization.dll @@ -682,7 +682,7 @@ - + ..\..\packages\razor4\System.Globalization.Calendars\ref\netstandard1.3\System.Globalization.Calendars.dll @@ -711,7 +711,7 @@ - + ..\..\packages\razor4\System.Globalization.Extensions\ref\netstandard1.3\System.Globalization.Extensions.dll @@ -749,7 +749,7 @@ - + ..\..\packages\razor4\System.IO\ref\netstandard1.5\System.IO.dll @@ -799,7 +799,7 @@ - + ..\..\packages\razor4\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll @@ -859,7 +859,7 @@ - + ..\..\packages\razor4\System.IO.Compression.ZipFile\lib\netstandard1.3\System.IO.Compression.ZipFile.dll @@ -868,7 +868,7 @@ - + ..\..\packages\razor4\System.IO.Compression.ZipFile\ref\netstandard1.3\System.IO.Compression.ZipFile.dll @@ -897,7 +897,7 @@ - + ..\..\packages\razor4\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll @@ -926,7 +926,7 @@ - + ..\..\packages\razor4\System.IO.FileSystem.Primitives\lib\netstandard1.3\System.IO.FileSystem.Primitives.dll @@ -935,7 +935,7 @@ - + ..\..\packages\razor4\System.IO.FileSystem.Primitives\ref\netstandard1.3\System.IO.FileSystem.Primitives.dll @@ -973,7 +973,7 @@ - + ..\..\packages\razor4\System.Linq\lib\netstandard1.6\System.Linq.dll @@ -982,7 +982,7 @@ - + ..\..\packages\razor4\System.Linq\ref\netstandard1.6\System.Linq.dll @@ -1020,7 +1020,7 @@ - + ..\..\packages\razor4\System.Linq.Expressions\lib\netstandard1.6\System.Linq.Expressions.dll @@ -1029,7 +1029,7 @@ - + ..\..\packages\razor4\System.Linq.Expressions\ref\netstandard1.6\System.Linq.Expressions.dll @@ -1086,7 +1086,7 @@ - + ..\..\packages\razor4\System.Net.Http\ref\netstandard1.3\System.Net.Http.dll @@ -1118,7 +1118,7 @@ - + ..\..\packages\razor4\System.Net.Primitives\ref\netstandard1.3\System.Net.Primitives.dll @@ -1147,7 +1147,7 @@ - + ..\..\packages\razor4\System.Net.Sockets\ref\netstandard1.3\System.Net.Sockets.dll @@ -1158,7 +1158,7 @@ - + ..\..\packages\razor4\System.ObjectModel\lib\netstandard1.3\System.ObjectModel.dll @@ -1167,7 +1167,7 @@ - + ..\..\packages\razor4\System.ObjectModel\ref\netstandard1.3\System.ObjectModel.dll @@ -1205,7 +1205,7 @@ - + ..\..\packages\razor4\System.Reflection\ref\netstandard1.5\System.Reflection.dll @@ -1216,7 +1216,7 @@ - + ..\..\packages\razor4\System.Reflection.Emit\ref\netstandard1.1\System.Reflection.Emit.dll @@ -1225,7 +1225,7 @@ - + ..\..\packages\razor4\System.Reflection.Emit\lib\netstandard1.3\System.Reflection.Emit.dll @@ -1236,7 +1236,7 @@ - + ..\..\packages\razor4\System.Reflection.Emit.ILGeneration\ref\netstandard1.0\System.Reflection.Emit.ILGeneration.dll @@ -1245,7 +1245,7 @@ - + ..\..\packages\razor4\System.Reflection.Emit.ILGeneration\lib\netstandard1.3\System.Reflection.Emit.ILGeneration.dll @@ -1256,7 +1256,7 @@ - + ..\..\packages\razor4\System.Reflection.Emit.Lightweight\ref\netstandard1.0\System.Reflection.Emit.Lightweight.dll @@ -1265,7 +1265,7 @@ - + ..\..\packages\razor4\System.Reflection.Emit.Lightweight\lib\netstandard1.3\System.Reflection.Emit.Lightweight.dll @@ -1276,7 +1276,7 @@ - + ..\..\packages\razor4\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.dll @@ -1287,7 +1287,7 @@ - + ..\..\packages\razor4\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.dll @@ -1332,7 +1332,7 @@ - + ..\..\packages\razor4\System.Reflection.TypeExtensions\lib\netstandard1.5\System.Reflection.TypeExtensions.dll @@ -1341,7 +1341,7 @@ - + ..\..\packages\razor4\System.Reflection.TypeExtensions\ref\netstandard1.5\System.Reflection.TypeExtensions.dll @@ -1352,7 +1352,7 @@ - + ..\..\packages\razor4\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.dll @@ -1400,7 +1400,7 @@ - + ..\..\packages\razor4\System.Runtime\ref\netstandard1.5\System.Runtime.dll @@ -1438,7 +1438,7 @@ - + ..\..\packages\razor4\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll @@ -1449,7 +1449,7 @@ - + ..\..\packages\razor4\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll @@ -1494,7 +1494,7 @@ - + ..\..\packages\razor4\System.Runtime.InteropServices\ref\netcoreapp1.1\System.Runtime.InteropServices.dll @@ -1532,7 +1532,7 @@ - + ..\..\packages\razor4\System.Runtime.InteropServices.RuntimeInformation\lib\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1541,7 +1541,7 @@ - + ..\..\packages\razor4\System.Runtime.InteropServices.RuntimeInformation\ref\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1568,7 +1568,7 @@ - + ..\..\packages\razor4\System.Runtime.Numerics\ref\netstandard1.1\System.Runtime.Numerics.dll @@ -1577,7 +1577,7 @@ - + ..\..\packages\razor4\System.Runtime.Numerics\lib\netstandard1.3\System.Runtime.Numerics.dll @@ -1656,7 +1656,7 @@ - + ..\..\packages\razor4\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll @@ -1717,7 +1717,7 @@ - + ..\..\packages\razor4\System.Security.Cryptography.Cng\ref\netstandard1.6\System.Security.Cryptography.Cng.dll @@ -1746,7 +1746,7 @@ - + ..\..\packages\razor4\System.Security.Cryptography.Csp\ref\netstandard1.3\System.Security.Cryptography.Csp.dll @@ -1775,7 +1775,7 @@ - + ..\..\packages\razor4\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.dll @@ -1786,7 +1786,7 @@ - + ..\..\packages\razor4\System.Security.Cryptography.OpenSsl\lib\netstandard1.6\System.Security.Cryptography.OpenSsl.dll @@ -1795,7 +1795,7 @@ - + ..\..\packages\razor4\System.Security.Cryptography.OpenSsl\ref\netstandard1.6\System.Security.Cryptography.OpenSsl.dll @@ -1824,7 +1824,7 @@ - + ..\..\packages\razor4\System.Security.Cryptography.Primitives\lib\netstandard1.3\System.Security.Cryptography.Primitives.dll @@ -1833,7 +1833,7 @@ - + ..\..\packages\razor4\System.Security.Cryptography.Primitives\ref\netstandard1.3\System.Security.Cryptography.Primitives.dll @@ -1887,7 +1887,7 @@ - + ..\..\packages\razor4\System.Security.Cryptography.X509Certificates\ref\netstandard1.4\System.Security.Cryptography.X509Certificates.dll @@ -1898,7 +1898,7 @@ - + ..\..\packages\razor4\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll @@ -1909,7 +1909,7 @@ - + ..\..\packages\razor4\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll @@ -1938,7 +1938,7 @@ - + ..\..\packages\razor4\System.Text.RegularExpressions\ref\netcoreapp1.1\System.Text.RegularExpressions.dll @@ -1956,7 +1956,7 @@ - + ..\..\packages\razor4\System.Text.RegularExpressions\lib\netstandard1.6\System.Text.RegularExpressions.dll @@ -1976,7 +1976,7 @@ - + ..\..\packages\razor4\System.Threading\lib\netstandard1.3\System.Threading.dll @@ -1985,7 +1985,7 @@ - + ..\..\packages\razor4\System.Threading\ref\netstandard1.3\System.Threading.dll @@ -1996,7 +1996,7 @@ - + ..\..\packages\razor4\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll @@ -2007,7 +2007,7 @@ - + ..\..\packages\razor4\System.Threading.Tasks.Extensions\lib\netstandard1.0\System.Threading.Tasks.Extensions.dll @@ -2036,7 +2036,7 @@ - + ..\..\packages\razor4\System.Threading.Thread\lib\netstandard1.3\System.Threading.Thread.dll @@ -2045,7 +2045,7 @@ - + ..\..\packages\razor4\System.Threading.Thread\ref\netstandard1.3\System.Threading.Thread.dll @@ -2056,7 +2056,7 @@ - + ..\..\packages\razor4\System.Threading.Timer\ref\netstandard1.2\System.Threading.Timer.dll @@ -2095,7 +2095,7 @@ - + ..\..\packages\razor4\System.Xml.ReaderWriter\lib\netstandard1.3\System.Xml.ReaderWriter.dll @@ -2104,7 +2104,7 @@ - + ..\..\packages\razor4\System.Xml.ReaderWriter\ref\netstandard1.3\System.Xml.ReaderWriter.dll @@ -2122,7 +2122,7 @@ - + ..\..\packages\razor4\System.Xml.XDocument\lib\netstandard1.3\System.Xml.XDocument.dll @@ -2131,7 +2131,7 @@ - + ..\..\packages\razor4\System.Xml.XDocument\ref\netstandard1.3\System.Xml.XDocument.dll diff --git a/integrationtests/scenarios/i004010-pack-template-only/before/PaketBug/hello.txt b/integrationtests/scenarios/i004010-pack-template-only/before/PaketBug/hello.txt new file mode 100644 index 0000000000..ce01362503 --- /dev/null +++ b/integrationtests/scenarios/i004010-pack-template-only/before/PaketBug/hello.txt @@ -0,0 +1 @@ +hello diff --git a/integrationtests/scenarios/i004010-pack-template-only/before/PaketBug/paket.template b/integrationtests/scenarios/i004010-pack-template-only/before/PaketBug/paket.template new file mode 100644 index 0000000000..2aa2b0956d --- /dev/null +++ b/integrationtests/scenarios/i004010-pack-template-only/before/PaketBug/paket.template @@ -0,0 +1,8 @@ +type file +id a +description + Silly empty demo project +authors Paket team + +files + hello.txt ==> content/docs diff --git a/integrationtests/scenarios/i004010-pack-template-only/before/PaketBug2/PaketBug2.csprojtemplate b/integrationtests/scenarios/i004010-pack-template-only/before/PaketBug2/PaketBug2.csprojtemplate new file mode 100644 index 0000000000..c1bb81aa65 --- /dev/null +++ b/integrationtests/scenarios/i004010-pack-template-only/before/PaketBug2/PaketBug2.csprojtemplate @@ -0,0 +1,61 @@ + + + + + Debug + AnyCPU + 5b41a984-0c88-41c7-8669-41d298d0e450 + Library + Properties + PaketBug2 + + v4.5.2 + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/integrationtests/scenarios/i004010-pack-template-only/before/PaketBug2/paket.template b/integrationtests/scenarios/i004010-pack-template-only/before/PaketBug2/paket.template new file mode 100644 index 0000000000..76744b947b --- /dev/null +++ b/integrationtests/scenarios/i004010-pack-template-only/before/PaketBug2/paket.template @@ -0,0 +1,8 @@ +type file +id b +description + Silly empty demo project +authors Paket team + +files + a/non_existing.txt ==> content/docs diff --git a/integrationtests/scenarios/i004010-pack-template-only/before/paket.dependencies b/integrationtests/scenarios/i004010-pack-template-only/before/paket.dependencies new file mode 100644 index 0000000000..c78b16de6a --- /dev/null +++ b/integrationtests/scenarios/i004010-pack-template-only/before/paket.dependencies @@ -0,0 +1 @@ +source https://nuget.org/api/v2 diff --git a/integrationtests/scenarios/i004010-pack-template-only/before/paket.lock b/integrationtests/scenarios/i004010-pack-template-only/before/paket.lock new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/integrationtests/scenarios/i004010-pack-template-only/before/paket.lock @@ -0,0 +1 @@ + diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index 0354e74397..776ec60654 100644 --- a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs +++ b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs @@ -4,16 +4,16 @@ [assembly: AssemblyTitleAttribute("Paket.Bootstrapper")] [assembly: AssemblyProductAttribute("Paket")] [assembly: AssemblyDescriptionAttribute("A dependency manager for .NET with support for NuGet packages and git repositories.")] -[assembly: AssemblyVersionAttribute("5.179.0")] -[assembly: AssemblyFileVersionAttribute("5.179.0")] -[assembly: AssemblyInformationalVersionAttribute("5.179.0")] +[assembly: AssemblyVersionAttribute("5.180.1")] +[assembly: AssemblyFileVersionAttribute("5.180.1")] +[assembly: AssemblyInformationalVersionAttribute("5.180.1")] namespace System { internal static class AssemblyVersionInformation { internal const System.String AssemblyTitle = "Paket.Bootstrapper"; internal const System.String AssemblyProduct = "Paket"; internal const System.String AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories."; - internal const System.String AssemblyVersion = "5.179.0"; - internal const System.String AssemblyFileVersion = "5.179.0"; - internal const System.String AssemblyInformationalVersion = "5.179.0"; + internal const System.String AssemblyVersion = "5.180.1"; + internal const System.String AssemblyFileVersion = "5.180.1"; + internal const System.String AssemblyInformationalVersion = "5.180.1"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index 522f0b8f4b..37bbd0daf1 100644 --- a/src/Paket.Core/AssemblyInfo.fs +++ b/src/Paket.Core/AssemblyInfo.fs @@ -6,9 +6,9 @@ open System.Reflection [] [] [] -[] -[] -[] +[] +[] +[] do () module internal AssemblyVersionInformation = @@ -16,6 +16,6 @@ module internal AssemblyVersionInformation = let [] AssemblyProduct = "Paket" let [] AssemblyCompany = "Paket team" let [] AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories." - let [] AssemblyVersion = "5.179.0" - let [] AssemblyFileVersion = "5.179.0" - let [] AssemblyInformationalVersion = "5.179.0" + let [] AssemblyVersion = "5.180.1" + let [] AssemblyFileVersion = "5.180.1" + let [] AssemblyInformationalVersion = "5.180.1" diff --git a/src/Paket.Core/Common/ProcessHelper.fs b/src/Paket.Core/Common/ProcessHelper.fs index eed6a98bdb..b829205dfd 100644 --- a/src/Paket.Core/Common/ProcessHelper.fs +++ b/src/Paket.Core/Common/ProcessHelper.fs @@ -181,6 +181,8 @@ let ExecProcessWithLambdas configProcessStartInfoF (timeOut : TimeSpan) silent e null with exn -> exn raise (Exception(sprintf "Process %s %s timed out." proc.StartInfo.FileName proc.StartInfo.Arguments, inner)) + // See http://stackoverflow.com/a/16095658/1149924 why WaitForExit must be called twice. + proc.WaitForExit() proc.ExitCode /// A process result including error code, message log and errors. diff --git a/src/Paket.Core/Packaging/PackageProcess.fs b/src/Paket.Core/Packaging/PackageProcess.fs index 8d963aab62..1987a10893 100644 --- a/src/Paket.Core/Packaging/PackageProcess.fs +++ b/src/Paket.Core/Packaging/PackageProcess.fs @@ -152,7 +152,9 @@ let Pack(workingDir,dependenciesFile : DependenciesFile, packageOutputPath, buil | None -> None | Some fileName -> match ProjectFile.tryLoad projectFile.FullName with - | Some projectFile -> Some(projectFile,TemplateFile.Load(fileName,lockFile,version,specificVersions)) + | Some projectFile -> + let templateFileParsed = TemplateFile.ParseFromFile(fileName,lockFile,version,specificVersions) + Some(projectFile,templateFileParsed) | None -> None) |> Array.filter (fun (_,templateFile) -> match templateFile with @@ -168,7 +170,9 @@ let Pack(workingDir,dependenciesFile : DependenciesFile, packageOutputPath, buil | _ -> true) |> Array.map (fun (projectFile,templateFile') -> allTemplateFiles.Remove(templateFile'.FileName) |> ignore - let merged = lazy (merge buildConfig buildPlatform version specificVersions projectFile templateFile') + let merged = lazy ( + let loadedTemplate = TemplateFile.ValidateTemplate templateFile' + merge buildConfig buildPlatform version specificVersions projectFile loadedTemplate) let willBePacked = match templateFile with | Some file -> normalizePath (Path.GetFullPath file) = normalizePath (Path.GetFullPath templateFile'.FileName) diff --git a/src/Paket.Core/PaketConfigFiles/TemplateFile.fs b/src/Paket.Core/PaketConfigFiles/TemplateFile.fs index 0b590adbf6..ce9516d3f5 100644 --- a/src/Paket.Core/PaketConfigFiles/TemplateFile.fs +++ b/src/Paket.Core/PaketConfigFiles/TemplateFile.fs @@ -587,18 +587,23 @@ module internal TemplateFile = return CompleteInfo(core, optionalInfo) } - let Load(fileName,lockFile,currentVersion,specificVersions) = + let internal ParseFromFile(fileName,lockFile,currentVersion,specificVersions) = let fi = FileInfo fileName - let root = fi.Directory.FullName let contents = Parse(fi.FullName,lockFile,currentVersion,specificVersions, File.OpenRead fileName) |> returnOrFail + + { FileName = fileName + Contents = contents } + + let internal ValidateTemplate(parsed) = + let root = (FileInfo parsed.FileName).Directory.FullName let getFiles files = [ for source, target in files do match Fake.Globbing.search root source with | [] -> if source.Contains "*" || source.Contains "?" then - traceWarnfn "The file pattern \"%s\" in %s did not match any files." source fileName + traceWarnfn "The file pattern \"%s\" in %s did not match any files." source parsed.FileName else - failwithf "The file \"%s\" requested in %s does not exist." source fileName + failwithf "The file \"%s\" requested in %s does not exist." source parsed.FileName | searchResult -> for file in searchResult do if source.Contains("**") then @@ -609,9 +614,9 @@ module internal TemplateFile = else yield file, target ] - { FileName = fileName + { FileName = parsed.FileName Contents = - match contents with + match parsed.Contents with | CompleteInfo(core, optionalInfo) -> let files = getFiles optionalInfo.Files CompleteInfo(core, { optionalInfo with Files = files }) @@ -619,6 +624,10 @@ module internal TemplateFile = let files = getFiles optionalInfo.Files ProjectInfo(core, { optionalInfo with Files = files }) } + let Load(fileName,lockFile,currentVersion,specificVersions) = + let parsed = ParseFromFile(fileName,lockFile,currentVersion,specificVersions) + ValidateTemplate parsed + let IsProjectType (filename: string) : bool = match TemplateParser.parse (File.ReadAllText filename) with | Choice1Of2 m -> diff --git a/src/Paket.Core/Versioning/FrameworkHandling.fs b/src/Paket.Core/Versioning/FrameworkHandling.fs index 7a848a3787..c5d897f3ae 100644 --- a/src/Paket.Core/Versioning/FrameworkHandling.fs +++ b/src/Paket.Core/Versioning/FrameworkHandling.fs @@ -193,18 +193,21 @@ type DotNetCoreAppVersion = | V1_1 | V2_0 | V2_1 + | V2_2 member private this.NumKey = match this with | V1_0 -> 0 | V1_1 -> 1 | V2_0 -> 2 | V2_1 -> 3 + | V2_2 -> 4 static member private FromNum num = match num with | 0 -> V1_0 | 1 -> V1_1 | 2 -> V2_0 | 3 -> V2_1 + | 4 -> V2_2 | _ -> failwithf "'%i' has no corresponding framework version" num static member (<->) (lower:DotNetCoreAppVersion,upper:DotNetCoreAppVersion) = if lower.NumKey < upper.NumKey then @@ -217,18 +220,21 @@ type DotNetCoreAppVersion = | V1_1 -> "v1.1" | V2_0 -> "v2.0" | V2_1 -> "v2.1" + | V2_2 -> "v2.2" member this.ShortString() = match this with | DotNetCoreAppVersion.V1_0 -> "1.0" | DotNetCoreAppVersion.V1_1 -> "1.1" | DotNetCoreAppVersion.V2_0 -> "2.0" | DotNetCoreAppVersion.V2_1 -> "2.1" + | DotNetCoreAppVersion.V2_2 -> "2.2" static member TryParse s = match s with | "" | "1" -> Some (DotNetCoreAppVersion.V1_0) | "1.1" -> Some (DotNetCoreAppVersion.V1_1) | "2" -> Some (DotNetCoreAppVersion.V2_0) | "2.1" -> Some (DotNetCoreAppVersion.V2_1) + | "2.2" -> Some (DotNetCoreAppVersion.V2_2) | _ -> None [] @@ -617,8 +623,9 @@ type FrameworkIdentifier = | DotNetStandard DotNetStandardVersion.V2_0 -> [ DotNetStandard DotNetStandardVersion.V1_6 ] | DotNetCoreApp DotNetCoreAppVersion.V1_0 -> [ DotNetStandard DotNetStandardVersion.V1_6 ] | DotNetCoreApp DotNetCoreAppVersion.V1_1 -> [ DotNetCoreApp DotNetCoreAppVersion.V1_0 ] - | DotNetCoreApp DotNetCoreAppVersion.V2_0 -> [ DotNetCoreApp DotNetCoreAppVersion.V1_1; DotNetStandard DotNetStandardVersion.V2_0 ] + | DotNetCoreApp DotNetCoreAppVersion.V2_0 -> [ DotNetCoreApp DotNetCoreAppVersion.V1_1; DotNetStandard DotNetStandardVersion.V2_0 ] | DotNetCoreApp DotNetCoreAppVersion.V2_1 -> [ DotNetCoreApp DotNetCoreAppVersion.V2_0 ] + | DotNetCoreApp DotNetCoreAppVersion.V2_2 -> [ DotNetCoreApp DotNetCoreAppVersion.V2_1 ] | DotNetUnity DotNetUnityVersion.V3_5_Full -> [ ] | DotNetUnity DotNetUnityVersion.V3_5_Subset -> [ ] | DotNetUnity DotNetUnityVersion.V3_5_Micro -> [ ] @@ -1135,6 +1142,7 @@ module KnownTargetProfiles = DotNetCoreAppVersion.V1_1 DotNetCoreAppVersion.V2_0 DotNetCoreAppVersion.V2_1 + DotNetCoreAppVersion.V2_2 ] let DotNetUnityVersions = [ diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index f8c599b320..bcc9ffb081 100644 --- a/src/Paket/AssemblyInfo.fs +++ b/src/Paket/AssemblyInfo.fs @@ -6,9 +6,9 @@ open System.Reflection [] [] [] -[] -[] -[] +[] +[] +[] do () module internal AssemblyVersionInformation = @@ -16,6 +16,6 @@ module internal AssemblyVersionInformation = let [] AssemblyProduct = "Paket" let [] AssemblyCompany = "Paket team" let [] AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories." - let [] AssemblyVersion = "5.179.0" - let [] AssemblyFileVersion = "5.179.0" - let [] AssemblyInformationalVersion = "5.179.0" + let [] AssemblyVersion = "5.180.1" + let [] AssemblyFileVersion = "5.180.1" + let [] AssemblyInformationalVersion = "5.180.1" diff --git a/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs b/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs index 36dc21af86..b2e26e5d97 100644 --- a/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs +++ b/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs @@ -33,7 +33,7 @@ let expected = """ - + ..\..\..\Rx-XAML\lib\portable-win81+wpa81\System.Reactive.Windows.Threading.dll diff --git a/tests/Paket.Tests/InstallModel/Xml/System.Security.Cryptography.Algorithms.fs b/tests/Paket.Tests/InstallModel/Xml/System.Security.Cryptography.Algorithms.fs index b63ffbd52c..7bdc7e69fd 100644 --- a/tests/Paket.Tests/InstallModel/Xml/System.Security.Cryptography.Algorithms.fs +++ b/tests/Paket.Tests/InstallModel/Xml/System.Security.Cryptography.Algorithms.fs @@ -54,7 +54,7 @@ let expected = """ - + ..\..\..\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll diff --git a/tests/Paket.Tests/InstallModel/Xml/SystemNetHttp.fs b/tests/Paket.Tests/InstallModel/Xml/SystemNetHttp.fs index 98541b00bc..270ccd74c4 100644 --- a/tests/Paket.Tests/InstallModel/Xml/SystemNetHttp.fs +++ b/tests/Paket.Tests/InstallModel/Xml/SystemNetHttp.fs @@ -108,7 +108,7 @@ let expected = """ - + ..\..\..\Microsoft.Net.Http\lib\portable-net45+win8\System.Net.Http.Extensions.dll diff --git a/tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs b/tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs index 4ff7fa89fe..3e5925d09f 100644 --- a/tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs +++ b/tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs @@ -20,7 +20,7 @@ let expectedPropertyDefinitionNodes = """ <__paket__xunit_runner_visualstudio_props>net20\xunit.runner.visualstudio - + <__paket__xunit_runner_visualstudio_props>portable-net45+aspnetcore50+win+wpa81+wp80+monotouch+monoandroid\xunit.runner.visualstudio diff --git a/tests/Paket.Tests/Versioning/FrameworkCompatibilitySpecs.fs b/tests/Paket.Tests/Versioning/FrameworkCompatibilitySpecs.fs index bc40939805..ab1b8b2fea 100644 --- a/tests/Paket.Tests/Versioning/FrameworkCompatibilitySpecs.fs +++ b/tests/Paket.Tests/Versioning/FrameworkCompatibilitySpecs.fs @@ -82,6 +82,20 @@ let ``netcoreapp2.1 should be compatible with netstandard2.0``() = ``netstandard2.0``.IsSmallerThan ``netcoreapp2.1`` |> shouldEqual true +[] +let ``netcoreapp2.2 should be compatible with netstandard2.0``() = + let ``netstandard2.0`` = TargetProfile.SinglePlatform (DotNetStandard DotNetStandardVersion.V2_0) + let ``netcoreapp2.2`` = TargetProfile.SinglePlatform (DotNetCoreApp DotNetCoreAppVersion.V2_2) + + ``netcoreapp2.2``.IsAtLeast ``netstandard2.0`` + |> shouldEqual true + + ``netstandard2.0``.IsSupportedBy ``netcoreapp2.2`` + |> shouldEqual true + + ``netstandard2.0``.IsSmallerThan ``netcoreapp2.2`` + |> shouldEqual true + [] let ``monoandroid8.0 should be compatible with netstandard2.0``() = let ``netstandard2.0`` = TargetProfile.SinglePlatform (DotNetStandard DotNetStandardVersion.V2_0)