From 7e4acae3daba2873453949d76937168e1712b8f4 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Mon, 2 Oct 2017 13:31:46 +0200 Subject: [PATCH] Remove dnxcore50 moniker from lock file - fixes #2810 --- tests/Paket.Tests/NuGetOData/ODataSpecs.fs | 22 -------- .../NuGetOData/WindowsAzure.Storage.xml | 51 ------------------- tests/Paket.Tests/Paket.Tests.fsproj | 5 +- 3 files changed, 1 insertion(+), 77 deletions(-) delete mode 100644 tests/Paket.Tests/NuGetOData/WindowsAzure.Storage.xml diff --git a/tests/Paket.Tests/NuGetOData/ODataSpecs.fs b/tests/Paket.Tests/NuGetOData/ODataSpecs.fs index d7b7d96f67..3f2c6ce67b 100644 --- a/tests/Paket.Tests/NuGetOData/ODataSpecs.fs +++ b/tests/Paket.Tests/NuGetOData/ODataSpecs.fs @@ -149,28 +149,6 @@ let ``can detect explicit dependencies for Microsoft.AspNet.WebApi.Client``() = FrameworkRestriction.And [getPortableRestriction("portable-net45+win8+wp8+wp81+wpa81"); FrameworkRestriction.NotAtLeast(DotNetFramework(FrameworkVersion.V4_5))] |> ExplicitRestriction) -[] -let ``can detect explicit dependencies for WindowsAzure.Storage``() = - let odata = parseList "NuGetOData/WindowsAzure.Storage.xml" |> ODataSearchResult.get - odata.PackageName |> shouldEqual "WindowsAzure.Storage" - odata.DownloadUrl |> shouldEqual"https://www.nuget.org/api/v2/package/WindowsAzure.Storage/4.4.1-preview" - let dependencies = odata|> NuGet.NuGetPackageCache.getDependencies |> Array.ofList - dependencies.[0] |> shouldEqual - (PackageName "Microsoft.Data.OData", DependenciesFileParser.parseVersionRequirement(">= 5.6.3"), - makeOrList [FrameworkRestriction.AtLeast(DNXCore(FrameworkVersion.V5_0))]) - - let vr,pr = - match DependenciesFileParser.parseVersionRequirement(">= 4.0.0-beta-22231") with - | VersionRequirement(vr,pr) -> vr,pr - - dependencies.[18] |> shouldEqual - (PackageName "System.Net.Http", VersionRequirement(vr,PreReleaseStatus.All), - makeOrList [FrameworkRestriction.AtLeast(DNXCore(FrameworkVersion.V5_0))]) - - dependencies.[44] |> shouldEqual - (PackageName "Newtonsoft.Json", DependenciesFileParser.parseVersionRequirement(">= 6.0.8"), - makeOrList [FrameworkRestriction.AtLeast(WindowsPhone WindowsPhoneVersion.V8); FrameworkRestriction.AtLeast(DotNetFramework(FrameworkVersion.V4))]) - [] let ``can ignore unknown frameworks``() = let parsed = parseList "NuGetOData/BenchmarkDotNet-UnknownFramework.xml" |> ODataSearchResult.get diff --git a/tests/Paket.Tests/NuGetOData/WindowsAzure.Storage.xml b/tests/Paket.Tests/NuGetOData/WindowsAzure.Storage.xml deleted file mode 100644 index 332fdc7ba0..0000000000 --- a/tests/Paket.Tests/NuGetOData/WindowsAzure.Storage.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - https://www.nuget.org/api/v2/Packages - Packages - 2015-07-16T08:58:27Z - - - https://www.nuget.org/api/v2/Packages(Id='WindowsAzure.Storage',Version='4.4.1-preview') - - - WindowsAzure.Storage - A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. - 2015-07-15T13:47:30Z - - Microsoft - - - - - 4.4.1-preview - 4.4.1-preview - - 2015-05-13T19:25:02.153 - Microsoft.Data.OData:5.6.3:aspnetcore50|Microsoft.Data.Services.Client:5.6.3:aspnetcore50|System.Spatial:5.6.3:aspnetcore50|System.Collections:4.0.10-beta-22231:aspnetcore50|System.Collections.Concurrent:4.0.0-beta-22231:aspnetcore50|System.Collections.Specialized:4.0.0-beta-22231:aspnetcore50|System.Diagnostics.Debug:4.0.10-beta-22231:aspnetcore50|System.Diagnostics.Tools:4.0.0-beta-22231:aspnetcore50|System.Diagnostics.TraceSource:4.0.0-beta-22231:aspnetcore50|System.Diagnostics.Tracing:4.0.10-beta-22231:aspnetcore50|System.Dynamic.Runtime:4.0.0-beta-22231:aspnetcore50|System.Globalization:4.0.10-beta-22231:aspnetcore50|System.IO:4.0.10-beta-22231:aspnetcore50|System.IO.FileSystem:4.0.0-beta-22231:aspnetcore50|System.IO.FileSystem.Primitives:4.0.0-beta-22231:aspnetcore50|System.Linq:4.0.0-beta-22231:aspnetcore50|System.Linq.Expressions:4.0.0-beta-22231:aspnetcore50|System.Linq.Queryable:4.0.0-beta-22231:aspnetcore50|System.Net.Http:4.0.0-beta-22231:aspnetcore50|System.Net.Primitives:4.0.10-beta-22231:aspnetcore50|System.Reflection:4.0.10-beta-22231:aspnetcore50|System.Reflection.Extensions:4.0.0-beta-22231:aspnetcore50|System.Reflection.TypeExtensions:4.0.0-beta-22231:aspnetcore50|System.Runtime:4.0.20-beta-22231:aspnetcore50|System.Runtime.Extensions:4.0.10-beta-22231:aspnetcore50|System.Runtime.InteropServices:4.0.20-beta-22231:aspnetcore50|System.Runtime.Serialization.Primitives:4.0.0-beta-22231:aspnetcore50|System.Runtime.Serialization.Xml:4.0.10-beta-22231:aspnetcore50|System.Security.Cryptography.Encoding:4.0.0-beta-22231:aspnetcore50|System.Security.Cryptography.Encryption:4.0.0-beta-22231:aspnetcore50|System.Security.Cryptography.Hashing:4.0.0-beta-22231:aspnetcore50|System.Security.Cryptography.Hashing.Algorithms:4.0.0-beta-22231:aspnetcore50|System.Text.Encoding:4.0.10-beta-22231:aspnetcore50|System.Text.Encoding.Extensions:4.0.10-beta-22231:aspnetcore50|System.Text.RegularExpressions:4.0.10-beta-22231:aspnetcore50|System.Threading:4.0.0-beta-22231:aspnetcore50|System.Threading.Tasks:4.0.10-beta-22231:aspnetcore50|System.Threading.Thread:4.0.0-beta-22231:aspnetcore50|System.Threading.ThreadPool:4.0.10-beta-22231:aspnetcore50|System.Threading.Timer:4.0.0-beta-22231:aspnetcore50|System.Xml.ReaderWriter:4.0.10-beta-22231:aspnetcore50|System.Xml.XDocument:4.0.0-beta-22231:aspnetcore50|System.Xml.XmlSerializer:4.0.0-beta-22231:aspnetcore50|Microsoft.Data.OData:5.6.3:aspnet50|Microsoft.Data.Services.Client:5.6.3:aspnet50|System.Spatial:5.6.3:aspnet50|Microsoft.Data.OData:5.6.2:net40-Client|Newtonsoft.Json:6.0.8:net40-Client|Microsoft.Data.Services.Client:5.6.2:net40-Client|Microsoft.WindowsAzure.ConfigurationManager:1.8.0.0:net40-Client|Microsoft.Azure.KeyVault.Core:0.9.1-preview:net40-Client|Microsoft.Data.OData:5.6.2:win80|Microsoft.Data.OData:5.6.2:wpa|Microsoft.Data.OData:5.6.2:wp80|Newtonsoft.Json:6.0.8:wp80|Microsoft.Azure.KeyVault.Core:0.9.1-preview:wp80|Microsoft.Data.OData:5.6.4:portable-net45+win+wpa81+MonoAndroid10+MonoTouch10 - This client library enables working with the Microsoft Azure storage services which include the blob and file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client. For this release see notes - https://github.com/Azure/azure-storage-net/blob/master/README.md and https://github.com/Azure/azure-storage-net/blob/master/changelog.txt Microsoft Azure Storage team's blog - http://blogs.msdn.com/b/windowsazurestorage/ - 2622119 - https://www.nuget.org/packages/WindowsAzure.Storage/4.4.1-preview - http://go.microsoft.com/fwlink/?LinkID=288890 - false - true - true - - 2015-05-13T19:25:02.153 - Yea3N7FUEbq/wgH1yKKv1ku2zaL0AGGckX/oXVTck7XzWWUhyu6/fc/wcfRrTgg+k6TDChDDQgmq1/GMq1cjbg== - SHA512 - 2197626 - http://go.microsoft.com/fwlink/?LinkId=235168 - https://www.nuget.org/package/ReportAbuse/WindowsAzure.Storage/4.4.1-preview - - true - Microsoft Azure Storage Table Blob File Queue Scalable windowsazureofficial - Windows Azure Storage - 3802 - 2.8.3 - - http://go.microsoft.com/fwlink/?LinkId=331471 - - - - - \ No newline at end of file diff --git a/tests/Paket.Tests/Paket.Tests.fsproj b/tests/Paket.Tests/Paket.Tests.fsproj index e7d74e7f46..88d856ecbb 100644 --- a/tests/Paket.Tests/Paket.Tests.fsproj +++ b/tests/Paket.Tests/Paket.Tests.fsproj @@ -1,4 +1,4 @@ - + @@ -168,9 +168,6 @@ Always - - Always - Always