From 4de76e56bfc7144f2ebbea81e44f1277a17aa8b0 Mon Sep 17 00:00:00 2001 From: Yaakov Date: Wed, 13 Jun 2018 17:30:44 +1000 Subject: [PATCH 01/86] Fix infinite recursion when handling errors. Fixes #3249. --- src/Paket.Core/Installation/RestoreProcess.fs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Paket.Core/Installation/RestoreProcess.fs b/src/Paket.Core/Installation/RestoreProcess.fs index a3f84584f2..2b6d0cc99b 100644 --- a/src/Paket.Core/Installation/RestoreProcess.fs +++ b/src/Paket.Core/Installation/RestoreProcess.fs @@ -393,7 +393,7 @@ let createProjectReferencesFiles (lockFile:LockFile) (projectFile:ProjectFile) ( if verbose then tracefn " - %s already up-to-date" newFileName.FullName with - | exn -> + | exn when trials > 0 -> if verbose then tracefn "Failed to save resolved file %s. Retry. Message: %s" newFileName.FullName exn.Message System.Threading.Thread.Sleep(100) @@ -421,7 +421,7 @@ let createProjectReferencesFiles (lockFile:LockFile) (projectFile:ProjectFile) ( // it can happen that the references file doesn't exist if paket doesn't find one in that case we update the cache by deleting it. if paketCachedReferencesFileName.Exists then paketCachedReferencesFileName.Delete() with - | exn -> + | exn when trials > 0 -> if verbose then tracefn "Failed to save cached file %s. Retry. Message: %s" paketCachedReferencesFileName.FullName exn.Message System.Threading.Thread.Sleep(100) From 152e4370f0d10b2b3f8cd25ee051cb6f6e9a0ba7 Mon Sep 17 00:00:00 2001 From: Ilja Nosik Date: Thu, 14 Jun 2018 14:15:52 +0200 Subject: [PATCH 02/86] Only emit version numbers in packages.config Fixes #3231. Partially reverts 833b36c13. --- src/Paket.Core/PaketConfigFiles/PackagesConfigFile.fs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/Paket.Core/PaketConfigFiles/PackagesConfigFile.fs b/src/Paket.Core/PaketConfigFiles/PackagesConfigFile.fs index 1c50be4fdb..57a71c7e33 100644 --- a/src/Paket.Core/PaketConfigFiles/PackagesConfigFile.fs +++ b/src/Paket.Core/PaketConfigFiles/PackagesConfigFile.fs @@ -36,13 +36,6 @@ let Serialize (packages: NugetPackage seq) = | Some tf -> sprintf "targetFramework=\"%s\" " (tf.Replace(">= ","")) | _ -> "" - Some (sprintf """ """ p.Id v framework) - | VersionRange.Minimum v -> - let framework = - match p.TargetFramework with - | Some tf -> sprintf "targetFramework=\"%s\" " (tf.Replace(">= ","")) - | _ -> "" - Some (sprintf """ """ p.Id v framework) | _ -> None) From e474e8d12ebaddfcb00480391e3061ee73349994 Mon Sep 17 00:00:00 2001 From: Ilja Nosik Date: Thu, 14 Jun 2018 13:41:00 +0200 Subject: [PATCH 03/86] Remove bad tests The packages.config file doesn't allow version ranges. --- tests/Paket.Tests.preview3/Paket.Tests.fsproj | 1 - tests/Paket.Tests/PackagesConfig/ReadConfig.fs | 8 -------- tests/Paket.Tests/PackagesConfig/WriteConfig.fs | 7 ------- .../PackagesConfig/xunit.visualstudio.packages2.config | 4 ---- tests/Paket.Tests/Paket.Tests.fsproj | 3 --- 5 files changed, 23 deletions(-) delete mode 100644 tests/Paket.Tests/PackagesConfig/xunit.visualstudio.packages2.config diff --git a/tests/Paket.Tests.preview3/Paket.Tests.fsproj b/tests/Paket.Tests.preview3/Paket.Tests.fsproj index 693e2c1489..cd3aeb3bf7 100644 --- a/tests/Paket.Tests.preview3/Paket.Tests.fsproj +++ b/tests/Paket.Tests.preview3/Paket.Tests.fsproj @@ -58,7 +58,6 @@ - diff --git a/tests/Paket.Tests/PackagesConfig/ReadConfig.fs b/tests/Paket.Tests/PackagesConfig/ReadConfig.fs index 3f24fade5b..282252dbea 100644 --- a/tests/Paket.Tests/PackagesConfig/ReadConfig.fs +++ b/tests/Paket.Tests/PackagesConfig/ReadConfig.fs @@ -12,11 +12,3 @@ let ``can read xunit.visualstudio.packages.config``() = config.Id |> shouldEqual "xunit.runner.visualstudio" config.TargetFramework |> shouldEqual None config.VersionRequirement.Range |> shouldEqual (VersionRange.Minimum (SemVer.Parse "2.0.1")) - -[] -let ``can read xunit.visualstudio.packages2.config``() = - let config = Read("PackagesConfig/xunit.visualstudio.packages2.config") |> List.head - - config.Id |> shouldEqual "xunit.runner.visualstudio" - config.TargetFramework |> shouldEqual None - config.VersionRequirement.Range |> shouldEqual (VersionRange.Specific (SemVer.Parse "2.0.1")) \ No newline at end of file diff --git a/tests/Paket.Tests/PackagesConfig/WriteConfig.fs b/tests/Paket.Tests/PackagesConfig/WriteConfig.fs index 02ee483afe..ed5ba26934 100644 --- a/tests/Paket.Tests/PackagesConfig/WriteConfig.fs +++ b/tests/Paket.Tests/PackagesConfig/WriteConfig.fs @@ -14,13 +14,6 @@ let ``can write xunit.visualstudio.packages.config``() = let expected = File.ReadAllText fileName |> normalizeLineEndings Serialize config |> normalizeLineEndings |> shouldEqual expected -[] -let ``can write xunit.visualstudio.package2s.config``() = - let fileName = "PackagesConfig/xunit.visualstudio.packages2.config" - let config = Read fileName - let expected = File.ReadAllText fileName |> normalizeLineEndings - Serialize config |> normalizeLineEndings |> shouldEqual expected - [] let ``can write asp.net.packages.config``() = let fileName = "PackagesConfig/asp.net.packages.config" diff --git a/tests/Paket.Tests/PackagesConfig/xunit.visualstudio.packages2.config b/tests/Paket.Tests/PackagesConfig/xunit.visualstudio.packages2.config deleted file mode 100644 index 57fc69571c..0000000000 --- a/tests/Paket.Tests/PackagesConfig/xunit.visualstudio.packages2.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/tests/Paket.Tests/Paket.Tests.fsproj b/tests/Paket.Tests/Paket.Tests.fsproj index 241fa7fa90..bec0c72427 100644 --- a/tests/Paket.Tests/Paket.Tests.fsproj +++ b/tests/Paket.Tests/Paket.Tests.fsproj @@ -138,9 +138,6 @@ Always - - Always - Always From c313039072b53dcfd41354e576ba8e73f7c8b24e Mon Sep 17 00:00:00 2001 From: Ilja Nosik Date: Thu, 14 Jun 2018 14:59:43 +0200 Subject: [PATCH 04/86] Fix failing tests --- src/Paket.Core/PaketConfigFiles/PackagesConfigFile.fs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Paket.Core/PaketConfigFiles/PackagesConfigFile.fs b/src/Paket.Core/PaketConfigFiles/PackagesConfigFile.fs index 57a71c7e33..c444e315bf 100644 --- a/src/Paket.Core/PaketConfigFiles/PackagesConfigFile.fs +++ b/src/Paket.Core/PaketConfigFiles/PackagesConfigFile.fs @@ -30,7 +30,8 @@ let Serialize (packages: NugetPackage seq) = packages |> Seq.choose (fun p -> match p.VersionRequirement.Range with - | VersionRange.Specific v -> + | VersionRange.Specific v + | VersionRange.Minimum v -> let framework = match p.TargetFramework with | Some tf -> sprintf "targetFramework=\"%s\" " (tf.Replace(">= ","")) From 671bae9fca66d7023523287f9e69df6e26352234 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Mon, 18 Jun 2018 15:17:33 +0200 Subject: [PATCH 05/86] release notes --- RELEASE_NOTES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 7a2ff4ee41..4d3a48a68a 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,6 @@ +#### 5.172.3 - 2018-06-18 +* BUGFIX: Fix infinite recursion when handling errors - https://github.com/fsprojects/Paket/pull/3251 + #### 5.172.2 - 2018-06-11 * BUGFIX: Report only transitive settings changes - https://github.com/fsprojects/Paket/issues/3218 From b495e3d915e31d0a568618bc09dcd11eb3878f52 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Mon, 18 Jun 2018 15:32:09 +0200 Subject: [PATCH 06/86] Bump version to 5.172.3 --- src/Paket.Bootstrapper/Properties/AssemblyInfo.cs | 12 ++++++------ src/Paket.Core/AssemblyInfo.fs | 12 ++++++------ src/Paket/AssemblyInfo.fs | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index 71105cc781..f736535d9a 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.172.2")] -[assembly: AssemblyFileVersionAttribute("5.172.2")] -[assembly: AssemblyInformationalVersionAttribute("5.172.2")] +[assembly: AssemblyVersionAttribute("5.172.3")] +[assembly: AssemblyFileVersionAttribute("5.172.3")] +[assembly: AssemblyInformationalVersionAttribute("5.172.3")] 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.172.2"; - internal const System.String AssemblyFileVersion = "5.172.2"; - internal const System.String AssemblyInformationalVersion = "5.172.2"; + internal const System.String AssemblyVersion = "5.172.3"; + internal const System.String AssemblyFileVersion = "5.172.3"; + internal const System.String AssemblyInformationalVersion = "5.172.3"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index c0ea320870..7cc61472c6 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.172.2" - let [] AssemblyFileVersion = "5.172.2" - let [] AssemblyInformationalVersion = "5.172.2" + let [] AssemblyVersion = "5.172.3" + let [] AssemblyFileVersion = "5.172.3" + let [] AssemblyInformationalVersion = "5.172.3" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index 6bdc17ef27..7fcfca7017 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.172.2" - let [] AssemblyFileVersion = "5.172.2" - let [] AssemblyInformationalVersion = "5.172.2" + let [] AssemblyVersion = "5.172.3" + let [] AssemblyFileVersion = "5.172.3" + let [] AssemblyInformationalVersion = "5.172.3" From 9e5aef518a91944d8401b73f15cc4ff3c19f39f9 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Mon, 18 Jun 2018 15:37:47 +0200 Subject: [PATCH 07/86] release notes --- RELEASE_NOTES.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 4d3a48a68a..6d80e1665a 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,5 +1,8 @@ +#### 5.172.4 - 2018-06-18 +* BUGFIX: Fixed invalid syntax in packages config - https://github.com/fsprojects/Paket/pull/3253 + #### 5.172.3 - 2018-06-18 -* BUGFIX: Fix infinite recursion when handling errors - https://github.com/fsprojects/Paket/pull/3251 +* BUGFIX: Fixed infinite recursion when handling errors - https://github.com/fsprojects/Paket/pull/3251 #### 5.172.2 - 2018-06-11 * BUGFIX: Report only transitive settings changes - https://github.com/fsprojects/Paket/issues/3218 From 7ae69a046ba8ad6415dd599875effd513c2aab0c Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Mon, 18 Jun 2018 15:53:20 +0200 Subject: [PATCH 08/86] Bump version to 5.172.4 --- src/Paket.Bootstrapper/Properties/AssemblyInfo.cs | 12 ++++++------ src/Paket.Core/AssemblyInfo.fs | 12 ++++++------ src/Paket/AssemblyInfo.fs | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index f736535d9a..e45f14439e 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.172.3")] -[assembly: AssemblyFileVersionAttribute("5.172.3")] -[assembly: AssemblyInformationalVersionAttribute("5.172.3")] +[assembly: AssemblyVersionAttribute("5.172.4")] +[assembly: AssemblyFileVersionAttribute("5.172.4")] +[assembly: AssemblyInformationalVersionAttribute("5.172.4")] 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.172.3"; - internal const System.String AssemblyFileVersion = "5.172.3"; - internal const System.String AssemblyInformationalVersion = "5.172.3"; + internal const System.String AssemblyVersion = "5.172.4"; + internal const System.String AssemblyFileVersion = "5.172.4"; + internal const System.String AssemblyInformationalVersion = "5.172.4"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index 7cc61472c6..a0ec2b54cc 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.172.3" - let [] AssemblyFileVersion = "5.172.3" - let [] AssemblyInformationalVersion = "5.172.3" + let [] AssemblyVersion = "5.172.4" + let [] AssemblyFileVersion = "5.172.4" + let [] AssemblyInformationalVersion = "5.172.4" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index 7fcfca7017..6f0e99193d 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.172.3" - let [] AssemblyFileVersion = "5.172.3" - let [] AssemblyInformationalVersion = "5.172.3" + let [] AssemblyVersion = "5.172.4" + let [] AssemblyFileVersion = "5.172.4" + let [] AssemblyInformationalVersion = "5.172.4" From 0446b5d311b38a946c1bdda66a0a8182e881e5b2 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Wed, 20 Jun 2018 14:11:10 +0200 Subject: [PATCH 09/86] Don't serialize individual settings that match group settings in lock file - fixes #3257 --- RELEASE_NOTES.md | 3 + .../ConsoleApplication1.fsprojtemplate | 2 +- .../ConsoleApplication1.vcxprojtemplate | 2 +- src/Paket.Core/PaketConfigFiles/LockFile.fs | 2 +- src/Paket.Core/Versioning/Requirements.fs | 73 ++++++++++--------- src/Paket/Paket.fsproj | 4 +- 6 files changed, 45 insertions(+), 41 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 6d80e1665a..f3573478b5 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,6 @@ +#### 5.173.0 - 2018-06-20 +* BUGFIX: Don't serialize individual settings that match group settings in lock file - https://github.com/fsprojects/Paket/issues/3257 + #### 5.172.4 - 2018-06-18 * BUGFIX: Fixed invalid syntax in packages config - https://github.com/fsprojects/Paket/pull/3253 diff --git a/integrationtests/scenarios/i001333-dup-refs/before/ConsoleApplication1/ConsoleApplication1.fsprojtemplate b/integrationtests/scenarios/i001333-dup-refs/before/ConsoleApplication1/ConsoleApplication1.fsprojtemplate index fb752d572f..8dbacad4de 100644 --- a/integrationtests/scenarios/i001333-dup-refs/before/ConsoleApplication1/ConsoleApplication1.fsprojtemplate +++ b/integrationtests/scenarios/i001333-dup-refs/before/ConsoleApplication1/ConsoleApplication1.fsprojtemplate @@ -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 d4cb0b4f9c..0caa71485e 100644 --- a/integrationtests/scenarios/i001467-cpp/before/MyClassLibrary/ConsoleApplication1/ConsoleApplication1.vcxprojtemplate +++ b/integrationtests/scenarios/i001467-cpp/before/MyClassLibrary/ConsoleApplication1/ConsoleApplication1.vcxprojtemplate @@ -137,7 +137,7 @@ - + ..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll diff --git a/src/Paket.Core/PaketConfigFiles/LockFile.fs b/src/Paket.Core/PaketConfigFiles/LockFile.fs index 1124e9c289..6ce7cc3f59 100644 --- a/src/Paket.Core/PaketConfigFiles/LockFile.fs +++ b/src/Paket.Core/PaketConfigFiles/LockFile.fs @@ -130,7 +130,7 @@ module LockFileSerializer = let s = // add "clitool" - match package.Kind, settings.ToString().ToLower() with + match package.Kind, settings.ToString(options.Settings,false).ToLower() with | ResolvedPackageKind.DotnetCliTool, "" -> "clitool: true" | ResolvedPackageKind.DotnetCliTool, s -> s + ", clitool: true" | ResolvedPackageKind.Package, s -> s diff --git a/src/Paket.Core/Versioning/Requirements.fs b/src/Paket.Core/Versioning/Requirements.fs index 06afe72d22..417b70c665 100644 --- a/src/Paket.Core/Versioning/Requirements.fs +++ b/src/Paket.Core/Versioning/Requirements.fs @@ -897,60 +897,61 @@ type InstallSettings = OmitContent = None GenerateLoadScripts = None } - member this.ToString(asLines) = + member this.ToString(groupSettings:InstallSettings,asLines) = let options = [ match this.CopyLocal with - | Some x -> yield "copy_local: " + x.ToString().ToLower() - | None -> () + | Some x when groupSettings.CopyLocal <> this.CopyLocal -> yield "copy_local: " + x.ToString().ToLower() + | _ -> () match this.SpecificVersion with - | Some x -> yield "specific_version: " + x.ToString().ToLower() - | None -> () + | Some x when groupSettings.SpecificVersion <> this.SpecificVersion -> yield "specific_version: " + x.ToString().ToLower() + | _ -> () match this.StorageConfig with - | Some (PackagesFolderGroupConfig.NoPackagesFolder) -> yield "storage: none" - | Some (PackagesFolderGroupConfig.SymbolicLink) -> yield "storage: symlink" - | Some (PackagesFolderGroupConfig.GivenPackagesFolder s) -> failwithf "Not implemented yet." - | Some (PackagesFolderGroupConfig.DefaultPackagesFolder) -> yield "storage: packages" - | None -> () + | Some (PackagesFolderGroupConfig.NoPackagesFolder) when groupSettings.StorageConfig <> this.StorageConfig -> yield "storage: none" + | Some (PackagesFolderGroupConfig.SymbolicLink) when groupSettings.StorageConfig <> this.StorageConfig -> yield "storage: symlink" + | Some (PackagesFolderGroupConfig.GivenPackagesFolder s) when groupSettings.StorageConfig <> this.StorageConfig -> failwithf "Not implemented yet." + | Some (PackagesFolderGroupConfig.DefaultPackagesFolder) when groupSettings.StorageConfig <> this.StorageConfig -> yield "storage: packages" + | _ -> () match this.CopyContentToOutputDirectory with - | Some CopyToOutputDirectorySettings.Never -> yield "copy_content_to_output_dir: never" - | Some CopyToOutputDirectorySettings.Always -> yield "copy_content_to_output_dir: always" - | Some CopyToOutputDirectorySettings.PreserveNewest -> yield "copy_content_to_output_dir: preserve_newest" - | None -> () + | Some CopyToOutputDirectorySettings.Never when groupSettings.CopyContentToOutputDirectory <> this.CopyContentToOutputDirectory -> yield "copy_content_to_output_dir: never" + | Some CopyToOutputDirectorySettings.Always when groupSettings.CopyContentToOutputDirectory <> this.CopyContentToOutputDirectory -> yield "copy_content_to_output_dir: always" + | Some CopyToOutputDirectorySettings.PreserveNewest when groupSettings.CopyContentToOutputDirectory <> this.CopyContentToOutputDirectory -> yield "copy_content_to_output_dir: preserve_newest" + | _ -> () match this.ImportTargets with - | Some x -> yield "import_targets: " + x.ToString().ToLower() - | None -> () + | Some x when groupSettings.ImportTargets <> this.ImportTargets -> yield "import_targets: " + x.ToString().ToLower() + | _ -> () match this.OmitContent with - | Some ContentCopySettings.Omit -> yield "content: none" - | Some ContentCopySettings.Overwrite -> yield "content: true" - | Some ContentCopySettings.OmitIfExisting -> yield "content: once" - | None -> () + | Some ContentCopySettings.Omit when groupSettings.OmitContent <> this.OmitContent -> yield "content: none" + | Some ContentCopySettings.Overwrite when groupSettings.OmitContent <> this.OmitContent -> yield "content: true" + | Some ContentCopySettings.OmitIfExisting when groupSettings.OmitContent <> this.OmitContent -> yield "content: once" + | _ -> () match this.IncludeVersionInPath with - | Some x -> yield "version_in_path: " + x.ToString().ToLower() - | None -> () + | Some x when groupSettings.IncludeVersionInPath <> this.IncludeVersionInPath -> yield "version_in_path: " + x.ToString().ToLower() + | _ -> () match this.LicenseDownload with - | Some x -> yield "license_download: " + x.ToString().ToLower() - | None -> () + | Some x when groupSettings.LicenseDownload <> this.LicenseDownload -> yield "license_download: " + x.ToString().ToLower() + | _ -> () match this.ReferenceCondition with - | Some x -> yield "condition: " + x.ToUpper() - | None -> () + | Some x when groupSettings.ReferenceCondition <> this.ReferenceCondition -> yield "condition: " + x.ToUpper() + | _ -> () match this.CreateBindingRedirects with - | Some BindingRedirectsSettings.On -> yield "redirects: on" - | Some BindingRedirectsSettings.Off -> yield "redirects: off" - | Some BindingRedirectsSettings.Force -> yield "redirects: force" - | None -> () + | Some BindingRedirectsSettings.On when groupSettings.CreateBindingRedirects <> this.CreateBindingRedirects -> yield "redirects: on" + | Some BindingRedirectsSettings.Off when groupSettings.CreateBindingRedirects <> this.CreateBindingRedirects -> yield "redirects: off" + | Some BindingRedirectsSettings.Force when groupSettings.CreateBindingRedirects <> this.CreateBindingRedirects -> yield "redirects: force" + | _ -> () match this.FrameworkRestrictions with - | ExplicitRestriction FrameworkRestriction.HasNoRestriction -> () + | ExplicitRestriction FrameworkRestriction.HasNoRestriction when groupSettings.FrameworkRestrictions <> this.FrameworkRestrictions -> () | AutoDetectFramework -> () - | ExplicitRestriction fr -> yield "restriction: " + (fr.ToString()) + | ExplicitRestriction fr when groupSettings.FrameworkRestrictions <> this.FrameworkRestrictions -> yield "restriction: " + (fr.ToString()) + | _ -> () match this.GenerateLoadScripts with - | Some true -> yield "generate_load_scripts: true" - | Some false -> yield "generate_load_scripts: false" - | None -> () ] + | Some true when groupSettings.GenerateLoadScripts <> this.GenerateLoadScripts -> yield "generate_load_scripts: true" + | Some false when groupSettings.GenerateLoadScripts <> this.GenerateLoadScripts -> yield "generate_load_scripts: false" + | _ -> () ] let separator = if asLines then Environment.NewLine else ", " String.Join(separator,options) - override this.ToString() = this.ToString(false) + override this.ToString() = this.ToString(InstallSettings.Default,false) static member (+)(self, other : InstallSettings) = { diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj index 27f59e7a57..4194f945ba 100644 --- a/src/Paket/Paket.fsproj +++ b/src/Paket/Paket.fsproj @@ -34,14 +34,14 @@ install C:\temp\Gu.Reactive update - restore + update --keep-patch C:\proj\Paket D:\temp\PaketTargetFrameworkRepro\ D:\code\bookstore C:\temp\paket-conflict\paket.conflict.app D:\temp\i3032 C:\code\Paket\integrationtests\scenarios\i003062-external-lock\before - C:\code\logary + C:\temp\flip true From ba79823e92d67723f3e4e1c83304f013a2ab963f Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Wed, 20 Jun 2018 19:25:17 +0200 Subject: [PATCH 10/86] Bump version to 5.173.0 --- src/Paket.Bootstrapper/Properties/AssemblyInfo.cs | 12 ++++++------ src/Paket.Core/AssemblyInfo.fs | 12 ++++++------ src/Paket/AssemblyInfo.fs | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index e45f14439e..8f74700b13 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.172.4")] -[assembly: AssemblyFileVersionAttribute("5.172.4")] -[assembly: AssemblyInformationalVersionAttribute("5.172.4")] +[assembly: AssemblyVersionAttribute("5.173.0")] +[assembly: AssemblyFileVersionAttribute("5.173.0")] +[assembly: AssemblyInformationalVersionAttribute("5.173.0")] 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.172.4"; - internal const System.String AssemblyFileVersion = "5.172.4"; - internal const System.String AssemblyInformationalVersion = "5.172.4"; + internal const System.String AssemblyVersion = "5.173.0"; + internal const System.String AssemblyFileVersion = "5.173.0"; + internal const System.String AssemblyInformationalVersion = "5.173.0"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index a0ec2b54cc..23085ddc66 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.172.4" - let [] AssemblyFileVersion = "5.172.4" - let [] AssemblyInformationalVersion = "5.172.4" + let [] AssemblyVersion = "5.173.0" + let [] AssemblyFileVersion = "5.173.0" + let [] AssemblyInformationalVersion = "5.173.0" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index 6f0e99193d..b0e1822da2 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.172.4" - let [] AssemblyFileVersion = "5.172.4" - let [] AssemblyInformationalVersion = "5.172.4" + let [] AssemblyVersion = "5.173.0" + let [] AssemblyFileVersion = "5.173.0" + let [] AssemblyInformationalVersion = "5.173.0" From c3342460c27ebca62eea46f91c0539ac5b2d5668 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Thu, 21 Jun 2018 10:17:16 +0200 Subject: [PATCH 11/86] Paket add should only run update on the touched group - fixes #3259 --- RELEASE_NOTES.md | 3 +++ src/Paket.Core/PackageManagement/AddProcess.fs | 9 +++++---- src/Paket/Paket.fsproj | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index f3573478b5..5e5420b597 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,6 @@ +#### 5.173.1 - 2018-06-21 +* BUGFIX: Paket add only runs update on the touched group - https://github.com/fsprojects/Paket/issues/3259 + #### 5.173.0 - 2018-06-20 * BUGFIX: Don't serialize individual settings that match group settings in lock file - https://github.com/fsprojects/Paket/issues/3257 diff --git a/src/Paket.Core/PackageManagement/AddProcess.fs b/src/Paket.Core/PackageManagement/AddProcess.fs index f4baec0af6..e6e2602df4 100644 --- a/src/Paket.Core/PackageManagement/AddProcess.fs +++ b/src/Paket.Core/PackageManagement/AddProcess.fs @@ -59,10 +59,11 @@ let private add installToProjects addToProjectsF dependenciesFileName groupName match !lockFile with | None -> () | Some lockFile -> - InstallProcess.Install(options, false, dependenciesFile, lockFile, Map.empty) + let touchedGroups = Map.empty.Add(groupName,"") + InstallProcess.Install(options, false, dependenciesFile, lockFile, touchedGroups) GarbageCollection.CleanUp(dependenciesFile, lockFile) else - let updateMode = PackageResolver.UpdateMode.Install + let updateMode = PackageResolver.UpdateMode.UpdateGroup groupName let alternativeProjectRoot = None let lockFile,hasChanged,updatedGroups = UpdateProcess.SelectiveUpdate(dependenciesFile, alternativeProjectRoot, updateMode, options.SemVerUpdateMode, options.Force) @@ -92,7 +93,7 @@ let AddToProject(dependenciesFileName, groupName, package, version, options : In // Add a package with the option to interactively add it to multiple projects. let Add(dependenciesFileName, groupName, package, version, options : InstallerOptions, interactive, installAfter, runResolver, packageKind) = - let groupName = matchGroupName(groupName) + let groupName = matchGroupName groupName let addToProjects (projects : ProjectFile seq) groupName package = if interactive then @@ -103,7 +104,7 @@ let Add(dependenciesFileName, groupName, package, version, options : InstallerOp add interactive addToProjects dependenciesFileName groupName package version options installAfter runResolver packageKind let AddGithub(dependenciesFileName, groupName, repository, file, version, options) = - let group = matchGroupName(groupName) + let group = matchGroupName groupName let existingDependenciesFile = DependenciesFile.ReadFromFile(dependenciesFileName) diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj index 4194f945ba..a5154de506 100644 --- a/src/Paket/Paket.fsproj +++ b/src/Paket/Paket.fsproj @@ -34,7 +34,7 @@ install C:\temp\Gu.Reactive update - update --keep-patch + add -g Foo Newtonsoft.Json C:\proj\Paket D:\temp\PaketTargetFrameworkRepro\ D:\code\bookstore From 47a810296fcb8ce0ddd314632f254af98ff195b3 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Thu, 21 Jun 2018 10:26:21 +0200 Subject: [PATCH 12/86] Paket add should only run update on the touched group - fixes #3259 --- .../Dependencies/PackageResolver.fs | 2 ++ src/Paket.Core/Installation/UpdateProcess.fs | 23 ++++++++++++++++++- .../PackageManagement/AddProcess.fs | 6 ++--- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/src/Paket.Core/Dependencies/PackageResolver.fs b/src/Paket.Core/Dependencies/PackageResolver.fs index 15c5500f8f..4d39a13ccb 100644 --- a/src/Paket.Core/Dependencies/PackageResolver.fs +++ b/src/Paket.Core/Dependencies/PackageResolver.fs @@ -402,6 +402,7 @@ type UpdateMode = | UpdateGroup of GroupName | UpdateFiltered of GroupName * PackageFilter | Install + | InstallGroup of GroupName | UpdateAll type private PackageConfig = { @@ -463,6 +464,7 @@ let private explorePackageConfig (getPackageDetailsBlock:PackageDetailsSyncFunc) match pkgConfig.UpdateMode with | Install -> tracefn " - %O %A" dependency.Name version + | InstallGroup _ -> tracefn " - %O %A" dependency.Name version | _ -> match dependency.VersionRequirement.Range with | OverrideAll _ when dependency.Parent.IsRootRequirement() -> diff --git a/src/Paket.Core/Installation/UpdateProcess.fs b/src/Paket.Core/Installation/UpdateProcess.fs index 6c75bad1b2..2ccdaba262 100644 --- a/src/Paket.Core/Installation/UpdateProcess.fs +++ b/src/Paket.Core/Installation/UpdateProcess.fs @@ -78,6 +78,23 @@ let selectiveUpdate force getSha1 getVersionsF getPackageDetailsF getRuntimeGrap |> Map.filter (fun k _ -> k = groupName || changes |> Seq.exists (fun (g,_) -> g = k)) changes,groups + | InstallGroup groupName -> + let hasAnyChanges,nuGetChanges,remoteFileChanges,hasChanges = DependencyChangeDetection.GetChanges(dependenciesFile,lockFile,true) + + let hasChanges groupName x = + let hasChanges = hasChanges groupName x + if not hasChanges then + tracefn "Skipping resolver for group %O since it is already up-to-date" groupName + hasChanges + + let groups = + dependenciesFile.Groups + |> Map.filter (fun k _ -> k = groupName) + |> Map.filter hasChanges + + nuGetChanges + |> Set.map (fun (f,s,_) -> f,s) + |> Set.filter (fun (g,_) -> g = groupName), groups | Install -> let hasAnyChanges,nuGetChanges,remoteFileChanges,hasChanges = DependencyChangeDetection.GetChanges(dependenciesFile,lockFile,true) @@ -91,7 +108,8 @@ let selectiveUpdate force getSha1 getVersionsF getPackageDetailsF getRuntimeGrap dependenciesFile.Groups |> Map.filter hasChanges - nuGetChanges |> Set.map (fun (f,s,_) -> f,s), groups + nuGetChanges + |> Set.map (fun (f,s,_) -> f,s), groups let preferredVersions = match updateMode with @@ -103,6 +121,9 @@ let selectiveUpdate force getSha1 getVersionsF getPackageDetailsF getRuntimeGrap | UpdateFiltered (groupName, filter) -> DependencyChangeDetection.GetPreferredNuGetVersions(dependenciesFile,lockFile) |> Map.filter (fun (g, p) _ -> g <> groupName || not (filter.Match p)) + | InstallGroup groupName -> + DependencyChangeDetection.GetPreferredNuGetVersions(dependenciesFile,lockFile) + |> Map.filter (fun (g, p) _ -> g <> groupName) | Install -> DependencyChangeDetection.GetPreferredNuGetVersions(dependenciesFile,lockFile) |> Map.map (fun (groupName,_packageName) (v,s) -> diff --git a/src/Paket.Core/PackageManagement/AddProcess.fs b/src/Paket.Core/PackageManagement/AddProcess.fs index e6e2602df4..942eb42b9f 100644 --- a/src/Paket.Core/PackageManagement/AddProcess.fs +++ b/src/Paket.Core/PackageManagement/AddProcess.fs @@ -63,7 +63,7 @@ let private add installToProjects addToProjectsF dependenciesFileName groupName InstallProcess.Install(options, false, dependenciesFile, lockFile, touchedGroups) GarbageCollection.CleanUp(dependenciesFile, lockFile) else - let updateMode = PackageResolver.UpdateMode.UpdateGroup groupName + let updateMode = PackageResolver.UpdateMode.InstallGroup groupName let alternativeProjectRoot = None let lockFile,hasChanged,updatedGroups = UpdateProcess.SelectiveUpdate(dependenciesFile, alternativeProjectRoot, updateMode, options.SemVerUpdateMode, options.Force) @@ -113,7 +113,7 @@ let AddGithub(dependenciesFileName, groupName, repository, file, version, option dependenciesFile.Save() - let updateMode = PackageResolver.UpdateMode.Install + let updateMode = PackageResolver.UpdateMode.InstallGroup group let alternativeProjectRoot = None let lockFile,_,_ = UpdateProcess.SelectiveUpdate(dependenciesFile, alternativeProjectRoot, updateMode, options.SemVerUpdateMode, options.Force) @@ -130,7 +130,7 @@ let AddGit(dependenciesFileName, groupName, repository, version, options) = dependenciesFile.Save() - let updateMode = PackageResolver.UpdateMode.Install + let updateMode = PackageResolver.UpdateMode.InstallGroup group let alternativeProjectRoot = None let lockFile,_,_ = UpdateProcess.SelectiveUpdate(dependenciesFile, alternativeProjectRoot, updateMode, options.SemVerUpdateMode, options.Force) From 43e95b80fccbfb3d81328c8c474158d081aedc17 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Thu, 21 Jun 2018 10:37:19 +0200 Subject: [PATCH 13/86] Bump version to 5.173.1 --- src/Paket.Bootstrapper/Properties/AssemblyInfo.cs | 12 ++++++------ src/Paket.Core/AssemblyInfo.fs | 12 ++++++------ src/Paket/AssemblyInfo.fs | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index 8f74700b13..bb3fd92d59 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.173.0")] -[assembly: AssemblyFileVersionAttribute("5.173.0")] -[assembly: AssemblyInformationalVersionAttribute("5.173.0")] +[assembly: AssemblyVersionAttribute("5.173.1")] +[assembly: AssemblyFileVersionAttribute("5.173.1")] +[assembly: AssemblyInformationalVersionAttribute("5.173.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.173.0"; - internal const System.String AssemblyFileVersion = "5.173.0"; - internal const System.String AssemblyInformationalVersion = "5.173.0"; + internal const System.String AssemblyVersion = "5.173.1"; + internal const System.String AssemblyFileVersion = "5.173.1"; + internal const System.String AssemblyInformationalVersion = "5.173.1"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index 23085ddc66..0457560993 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.173.0" - let [] AssemblyFileVersion = "5.173.0" - let [] AssemblyInformationalVersion = "5.173.0" + let [] AssemblyVersion = "5.173.1" + let [] AssemblyFileVersion = "5.173.1" + let [] AssemblyInformationalVersion = "5.173.1" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index b0e1822da2..33b0946e26 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.173.0" - let [] AssemblyFileVersion = "5.173.0" - let [] AssemblyInformationalVersion = "5.173.0" + let [] AssemblyVersion = "5.173.1" + let [] AssemblyFileVersion = "5.173.1" + let [] AssemblyInformationalVersion = "5.173.1" From 4a9c9f5b17513bc0a1636e5bd84f63a39cfb2a7b Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Thu, 21 Jun 2018 10:57:23 +0200 Subject: [PATCH 14/86] Allow to install single group --- src/Paket/Commands.fs | 6 ++++++ src/Paket/Program.fs | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/src/Paket/Commands.fs b/src/Paket/Commands.fs index bc9486bf18..c6d3d0cd33 100644 --- a/src/Paket/Commands.fs +++ b/src/Paket/Commands.fs @@ -179,6 +179,9 @@ type InstallArgs = | [] Force | [] Redirects + | [] Group of name:string + | [] Group_Legacy of name:string + | [] Create_New_Binding_Files | [] Create_New_Binding_Files_Legacy @@ -203,6 +206,9 @@ with | Force -> "force download and reinstallation of all dependencies" | Redirects -> "create binding redirects" + | Group(_) -> "specify dependency group to update (default: all groups)" + | Group_Legacy(_) -> "[obsolete]" + | Create_New_Binding_Files -> "create binding redirect files if needed" | Create_New_Binding_Files_Legacy -> "[obsolete]" diff --git a/src/Paket/Program.fs b/src/Paket/Program.fs index 7e3bc771d1..4adaddbcd0 100644 --- a/src/Paket/Program.fs +++ b/src/Paket/Program.fs @@ -358,6 +358,10 @@ let install (results : ParseResults<_>) = if results.Contains <@ InstallArgs.Keep_Major @> then SemVerUpdateMode.KeepMajor else SemVerUpdateMode.NoRestriction let touchAffectedRefs = results.Contains <@ InstallArgs.Touch_Affected_Refs @> + let group = + (results.TryGetResult <@ InstallArgs.Group @>, + results.TryGetResult <@ InstallArgs.Group_Legacy @>) + |> legacyOption results (ReplaceArgument("--group", "group")) Dependencies.Locate().Install( force, From 7b9e061e94a8f0f4eca99a697e012b77f1a7106b Mon Sep 17 00:00:00 2001 From: Viktor Svub Date: Mon, 25 Jun 2018 10:57:17 +0200 Subject: [PATCH 15/86] extending NuGetV3 source detection with Artifactory feed format [www.jfrog.com/confluence/display/RTF/NuGet+Repositories](https://www.jfrog.com/confluence/display/RTF/NuGet+Repositories#NuGetRepositories-NuGetAPIv3RegistrySupport) --- src/Paket.Core/Versioning/PackageSources.fs | 2 +- tests/Paket.Tests/Paket.Tests.fsproj | 1 + .../Versioning/PackageSourceSpecs.fs | 40 +++++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 tests/Paket.Tests/Versioning/PackageSourceSpecs.fs diff --git a/src/Paket.Core/Versioning/PackageSources.fs b/src/Paket.Core/Versioning/PackageSources.fs index 3d5925105a..71dc1d49c4 100644 --- a/src/Paket.Core/Versioning/PackageSources.fs +++ b/src/Paket.Core/Versioning/PackageSources.fs @@ -150,7 +150,7 @@ type PackageSource = #endif LocalNuGet(source,None) else - if String.endsWithIgnoreCase "v3/index.json" source then + if Regex("/v3(?:/[-\w]+)?/index.json$").IsMatch source then NuGetV3 { Url = source; Authentication = auth } else NuGetV2 { Url = source; Authentication = auth } diff --git a/tests/Paket.Tests/Paket.Tests.fsproj b/tests/Paket.Tests/Paket.Tests.fsproj index 241fa7fa90..19a579cdff 100644 --- a/tests/Paket.Tests/Paket.Tests.fsproj +++ b/tests/Paket.Tests/Paket.Tests.fsproj @@ -76,6 +76,7 @@ True FsUnit.fs + diff --git a/tests/Paket.Tests/Versioning/PackageSourceSpecs.fs b/tests/Paket.Tests/Versioning/PackageSourceSpecs.fs new file mode 100644 index 0000000000..982e80a473 --- /dev/null +++ b/tests/Paket.Tests/Versioning/PackageSourceSpecs.fs @@ -0,0 +1,40 @@ +module Paket.PackageSourceSpecs + +open Paket +open NUnit.Framework +open FsUnit +open Paket.Domain +open Paket.PackageSources + +[] +[] +[] +[] +[] +[] +let ``should parse known nuget2 source``(feed : string) = + let line = sprintf "source %s" feed + match PackageSource.Parse(line) with + | NuGetV2 { Url = source; Authentication = _ } -> + let quoted = sprintf "source \"%s\"" feed + match PackageSource.Parse(quoted) with + | NuGetV2 { Url = qsource; Authentication = _ } -> + source |> shouldEqual qsource + | _ -> failwith quoted + | _ -> failwith feed + +[] +[] +[] +[] +[] +let ``should parse known nuget3 source``(feed : string) = + let line = sprintf "source %s" feed + match PackageSource.Parse(line) with + | NuGetV3 { Url = source; Authentication = _ } -> + let quoted = sprintf "source \"%s\"" feed + match PackageSource.Parse(quoted) with + | NuGetV3 { Url = qsource; Authentication = _ } -> + source |> shouldEqual qsource + | _ -> failwith quoted + | _ -> failwith feed \ No newline at end of file From 0dd59719c6e358d969f5f926ec6383674c8cb619 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Thu, 28 Jun 2018 18:33:09 +0200 Subject: [PATCH 16/86] RELEASE_NOTES --- RELEASE_NOTES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 5e5420b597..a43dcef528 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,6 @@ +#### 5.173.2 - 2018-06-28 +* BUGFIX: Extended NuGetV3 source detection with Artifactory feed format - https://github.com/fsprojects/Paket/pull/3267 + #### 5.173.1 - 2018-06-21 * BUGFIX: Paket add only runs update on the touched group - https://github.com/fsprojects/Paket/issues/3259 From 00d969f924301ef0562bcd61fba852858828dc20 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Thu, 28 Jun 2018 18:48:17 +0200 Subject: [PATCH 17/86] Bump version to 5.173.2 --- src/Paket.Bootstrapper/Properties/AssemblyInfo.cs | 12 ++++++------ src/Paket.Core/AssemblyInfo.fs | 12 ++++++------ src/Paket/AssemblyInfo.fs | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index bb3fd92d59..1cd75d75d4 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.173.1")] -[assembly: AssemblyFileVersionAttribute("5.173.1")] -[assembly: AssemblyInformationalVersionAttribute("5.173.1")] +[assembly: AssemblyVersionAttribute("5.173.2")] +[assembly: AssemblyFileVersionAttribute("5.173.2")] +[assembly: AssemblyInformationalVersionAttribute("5.173.2")] 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.173.1"; - internal const System.String AssemblyFileVersion = "5.173.1"; - internal const System.String AssemblyInformationalVersion = "5.173.1"; + internal const System.String AssemblyVersion = "5.173.2"; + internal const System.String AssemblyFileVersion = "5.173.2"; + internal const System.String AssemblyInformationalVersion = "5.173.2"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index 0457560993..87c648dad5 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.173.1" - let [] AssemblyFileVersion = "5.173.1" - let [] AssemblyInformationalVersion = "5.173.1" + let [] AssemblyVersion = "5.173.2" + let [] AssemblyFileVersion = "5.173.2" + let [] AssemblyInformationalVersion = "5.173.2" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index 33b0946e26..e4bd11e7f8 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.173.1" - let [] AssemblyFileVersion = "5.173.1" - let [] AssemblyInformationalVersion = "5.173.1" + let [] AssemblyVersion = "5.173.2" + let [] AssemblyFileVersion = "5.173.2" + let [] AssemblyInformationalVersion = "5.173.2" From 7b438b08482fcc40bf523c8eb083ea5ecccfc8f9 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Thu, 28 Jun 2018 19:00:58 +0200 Subject: [PATCH 18/86] Revert "Allow to install single group" This reverts commit 4a9c9f5b17513bc0a1636e5bd84f63a39cfb2a7b. --- src/Paket/Commands.fs | 6 ------ src/Paket/Program.fs | 4 ---- 2 files changed, 10 deletions(-) diff --git a/src/Paket/Commands.fs b/src/Paket/Commands.fs index c6d3d0cd33..bc9486bf18 100644 --- a/src/Paket/Commands.fs +++ b/src/Paket/Commands.fs @@ -179,9 +179,6 @@ type InstallArgs = | [] Force | [] Redirects - | [] Group of name:string - | [] Group_Legacy of name:string - | [] Create_New_Binding_Files | [] Create_New_Binding_Files_Legacy @@ -206,9 +203,6 @@ with | Force -> "force download and reinstallation of all dependencies" | Redirects -> "create binding redirects" - | Group(_) -> "specify dependency group to update (default: all groups)" - | Group_Legacy(_) -> "[obsolete]" - | Create_New_Binding_Files -> "create binding redirect files if needed" | Create_New_Binding_Files_Legacy -> "[obsolete]" diff --git a/src/Paket/Program.fs b/src/Paket/Program.fs index 4adaddbcd0..7e3bc771d1 100644 --- a/src/Paket/Program.fs +++ b/src/Paket/Program.fs @@ -358,10 +358,6 @@ let install (results : ParseResults<_>) = if results.Contains <@ InstallArgs.Keep_Major @> then SemVerUpdateMode.KeepMajor else SemVerUpdateMode.NoRestriction let touchAffectedRefs = results.Contains <@ InstallArgs.Touch_Affected_Refs @> - let group = - (results.TryGetResult <@ InstallArgs.Group @>, - results.TryGetResult <@ InstallArgs.Group_Legacy @>) - |> legacyOption results (ReplaceArgument("--group", "group")) Dependencies.Locate().Install( force, From 207e81bce7b04bcc2471eddbca6ae315b956d765 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Thu, 28 Jun 2018 19:01:35 +0200 Subject: [PATCH 19/86] release notes --- RELEASE_NOTES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index a43dcef528..826433232c 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,4 +1,4 @@ -#### 5.173.2 - 2018-06-28 +#### 5.173.3 - 2018-06-28 * BUGFIX: Extended NuGetV3 source detection with Artifactory feed format - https://github.com/fsprojects/Paket/pull/3267 #### 5.173.1 - 2018-06-21 From e83029f2e6d488013cb89d42311ed4979466b166 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Thu, 28 Jun 2018 19:39:44 +0200 Subject: [PATCH 20/86] release notes --- RELEASE_NOTES.md | 2 +- src/Paket.Bootstrapper/Properties/AssemblyInfo.cs | 12 ++++++------ src/Paket.Core/AssemblyInfo.fs | 12 ++++++------ src/Paket/AssemblyInfo.fs | 12 ++++++------ 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 826433232c..c577a0faac 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,4 +1,4 @@ -#### 5.173.3 - 2018-06-28 +#### 5.173.4 - 2018-06-28 * BUGFIX: Extended NuGetV3 source detection with Artifactory feed format - https://github.com/fsprojects/Paket/pull/3267 #### 5.173.1 - 2018-06-21 diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index 1cd75d75d4..097d131d61 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.173.2")] -[assembly: AssemblyFileVersionAttribute("5.173.2")] -[assembly: AssemblyInformationalVersionAttribute("5.173.2")] +[assembly: AssemblyVersionAttribute("5.173.3")] +[assembly: AssemblyFileVersionAttribute("5.173.3")] +[assembly: AssemblyInformationalVersionAttribute("5.173.3")] 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.173.2"; - internal const System.String AssemblyFileVersion = "5.173.2"; - internal const System.String AssemblyInformationalVersion = "5.173.2"; + internal const System.String AssemblyVersion = "5.173.3"; + internal const System.String AssemblyFileVersion = "5.173.3"; + internal const System.String AssemblyInformationalVersion = "5.173.3"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index 87c648dad5..990997aebf 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.173.2" - let [] AssemblyFileVersion = "5.173.2" - let [] AssemblyInformationalVersion = "5.173.2" + let [] AssemblyVersion = "5.173.3" + let [] AssemblyFileVersion = "5.173.3" + let [] AssemblyInformationalVersion = "5.173.3" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index e4bd11e7f8..ef015c0cb0 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.173.2" - let [] AssemblyFileVersion = "5.173.2" - let [] AssemblyInformationalVersion = "5.173.2" + let [] AssemblyVersion = "5.173.3" + let [] AssemblyFileVersion = "5.173.3" + let [] AssemblyInformationalVersion = "5.173.3" From 9cbc7a05fc851611e541051d8f07beb8d25e9596 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Thu, 28 Jun 2018 19:53:30 +0200 Subject: [PATCH 21/86] Bump version to 5.173.4 --- src/Paket.Bootstrapper/Properties/AssemblyInfo.cs | 12 ++++++------ src/Paket.Core/AssemblyInfo.fs | 12 ++++++------ src/Paket/AssemblyInfo.fs | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index 097d131d61..857ae794fc 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.173.3")] -[assembly: AssemblyFileVersionAttribute("5.173.3")] -[assembly: AssemblyInformationalVersionAttribute("5.173.3")] +[assembly: AssemblyVersionAttribute("5.173.4")] +[assembly: AssemblyFileVersionAttribute("5.173.4")] +[assembly: AssemblyInformationalVersionAttribute("5.173.4")] 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.173.3"; - internal const System.String AssemblyFileVersion = "5.173.3"; - internal const System.String AssemblyInformationalVersion = "5.173.3"; + internal const System.String AssemblyVersion = "5.173.4"; + internal const System.String AssemblyFileVersion = "5.173.4"; + internal const System.String AssemblyInformationalVersion = "5.173.4"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index 990997aebf..1a89e2bbcd 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.173.3" - let [] AssemblyFileVersion = "5.173.3" - let [] AssemblyInformationalVersion = "5.173.3" + let [] AssemblyVersion = "5.173.4" + let [] AssemblyFileVersion = "5.173.4" + let [] AssemblyInformationalVersion = "5.173.4" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index ef015c0cb0..7dc7e3ffe4 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.173.3" - let [] AssemblyFileVersion = "5.173.3" - let [] AssemblyInformationalVersion = "5.173.3" + let [] AssemblyVersion = "5.173.4" + let [] AssemblyFileVersion = "5.173.4" + let [] AssemblyInformationalVersion = "5.173.4" From f5ce16ffa78a717615f5f08edcd91646527bbc01 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Fri, 29 Jun 2018 14:24:31 +0200 Subject: [PATCH 22/86] Move the files over to props --- src/Paket.Core/Installation/InstallProcess.fs | 16 +----- src/Paket.Core/Installation/RestoreProcess.fs | 53 +++++++++++++++---- src/Paket.Core/Versioning/Requirements.fs | 9 +++- src/Paket.Core/embedded/Paket.Restore.targets | 4 +- 4 files changed, 54 insertions(+), 28 deletions(-) diff --git a/src/Paket.Core/Installation/InstallProcess.fs b/src/Paket.Core/Installation/InstallProcess.fs index f40cd710c3..4ec209fd14 100644 --- a/src/Paket.Core/Installation/InstallProcess.fs +++ b/src/Paket.Core/Installation/InstallProcess.fs @@ -338,25 +338,13 @@ let private applyBindingRedirects isFirstGroup createNewBindingFiles cleanBindin |> Seq.sort applyBindingRedirectsToFolder isFirstGroup createNewBindingFiles cleanBindingRedirects root allKnownLibNames bindingRedirects - -let invalidateRestoreCachesForDotnetSdk (projectFileInfo:FileInfo) = - let paketPropsFile = ProjectFile.getPaketPropsFileInfo projectFileInfo - if paketPropsFile.Exists then - let old = File.ReadAllText paketPropsFile.FullName - let newContent = old.Replace("","False") - File.WriteAllText(paketPropsFile.FullName, newContent) - let assetsFile = ProjectFile.getAssetsFileInfo projectFileInfo - if assetsFile.Exists then - try assetsFile.Delete() with | _ -> () - + let installForDotnetSDK root (project:ProjectFile) = let paketTargetsPath = RestoreProcess.extractRestoreTargets root let relativePath = createRelativePath project.FileName paketTargetsPath project.RemoveImportForPaketTargets() project.AddImportForPaketTargets(relativePath) - let projectFileInfo = FileInfo(project.FileName) - invalidateRestoreCachesForDotnetSdk (projectFileInfo) - + /// Installs all packages from the lock file. let InstallIntoProjects(options : InstallerOptions, forceTouch, dependenciesFile, lockFile : LockFile, projectsAndReferences : (ProjectFile * ReferencesFile) list, updatedGroups) = tracefn " - Creating model and downloading packages." diff --git a/src/Paket.Core/Installation/RestoreProcess.fs b/src/Paket.Core/Installation/RestoreProcess.fs index 2b6d0cc99b..f15ed11dba 100644 --- a/src/Paket.Core/Installation/RestoreProcess.fs +++ b/src/Paket.Core/Installation/RestoreProcess.fs @@ -10,6 +10,7 @@ open Paket.PackageSources open System open Chessie.ErrorHandling open System.Reflection +open Requirements /// Finds packages which would be affected by a restore, i.e. not extracted yet or with the wrong version let FindPackagesNotExtractedYet(dependenciesFileName) = @@ -255,7 +256,7 @@ let createAlternativeNuGetConfig (projectFile:FileInfo) = saveToFile config alternativeConfigFileInfo |> ignore -let createPaketPropsFile (cliTools:ResolvedPackage seq) restoreSuccess (fileInfo:FileInfo) = +let createPaketPropsFile (lockFile:LockFile) (cliTools:ResolvedPackage seq) (packages:((GroupName * PackageName) * PackageInstallSettings * _)seq) (fileInfo:FileInfo) = let cliParts = if Seq.isEmpty cliTools then "" @@ -264,22 +265,49 @@ let createPaketPropsFile (cliTools:ResolvedPackage seq) restoreSuccess (fileInfo |> Seq.map (fun cliTool -> sprintf """ """ cliTool.Name cliTool.Version) |> fun xs -> String.Join(Environment.NewLine,xs) |> fun s -> " " + Environment.NewLine + s + Environment.NewLine + " " - - + + let packagesParts = + if Seq.isEmpty packages then + "" + else + packages + |> Seq.map (fun ((groupName,packageName),_,_) -> + let p = lockFile.Groups.[groupName].Resolution.[packageName] + let condition = Paket.Requirements.getExplicitRestriction p.Settings.FrameworkRestrictions + p,condition) + |> Seq.groupBy snd + |> Seq.collect (fun (condition,packages) -> + let condition = condition.ToMSBuildCondition() + let condition = + if condition = "" || condition = "true" then "" else + sprintf " AND (%s)" condition + + let packageReferences = + packages + |> Seq.collect (fun (p,_) -> + [sprintf """ """ p.Name + sprintf """ %O""" p.Version + //""" All""" + + //""" runtime""" + + //""" true""" + + """ """]) + + [yield sprintf " " condition + yield! packageReferences + yield " "]) + |> fun xs -> String.Join(Environment.NewLine,xs) + let content = sprintf """ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - %s %s -""" - (if restoreSuccess then - "" - else - "False") +%s +""" cliParts + packagesParts saveToFile content fileInfo |> ignore @@ -402,14 +430,17 @@ let createProjectReferencesFiles (lockFile:LockFile) (projectFile:ProjectFile) ( loop 5 let cliTools = System.Collections.Generic.List<_>() + let packages = System.Collections.Generic.List<_>() for kv in groups do - let _,cliToolsInGroup = lockFile.GetOrderedPackageHull(kv.Key,referencesFile) + let packagesInGroup,cliToolsInGroup = lockFile.GetOrderedPackageHull(kv.Key,referencesFile) cliTools.AddRange cliToolsInGroup + packages.AddRange packagesInGroup let paketCLIToolsFileName = FileInfo(Path.Combine(projectFileInfo.Directory.FullName,"obj",projectFileInfo.Name + ".paket.clitools")) createPaketCLIToolsFile cliTools paketCLIToolsFileName - createPaketPropsFile cliTools true (ProjectFile.getPaketPropsFileInfo projectFileInfo) + let propsFile = ProjectFile.getPaketPropsFileInfo projectFileInfo + createPaketPropsFile lockFile cliTools packages propsFile // Write "cached" file, this way msbuild can check if the references file has changed. let paketCachedReferencesFileName = FileInfo(Path.Combine(projectFileInfo.Directory.FullName,"obj",projectFileInfo.Name + ".paket.references.cached")) diff --git a/src/Paket.Core/Versioning/Requirements.fs b/src/Paket.Core/Versioning/Requirements.fs index 417b70c665..e88c053c17 100644 --- a/src/Paket.Core/Versioning/Requirements.fs +++ b/src/Paket.Core/Versioning/Requirements.fs @@ -52,7 +52,7 @@ type FrameworkRestrictionP = | [] -> "true" | [single] -> sprintf "%O" single | _ -> sprintf "&& %s" (System.String.Join(" ", frl |> Seq.map (sprintf "(%O)"))) - + /// The list represented by this restriction (ie the included set of frameworks) // NOTE: All critical paths test only if this set is empty, so we use lazy seq here member x.RepresentedFrameworks = @@ -297,6 +297,13 @@ type FrameworkRestriction = set member x.IsMatch tp = x.RawFormular.IsMatch tp + + member x.ToMSBuildCondition() = + let formulas = + [for fr in x.RepresentedFrameworks -> + sprintf "('$(TargetFramework)' == '%O')" fr] + String.Join(" OR ",formulas) + override x.Equals(y) = match y with | :? FrameworkRestriction as r -> diff --git a/src/Paket.Core/embedded/Paket.Restore.targets b/src/Paket.Core/embedded/Paket.Restore.targets index 55292f317c..ceb2f35c04 100644 --- a/src/Paket.Core/embedded/Paket.Restore.targets +++ b/src/Paket.Core/embedded/Paket.Restore.targets @@ -132,11 +132,11 @@ - + - + $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0]) $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1]) From 979acaeb618e38a367d9135e49e1a85edfe4fc50 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Fri, 29 Jun 2018 14:35:17 +0200 Subject: [PATCH 23/86] RELEASE_NOTES --- RELEASE_NOTES.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index c577a0faac..f18bfddb03 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,7 +1,6 @@ -#### 5.173.4 - 2018-06-28 +#### 5.174.0-alpha001 - 2018-06-29 +* NEW FEATURE: Improved Visual Studio integration - https://github.com/fsprojects/Paket/pull/3273 * BUGFIX: Extended NuGetV3 source detection with Artifactory feed format - https://github.com/fsprojects/Paket/pull/3267 - -#### 5.173.1 - 2018-06-21 * BUGFIX: Paket add only runs update on the touched group - https://github.com/fsprojects/Paket/issues/3259 #### 5.173.0 - 2018-06-20 From 50f80549e8efa349f4da4187914e7660af9351f1 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Fri, 29 Jun 2018 14:45:50 +0200 Subject: [PATCH 24/86] Bump version to 5.174.0-alpha001 --- src/Paket.Bootstrapper/Properties/AssemblyInfo.cs | 12 ++++++------ src/Paket.Core/AssemblyInfo.fs | 12 ++++++------ src/Paket/AssemblyInfo.fs | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index 857ae794fc..1f0bc3dab3 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.173.4")] -[assembly: AssemblyFileVersionAttribute("5.173.4")] -[assembly: AssemblyInformationalVersionAttribute("5.173.4")] +[assembly: AssemblyVersionAttribute("5.174.0")] +[assembly: AssemblyFileVersionAttribute("5.174.0")] +[assembly: AssemblyInformationalVersionAttribute("5.174.0-alpha001")] 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.173.4"; - internal const System.String AssemblyFileVersion = "5.173.4"; - internal const System.String AssemblyInformationalVersion = "5.173.4"; + internal const System.String AssemblyVersion = "5.174.0"; + internal const System.String AssemblyFileVersion = "5.174.0"; + internal const System.String AssemblyInformationalVersion = "5.174.0-alpha001"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index 1a89e2bbcd..6fee7c85bc 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.173.4" - let [] AssemblyFileVersion = "5.173.4" - let [] AssemblyInformationalVersion = "5.173.4" + let [] AssemblyVersion = "5.174.0" + let [] AssemblyFileVersion = "5.174.0" + let [] AssemblyInformationalVersion = "5.174.0-alpha001" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index 7dc7e3ffe4..0066bcbb59 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.173.4" - let [] AssemblyFileVersion = "5.173.4" - let [] AssemblyInformationalVersion = "5.173.4" + let [] AssemblyVersion = "5.174.0" + let [] AssemblyFileVersion = "5.174.0" + let [] AssemblyInformationalVersion = "5.174.0-alpha001" From 0f4dc5facf3f7910e36ae2f4f22161551d5aa90a Mon Sep 17 00:00:00 2001 From: Lysogorskiy Aleksey Date: Sun, 1 Jul 2018 12:14:14 +0300 Subject: [PATCH 25/86] fix #3275 (pack localized assemblies with new .csproj) --- .../Paket.IntegrationTests/PackSpecs.fs | 18 +-- .../before/LocalizedLib.sln | 28 ---- .../before/LocalizedLib/Class1.cs | 6 - .../before/LocalizedLib/LocalizedLib.csproj | 66 ---------- .../LocalizedLib/Properties/AssemblyInfo.cs | 36 ----- .../Properties/Resources.Designer.cs | 72 ---------- .../LocalizedLib/Properties/Resources.resx | 123 ------------------ .../Properties/Resources.sv-FI.resx | 123 ------------------ .../LocalizedLib/Properties/Resources.sv.resx | 123 ------------------ .../LocalizedLib/bin/Release/LocalizedLib.dll | Bin 5120 -> 0 bytes .../Release/sv-FI/LocalizedLib.resources.dll | Bin 3584 -> 0 bytes .../LocalizedLib/paket.templatetemplate | 4 - .../before/paket.dependencies | 2 - .../before/LibForTest.sln | 21 +++ .../before/LibForTest/Class1.cs | 8 ++ .../before/LibForTest/LibForTest.csproj | 7 + .../before/LibForTest/Resources1.de.resx | 21 +++ .../before/LibForTest/Resources1.en-US.resx | 21 +++ .../before/LibForTest/Resources1.ru.resx | 21 +++ .../netstandard2.0/LibForTest.deps.json | 58 +++++++++ .../bin/Release/netstandard2.0/LibForTest.dll | Bin 0 -> 4096 bytes .../bin/Release/netstandard2.0/LibForTest.pdb | Bin 0 -> 244 bytes .../de/LibForTest.resources.dll | Bin 0 -> 3584 bytes .../en-US/LibForTest.resources.dll | Bin 0 -> 3584 bytes .../ru/LibForTest.resources.dll | Bin 0 -> 3584 bytes .../before/LibForTest/paket.references | 0 .../before/LibForTest/paket.templatetemplate | 3 + .../before/paket-files/paket.restore.cached} | 0 .../before/paket.dependencies | 1 + .../before/paket.lock | 1 + src/Paket.Core/Packaging/PackageMetaData.fs | 13 +- 31 files changed, 177 insertions(+), 599 deletions(-) delete mode 100644 integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib.sln delete mode 100644 integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Class1.cs delete mode 100644 integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/LocalizedLib.csproj delete mode 100644 integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/AssemblyInfo.cs delete mode 100644 integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.Designer.cs delete mode 100644 integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.resx delete mode 100644 integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.sv-FI.resx delete mode 100644 integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.sv.resx delete mode 100644 integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/bin/Release/LocalizedLib.dll delete mode 100644 integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/bin/Release/sv-FI/LocalizedLib.resources.dll delete mode 100644 integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/paket.templatetemplate delete mode 100644 integrationtests/scenarios/i001816-pack-localized-missing-dll/before/paket.dependencies create mode 100644 integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest.sln create mode 100644 integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/Class1.cs create mode 100644 integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/LibForTest.csproj create mode 100644 integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/Resources1.de.resx create mode 100644 integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/Resources1.en-US.resx create mode 100644 integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/Resources1.ru.resx create mode 100644 integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/bin/Release/netstandard2.0/LibForTest.deps.json create mode 100644 integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/bin/Release/netstandard2.0/LibForTest.dll create mode 100644 integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/bin/Release/netstandard2.0/LibForTest.pdb create mode 100644 integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/bin/Release/netstandard2.0/de/LibForTest.resources.dll create mode 100644 integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/bin/Release/netstandard2.0/en-US/LibForTest.resources.dll create mode 100644 integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/bin/Release/netstandard2.0/ru/LibForTest.resources.dll create mode 100644 integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/paket.references create mode 100644 integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/paket.templatetemplate rename integrationtests/scenarios/{i001816-pack-localized-missing-dll/before/paket.lock => i003275-pack-localized-netstandard/before/paket-files/paket.restore.cached} (100%) create mode 100644 integrationtests/scenarios/i003275-pack-localized-netstandard/before/paket.dependencies create mode 100644 integrationtests/scenarios/i003275-pack-localized-netstandard/before/paket.lock diff --git a/integrationtests/Paket.IntegrationTests/PackSpecs.fs b/integrationtests/Paket.IntegrationTests/PackSpecs.fs index 1742bf47a3..82fe394cfc 100644 --- a/integrationtests/Paket.IntegrationTests/PackSpecs.fs +++ b/integrationtests/Paket.IntegrationTests/PackSpecs.fs @@ -373,19 +373,19 @@ let ``#1816 pack localized happy path`` () = CleanDir rootPath [] -let ``#1816 pack localized when satellite dll is missing`` () = - let scenario = "i001816-pack-localized-missing-dll" +let ``#3275 netstandard pack localized happy path`` () = + let scenario = "i003275-pack-localized-netstandard" let rootPath = scenarioTempPath scenario let outPath = Path.Combine(rootPath, "out") - let package = Path.Combine(outPath, "LocalizedLib.1.0.0.0.nupkg") - - let result = paket ("pack -v output \"" + outPath + "\"") scenario - let expectedMessage = "Did not find satellite assembly for (sv) try building and running pack again." - StringAssert.Contains(expectedMessage, result) + let package = Path.Combine(outPath, "LibForTest.1.0.0.nupkg") + + paket ("pack -v output \"" + outPath + "\"") scenario |> ignore ZipFile.ExtractToDirectory(package, outPath) - Path.Combine(outPath, "lib", "net45", "LocalizedLib.dll") |> checkFileExists - Path.Combine(outPath, "lib", "net45", "sv-FI", "LocalizedLib.resources.dll") |> checkFileExists + Path.Combine(outPath, "lib", "netstandard2.0", "LibForTest.dll") |> checkFileExists + Path.Combine(outPath, "lib", "netstandard2.0", "de", "LibForTest.resources.dll") |> checkFileExists + Path.Combine(outPath, "lib", "netstandard2.0", "ru", "LibForTest.resources.dll") |> checkFileExists + Path.Combine(outPath, "lib", "netstandard2.0", "en-US", "LibForTest.resources.dll") |> checkFileExists CleanDir rootPath diff --git a/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib.sln b/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib.sln deleted file mode 100644 index d3aadd78ef..0000000000 --- a/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib.sln +++ /dev/null @@ -1,28 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LocalizedLib", "LocalizedLib\LocalizedLib.csproj", "{F1120474-4821-4FE7-95C1-C71E639664C0}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{3941EE73-7D23-4860-863E-56F6F201A552}" - ProjectSection(SolutionItems) = preProject - paket.dependencies = paket.dependencies - paket.lock = paket.lock - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F1120474-4821-4FE7-95C1-C71E639664C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F1120474-4821-4FE7-95C1-C71E639664C0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F1120474-4821-4FE7-95C1-C71E639664C0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F1120474-4821-4FE7-95C1-C71E639664C0}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Class1.cs b/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Class1.cs deleted file mode 100644 index 48508ef3d9..0000000000 --- a/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Class1.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace LocalizedLib -{ - public class Class1 - { - } -} diff --git a/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/LocalizedLib.csproj b/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/LocalizedLib.csproj deleted file mode 100644 index e0764eb484..0000000000 --- a/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/LocalizedLib.csproj +++ /dev/null @@ -1,66 +0,0 @@ - - - - - Debug - AnyCPU - {F1120474-4821-4FE7-95C1-C71E639664C0} - Library - Properties - LocalizedLib - LocalizedLib - v4.5 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - none - true - bin\Release\ - TRACE - prompt - 0 - - - - - - - - - - - True - True - Resources.resx - - - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - - - - - - - \ No newline at end of file diff --git a/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/AssemblyInfo.cs b/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/AssemblyInfo.cs deleted file mode 100644 index 39a892127f..0000000000 --- a/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("LocalizedLib")] -[assembly: AssemblyDescription("Test with satellite dlls")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Author")] -[assembly: AssemblyProduct("LocalizedLib")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("f1120474-4821-4fe7-95c1-c71e639664c0")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.Designer.cs b/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.Designer.cs deleted file mode 100644 index 06c92529ef..0000000000 --- a/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.Designer.cs +++ /dev/null @@ -1,72 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace LocalizedLib.Properties { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("LocalizedLib.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized string similar to Key. - /// - internal static string Key { - get { - return ResourceManager.GetString("Key", resourceCulture); - } - } - } -} diff --git a/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.resx b/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.resx deleted file mode 100644 index 58c1f76475..0000000000 --- a/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Key - - \ No newline at end of file diff --git a/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.sv-FI.resx b/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.sv-FI.resx deleted file mode 100644 index 3ae158b572..0000000000 --- a/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.sv-FI.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Nyckel - - \ No newline at end of file diff --git a/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.sv.resx b/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.sv.resx deleted file mode 100644 index 3ae158b572..0000000000 --- a/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.sv.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Nyckel - - \ No newline at end of file diff --git a/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/bin/Release/LocalizedLib.dll b/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/bin/Release/LocalizedLib.dll deleted file mode 100644 index 56b6a4e70aa3c17d81de4c2d3e221f01edc7012d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5120 zcmeHLU2Ggz6+Sb&UOP#%)Na$HK?zeFAa(4O*IwH(ZNNWkC!5%@W3QdG4T@)Huh-Me z&MY&twl`G4sBLIfAyMUtwhtijK$QxWsDgmhs^JBM8mQDh08f#C3L#L$0}?{0;X8L` zylXq5^by2e&$;LCo_p@OXU@Ij$;ZD*F(QiNxqX}H8hUO+68?Lz266IJKS|OX+ipB` zO_{jyP=3kuw2JGLT)nIrx@|kYRuGz7wKdb$vQx8K*(r+D&Yjy2gr=v*h$fU6y|#Sm zbTr#d`n0w~=_a}doJ7E#KZIVxGlYleUWu!L-^>Wrh}J-W&n-p^&$252)%%cS7Fry3 zrx+O`dY=Qaxh({4Y-WEXtr4{}D7An-){TK%yC6y-&AU%*EFK%wh<}JM9Xv# zy&Ita5!|mHypL#m$M-M7LcD9gi>~r60;?XpAADyQfcF5v8q1|p$KH!@Hr}ycU6cL% zL8vEOBt}IFoZV~?vyaRkA5lWjc%93cRClVkyEi?^t~HSb_)nNNm+pAZ(>)}?es%x0{;dqC+Hi*v;0l10{%gL z3({432Jl0`1f8HOfS;4_&$0K|*)VH4&I%%=P%8~foa6OW?0SqT72K<84seMkX~hOr)l-l?6H?PO59)=GI!jN0x*SqBV|p01$JK4LFUB6Q6r|E6L7XV|331R01V1=Fp{C&(pWMcTK$gd{I zoA6VSIn5Mbi}DPLvb6$o7DjD|_Dggl?~2@W7VvDBICY6eE#33d^ys8htXkp=G~pP! zWnK`)39~?D&v0A|$V}Dt&9cbXD&m-K7cD_Yh0oNu>y$$dlT;G^xzVcSS6x9~1MUjX zsk(-UWMf6scia)zS@HCOC1!oy7c}aWE2bsfqrw(07{y^9Z*-vw(b1~eNJR>xIAZEb zSy8B#O2R$q*mIt6?H{`;Q5V3IdDAmDC=Yv{C>N|+-t-%7tg~IcD9XBfzHTM2 zyNJg)4oI=$Gzy|I<5=yya6Qwp>!Tv!sADghr78k(M{!nohHF+f3WEsB5i`QlS0(0c zwLR@(yA6MsD3JY|ZmUITfm=!o{LW za{>kRI?`b~jxB5-sVJ-siI^%{R;Wf%CQa&gH1a6wI47-KZN!`rify)_-XD*GBu4}}Om`hhQ-vq7db!*aq9*$&v4Z!0f*dkP z$4P3^1rk)G319`(t7&o}tAOW{4<6oRaA#!iP!(K5;?#TseNCEs>Fm_CmFIpi@#Z_P zY=8E|2fw4ZrYJ2awMr9^)>bBy4Adq~Rgy``eGF$vo8Bto8nu}T=F2XbY@2KO(S@_~ z4`yyYA4{~I!ZU|b)^>`)9EzdRHizn!jJGfkU@q1|$rdF%&-U|imRBD*?dlbjg0WRY z$k!yl#N|eTUQh^I6}o3bxubmw?a2$z*H%n_N%K&GEF`tikbbyTG|5AKheCx z6zYv$y(n{1dB?H56ka;VE}@K}ToyOBQMk=~%aX3dg9{A3gWdh*FK)fXJ0C|EFWiFV{B`S z?#hAW+^FMbEo)LY?chulLY5?!-u?`1@b&V)tnrPHXb;iaM#uT(Awo88;jY_K}w>}IuE84K2|Dv=K++fzPC?PM4 zUV&8|Rc9Qv$U?=*kxh%JP}~m4druxx9b6A`UDhlIRM1|J{~AUW_~b*&1iy3#OK(V> zZmc`_Wl#wb13HeosDk^QLuLE~M*EnBC@(9ZkF8&UO&@n-4Sb$kzz43WjA^Ka3j6kZY(w&xBsE#=BK=w$Y86Shq0` z8!o)5k4?j??)8V~Y=u5YnEiLr^9fP+@@{jb!j$y4Rd7yl^h;PD ze+zHrY4j@MrBM(3NfU}Fb-+raonV)Xuv>;*7x(HQt~}>)>GxDP2k$cb9mS3*-aY*P z0lwV%)C+csZGB$GJvar6*b@UD*CTLu8$3269(E6h4oZwoo8~1R-d+O-qcizRb|_(+E0k2c%M9(iy5TCiKmlOZ(C{?~V7} z0frdTgxO zogfIcC`zHKf$##6J(?Hguq5rZYghNxL+ADrjazMW>EyZBlF{zbik@z(o2Ua8E}&ny zgFwlk5Ite!6)|o$Fn&XG;IK2bQRZEC<$trTt84>w3&IzdKVOTqEZY+@ z3aiSMQA3)LPD!eMQI6bD`ChSKOiC4bVX$w|PVui_j8=VJRdQb-t6DjJzsOaKzULm2 zwL&;6gMG!_yPcix&RyxDfkBztGt|3uuxg;avP?$LOU-#{Ol~-v!++xU_psTBZlZJ? zB1tvY$m%#!b7!SbBl%ZHta>L-=}87SkQzu2vD-@W!MhN%_bib{ontw#l^0A$?C}l8 ztj>)@s~G2B+XrY<47n33o48J7*12FO z)$0!0PETSxjTnC1@Y9B0F#M9?H^G_WzC62Cw3oKgdc(IE-edT4hNlf5GTf$a>LVKw zc7boD0(h^nJWo@Q2k12Ti*%OS=aLaHl%aXrWbqbG$fDH{xx}7N$AF0T9u7-YU%o`i z{-DOt0e{}b^%3GgM*QaORoZK>a z@BNL}E`5CK`s{{3?y5iEIXB-v|K(4W8|}if)~&Z_%|bv#&sem%AR{eKd3r`fj+Vaf zX(<35JHFeZj^V1F!6ML87Hw#xOnh}wh#jf)E}R;R@Y<}gs52d(c3`_wzl#{>9hL=4 zODVat;+Es1q00LHVaE&Ny&|Q}DP)@8ju__lk9{BWhiAYt$=Xab*XkGFeyL^b?8k4% z>lxgAcsCN#ZG#XeDNo12_tONVF}$=#ppStch+kd$y#4;)@ySmPeq6s?55#u`?!y+! zLbDLnA%!>|?q7+R0iB@G`1P4bvVc|x)(GtmY50ZEV!GV^BVV$>q~YbkKD|t&%f=@~ z$#0N~knz1jThMnD@yhr~^wt=Ka1Tn<8e8rZVrrU!6q&IlF!;tMVJjKUJPnA~*@#s! zcx%XxW8yN_VXB%)A#gHfX)XMdS!d0Nu9-sxe$6?K1D%UFJn9*Em4Mmf(aXBL)=AeLvWxGCm#&M7~AnrKq(Bi4A8c-@xI$-m*;YjU1L z{1E7?n2By#qX)&skThs=-P(6?#uw*%kLfdvY(>Cb#;W + + + netstandard2.0 + + + \ No newline at end of file diff --git a/integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/Resources1.de.resx b/integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/Resources1.de.resx new file mode 100644 index 0000000000..4ba99c00b7 --- /dev/null +++ b/integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/Resources1.de.resx @@ -0,0 +1,21 @@ + + + + + + + + + + text/microsoft-resx + + + 1.3 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/Resources1.en-US.resx b/integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/Resources1.en-US.resx new file mode 100644 index 0000000000..4ba99c00b7 --- /dev/null +++ b/integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/Resources1.en-US.resx @@ -0,0 +1,21 @@ + + + + + + + + + + text/microsoft-resx + + + 1.3 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/Resources1.ru.resx b/integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/Resources1.ru.resx new file mode 100644 index 0000000000..4ba99c00b7 --- /dev/null +++ b/integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/Resources1.ru.resx @@ -0,0 +1,21 @@ + + + + + + + + + + text/microsoft-resx + + + 1.3 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/bin/Release/netstandard2.0/LibForTest.deps.json b/integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/bin/Release/netstandard2.0/LibForTest.deps.json new file mode 100644 index 0000000000..128c747f9a --- /dev/null +++ b/integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/bin/Release/netstandard2.0/LibForTest.deps.json @@ -0,0 +1,58 @@ +{ + "runtimeTarget": { + "name": ".NETStandard,Version=v2.0/", + "signature": "cfe1dc2a80602aef150a12815387068463a61a0d" + }, + "compilationOptions": {}, + "targets": { + ".NETStandard,Version=v2.0": {}, + ".NETStandard,Version=v2.0/": { + "LibForTest/1.0.0": { + "dependencies": { + "NETStandard.Library": "2.0.3" + }, + "runtime": { + "LibForTest.dll": {} + }, + "resources": { + "de/LibForTest.resources.dll": { + "locale": "de" + }, + "en-US/LibForTest.resources.dll": { + "locale": "en-US" + }, + "ru/LibForTest.resources.dll": { + "locale": "ru" + } + } + }, + "Microsoft.NETCore.Platforms/1.1.0": {}, + "NETStandard.Library/2.0.3": { + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0" + } + } + } + }, + "libraries": { + "LibForTest/1.0.0": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "Microsoft.NETCore.Platforms/1.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==", + "path": "microsoft.netcore.platforms/1.1.0", + "hashPath": "microsoft.netcore.platforms.1.1.0.nupkg.sha512" + }, + "NETStandard.Library/2.0.3": { + "type": "package", + "serviceable": true, + "sha512": "sha512-st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", + "path": "netstandard.library/2.0.3", + "hashPath": "netstandard.library.2.0.3.nupkg.sha512" + } + } +} \ No newline at end of file diff --git a/integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/bin/Release/netstandard2.0/LibForTest.dll b/integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/bin/Release/netstandard2.0/LibForTest.dll new file mode 100644 index 0000000000000000000000000000000000000000..fc47beacbd97901b27311cde47bb62d321bdc0fe GIT binary patch literal 4096 zcmeHJTWl0n82(Q$ODRxFxCCN=!E*C9*`>7+FSu>Dg~Ikicd1}Dp|iWE%fRf+W@fgu zAt8OC4~oVoebIyj6CX$ni6#;iV*(F8Kw=_KUJ{KaK59&S&=BkQpPA`yDWLHY`FGEM z{@eVwbLN~Gdif1%B%&sa`FWx%m>H4^-yh9F-M01PHu`Y+&23ji`sTLm3DeUmu2XW2 zvQ{u`+wrx$)ZD7AnYNZ1$!KM#DD_pVTDOO;NBfD=qLIuiU;P?I`<@=vR){!J3nZ~X z8rz9k!$@KfwJW+I$eRV6zk*p{$Qc?bd5%r_Uz5REXAB#Lt*?t}@Vm5^OW z!r41@_v5u7{m7&R{DFwUtow4>$Gnp3(=fQ!FmF%_G@=RJ_1pqDm0J=77ut$Z2T5eF zyV7!C$hp!42K#EmsDmU?Zyl@1pHV*p=hi^YbW|g<5JRx=KfsoT-7ApbzL+2G$evKM%Umi%|;zSN(!zcckWXJ>yg_6^jU`ICFuDfr&zV*KC-3n`G#FI+#;o9 zzFI07c}w>ASiXGKm(=5VvYfYOvZh}z&Khn>`U5x{l8PAtxJv7q8bg{W9ZRQ6YH!D3~FIpA_hT)`-$w^BVxJ1$mzT-yn zlxdV~$MemC7l|U*L1og-NO#ICNH1Ivgu-fp9m$`B$GWh=sxJR+;?iqhpE>l_7e9Ue z!{&FUs7Vu|rBNf%3}Ve1X4_hBoLM`6^QrF+w+MAU5pCgJoo(3gl513k9lL+JAS;}1 z_Jr%4_5|#LP1G%DlRn&^&4k1OuVNW9!`KzHT2O1PK{(9> zEyH?A!;=A%z$tgJ*3|I-1!vGCpy%`UDv zxXJO_Es?Vwe>)sa65Xo1KyEd3K{`$uIu6`VW1t3cI}L*$1Re;!y69@tFMkDZC%;_` z!Te&tsBeHew@S+200LeOa^c6sw}gaGn5?c4ZT%=+{Mg&_vz1c?IrNhssn@F=kMa0ZuCaX?V=Tp99}n$UJo-5$#jY zMH#1*rl8_i7Ug%Z=i@kp#X_Frc;1EYT3rd;@$rSh@m9m0JL4-`8#!8ancgjqPDR-8 z*BQ}n9Oi=3c($aT6`5LGL`&R>oRcs7k|*THMjvGu+n)6tIB&joi}xfY$f0 ItowH0Z>byl)c^nh literal 0 HcmV?d00001 diff --git a/integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/bin/Release/netstandard2.0/LibForTest.pdb b/integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/bin/Release/netstandard2.0/LibForTest.pdb new file mode 100644 index 0000000000000000000000000000000000000000..efaf53c8614e74b3415b2f35323bd8c8e9c4cb8c GIT binary patch literal 244 zcmZ?pzI#%=>nude6V__oP3aBZL+JE2l+&L?JH^XDDhXT x@Y#O&4p5lEU4(&w6G($x1#%M;l+6vKxu9%_i@|bGrV>yF0zd*Vd6*b74FD$T8z2Ax literal 0 HcmV?d00001 diff --git a/integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/bin/Release/netstandard2.0/de/LibForTest.resources.dll b/integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/bin/Release/netstandard2.0/de/LibForTest.resources.dll new file mode 100644 index 0000000000000000000000000000000000000000..d910fbaf8e3184c147f079ff9323de8db9996bb7 GIT binary patch literal 3584 zcmeHIO=w(I6h1FMZPKJsF{nYXH%=mo;W;5wn?PeHlW8=XG(%<@iU~At-rS@Q@4Oe@ zPjLh#C@$RT)%X&sJJYyidqmibuGd8o%`m^Ofs>EJGE!#o_qf8x#ygF z-?@vgzE7P*)P=FPN3?^PA*=Dd(KgfrC%zbU^wp`Z> zMOg|za)slH{8CX=y^1uCA3ruycU?G3v|x17t)a=)WVhSYG2CbL5gmbq2jB@_ATY8R zL=S4ZBaWK|9KVKbV8|IdDf=#)^1nIPSr!3qq=<@4WQi_tAr8ViQU5{N-{A#OPm5g- z_?KFEGnB7~;72%c=yaa-xWQ=_%=8lTNVV{w>kz3an|&u@?fZAU5Ai;9S9tD zIY{>d*A>9Abx=3;3=@5YwT6}w6-4t+)J6B4u0s3Ww|Bqf^&eoUVl4<|)m)Z=7x}gf z8q~71D$*Yl)xh?A<&?+7iu41=bEh+Antx+rHd0~a%V}3ep>L@%QHaXQv0st3lJ}Z) zr^}~KStsq2&yP<{WMq1BD%HMO7>MxSIi6tidlIOX_@)DxmqwrCvNgpU2F5E-;@{UKuk3 zM8?rUqFyf4@1qm+NL=%7uq@&^p_%7Fbge!gp;3AmS0<Y$l9|AMP_MA~Kou(7? zkj6tA4{Q94#wPXA2$@*L_;HO>lmY!LouRJn#1mX<_@3@Gzcokyyzf|p3bB>a2$_1x9=lLZWg!rJ68(UF|4pUG?w#t)B7L1$dagF7u zMW@hJF@E^?(cI-H&t12^R-fJ4y+S?L-dI~1%G`c$@S{8L{PgyxKfbxTd*#>9SD*Uk z#&bJ^UBWO19zcPcd!y0@b&vDcp|9XkO)~Qv`d9)3{7s95J22P3_onpXtmo&ITC^ND zJ}W6r&X{3u6n=E~Y}((a{<{@0^kF|nw7oyaxHICKwaM9z-;N7eqFpq#1a>9PO22C`Ho@vl5{8ed7 z?@>cW7C5QhFTi6N{yg|DK^9;ahOAzfM4ZFPDMWOrm1!jjOOlHJ!yK zUDBBfsVM|v0)*fE}G+s=D_OClw#byop poVngJs78Q%t2k4IOa*S<{>nGkaQ**ffWzuX$bvuD`|!W3z@KC?g5m%G literal 0 HcmV?d00001 diff --git a/integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/bin/Release/netstandard2.0/en-US/LibForTest.resources.dll b/integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/bin/Release/netstandard2.0/en-US/LibForTest.resources.dll new file mode 100644 index 0000000000000000000000000000000000000000..937667223065d53fa8dafa05c9aed5f13140ef2e GIT binary patch literal 3584 zcmeHIO>7%Q6n>kZHfh=vM1+Wt=tNFX5n*u@mnKp}ox}}zYn*1(oAe`}z4*$G88@HYahB5cd^ zd?iX!1d%5kPvjO0qT-jOdF;NO%CA-~|FB zi$U~|rrYAUS-|mY*aU{0p`Ehtu_^x>bDd=o;C6~=j)^SMMJ_}utPve;mHi!F5Op=# zb%B4ei8qyeU4b9uz@gK5*5d}JK@hE(K^WNJbZl7=Y~Sn{EW}wekgg9y9qSr|?5ibk z*iAvY7r3qfj;)P4scV4fCe|8SN|YCkJ5d+ice)1cci-Oon%94b;TCG4k`;4FhJF;- zGTfz>q*a!|u&9K#AGl6wSS-sRbbN0jW2X5xET$t@MS+~~WTXPi9Txeh4H4b7l zJvuVZ#+~E>|BR7(8#O_4eHf{N3LI}EWQ#KV^0A~Y6vze5S1$F!h1neDH^I*{Kjr!* z%nT42hx>@Sxlq3kjnboW%{#%ei06c6o(IwO`h19n=n-6*DUDY&RvLc<%n;jiM%{FV zPSC>|_iH?$@lzU`)I)=0Vin`ZHBM0m^wV^fIyMteaH-)o-EF)zNDMjx%p&k41xfE29Cwo{xo6>s zsdWt}x-9KNPshL5tbQ^V&0LxM?CSE%KU|@%>u;<@+5Y&K zFIS%Y=H|0oeI3FudXJ;fjg3%ogE~j}mEe^dbXb$j{Dyv(Krg>-k#H?@{oNB?n)ZX7 z>n>Q17oU}sCTGmBGlccJd$z28!2TyIVCchsjA(OjdU0pO_1Y(AJN|ZD%o1&*sU@)8 zmI1j;1-b-$j+Q{p(juJ)KMOnqn&GRCdw;~8Bkov9zd5V5@#n6|t(NA14S2OEfFB3F zS;D7B>*Q068!n_U4$&eE(}?{E{Qm&HMZWrx+lKBTA#)j#@LN>8S4Z1 zZsawBuASZ;guVM=&y`Wy){A5F*0f1wtcyFsNqo5se9a^(#@@IJ zRjTPMHt4d>R3O(?z4u~W&J||sBzNZGYW5G-&U- v)+#n?$mh)UobA15+y9)dXU|EEB literal 0 HcmV?d00001 diff --git a/integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/bin/Release/netstandard2.0/ru/LibForTest.resources.dll b/integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/bin/Release/netstandard2.0/ru/LibForTest.resources.dll new file mode 100644 index 0000000000000000000000000000000000000000..5e3ec33349da0250d1889634b469e9a57283121c GIT binary patch literal 3584 zcmeHIU1%It6h4!mHfhqR7{wsi8#eI=!*oNoHj&0|l5I4aG)s0HiU~Hevp4DB>`b^b zBd(wX#RuQoS08*75g!DLje_En6rtj)Z^c>=`%s@H7{7C8C$ssnh;M4o?mhRMbI(2Z zobTSbckbm&)JjBcXxrOFo9LPHn%|vmV7TYlmpyc)^LqcLF?+qge9;NSy7JeQRTH-5 zd44D=QmDuijwcH9B~kOM(mZ@eI+d(Mmt|jV>jt-Jq8KE~AU+5G>q4kMRV7 zmPaGHU&}3V-fZCfHEn>y&eTfzciENyY2Q%U1iF?XDzT6!I?q7tr4^#?y|%xj3!;uD zzYgdxH0fq2Uk{-VaN-!#bvE*brb!U3m?}^0{b@yh6;1uRMPd~sB>L`kz?&i z9Db9q?k2_+#JROlJ9YFEeS^7%wh|RZdL|mCyLMMF`u%rzzUKLt(cDr!2xZM&kbxg5 zTLwGQg0!kq4T)M{`^t4HLt;^?!12BDoSEg{keG_xFj8{dlToNFcSsbYitE@f$$Hs; zReIxqg6zLgjdC0edVXE^kZbT#2fX`N(CSKQ~iA&uh-IKI!@u z^h_`rhkJ=S8K~a}N9f@g^LD6g;y#gC=SFn3(I28gdJsouQu8IvL(Sg@XNvu~qE0$R z$LImg`!w&@{3*>%>Y@QMF^l=5nrA2n`Dr>$Z5v4>gw*r{-AcbTSPVJ>&Mo%*MN43( z=KN~p%I7HAU)tH6Rae>}Hku}aK-Ma5z3hapoCtwtB?={(cIc~}!70DCZh7@|IGI&c zSiuhW56pP0zN%Tggyl94)qbyO$CdjAXPwHlugWqA@j)dgw(7cc&;Y5Z*`6G-VAxbq zIvrTF3XRGW$8X>M@ba@~KfmezOlU6m%H&^??<=Zx%u{IKfSrM^}(-S zEIt11wd0$;ZNe~m?gPN-+CbW%_F?`y^btI)MOJ>pJ(f@pf72q-_VkVKJ+)q#@>Rig z=PbvI_ex5WD`wgrL>zs4rvCS&|1JWC-t0$+Hg?w--;6kB`|Rw;Z^!vO(H1VXgtl68 z5Et>bUI0Hs3y@}Lp3Xv_0iTA<^i|uPKjNDszOj<~=CmG-pSz~8+FAfN5Y-}uI1cV+ ziI^U(lCQ@H^bJ+Us0C|)af?Fu`Osqew2kj;13888a$sLOAkwJz$x`ymQ3W#5DDF&y zrVy`2>w1kkDzczS9ex%OD~RVKb{Vz+t1#vDyd>j-9$~#%tNB^HFvd=vir~fOtkFeXsX(pEdhPj!oe^g5q;}R~wEjsBG5$rw_K{hHEW@U%_^mw{|14figLco` ti(-l)?=#~)0W<>CTf?5Zs8rzO?M6PG!}$Np2%FW7lm&mT_vn9zz@O$7g3tf} literal 0 HcmV?d00001 diff --git a/integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/paket.references b/integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/paket.references new file mode 100644 index 0000000000..e69de29bb2 diff --git a/integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/paket.templatetemplate b/integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/paket.templatetemplate new file mode 100644 index 0000000000..f391c6c5bf --- /dev/null +++ b/integrationtests/scenarios/i003275-pack-localized-netstandard/before/LibForTest/paket.templatetemplate @@ -0,0 +1,3 @@ +type project +authors test +description test \ No newline at end of file diff --git a/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/paket.lock b/integrationtests/scenarios/i003275-pack-localized-netstandard/before/paket-files/paket.restore.cached similarity index 100% rename from integrationtests/scenarios/i001816-pack-localized-missing-dll/before/paket.lock rename to integrationtests/scenarios/i003275-pack-localized-netstandard/before/paket-files/paket.restore.cached diff --git a/integrationtests/scenarios/i003275-pack-localized-netstandard/before/paket.dependencies b/integrationtests/scenarios/i003275-pack-localized-netstandard/before/paket.dependencies new file mode 100644 index 0000000000..5c03f805b1 --- /dev/null +++ b/integrationtests/scenarios/i003275-pack-localized-netstandard/before/paket.dependencies @@ -0,0 +1 @@ +source https://www.nuget.org/api/v2 \ No newline at end of file diff --git a/integrationtests/scenarios/i003275-pack-localized-netstandard/before/paket.lock b/integrationtests/scenarios/i003275-pack-localized-netstandard/before/paket.lock new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/integrationtests/scenarios/i003275-pack-localized-netstandard/before/paket.lock @@ -0,0 +1 @@ + diff --git a/src/Paket.Core/Packaging/PackageMetaData.fs b/src/Paket.Core/Packaging/PackageMetaData.fs index 1d2abdd7b6..8f4dd48c9c 100644 --- a/src/Paket.Core/Packaging/PackageMetaData.fs +++ b/src/Paket.Core/Packaging/PackageMetaData.fs @@ -213,13 +213,12 @@ let findDependencies (dependenciesFile : DependenciesFile) config platform (temp let satelliteAssemblyName = Path.GetFileNameWithoutExtension(project.GetAssemblyName()) + ".resources.dll" let projectDir = Path.GetDirectoryName(Path.GetFullPath(project.FileName)) let outputDir = Path.Combine(projectDir, project.GetOutputDirectory config platform) - for language in project.FindLocalizedLanguageNames() do - let fileName = Path.Combine(outputDir, language, satelliteAssemblyName) - if File.Exists fileName then - let satelliteTargetDir = Path.Combine(targetDir, language) - yield (FileInfo fileName, satelliteTargetDir) - else - traceWarnfn "Did not find satellite assembly for (%s) try building and running pack again." language + + yield! + Directory.GetFiles(outputDir, satelliteAssemblyName, SearchOption.AllDirectories) + |> Array.map (fun sa -> (sa, Directory.GetParent(sa))) + |> Array.filter (fun (sa, dirInfo) -> Cultures.isLanguageName (dirInfo.Name)) + |> Array.map (fun (sa, dirInfo) -> (FileInfo sa, Path.Combine(targetDir, dirInfo.Name))) } let template = From 775f34c9348c1da01ce4f82e28b1876f2034af0c Mon Sep 17 00:00:00 2001 From: Lysogorskiy Aleksey Date: Mon, 2 Jul 2018 00:14:43 +0300 Subject: [PATCH 26/86] return warn about missed satellite assembly --- .../Paket.IntegrationTests/PackSpecs.fs | 17 +++ .../before/LocalizedLib.sln | 28 ++++ .../before/LocalizedLib/Class1.cs | 6 + .../before/LocalizedLib/LocalizedLib.csproj | 66 ++++++++++ .../LocalizedLib/Properties/AssemblyInfo.cs | 36 +++++ .../Properties/Resources.Designer.cs | 72 ++++++++++ .../LocalizedLib/Properties/Resources.resx | 123 ++++++++++++++++++ .../Properties/Resources.sv-FI.resx | 123 ++++++++++++++++++ .../LocalizedLib/Properties/Resources.sv.resx | 123 ++++++++++++++++++ .../LocalizedLib/bin/Release/LocalizedLib.dll | Bin 0 -> 5120 bytes .../Release/sv-FI/LocalizedLib.resources.dll | Bin 0 -> 3584 bytes .../LocalizedLib/paket.templatetemplate | 4 + .../before/paket.dependencies | 2 + .../before/paket.lock | 1 + src/Paket.Core/Packaging/PackageMetaData.fs | 15 ++- 15 files changed, 615 insertions(+), 1 deletion(-) create mode 100644 integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib.sln create mode 100644 integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Class1.cs create mode 100644 integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/LocalizedLib.csproj create mode 100644 integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/AssemblyInfo.cs create mode 100644 integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.Designer.cs create mode 100644 integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.resx create mode 100644 integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.sv-FI.resx create mode 100644 integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.sv.resx create mode 100644 integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/bin/Release/LocalizedLib.dll create mode 100644 integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/bin/Release/sv-FI/LocalizedLib.resources.dll create mode 100644 integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/paket.templatetemplate create mode 100644 integrationtests/scenarios/i001816-pack-localized-missing-dll/before/paket.dependencies create mode 100644 integrationtests/scenarios/i001816-pack-localized-missing-dll/before/paket.lock diff --git a/integrationtests/Paket.IntegrationTests/PackSpecs.fs b/integrationtests/Paket.IntegrationTests/PackSpecs.fs index 82fe394cfc..550feb2e93 100644 --- a/integrationtests/Paket.IntegrationTests/PackSpecs.fs +++ b/integrationtests/Paket.IntegrationTests/PackSpecs.fs @@ -372,6 +372,23 @@ let ``#1816 pack localized happy path`` () = CleanDir rootPath +[] +let ``#1816 pack localized when satellite dll is missing`` () = + let scenario = "i001816-pack-localized-missing-dll" + let rootPath = scenarioTempPath scenario + let outPath = Path.Combine(rootPath, "out") + let package = Path.Combine(outPath, "LocalizedLib.1.0.0.0.nupkg") + + let result = paket ("pack -v output \"" + outPath + "\"") scenario + let expectedMessage = "Did not find satellite assembly for (sv) try building and running pack again." + StringAssert.Contains(expectedMessage, result) + ZipFile.ExtractToDirectory(package, outPath) + + Path.Combine(outPath, "lib", "net45", "LocalizedLib.dll") |> checkFileExists + Path.Combine(outPath, "lib", "net45", "sv-FI", "LocalizedLib.resources.dll") |> checkFileExists + + CleanDir rootPath + [] let ``#3275 netstandard pack localized happy path`` () = let scenario = "i003275-pack-localized-netstandard" diff --git a/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib.sln b/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib.sln new file mode 100644 index 0000000000..d3aadd78ef --- /dev/null +++ b/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib.sln @@ -0,0 +1,28 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LocalizedLib", "LocalizedLib\LocalizedLib.csproj", "{F1120474-4821-4FE7-95C1-C71E639664C0}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{3941EE73-7D23-4860-863E-56F6F201A552}" + ProjectSection(SolutionItems) = preProject + paket.dependencies = paket.dependencies + paket.lock = paket.lock + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F1120474-4821-4FE7-95C1-C71E639664C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F1120474-4821-4FE7-95C1-C71E639664C0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F1120474-4821-4FE7-95C1-C71E639664C0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F1120474-4821-4FE7-95C1-C71E639664C0}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Class1.cs b/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Class1.cs new file mode 100644 index 0000000000..48508ef3d9 --- /dev/null +++ b/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Class1.cs @@ -0,0 +1,6 @@ +namespace LocalizedLib +{ + public class Class1 + { + } +} diff --git a/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/LocalizedLib.csproj b/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/LocalizedLib.csproj new file mode 100644 index 0000000000..e0764eb484 --- /dev/null +++ b/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/LocalizedLib.csproj @@ -0,0 +1,66 @@ + + + + + Debug + AnyCPU + {F1120474-4821-4FE7-95C1-C71E639664C0} + Library + Properties + LocalizedLib + LocalizedLib + v4.5 + 512 + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + none + true + bin\Release\ + TRACE + prompt + 0 + + + + + + + + + + + True + True + Resources.resx + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + + + + + + + \ No newline at end of file diff --git a/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/AssemblyInfo.cs b/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..39a892127f --- /dev/null +++ b/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("LocalizedLib")] +[assembly: AssemblyDescription("Test with satellite dlls")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Author")] +[assembly: AssemblyProduct("LocalizedLib")] +[assembly: AssemblyCopyright("Copyright © 2016")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("f1120474-4821-4fe7-95c1-c71e639664c0")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.Designer.cs b/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.Designer.cs new file mode 100644 index 0000000000..06c92529ef --- /dev/null +++ b/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.Designer.cs @@ -0,0 +1,72 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace LocalizedLib.Properties { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("LocalizedLib.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to Key. + /// + internal static string Key { + get { + return ResourceManager.GetString("Key", resourceCulture); + } + } + } +} diff --git a/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.resx b/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.resx new file mode 100644 index 0000000000..58c1f76475 --- /dev/null +++ b/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Key + + \ No newline at end of file diff --git a/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.sv-FI.resx b/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.sv-FI.resx new file mode 100644 index 0000000000..3ae158b572 --- /dev/null +++ b/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.sv-FI.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Nyckel + + \ No newline at end of file diff --git a/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.sv.resx b/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.sv.resx new file mode 100644 index 0000000000..3ae158b572 --- /dev/null +++ b/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/Properties/Resources.sv.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Nyckel + + \ No newline at end of file diff --git a/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/bin/Release/LocalizedLib.dll b/integrationtests/scenarios/i001816-pack-localized-missing-dll/before/LocalizedLib/bin/Release/LocalizedLib.dll new file mode 100644 index 0000000000000000000000000000000000000000..56b6a4e70aa3c17d81de4c2d3e221f01edc7012d GIT binary patch literal 5120 zcmeHLU2Ggz6+Sb&UOP#%)Na$HK?zeFAa(4O*IwH(ZNNWkC!5%@W3QdG4T@)Huh-Me z&MY&twl`G4sBLIfAyMUtwhtijK$QxWsDgmhs^JBM8mQDh08f#C3L#L$0}?{0;X8L` zylXq5^by2e&$;LCo_p@OXU@Ij$;ZD*F(QiNxqX}H8hUO+68?Lz266IJKS|OX+ipB` zO_{jyP=3kuw2JGLT)nIrx@|kYRuGz7wKdb$vQx8K*(r+D&Yjy2gr=v*h$fU6y|#Sm zbTr#d`n0w~=_a}doJ7E#KZIVxGlYleUWu!L-^>Wrh}J-W&n-p^&$252)%%cS7Fry3 zrx+O`dY=Qaxh({4Y-WEXtr4{}D7An-){TK%yC6y-&AU%*EFK%wh<}JM9Xv# zy&Ita5!|mHypL#m$M-M7LcD9gi>~r60;?XpAADyQfcF5v8q1|p$KH!@Hr}ycU6cL% zL8vEOBt}IFoZV~?vyaRkA5lWjc%93cRClVkyEi?^t~HSb_)nNNm+pAZ(>)}?es%x0{;dqC+Hi*v;0l10{%gL z3({432Jl0`1f8HOfS;4_&$0K|*)VH4&I%%=P%8~foa6OW?0SqT72K<84seMkX~hOr)l-l?6H?PO59)=GI!jN0x*SqBV|p01$JK4LFUB6Q6r|E6L7XV|331R01V1=Fp{C&(pWMcTK$gd{I zoA6VSIn5Mbi}DPLvb6$o7DjD|_Dggl?~2@W7VvDBICY6eE#33d^ys8htXkp=G~pP! zWnK`)39~?D&v0A|$V}Dt&9cbXD&m-K7cD_Yh0oNu>y$$dlT;G^xzVcSS6x9~1MUjX zsk(-UWMf6scia)zS@HCOC1!oy7c}aWE2bsfqrw(07{y^9Z*-vw(b1~eNJR>xIAZEb zSy8B#O2R$q*mIt6?H{`;Q5V3IdDAmDC=Yv{C>N|+-t-%7tg~IcD9XBfzHTM2 zyNJg)4oI=$Gzy|I<5=yya6Qwp>!Tv!sADghr78k(M{!nohHF+f3WEsB5i`QlS0(0c zwLR@(yA6MsD3JY|ZmUITfm=!o{LW za{>kRI?`b~jxB5-sVJ-siI^%{R;Wf%CQa&gH1a6wI47-KZN!`rify)_-XD*GBu4}}Om`hhQ-vq7db!*aq9*$&v4Z!0f*dkP z$4P3^1rk)G319`(t7&o}tAOW{4<6oRaA#!iP!(K5;?#TseNCEs>Fm_CmFIpi@#Z_P zY=8E|2fw4ZrYJ2awMr9^)>bBy4Adq~Rgy``eGF$vo8Bto8nu}T=F2XbY@2KO(S@_~ z4`yyYA4{~I!ZU|b)^>`)9EzdRHizn!jJGfkU@q1|$rdF%&-U|imRBD*?dlbjg0WRY z$k!yl#N|eTUQh^I6}o3bxubmw?a2$z*H%n_N%K&GEF`tikbbyTG|5AKheCx z6zYv$y(n{1dB?H56ka;VE}@K}ToyOBQMk=~%aX3dg9{A3gWdh*FK)fXJ0C|EFWiFV{B`S z?#hAW+^FMbEo)LY?chulLY5?!-u?`1@b&V)tnrPHXb;iaM#uT(Awo88;jY_K}w>}IuE84K2|Dv=K++fzPC?PM4 zUV&8|Rc9Qv$U?=*kxh%JP}~m4druxx9b6A`UDhlIRM1|J{~AUW_~b*&1iy3#OK(V> zZmc`_Wl#wb13HeosDk^QLuLE~M*EnBC@(9ZkF8&UO&@n-4Sb$kzz43WjA^Ka3j6kZY(w&xBsE#=BK=w$Y86Shq0` z8!o)5k4?j??)8V~Y=u5YnEiLr^9fP+@@{jb!j$y4Rd7yl^h;PD ze+zHrY4j@MrBM(3NfU}Fb-+raonV)Xuv>;*7x(HQt~}>)>GxDP2k$cb9mS3*-aY*P z0lwV%)C+csZGB$GJvar6*b@UD*CTLu8$3269(E6h4oZwoo8~1R-d+O-qcizRb|_(+E0k2c%M9(iy5TCiKmlOZ(C{?~V7} z0frdTgxO zogfIcC`zHKf$##6J(?Hguq5rZYghNxL+ADrjazMW>EyZBlF{zbik@z(o2Ua8E}&ny zgFwlk5Ite!6)|o$Fn&XG;IK2bQRZEC<$trTt84>w3&IzdKVOTqEZY+@ z3aiSMQA3)LPD!eMQI6bD`ChSKOiC4bVX$w|PVui_j8=VJRdQb-t6DjJzsOaKzULm2 zwL&;6gMG!_yPcix&RyxDfkBztGt|3uuxg;avP?$LOU-#{Ol~-v!++xU_psTBZlZJ? zB1tvY$m%#!b7!SbBl%ZHta>L-=}87SkQzu2vD-@W!MhN%_bib{ontw#l^0A$?C}l8 ztj>)@s~G2B+XrY<47n33o48J7*12FO z)$0!0PETSxjTnC1@Y9B0F#M9?H^G_WzC62Cw3oKgdc(IE-edT4hNlf5GTf$a>LVKw zc7boD0(h^nJWo@Q2k12Ti*%OS=aLaHl%aXrWbqbG$fDH{xx}7N$AF0T9u7-YU%o`i z{-DOt0e{}b^%3GgM*QaORoZK>a z@BNL}E`5CK`s{{3?y5iEIXB-v|K(4W8|}if)~&Z_%|bv#&sem%AR{eKd3r`fj+Vaf zX(<35JHFeZj^V1F!6ML87Hw#xOnh}wh#jf)E}R;R@Y<}gs52d(c3`_wzl#{>9hL=4 zODVat;+Es1q00LHVaE&Ny&|Q}DP)@8ju__lk9{BWhiAYt$=Xab*XkGFeyL^b?8k4% z>lxgAcsCN#ZG#XeDNo12_tONVF}$=#ppStch+kd$y#4;)@ySmPeq6s?55#u`?!y+! zLbDLnA%!>|?q7+R0iB@G`1P4bvVc|x)(GtmY50ZEV!GV^BVV$>q~YbkKD|t&%f=@~ z$#0N~knz1jThMnD@yhr~^wt=Ka1Tn<8e8rZVrrU!6q&IlF!;tMVJjKUJPnA~*@#s! zcx%XxW8yN_VXB%)A#gHfX)XMdS!d0Nu9-sxe$6?K1D%UFJn9*Em4Mmf(aXBL)=AeLvWxGCm#&M7~AnrKq(Bi4A8c-@xI$-m*;YjU1L z{1E7?n2By#qX)&skThs=-P(6?#uw*%kLfdvY(>Cb#;W Array.map (fun sa -> (sa, Directory.GetParent(sa))) |> Array.filter (fun (sa, dirInfo) -> Cultures.isLanguageName (dirInfo.Name)) + + let existedSatelliteLanguages = + satelliteWithFolders + |> Array.map (fun (_, dirInfo) -> dirInfo.Name) + |> Set.ofArray + + project.FindLocalizedLanguageNames() + |> List.filter (existedSatelliteLanguages.Contains >> not) + |> List.iter (fun lang -> + traceWarnfn "Did not find satellite assembly for (%s) try building and running pack again." lang) + + yield! + satelliteWithFolders |> Array.map (fun (sa, dirInfo) -> (FileInfo sa, Path.Combine(targetDir, dirInfo.Name))) } From ca47546954666ce6155a52c33dd8294b87d153e5 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Mon, 2 Jul 2018 07:32:53 +0200 Subject: [PATCH 27/86] Check if we already loaded the props --- RELEASE_NOTES.md | 2 +- src/Paket.Core/Installation/RestoreProcess.fs | 1 + src/Paket.Core/embedded/Paket.Restore.targets | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index f18bfddb03..6f36c7d845 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,4 +1,4 @@ -#### 5.174.0-alpha001 - 2018-06-29 +#### 5.174.0-alpha002 - 2018-06-29 * NEW FEATURE: Improved Visual Studio integration - https://github.com/fsprojects/Paket/pull/3273 * BUGFIX: Extended NuGetV3 source detection with Artifactory feed format - https://github.com/fsprojects/Paket/pull/3267 * BUGFIX: Paket add only runs update on the touched group - https://github.com/fsprojects/Paket/issues/3259 diff --git a/src/Paket.Core/Installation/RestoreProcess.fs b/src/Paket.Core/Installation/RestoreProcess.fs index f15ed11dba..614e042d9a 100644 --- a/src/Paket.Core/Installation/RestoreProcess.fs +++ b/src/Paket.Core/Installation/RestoreProcess.fs @@ -302,6 +302,7 @@ let createPaketPropsFile (lockFile:LockFile) (cliTools:ResolvedPackage seq) (pac $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true %s %s diff --git a/src/Paket.Core/embedded/Paket.Restore.targets b/src/Paket.Core/embedded/Paket.Restore.targets index ceb2f35c04..d98abdf8ea 100644 --- a/src/Paket.Core/embedded/Paket.Restore.targets +++ b/src/Paket.Core/embedded/Paket.Restore.targets @@ -71,7 +71,10 @@ false true - + + + true + From dd4a17b9dfd59ef280357dd05b8b0e4b8ebcec9f Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Mon, 2 Jul 2018 07:38:54 +0200 Subject: [PATCH 28/86] Bump version to 5.174.0-alpha002 --- .paket/Paket.Restore.targets | 4 ++-- src/Paket.Bootstrapper/Properties/AssemblyInfo.cs | 4 ++-- src/Paket.Core/AssemblyInfo.fs | 4 ++-- src/Paket/AssemblyInfo.fs | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets index 55292f317c..ceb2f35c04 100644 --- a/.paket/Paket.Restore.targets +++ b/.paket/Paket.Restore.targets @@ -132,11 +132,11 @@ - + - + $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0]) $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1]) diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index 1f0bc3dab3..6d74d3f427 100644 --- a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs +++ b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs @@ -6,7 +6,7 @@ [assembly: AssemblyDescriptionAttribute("A dependency manager for .NET with support for NuGet packages and git repositories.")] [assembly: AssemblyVersionAttribute("5.174.0")] [assembly: AssemblyFileVersionAttribute("5.174.0")] -[assembly: AssemblyInformationalVersionAttribute("5.174.0-alpha001")] +[assembly: AssemblyInformationalVersionAttribute("5.174.0-alpha002")] namespace System { internal static class AssemblyVersionInformation { internal const System.String AssemblyTitle = "Paket.Bootstrapper"; @@ -14,6 +14,6 @@ internal static class AssemblyVersionInformation { internal const System.String AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories."; internal const System.String AssemblyVersion = "5.174.0"; internal const System.String AssemblyFileVersion = "5.174.0"; - internal const System.String AssemblyInformationalVersion = "5.174.0-alpha001"; + internal const System.String AssemblyInformationalVersion = "5.174.0-alpha002"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index 6fee7c85bc..3cb6450f3c 100644 --- a/src/Paket.Core/AssemblyInfo.fs +++ b/src/Paket.Core/AssemblyInfo.fs @@ -8,7 +8,7 @@ open System.Reflection [] [] [] -[] +[] do () module internal AssemblyVersionInformation = @@ -18,4 +18,4 @@ module internal AssemblyVersionInformation = let [] AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories." let [] AssemblyVersion = "5.174.0" let [] AssemblyFileVersion = "5.174.0" - let [] AssemblyInformationalVersion = "5.174.0-alpha001" + let [] AssemblyInformationalVersion = "5.174.0-alpha002" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index 0066bcbb59..25f2c799d4 100644 --- a/src/Paket/AssemblyInfo.fs +++ b/src/Paket/AssemblyInfo.fs @@ -8,7 +8,7 @@ open System.Reflection [] [] [] -[] +[] do () module internal AssemblyVersionInformation = @@ -18,4 +18,4 @@ module internal AssemblyVersionInformation = let [] AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories." let [] AssemblyVersion = "5.174.0" let [] AssemblyFileVersion = "5.174.0" - let [] AssemblyInformationalVersion = "5.174.0-alpha001" + let [] AssemblyInformationalVersion = "5.174.0-alpha002" From 425502a709f4ee96efba6d729f0e16e82aa4ab2e Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Mon, 2 Jul 2018 07:53:10 +0200 Subject: [PATCH 29/86] Check if we already loaded the props --- RELEASE_NOTES.md | 2 +- src/Paket.Core/Installation/RestoreProcess.fs | 2 +- src/Paket.Core/embedded/Paket.Restore.targets | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 6f36c7d845..15eca1c824 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,4 +1,4 @@ -#### 5.174.0-alpha002 - 2018-06-29 +#### 5.174.0-alpha003 - 2018-07-02 * NEW FEATURE: Improved Visual Studio integration - https://github.com/fsprojects/Paket/pull/3273 * BUGFIX: Extended NuGetV3 source detection with Artifactory feed format - https://github.com/fsprojects/Paket/pull/3267 * BUGFIX: Paket add only runs update on the touched group - https://github.com/fsprojects/Paket/issues/3259 diff --git a/src/Paket.Core/Installation/RestoreProcess.fs b/src/Paket.Core/Installation/RestoreProcess.fs index 614e042d9a..c76046c3be 100644 --- a/src/Paket.Core/Installation/RestoreProcess.fs +++ b/src/Paket.Core/Installation/RestoreProcess.fs @@ -302,7 +302,7 @@ let createPaketPropsFile (lockFile:LockFile) (cliTools:ResolvedPackage seq) (pac $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true + 5.174.0 %s %s diff --git a/src/Paket.Core/embedded/Paket.Restore.targets b/src/Paket.Core/embedded/Paket.Restore.targets index d98abdf8ea..16f3fe1fa9 100644 --- a/src/Paket.Core/embedded/Paket.Restore.targets +++ b/src/Paket.Core/embedded/Paket.Restore.targets @@ -72,7 +72,7 @@ true - + true From bba4f2ec0abeed5a1228c8ade188046132cae59b Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Mon, 2 Jul 2018 08:03:41 +0200 Subject: [PATCH 30/86] Bump version to 5.174.0-alpha003 --- .paket/Paket.Restore.targets | 5 ++++- src/Paket.Bootstrapper/Properties/AssemblyInfo.cs | 4 ++-- src/Paket.Core/AssemblyInfo.fs | 4 ++-- src/Paket/AssemblyInfo.fs | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets index ceb2f35c04..d98abdf8ea 100644 --- a/.paket/Paket.Restore.targets +++ b/.paket/Paket.Restore.targets @@ -71,7 +71,10 @@ false true - + + + true + diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index 6d74d3f427..22a997297d 100644 --- a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs +++ b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs @@ -6,7 +6,7 @@ [assembly: AssemblyDescriptionAttribute("A dependency manager for .NET with support for NuGet packages and git repositories.")] [assembly: AssemblyVersionAttribute("5.174.0")] [assembly: AssemblyFileVersionAttribute("5.174.0")] -[assembly: AssemblyInformationalVersionAttribute("5.174.0-alpha002")] +[assembly: AssemblyInformationalVersionAttribute("5.174.0-alpha003")] namespace System { internal static class AssemblyVersionInformation { internal const System.String AssemblyTitle = "Paket.Bootstrapper"; @@ -14,6 +14,6 @@ internal static class AssemblyVersionInformation { internal const System.String AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories."; internal const System.String AssemblyVersion = "5.174.0"; internal const System.String AssemblyFileVersion = "5.174.0"; - internal const System.String AssemblyInformationalVersion = "5.174.0-alpha002"; + internal const System.String AssemblyInformationalVersion = "5.174.0-alpha003"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index 3cb6450f3c..45e5daf2de 100644 --- a/src/Paket.Core/AssemblyInfo.fs +++ b/src/Paket.Core/AssemblyInfo.fs @@ -8,7 +8,7 @@ open System.Reflection [] [] [] -[] +[] do () module internal AssemblyVersionInformation = @@ -18,4 +18,4 @@ module internal AssemblyVersionInformation = let [] AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories." let [] AssemblyVersion = "5.174.0" let [] AssemblyFileVersion = "5.174.0" - let [] AssemblyInformationalVersion = "5.174.0-alpha002" + let [] AssemblyInformationalVersion = "5.174.0-alpha003" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index 25f2c799d4..dadf995d7a 100644 --- a/src/Paket/AssemblyInfo.fs +++ b/src/Paket/AssemblyInfo.fs @@ -8,7 +8,7 @@ open System.Reflection [] [] [] -[] +[] do () module internal AssemblyVersionInformation = @@ -18,4 +18,4 @@ module internal AssemblyVersionInformation = let [] AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories." let [] AssemblyVersion = "5.174.0" let [] AssemblyFileVersion = "5.174.0" - let [] AssemblyInformationalVersion = "5.174.0-alpha002" + let [] AssemblyInformationalVersion = "5.174.0-alpha003" From 9659b0ea57f8bdcd52857e0c864ed4c6000ac86b Mon Sep 17 00:00:00 2001 From: Manuel Pfemeter Date: Tue, 3 Jul 2018 09:36:36 +0200 Subject: [PATCH 31/86] changes vs extension link to vs marketplace --- docs/content/editor-support.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/editor-support.md b/docs/content/editor-support.md index e28511df58..86b4f08019 100644 --- a/docs/content/editor-support.md +++ b/docs/content/editor-support.md @@ -38,7 +38,7 @@ * [Project site](https://github.com/fsprojects/Paket.VisualStudio) * Status: In Development * Installation: Available via - [Visual Studio Gallery](https://visualstudiogallery.msdn.microsoft.com/ce104917-e8b3-4365-9490-8432c6e75c36) + [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=SteffenForkmann.PaketforVisualStudio) * Features: * Solution Explorer Extensions for Paket files * Paket commands in Solution Explorer menu From 595669a4b5b875dc872dbc44746bce842e26cd89 Mon Sep 17 00:00:00 2001 From: Ilja Nosik Date: Tue, 3 Jul 2018 12:24:01 +0200 Subject: [PATCH 32/86] Make the group parameter for outdated work like everywhere else Prior to this change, the `--group` parameter was case-sensitive, and probably some other issues. --- src/Paket.Core/PackageAnalysis/FindOutdated.fs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Paket.Core/PackageAnalysis/FindOutdated.fs b/src/Paket.Core/PackageAnalysis/FindOutdated.fs index 61ac16f8f3..ccc621ce23 100644 --- a/src/Paket.Core/PackageAnalysis/FindOutdated.fs +++ b/src/Paket.Core/PackageAnalysis/FindOutdated.fs @@ -41,10 +41,10 @@ let FindOutdated strict force includingPrereleases groupNameFilter environment = return versions |> List.toSeq } let getPreferredVersionsF resolverStrategy parameters = [] let dependenciesFile = UpdateProcess.detectProjectFrameworksForDependenciesFile dependenciesFile - let checkedDepsGroups = + let checkedDepsGroups = match groupNameFilter with | None -> dependenciesFile.Groups - | Some gname -> dependenciesFile.Groups |> Map.filter(fun k g -> k.ToString() = gname) + | Some gname -> dependenciesFile.Groups |> Map.filter(fun k _ -> k = GroupName gname) let newResolution = dependenciesFile.Resolve(force, getSha1, getVersionsF, getPreferredVersionsF, NuGet.GetPackageDetails alternativeProjectRoot root true, RuntimeGraph.getRuntimeGraphFromNugetCache root, checkedDepsGroups, PackageResolver.UpdateMode.UpdateAll) From a9f153aadae9eacdef35c2e45404e16f50b6cd54 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Wed, 4 Jul 2018 10:41:55 +0200 Subject: [PATCH 33/86] Cleanup --- src/Paket.Core/Installation/InstallProcess.fs | 13 +++++-------- src/Paket.Core/PaketConfigFiles/ProjectFile.fs | 3 +-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/Paket.Core/Installation/InstallProcess.fs b/src/Paket.Core/Installation/InstallProcess.fs index f40cd710c3..1329e3e05f 100644 --- a/src/Paket.Core/Installation/InstallProcess.fs +++ b/src/Paket.Core/Installation/InstallProcess.fs @@ -379,8 +379,7 @@ let InstallIntoProjects(options : InstallerOptions, forceTouch, dependenciesFile let prefix = dependenciesFile.Directory.Length + 1 let norm (s:string) = (s.Substring prefix).Replace('\\', '/') - - let groupSettings = lockFile.Groups |> Map.map (fun k v -> v.Options.Settings) + for project, referenceFile in projectsAndReferences do tracefn " - %s -> %s" (norm referenceFile.FileName) (norm project.FileName) let toolsVersion = project.GetToolsVersion() @@ -427,15 +426,13 @@ let InstallIntoProjects(options : InstallerOptions, forceTouch, dependenciesFile directDependencies |> Seq.collect (fun u -> lookup.[u.Key] |> Seq.map (fun i -> fst u.Key, u.Value, i)) |> Seq.partitionAndChoose - (fun (groupName,(_,parentSettings), dep) -> - lockFile.Groups |> Map.containsKey groupName) + (fun (groupName,_, _) -> lockFile.Groups |> Map.containsKey groupName) (fun (groupName,(_,parentSettings), dep) -> let group = lockFile.Groups.[groupName] match group.TryFind dep with | None -> None - | Some p -> - Some ((groupName,p.Name), (p.Version,parentSettings + p.Settings)) ) - (fun (groupName,(_,parentSettings), dep) -> + | Some p -> Some ((groupName,p.Name), (p.Version,parentSettings + p.Settings)) ) + (fun (groupName,_, _) -> Some (sprintf " - %s uses the group %O, but this group was not found in paket.lock." referenceFile.FileName groupName) ) for key,settings in usedPackageDependencies do @@ -514,7 +511,7 @@ let InstallIntoProjects(options : InstallerOptions, forceTouch, dependenciesFile if toolsVersion >= 15.0 then installForDotnetSDK root project else - project.UpdateReferences(root, model, directDependencies, usedPackages) + project.UpdateReferences(model, directDependencies, usedPackages) Path.Combine(FileInfo(project.FileName).Directory.FullName, Constants.PackagesConfigFile) |> updatePackagesConfigFile usedPackages diff --git a/src/Paket.Core/PaketConfigFiles/ProjectFile.fs b/src/Paket.Core/PaketConfigFiles/ProjectFile.fs index a8c1b64d1c..094afc8e60 100644 --- a/src/Paket.Core/PaketConfigFiles/ProjectFile.fs +++ b/src/Paket.Core/PaketConfigFiles/ProjectFile.fs @@ -1132,7 +1132,6 @@ module ProjectFile = | _ -> fallback() let updateReferences - rootPath (completeModel: Map) (directPackages : Map) (usedPackages : Map) @@ -1731,7 +1730,7 @@ type ProjectFile with member this.RemovePaketNodes () = ProjectFile.removePaketNodes this - member this.UpdateReferences (root, completeModel, directDependencies, usedPackages) = ProjectFile.updateReferences root completeModel directDependencies usedPackages this + member this.UpdateReferences (completeModel, directDependencies, usedPackages) = ProjectFile.updateReferences completeModel directDependencies usedPackages this member this.Save(forceTouch) = ProjectFile.save forceTouch this From f189eaca772da73c843889d05bd4acbd01fe246e Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Wed, 4 Jul 2018 10:45:40 +0200 Subject: [PATCH 34/86] Cleanup --- src/Paket.Core/Installation/InstallProcess.fs | 42 +++++++++---------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/src/Paket.Core/Installation/InstallProcess.fs b/src/Paket.Core/Installation/InstallProcess.fs index 1329e3e05f..892ab8d8ea 100644 --- a/src/Paket.Core/Installation/InstallProcess.fs +++ b/src/Paket.Core/Installation/InstallProcess.fs @@ -526,29 +526,27 @@ let InstallIntoProjects(options : InstallerOptions, forceTouch, dependenciesFile let linked = defaultArg file.Settings.Link true let buildAction = project.DetermineBuildActionForRemoteItems file.Name if buildAction <> BuildAction.Reference && linked then - { BuildAction = buildAction - Include = createRelativePath project.FileName remoteFilePath - WithPaketSubNode = true - CopyToOutputDirectory = None - Link = Some link - } + { BuildAction = buildAction + Include = createRelativePath project.FileName remoteFilePath + WithPaketSubNode = true + CopyToOutputDirectory = None + Link = Some link } else - { BuildAction = buildAction - WithPaketSubNode = true - CopyToOutputDirectory = None - Include = - if buildAction = BuildAction.Reference then - createRelativePath project.FileName remoteFilePath - else - let toDir = Path.GetDirectoryName(project.FileName) - let targetFile = FileInfo(Path.Combine(toDir,link)) - if targetFile.Directory.Exists |> not then - targetFile.Directory.Create() - - File.Copy(remoteFilePath,targetFile.FullName,true) - createRelativePath project.FileName targetFile.FullName - Link = None - } + { BuildAction = buildAction + WithPaketSubNode = true + CopyToOutputDirectory = None + Include = + if buildAction = BuildAction.Reference then + createRelativePath project.FileName remoteFilePath + else + let toDir = Path.GetDirectoryName(project.FileName) + let targetFile = FileInfo(Path.Combine(toDir,link)) + if targetFile.Directory.Exists |> not then + targetFile.Directory.Create() + + File.Copy(remoteFilePath,targetFile.FullName,true) + createRelativePath project.FileName targetFile.FullName + Link = None } ) |> Seq.toList processContentFiles root project usedPackages gitRemoteItems options From f6c4511edc960b693fb6cdcc6323b2db5f61a821 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Wed, 4 Jul 2018 10:45:46 +0200 Subject: [PATCH 35/86] Cleanup --- src/Paket.Core/Installation/InstallProcess.fs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Paket.Core/Installation/InstallProcess.fs b/src/Paket.Core/Installation/InstallProcess.fs index 892ab8d8ea..03056a031b 100644 --- a/src/Paket.Core/Installation/InstallProcess.fs +++ b/src/Paket.Core/Installation/InstallProcess.fs @@ -446,11 +446,10 @@ let InstallIntoProjects(options : InstallerOptions, forceTouch, dependenciesFile usedPackages |> Map.filter (fun (_groupName,packageName) (v,settings) -> let hasCondition = settings.ReferenceCondition.IsSome - //settings.FrameworkRestrictions match dict.TryGetValue packageName with - | true,(v',true,_) when hasCondition -> + | true,(_,true,_) when hasCondition -> true - | true,(v',hasCondition',restrictions') -> + | true,(v',_,restrictions') -> let filtered = filterRestrictions settings.FrameworkRestrictions restrictions' dict.[packageName] <- (v,hasCondition,filtered) if v' = v then From 4f40b2fa31f8c65ec924cdb1fbaba2e9af38e910 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Wed, 4 Jul 2018 10:46:45 +0200 Subject: [PATCH 36/86] Do not add Compile tags for packages when we use new project format - fixes #3269 --- src/Paket.Core/Installation/InstallProcess.fs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Paket.Core/Installation/InstallProcess.fs b/src/Paket.Core/Installation/InstallProcess.fs index 03056a031b..a8f6da23c2 100644 --- a/src/Paket.Core/Installation/InstallProcess.fs +++ b/src/Paket.Core/Installation/InstallProcess.fs @@ -547,8 +547,12 @@ let InstallIntoProjects(options : InstallerOptions, forceTouch, dependenciesFile createRelativePath project.FileName targetFile.FullName Link = None } ) |> Seq.toList - - processContentFiles root project usedPackages gitRemoteItems options + + if toolsVersion >= 15.0 then + processContentFiles root project Map.empty gitRemoteItems options + else + processContentFiles root project usedPackages gitRemoteItems options + project.Save forceTouch projectCache.[project.FileName] <- Some project From 2f50af4ca0b56271e11b7804fb9842dc82d080ce Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Wed, 4 Jul 2018 11:00:46 +0200 Subject: [PATCH 37/86] Bump version to 5.174.0-alpha004 --- .paket/Paket.Restore.targets | 2 +- src/Paket.Bootstrapper/Properties/AssemblyInfo.cs | 4 ++-- src/Paket.Core/AssemblyInfo.fs | 4 ++-- src/Paket/AssemblyInfo.fs | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets index d98abdf8ea..16f3fe1fa9 100644 --- a/.paket/Paket.Restore.targets +++ b/.paket/Paket.Restore.targets @@ -72,7 +72,7 @@ true - + true diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index 22a997297d..ce398d2e6b 100644 --- a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs +++ b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs @@ -6,7 +6,7 @@ [assembly: AssemblyDescriptionAttribute("A dependency manager for .NET with support for NuGet packages and git repositories.")] [assembly: AssemblyVersionAttribute("5.174.0")] [assembly: AssemblyFileVersionAttribute("5.174.0")] -[assembly: AssemblyInformationalVersionAttribute("5.174.0-alpha003")] +[assembly: AssemblyInformationalVersionAttribute("5.174.0-alpha004")] namespace System { internal static class AssemblyVersionInformation { internal const System.String AssemblyTitle = "Paket.Bootstrapper"; @@ -14,6 +14,6 @@ internal static class AssemblyVersionInformation { internal const System.String AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories."; internal const System.String AssemblyVersion = "5.174.0"; internal const System.String AssemblyFileVersion = "5.174.0"; - internal const System.String AssemblyInformationalVersion = "5.174.0-alpha003"; + internal const System.String AssemblyInformationalVersion = "5.174.0-alpha004"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index 45e5daf2de..ef1e994e2b 100644 --- a/src/Paket.Core/AssemblyInfo.fs +++ b/src/Paket.Core/AssemblyInfo.fs @@ -8,7 +8,7 @@ open System.Reflection [] [] [] -[] +[] do () module internal AssemblyVersionInformation = @@ -18,4 +18,4 @@ module internal AssemblyVersionInformation = let [] AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories." let [] AssemblyVersion = "5.174.0" let [] AssemblyFileVersion = "5.174.0" - let [] AssemblyInformationalVersion = "5.174.0-alpha003" + let [] AssemblyInformationalVersion = "5.174.0-alpha004" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index dadf995d7a..6bcb02ed4b 100644 --- a/src/Paket/AssemblyInfo.fs +++ b/src/Paket/AssemblyInfo.fs @@ -8,7 +8,7 @@ open System.Reflection [] [] [] -[] +[] do () module internal AssemblyVersionInformation = @@ -18,4 +18,4 @@ module internal AssemblyVersionInformation = let [] AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories." let [] AssemblyVersion = "5.174.0" let [] AssemblyFileVersion = "5.174.0" - let [] AssemblyInformationalVersion = "5.174.0-alpha003" + let [] AssemblyInformationalVersion = "5.174.0-alpha004" From baaf0120d9f10f97c405b932c9c43d9ac0e6575f Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Wed, 4 Jul 2018 11:04:15 +0200 Subject: [PATCH 38/86] RELEASE_NOTES --- RELEASE_NOTES.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 772df23c20..8899fa242c 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,8 +1,9 @@ -#### 5.174.0-alpha004 - 2018-07-04 +#### 5.174.0-alpha005 - 2018-07-04 * NEW FEATURE: Improved Visual Studio integration - https://github.com/fsprojects/Paket/pull/3273 * BUGFIX: Paket doesn't add Compile tags for packages when new project format ius used - https://github.com/fsprojects/Paket/issues/3269 * BUGFIX: Extended NuGetV3 source detection with Artifactory feed format - https://github.com/fsprojects/Paket/pull/3267 * BUGFIX: Paket add only runs update on the touched group - https://github.com/fsprojects/Paket/issues/3259 +* COSMETICS: group parameter for outdated works like everywhere else - https://github.com/fsprojects/Paket/pull/3280 #### 5.173.0 - 2018-06-20 * BUGFIX: Don't serialize individual settings that match group settings in lock file - https://github.com/fsprojects/Paket/issues/3257 From 3c4ef8f3325bff8203dcdb558a1848dedab522bb Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Wed, 4 Jul 2018 11:09:46 +0200 Subject: [PATCH 39/86] Bump version to 5.174.0-alpha005 --- src/Paket.Bootstrapper/Properties/AssemblyInfo.cs | 4 ++-- src/Paket.Core/AssemblyInfo.fs | 4 ++-- src/Paket/AssemblyInfo.fs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index ce398d2e6b..4979227955 100644 --- a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs +++ b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs @@ -6,7 +6,7 @@ [assembly: AssemblyDescriptionAttribute("A dependency manager for .NET with support for NuGet packages and git repositories.")] [assembly: AssemblyVersionAttribute("5.174.0")] [assembly: AssemblyFileVersionAttribute("5.174.0")] -[assembly: AssemblyInformationalVersionAttribute("5.174.0-alpha004")] +[assembly: AssemblyInformationalVersionAttribute("5.174.0-alpha005")] namespace System { internal static class AssemblyVersionInformation { internal const System.String AssemblyTitle = "Paket.Bootstrapper"; @@ -14,6 +14,6 @@ internal static class AssemblyVersionInformation { internal const System.String AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories."; internal const System.String AssemblyVersion = "5.174.0"; internal const System.String AssemblyFileVersion = "5.174.0"; - internal const System.String AssemblyInformationalVersion = "5.174.0-alpha004"; + internal const System.String AssemblyInformationalVersion = "5.174.0-alpha005"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index ef1e994e2b..fcf1d832ce 100644 --- a/src/Paket.Core/AssemblyInfo.fs +++ b/src/Paket.Core/AssemblyInfo.fs @@ -8,7 +8,7 @@ open System.Reflection [] [] [] -[] +[] do () module internal AssemblyVersionInformation = @@ -18,4 +18,4 @@ module internal AssemblyVersionInformation = let [] AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories." let [] AssemblyVersion = "5.174.0" let [] AssemblyFileVersion = "5.174.0" - let [] AssemblyInformationalVersion = "5.174.0-alpha004" + let [] AssemblyInformationalVersion = "5.174.0-alpha005" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index 6bcb02ed4b..426dddfa9b 100644 --- a/src/Paket/AssemblyInfo.fs +++ b/src/Paket/AssemblyInfo.fs @@ -8,7 +8,7 @@ open System.Reflection [] [] [] -[] +[] do () module internal AssemblyVersionInformation = @@ -18,4 +18,4 @@ module internal AssemblyVersionInformation = let [] AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories." let [] AssemblyVersion = "5.174.0" let [] AssemblyFileVersion = "5.174.0" - let [] AssemblyInformationalVersion = "5.174.0-alpha004" + let [] AssemblyInformationalVersion = "5.174.0-alpha005" From 28b3068b1eb2cd92a826194fdce48ba2c70b08ab Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Wed, 4 Jul 2018 11:11:34 +0200 Subject: [PATCH 40/86] RELEASE_NOTES --- RELEASE_NOTES.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 8899fa242c..089b895ecc 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,6 +1,7 @@ -#### 5.174.0-alpha005 - 2018-07-04 +#### 5.174.0-beta001 - 2018-07-04 * NEW FEATURE: Improved Visual Studio integration - https://github.com/fsprojects/Paket/pull/3273 * BUGFIX: Paket doesn't add Compile tags for packages when new project format ius used - https://github.com/fsprojects/Paket/issues/3269 +* BUGFIX: Paket packs localized assemblies with new .csproj - https://github.com/fsprojects/Paket/pull/3276 * BUGFIX: Extended NuGetV3 source detection with Artifactory feed format - https://github.com/fsprojects/Paket/pull/3267 * BUGFIX: Paket add only runs update on the touched group - https://github.com/fsprojects/Paket/issues/3259 * COSMETICS: group parameter for outdated works like everywhere else - https://github.com/fsprojects/Paket/pull/3280 From d493d43612eea4b97551210b5211f0d01669947d Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Wed, 4 Jul 2018 11:17:28 +0200 Subject: [PATCH 41/86] Bump version to 5.174.0-beta001 --- src/Paket.Bootstrapper/Properties/AssemblyInfo.cs | 4 ++-- src/Paket.Core/AssemblyInfo.fs | 4 ++-- src/Paket/AssemblyInfo.fs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index 4979227955..5824721335 100644 --- a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs +++ b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs @@ -6,7 +6,7 @@ [assembly: AssemblyDescriptionAttribute("A dependency manager for .NET with support for NuGet packages and git repositories.")] [assembly: AssemblyVersionAttribute("5.174.0")] [assembly: AssemblyFileVersionAttribute("5.174.0")] -[assembly: AssemblyInformationalVersionAttribute("5.174.0-alpha005")] +[assembly: AssemblyInformationalVersionAttribute("5.174.0-beta001")] namespace System { internal static class AssemblyVersionInformation { internal const System.String AssemblyTitle = "Paket.Bootstrapper"; @@ -14,6 +14,6 @@ internal static class AssemblyVersionInformation { internal const System.String AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories."; internal const System.String AssemblyVersion = "5.174.0"; internal const System.String AssemblyFileVersion = "5.174.0"; - internal const System.String AssemblyInformationalVersion = "5.174.0-alpha005"; + internal const System.String AssemblyInformationalVersion = "5.174.0-beta001"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index fcf1d832ce..8c9cb654bd 100644 --- a/src/Paket.Core/AssemblyInfo.fs +++ b/src/Paket.Core/AssemblyInfo.fs @@ -8,7 +8,7 @@ open System.Reflection [] [] [] -[] +[] do () module internal AssemblyVersionInformation = @@ -18,4 +18,4 @@ module internal AssemblyVersionInformation = let [] AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories." let [] AssemblyVersion = "5.174.0" let [] AssemblyFileVersion = "5.174.0" - let [] AssemblyInformationalVersion = "5.174.0-alpha005" + let [] AssemblyInformationalVersion = "5.174.0-beta001" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index 426dddfa9b..fe1a0e595b 100644 --- a/src/Paket/AssemblyInfo.fs +++ b/src/Paket/AssemblyInfo.fs @@ -8,7 +8,7 @@ open System.Reflection [] [] [] -[] +[] do () module internal AssemblyVersionInformation = @@ -18,4 +18,4 @@ module internal AssemblyVersionInformation = let [] AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories." let [] AssemblyVersion = "5.174.0" let [] AssemblyFileVersion = "5.174.0" - let [] AssemblyInformationalVersion = "5.174.0-alpha005" + let [] AssemblyInformationalVersion = "5.174.0-beta001" From 13ec72789fad4ecbf01011b5e316ee2dac338c06 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Fri, 6 Jul 2018 07:54:09 +0200 Subject: [PATCH 42/86] RELEASE_NOTES --- RELEASE_NOTES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 089b895ecc..1f8c371efc 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,4 +1,4 @@ -#### 5.174.0-beta001 - 2018-07-04 +#### 5.174.0 - 2018-07-06 * NEW FEATURE: Improved Visual Studio integration - https://github.com/fsprojects/Paket/pull/3273 * BUGFIX: Paket doesn't add Compile tags for packages when new project format ius used - https://github.com/fsprojects/Paket/issues/3269 * BUGFIX: Paket packs localized assemblies with new .csproj - https://github.com/fsprojects/Paket/pull/3276 From 5f171393d298e78f1514544df27c5c94730eb6f9 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Fri, 6 Jul 2018 07:59:44 +0200 Subject: [PATCH 43/86] Bump version to 5.174.0 --- src/Paket.Bootstrapper/Properties/AssemblyInfo.cs | 4 ++-- src/Paket.Core/AssemblyInfo.fs | 4 ++-- src/Paket/AssemblyInfo.fs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index 5824721335..a065910e82 100644 --- a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs +++ b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs @@ -6,7 +6,7 @@ [assembly: AssemblyDescriptionAttribute("A dependency manager for .NET with support for NuGet packages and git repositories.")] [assembly: AssemblyVersionAttribute("5.174.0")] [assembly: AssemblyFileVersionAttribute("5.174.0")] -[assembly: AssemblyInformationalVersionAttribute("5.174.0-beta001")] +[assembly: AssemblyInformationalVersionAttribute("5.174.0")] namespace System { internal static class AssemblyVersionInformation { internal const System.String AssemblyTitle = "Paket.Bootstrapper"; @@ -14,6 +14,6 @@ internal static class AssemblyVersionInformation { internal const System.String AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories."; internal const System.String AssemblyVersion = "5.174.0"; internal const System.String AssemblyFileVersion = "5.174.0"; - internal const System.String AssemblyInformationalVersion = "5.174.0-beta001"; + internal const System.String AssemblyInformationalVersion = "5.174.0"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index 8c9cb654bd..54cbac501a 100644 --- a/src/Paket.Core/AssemblyInfo.fs +++ b/src/Paket.Core/AssemblyInfo.fs @@ -8,7 +8,7 @@ open System.Reflection [] [] [] -[] +[] do () module internal AssemblyVersionInformation = @@ -18,4 +18,4 @@ module internal AssemblyVersionInformation = let [] AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories." let [] AssemblyVersion = "5.174.0" let [] AssemblyFileVersion = "5.174.0" - let [] AssemblyInformationalVersion = "5.174.0-beta001" + let [] AssemblyInformationalVersion = "5.174.0" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index fe1a0e595b..f58733f68b 100644 --- a/src/Paket/AssemblyInfo.fs +++ b/src/Paket/AssemblyInfo.fs @@ -8,7 +8,7 @@ open System.Reflection [] [] [] -[] +[] do () module internal AssemblyVersionInformation = @@ -18,4 +18,4 @@ module internal AssemblyVersionInformation = let [] AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories." let [] AssemblyVersion = "5.174.0" let [] AssemblyFileVersion = "5.174.0" - let [] AssemblyInformationalVersion = "5.174.0-beta001" + let [] AssemblyInformationalVersion = "5.174.0" From 658a48690aa07382f8d3ac482bdf96b6174dbf69 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Fri, 6 Jul 2018 13:23:07 +0200 Subject: [PATCH 44/86] Accept netstandard20 in Visual Studion integration -references #3284 --- RELEASE_NOTES.md | 3 +++ src/Paket.Core/Installation/RestoreProcess.fs | 3 --- src/Paket.Core/Versioning/Requirements.fs | 11 +++++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 1f8c371efc..56f94e0071 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,6 @@ +#### 5.174.1 - 2018-07-06 +* BUGFIX: Accept netstandard20 in Visual Studion integration - https://github.com/fsprojects/Paket/issues/3284 + #### 5.174.0 - 2018-07-06 * NEW FEATURE: Improved Visual Studio integration - https://github.com/fsprojects/Paket/pull/3273 * BUGFIX: Paket doesn't add Compile tags for packages when new project format ius used - https://github.com/fsprojects/Paket/issues/3269 diff --git a/src/Paket.Core/Installation/RestoreProcess.fs b/src/Paket.Core/Installation/RestoreProcess.fs index c76046c3be..1360b9ef09 100644 --- a/src/Paket.Core/Installation/RestoreProcess.fs +++ b/src/Paket.Core/Installation/RestoreProcess.fs @@ -287,9 +287,6 @@ let createPaketPropsFile (lockFile:LockFile) (cliTools:ResolvedPackage seq) (pac |> Seq.collect (fun (p,_) -> [sprintf """ """ p.Name sprintf """ %O""" p.Version - //""" All""" + - //""" runtime""" + - //""" true""" + """ """]) [yield sprintf " " condition diff --git a/src/Paket.Core/Versioning/Requirements.fs b/src/Paket.Core/Versioning/Requirements.fs index e88c053c17..b81e5bf579 100644 --- a/src/Paket.Core/Versioning/Requirements.fs +++ b/src/Paket.Core/Versioning/Requirements.fs @@ -299,10 +299,13 @@ type FrameworkRestriction = x.RawFormular.IsMatch tp member x.ToMSBuildCondition() = - let formulas = - [for fr in x.RepresentedFrameworks -> - sprintf "('$(TargetFramework)' == '%O')" fr] - String.Join(" OR ",formulas) + let formulas = + [for fr in x.RepresentedFrameworks do + let fr = fr.ToString() + yield sprintf "('$(TargetFramework)' == '%s')" fr + if fr.Contains "." then + yield sprintf "('$(TargetFramework)' == '%s')" (fr.Replace(".",""))] + String.Join(" OR ",formulas) override x.Equals(y) = match y with From 1fc11138baea061ce4f788942f9ad5fb0d48de28 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Fri, 6 Jul 2018 13:29:01 +0200 Subject: [PATCH 45/86] Bump version to 5.174.1 --- src/Paket.Bootstrapper/Properties/AssemblyInfo.cs | 12 ++++++------ src/Paket.Core/AssemblyInfo.fs | 12 ++++++------ src/Paket/AssemblyInfo.fs | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index a065910e82..0f32f3c5f6 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.174.0")] -[assembly: AssemblyFileVersionAttribute("5.174.0")] -[assembly: AssemblyInformationalVersionAttribute("5.174.0")] +[assembly: AssemblyVersionAttribute("5.174.1")] +[assembly: AssemblyFileVersionAttribute("5.174.1")] +[assembly: AssemblyInformationalVersionAttribute("5.174.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.174.0"; - internal const System.String AssemblyFileVersion = "5.174.0"; - internal const System.String AssemblyInformationalVersion = "5.174.0"; + internal const System.String AssemblyVersion = "5.174.1"; + internal const System.String AssemblyFileVersion = "5.174.1"; + internal const System.String AssemblyInformationalVersion = "5.174.1"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index 54cbac501a..70de52064f 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.174.0" - let [] AssemblyFileVersion = "5.174.0" - let [] AssemblyInformationalVersion = "5.174.0" + let [] AssemblyVersion = "5.174.1" + let [] AssemblyFileVersion = "5.174.1" + let [] AssemblyInformationalVersion = "5.174.1" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index f58733f68b..101dad3119 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.174.0" - let [] AssemblyFileVersion = "5.174.0" - let [] AssemblyInformationalVersion = "5.174.0" + let [] AssemblyVersion = "5.174.1" + let [] AssemblyFileVersion = "5.174.1" + let [] AssemblyInformationalVersion = "5.174.1" From 37a78595ff0116fa0c7676ce05f7982a81b81887 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Fri, 6 Jul 2018 14:07:34 +0200 Subject: [PATCH 46/86] PaketPropsLoaded --- RELEASE_NOTES.md | 2 +- src/Paket.Core/Installation/RestoreProcess.fs | 3 ++- src/Paket.Core/embedded/Paket.Restore.targets | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 56f94e0071..7f101fced7 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,4 +1,4 @@ -#### 5.174.1 - 2018-07-06 +#### 5.174.2 - 2018-07-06 * BUGFIX: Accept netstandard20 in Visual Studion integration - https://github.com/fsprojects/Paket/issues/3284 #### 5.174.0 - 2018-07-06 diff --git a/src/Paket.Core/Installation/RestoreProcess.fs b/src/Paket.Core/Installation/RestoreProcess.fs index 1360b9ef09..974d28122f 100644 --- a/src/Paket.Core/Installation/RestoreProcess.fs +++ b/src/Paket.Core/Installation/RestoreProcess.fs @@ -299,7 +299,8 @@ let createPaketPropsFile (lockFile:LockFile) (cliTools:ResolvedPackage seq) (pac $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 5.174.0 + 5.174.2 + true %s %s diff --git a/src/Paket.Core/embedded/Paket.Restore.targets b/src/Paket.Core/embedded/Paket.Restore.targets index 16f3fe1fa9..e12083c13a 100644 --- a/src/Paket.Core/embedded/Paket.Restore.targets +++ b/src/Paket.Core/embedded/Paket.Restore.targets @@ -72,7 +72,7 @@ true - + true @@ -135,11 +135,11 @@ - + - + $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0]) $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1]) From e7c939ecbf0fcc4b6c18dfa608b167442dce9f0a Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Fri, 6 Jul 2018 14:13:24 +0200 Subject: [PATCH 47/86] Bump version to 5.174.2 --- src/Paket.Bootstrapper/Properties/AssemblyInfo.cs | 12 ++++++------ src/Paket.Core/AssemblyInfo.fs | 12 ++++++------ src/Paket/AssemblyInfo.fs | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index 0f32f3c5f6..b851f829bc 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.174.1")] -[assembly: AssemblyFileVersionAttribute("5.174.1")] -[assembly: AssemblyInformationalVersionAttribute("5.174.1")] +[assembly: AssemblyVersionAttribute("5.174.2")] +[assembly: AssemblyFileVersionAttribute("5.174.2")] +[assembly: AssemblyInformationalVersionAttribute("5.174.2")] 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.174.1"; - internal const System.String AssemblyFileVersion = "5.174.1"; - internal const System.String AssemblyInformationalVersion = "5.174.1"; + internal const System.String AssemblyVersion = "5.174.2"; + internal const System.String AssemblyFileVersion = "5.174.2"; + internal const System.String AssemblyInformationalVersion = "5.174.2"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index 70de52064f..b44a1d50da 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.174.1" - let [] AssemblyFileVersion = "5.174.1" - let [] AssemblyInformationalVersion = "5.174.1" + let [] AssemblyVersion = "5.174.2" + let [] AssemblyFileVersion = "5.174.2" + let [] AssemblyInformationalVersion = "5.174.2" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index 101dad3119..f8dfaea992 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.174.1" - let [] AssemblyFileVersion = "5.174.1" - let [] AssemblyInformationalVersion = "5.174.1" + let [] AssemblyVersion = "5.174.2" + let [] AssemblyFileVersion = "5.174.2" + let [] AssemblyInformationalVersion = "5.174.2" From 74ac6498101f3f1cf5e84c3a7320ed02c3146e05 Mon Sep 17 00:00:00 2001 From: Lysogorskiy Aleksey Date: Thu, 12 Jul 2018 11:59:03 +0300 Subject: [PATCH 48/86] expand environment variables in environment variable values --- src/Paket.Core/Common/ProcessHelper.fs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Paket.Core/Common/ProcessHelper.fs b/src/Paket.Core/Common/ProcessHelper.fs index 9d060bb56f..a352b922e3 100644 --- a/src/Paket.Core/Common/ProcessHelper.fs +++ b/src/Paket.Core/Common/ProcessHelper.fs @@ -41,7 +41,10 @@ let findFile dirs file = /// Retrieves the environment variable or None let environVarOrNone name = - let var = Environment.GetEnvironmentVariable name + let var = name + |> Environment.GetEnvironmentVariable + |> Environment.ExpandEnvironmentVariables + if String.IsNullOrEmpty var then None else Some var From edde8148a2664515a1fead040d4ca44bef99701f Mon Sep 17 00:00:00 2001 From: Lysogorskiy Aleksey Date: Thu, 12 Jul 2018 11:58:29 +0300 Subject: [PATCH 49/86] fix #3290 (catch exception when search file in malformed paths) --- src/Paket.Core/Common/ProcessHelper.fs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Paket.Core/Common/ProcessHelper.fs b/src/Paket.Core/Common/ProcessHelper.fs index a352b922e3..eed6a98bdb 100644 --- a/src/Paket.Core/Common/ProcessHelper.fs +++ b/src/Paket.Core/Common/ProcessHelper.fs @@ -15,6 +15,7 @@ let tryFindFile dirs file = let files = dirs |> Seq.map (fun (path : string) -> + try let dir = DirectoryInfo( path @@ -26,7 +27,13 @@ let tryFindFile dirs file = else let fi = FileInfo(Path.Combine(dir.FullName,file)) if fi.Exists then fi.FullName - else "") + else "" + with + | exn -> + Logging.verbosefn "Exception while searching %s in %s:" file path + Logging.verbosefn "%O" exn + + "") |> Seq.filter ((<>) "") |> Seq.cache if not (Seq.isEmpty files) then Some(Seq.head files) From ed77db2d9b37ed523ac8745804095dc1c3461027 Mon Sep 17 00:00:00 2001 From: Steven Taylor Date: Fri, 13 Jul 2018 20:26:17 +1000 Subject: [PATCH 50/86] the -T switch is not supported on MacOSX, which causes "mono .paket/paket.exe install" to fail when "storage: symlink" is set in paket.dependencies. The fix merely removes -T when isMacOS is true. --- src/Paket.Core/Common/SymlinkUtils.fs | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/Paket.Core/Common/SymlinkUtils.fs b/src/Paket.Core/Common/SymlinkUtils.fs index 7b03bf1c0c..01a41770db 100644 --- a/src/Paket.Core/Common/SymlinkUtils.fs +++ b/src/Paket.Core/Common/SymlinkUtils.fs @@ -4,28 +4,32 @@ open System open Paket open System.Diagnostics -let isDirectoryLink directory = +let isDirectoryLink directory = let di = IO.DirectoryInfo(directory) di.Exists && di.Attributes.HasFlag(IO.FileAttributes.ReparsePoint) /// delete the symlink only (do not remove files before) let delete directory = if isDirectoryLink directory then IO.Directory.Delete directory -let makeDirectoryLink target source = - let mklink (p:ProcessStartInfo) = +let makeDirectoryLink target source = + let mklink (p:ProcessStartInfo) = p.FileName <- "cmd.exe" p.Arguments <- sprintf @"/c ""mklink /D ""%s"" ""%s""""" target source - let ln (p:ProcessStartInfo) = + let ln (p:ProcessStartInfo) = p.FileName <- "ln" p.Arguments <- sprintf @"-sT ""%s"" ""%s""" target source - let xLn = if isUnix then ln else mklink - + let ln_onMacOS (p:ProcessStartInfo) = + p.FileName <- "ln" + p.Arguments <- sprintf @"-s ""%s"" ""%s""" target source + + let xLn = if isMacOS then ln_onMacOS elif isUnix then ln else mklink + let r = ProcessHelper.ExecProcessAndReturnMessages xLn (TimeSpan.FromSeconds(10.)) - + match r.OK, Logging.verbose with - | true, true -> + | true, true -> let m = ProcessHelper.toLines r.Messages sprintf "symlink used %s -> %s (%s)" source target m |> Logging.traceVerbose | true, false -> () From db1e3b20d7d51d05cfe04d09c73a20f579da29ed Mon Sep 17 00:00:00 2001 From: Martin Halliday Date: Fri, 13 Jul 2018 23:23:15 -0700 Subject: [PATCH 51/86] Update getting-started.md Added an instruction to ignore the paket-files folder. Failing to do this can cause a lot of confusion for first time users of Paket. I also added a section at the bottom about how to include Paket in the development process when working with other people. --- docs/content/getting-started.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/docs/content/getting-started.md b/docs/content/getting-started.md index 628b075c7c..98f910f3fd 100644 --- a/docs/content/getting-started.md +++ b/docs/content/getting-started.md @@ -34,6 +34,8 @@ This guide will show you 1. Commit `.paket/paket.exe` to your repository. 1. After the first `.paket/paket.exe` invocation Paket will create a couple of files in `.paket` — commit those as well. +1. Configure your source control system to ignore the `paket-files` folder, for example + in Git add a line to the `.gitignore` file containing `paket-files`. ### Specifying dependencies @@ -154,3 +156,22 @@ This command will analyze your If you are already using NuGet and want to learn how to use the automatic NuGet conversion, then read the next [tutorial](convert-from-nuget-tutorial.html). + +### Working with Paket + +The most frequently used Paket commands are: + +* `paket install` which you should run after modifying the `paket.dependencies` file. + This command will update the `paket.lock` file, then update all of your Visual Studio + projects to the new versions. + +* `paket restore` which you should run after cloning the repository or switching branches. + This command will take the current `paket.lock` file and update your Visual Studio projects + so that they are referencing the correct versions of NuGet packages. If you are using a + continuous integration system like TeamCity or Jenkins then you should also run this + command after getting the source code and before compiling it. + +* `paket update` which you can run to update your project to the latest versions of all + dependent packages. This command will update the `paket.lock` file to reference the most + recent versions permitted by the restrictions in `paket.dependencies`, then apply these + changes to your Visual Studio projects. From 17369ca17a7dc15b9a3ae616bb0fcb5a1f373baf Mon Sep 17 00:00:00 2001 From: Robin Munn Date: Mon, 16 Jul 2018 13:39:58 +0700 Subject: [PATCH 52/86] Report NuGet download time correctly --- src/Paket.Core/Dependencies/NuGet.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Paket.Core/Dependencies/NuGet.fs b/src/Paket.Core/Dependencies/NuGet.fs index 390f2f77d7..40e7446510 100644 --- a/src/Paket.Core/Dependencies/NuGet.fs +++ b/src/Paket.Core/Dependencies/NuGet.fs @@ -946,7 +946,7 @@ let private downloadAndExtractPackage(alternativeProjectRoot, root, isLocalOverr | HttpStatusCode.OK -> () | statusCode -> failwithf "HTTP status code was %d - %O" (int statusCode) statusCode - let speed = int (float pos * 8. / float lastSpeedMeasure.ElapsedMilliseconds) + let speed = int (float pos * 8. / float sw.ElapsedMilliseconds) let size = pos / (1024L * 1024L) tracefn "Download of %O %O%s done in %s. (%d kbit/s, %d MB)" packageName version groupString (Utils.TimeSpanToReadableString sw.Elapsed) speed size From e63625427d923c92081fff8485008e710c3cbf2d Mon Sep 17 00:00:00 2001 From: Martin Halliday Date: Mon, 16 Jul 2018 17:52:13 -0700 Subject: [PATCH 53/86] Update getting started page to link to the pages of referenced commands --- docs/content/getting-started.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/content/getting-started.md b/docs/content/getting-started.md index 98f910f3fd..7aafd59d7f 100644 --- a/docs/content/getting-started.md +++ b/docs/content/getting-started.md @@ -161,17 +161,17 @@ conversion, then read the next [tutorial](convert-from-nuget-tutorial.html). The most frequently used Paket commands are: -* `paket install` which you should run after modifying the `paket.dependencies` file. +* [`paket install` command](paket-install.html) which you should run after modifying the `paket.dependencies` file. This command will update the `paket.lock` file, then update all of your Visual Studio projects to the new versions. -* `paket restore` which you should run after cloning the repository or switching branches. +* [`paket restore` command](paket-restore.html) which you should run after cloning the repository or switching branches. This command will take the current `paket.lock` file and update your Visual Studio projects so that they are referencing the correct versions of NuGet packages. If you are using a continuous integration system like TeamCity or Jenkins then you should also run this command after getting the source code and before compiling it. -* `paket update` which you can run to update your project to the latest versions of all +* [`paket update` command](paket-update.html) which you can run to update your project to the latest versions of all dependent packages. This command will update the `paket.lock` file to reference the most recent versions permitted by the restrictions in `paket.dependencies`, then apply these changes to your Visual Studio projects. From e823fd92434fbf1d5ba5ab0338429bff9ddaf60d Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Tue, 17 Jul 2018 09:51:38 +0200 Subject: [PATCH 54/86] RELEASE_NOTES --- RELEASE_NOTES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 7f101fced7..ed2562e8f6 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,6 @@ +#### 5.174.3 - 2018-07-17 +* BUGFIX: Reports NuGet download time correctly - https://github.com/fsprojects/Paket/pull/3304 + #### 5.174.2 - 2018-07-06 * BUGFIX: Accept netstandard20 in Visual Studion integration - https://github.com/fsprojects/Paket/issues/3284 From 5f57eea1af1445ceddaafcbea94583903d188b07 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Tue, 17 Jul 2018 09:57:32 +0200 Subject: [PATCH 55/86] Bump version to 5.174.3 --- .paket/Paket.Restore.targets | 6 +++--- src/Paket.Bootstrapper/Properties/AssemblyInfo.cs | 12 ++++++------ src/Paket.Core/AssemblyInfo.fs | 12 ++++++------ src/Paket/AssemblyInfo.fs | 12 ++++++------ 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets index 16f3fe1fa9..e12083c13a 100644 --- a/.paket/Paket.Restore.targets +++ b/.paket/Paket.Restore.targets @@ -72,7 +72,7 @@ true - + true @@ -135,11 +135,11 @@ - + - + $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0]) $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1]) diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index b851f829bc..0c7a294ef4 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.174.2")] -[assembly: AssemblyFileVersionAttribute("5.174.2")] -[assembly: AssemblyInformationalVersionAttribute("5.174.2")] +[assembly: AssemblyVersionAttribute("5.174.3")] +[assembly: AssemblyFileVersionAttribute("5.174.3")] +[assembly: AssemblyInformationalVersionAttribute("5.174.3")] 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.174.2"; - internal const System.String AssemblyFileVersion = "5.174.2"; - internal const System.String AssemblyInformationalVersion = "5.174.2"; + internal const System.String AssemblyVersion = "5.174.3"; + internal const System.String AssemblyFileVersion = "5.174.3"; + internal const System.String AssemblyInformationalVersion = "5.174.3"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index b44a1d50da..9b7eb7d631 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.174.2" - let [] AssemblyFileVersion = "5.174.2" - let [] AssemblyInformationalVersion = "5.174.2" + let [] AssemblyVersion = "5.174.3" + let [] AssemblyFileVersion = "5.174.3" + let [] AssemblyInformationalVersion = "5.174.3" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index f8dfaea992..8bf9976ac2 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.174.2" - let [] AssemblyFileVersion = "5.174.2" - let [] AssemblyInformationalVersion = "5.174.2" + let [] AssemblyVersion = "5.174.3" + let [] AssemblyFileVersion = "5.174.3" + let [] AssemblyInformationalVersion = "5.174.3" From d47a965b5235e667c165b7d4e00b6667dc8bac71 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Tue, 17 Jul 2018 10:01:16 +0200 Subject: [PATCH 56/86] RELEASE_NOTES --- RELEASE_NOTES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index ed2562e8f6..17ac718d74 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,6 @@ +#### 5.174.4 - 2018-07-17 +* BUGFIX: Fixed exception during restore when accessing missing folders - https://github.com/fsprojects/Paket/pull/3293 + #### 5.174.3 - 2018-07-17 * BUGFIX: Reports NuGet download time correctly - https://github.com/fsprojects/Paket/pull/3304 From 39c5c3b2cc860e3108784958c2aadf125b3e437b Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Tue, 17 Jul 2018 10:07:01 +0200 Subject: [PATCH 57/86] Bump version to 5.174.4 --- src/Paket.Bootstrapper/Properties/AssemblyInfo.cs | 12 ++++++------ src/Paket.Core/AssemblyInfo.fs | 12 ++++++------ src/Paket/AssemblyInfo.fs | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index 0c7a294ef4..d25bea0b66 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.174.3")] -[assembly: AssemblyFileVersionAttribute("5.174.3")] -[assembly: AssemblyInformationalVersionAttribute("5.174.3")] +[assembly: AssemblyVersionAttribute("5.174.4")] +[assembly: AssemblyFileVersionAttribute("5.174.4")] +[assembly: AssemblyInformationalVersionAttribute("5.174.4")] 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.174.3"; - internal const System.String AssemblyFileVersion = "5.174.3"; - internal const System.String AssemblyInformationalVersion = "5.174.3"; + internal const System.String AssemblyVersion = "5.174.4"; + internal const System.String AssemblyFileVersion = "5.174.4"; + internal const System.String AssemblyInformationalVersion = "5.174.4"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index 9b7eb7d631..a4817496e4 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.174.3" - let [] AssemblyFileVersion = "5.174.3" - let [] AssemblyInformationalVersion = "5.174.3" + let [] AssemblyVersion = "5.174.4" + let [] AssemblyFileVersion = "5.174.4" + let [] AssemblyInformationalVersion = "5.174.4" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index 8bf9976ac2..25eb7e274b 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.174.3" - let [] AssemblyFileVersion = "5.174.3" - let [] AssemblyInformationalVersion = "5.174.3" + let [] AssemblyVersion = "5.174.4" + let [] AssemblyFileVersion = "5.174.4" + let [] AssemblyInformationalVersion = "5.174.4" From 14e498d0ff162a280493179d31c1a53ee37bb9af Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Tue, 17 Jul 2018 10:13:34 +0200 Subject: [PATCH 58/86] RELEASE_NOTES --- RELEASE_NOTES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 17ac718d74..7ce8492510 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,6 @@ +#### 5.174.5 - 2018-07-17 +* BUGFIX: "-T" switch removed when isMacOS, because it is not valid on OSX - https://github.com/fsprojects/Paket/pull/3298 + #### 5.174.4 - 2018-07-17 * BUGFIX: Fixed exception during restore when accessing missing folders - https://github.com/fsprojects/Paket/pull/3293 From 86a790131e3e8060e374620b6e3626735c3d51f1 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Tue, 17 Jul 2018 10:19:51 +0200 Subject: [PATCH 59/86] Bump version to 5.174.5 --- src/Paket.Bootstrapper/Properties/AssemblyInfo.cs | 12 ++++++------ src/Paket.Core/AssemblyInfo.fs | 12 ++++++------ src/Paket/AssemblyInfo.fs | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index d25bea0b66..2a5ba50e5b 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.174.4")] -[assembly: AssemblyFileVersionAttribute("5.174.4")] -[assembly: AssemblyInformationalVersionAttribute("5.174.4")] +[assembly: AssemblyVersionAttribute("5.174.5")] +[assembly: AssemblyFileVersionAttribute("5.174.5")] +[assembly: AssemblyInformationalVersionAttribute("5.174.5")] 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.174.4"; - internal const System.String AssemblyFileVersion = "5.174.4"; - internal const System.String AssemblyInformationalVersion = "5.174.4"; + internal const System.String AssemblyVersion = "5.174.5"; + internal const System.String AssemblyFileVersion = "5.174.5"; + internal const System.String AssemblyInformationalVersion = "5.174.5"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index a4817496e4..4a7dfece64 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.174.4" - let [] AssemblyFileVersion = "5.174.4" - let [] AssemblyInformationalVersion = "5.174.4" + let [] AssemblyVersion = "5.174.5" + let [] AssemblyFileVersion = "5.174.5" + let [] AssemblyInformationalVersion = "5.174.5" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index 25eb7e274b..40222cc43e 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.174.4" - let [] AssemblyFileVersion = "5.174.4" - let [] AssemblyInformationalVersion = "5.174.4" + let [] AssemblyVersion = "5.174.5" + let [] AssemblyFileVersion = "5.174.5" + let [] AssemblyInformationalVersion = "5.174.5" From 49d7746e007a5b88c71c4145d03d3160cadb3767 Mon Sep 17 00:00:00 2001 From: Matthias Dittrich Date: Sun, 22 Jul 2018 10:02:54 +0200 Subject: [PATCH 60/86] Revert impact of https://github.com/dotnet/corefx/issues/31098 by using WinHttpHandler --- .../Paket.IntegrationTests.fsproj | 364 ++++++++---- paket.dependencies | 1 + paket.lock | 169 +++--- src/Paket.Core.preview3/Paket.Core.fsproj | 1 + src/Paket.Core.preview3/paket.references | 1 + src/Paket.Core/Common/NetUtils.fs | 87 ++- src/Paket.Core/Paket.Core.fsproj | 517 +++++++++++++++--- src/Paket.Core/paket.references | 1 + src/Paket/Paket.fsproj | 287 +++++++--- .../Paket.Bootstrapper.Tests.csproj | 311 ++++++++--- tests/Paket.Tests/Paket.Tests.fsproj | 378 +++++++++---- 11 files changed, 1558 insertions(+), 559 deletions(-) diff --git a/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj b/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj index 1b6cc8f927..7b878da55a 100644 --- a/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj +++ b/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj @@ -16,6 +16,7 @@ ..\..\ true + true true @@ -49,7 +50,7 @@ - + <__paket__NUnit3TestAdapter_props>net35\NUnit3TestAdapter @@ -62,7 +63,7 @@ - + <__paket__NETStandard_Library_targets>netstandard2.0\NETStandard.Library @@ -135,7 +136,7 @@ - + ..\..\packages\Chessie\lib\net40\Chessie.dll @@ -155,7 +156,7 @@ - + ..\..\packages\FSharp.Core\lib\net45\FSharp.Core.dll @@ -175,7 +176,21 @@ - + + + + True + + + + + + + True + + + + ..\..\packages\Microsoft.CSharp\ref\netstandard1.0\Microsoft.CSharp.dll @@ -184,7 +199,7 @@ - + ..\..\packages\Microsoft.CSharp\lib\netstandard1.3\Microsoft.CSharp.dll @@ -193,7 +208,7 @@ - + ..\..\packages\Microsoft.CSharp\lib\netstandard2.0\Microsoft.CSharp.dll @@ -202,7 +217,7 @@ - + ..\..\packages\Microsoft.CSharp\ref\netstandard2.0\Microsoft.CSharp.dll @@ -211,6 +226,34 @@ + + + + True + + + + + + + True + + + + + + + True + + + + + + + True + + + @@ -233,7 +276,7 @@ - + ..\..\packages\Microsoft.Win32.Primitives\ref\netstandard1.3\Microsoft.Win32.Primitives.dll @@ -309,7 +352,7 @@ - + ..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll @@ -336,7 +379,7 @@ - + ..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+win8+wp8+wpa81\Newtonsoft.Json.dll @@ -388,7 +431,7 @@ - + ..\..\packages\NUnit\lib\net45\nunit.framework.dll @@ -406,7 +449,7 @@ - + ..\..\packages\NUnit\lib\netstandard1.6\nunit.framework.dll @@ -435,7 +478,7 @@ - + ..\..\packages\System.AppContext\lib\netstandard1.6\System.AppContext.dll @@ -444,7 +487,7 @@ - + ..\..\packages\System.AppContext\ref\netstandard1.6\System.AppContext.dll @@ -455,7 +498,7 @@ - + ..\..\packages\System.Buffers\lib\netstandard1.1\System.Buffers.dll @@ -464,7 +507,7 @@ - + ..\..\packages\System.Buffers\ref\netstandard1.1\System.Buffers.dll @@ -473,7 +516,7 @@ - + ..\..\packages\System.Buffers\lib\netstandard2.0\System.Buffers.dll @@ -482,7 +525,7 @@ - + ..\..\packages\System.Buffers\ref\netstandard2.0\System.Buffers.dll @@ -502,7 +545,7 @@ - + ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll @@ -522,7 +565,7 @@ - + ..\..\packages\System.Collections.Concurrent\lib\netstandard1.3\System.Collections.Concurrent.dll @@ -531,7 +574,7 @@ - + ..\..\packages\System.Collections.Concurrent\ref\netstandard1.3\System.Collections.Concurrent.dll @@ -542,7 +585,7 @@ - + ..\..\packages\System.Collections.NonGeneric\lib\netstandard1.3\System.Collections.NonGeneric.dll @@ -551,7 +594,7 @@ - + ..\..\packages\System.Collections.NonGeneric\ref\netstandard1.3\System.Collections.NonGeneric.dll @@ -582,7 +625,7 @@ - + ..\..\packages\System.ComponentModel\ref\netstandard1.0\System.ComponentModel.dll @@ -591,7 +634,7 @@ - + ..\..\packages\System.ComponentModel\lib\netstandard1.3\System.ComponentModel.dll @@ -689,7 +732,7 @@ - + ..\..\packages\System.Console\ref\netstandard1.3\System.Console.dll @@ -709,7 +752,7 @@ - + ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll @@ -720,7 +763,16 @@ - + + + + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\net46\System.Diagnostics.DiagnosticSource.dll + True + True + + + + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll @@ -731,7 +783,7 @@ - + ..\..\packages\System.Diagnostics.Process\ref\netstandard1.4\System.Diagnostics.Process.dll @@ -742,7 +794,7 @@ - + ..\..\packages\System.Diagnostics.Tools\ref\netstandard1.0\System.Diagnostics.Tools.dll @@ -780,7 +832,7 @@ - + ..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.dll @@ -791,7 +843,7 @@ - + ..\..\packages\System.Dynamic.Runtime\lib\netstandard1.3\System.Dynamic.Runtime.dll @@ -800,7 +852,7 @@ - + ..\..\packages\System.Dynamic.Runtime\ref\netstandard1.3\System.Dynamic.Runtime.dll @@ -820,7 +872,7 @@ - + ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll @@ -840,7 +892,7 @@ - + ..\..\packages\System.Globalization.Calendars\ref\netstandard1.3\System.Globalization.Calendars.dll @@ -851,7 +903,7 @@ - + ..\..\packages\System.Globalization.Extensions\ref\netstandard1.3\System.Globalization.Extensions.dll @@ -880,7 +932,7 @@ - + ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll @@ -900,7 +952,7 @@ - + ..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll @@ -949,7 +1001,7 @@ - + ..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll @@ -969,7 +1021,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\lib\netstandard1.3\System.IO.FileSystem.Primitives.dll @@ -978,7 +1030,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\ref\netstandard1.3\System.IO.FileSystem.Primitives.dll @@ -998,7 +1050,7 @@ - + ..\..\packages\System.Linq\lib\netstandard1.6\System.Linq.dll @@ -1007,7 +1059,7 @@ - + ..\..\packages\System.Linq\ref\netstandard1.6\System.Linq.dll @@ -1018,7 +1070,25 @@ - + + + + ..\..\packages\System.Linq.Expressions\ref\netstandard1.0\System.Linq.Expressions.dll + False + True + + + + + + + ..\..\packages\System.Linq.Expressions\ref\netstandard1.3\System.Linq.Expressions.dll + False + True + + + + ..\..\packages\System.Linq.Expressions\lib\netstandard1.6\System.Linq.Expressions.dll @@ -1027,7 +1097,7 @@ - + ..\..\packages\System.Linq.Expressions\ref\netstandard1.6\System.Linq.Expressions.dll @@ -1038,7 +1108,7 @@ - + ..\..\packages\System.Linq.Queryable\ref\netstandard1.0\System.Linq.Queryable.dll @@ -1047,7 +1117,7 @@ - + ..\..\packages\System.Linq.Queryable\lib\netstandard1.3\System.Linq.Queryable.dll @@ -1058,7 +1128,23 @@ - + + + + True + + + + + + + ..\..\packages\System.Net.Http\ref\netstandard1.1\System.Net.Http.dll + False + True + + + + ..\..\packages\System.Net.Http\ref\netstandard1.3\System.Net.Http.dll @@ -1087,7 +1173,7 @@ - + ..\..\packages\System.Net.Primitives\ref\netstandard1.3\System.Net.Primitives.dll @@ -1098,7 +1184,7 @@ - + ..\..\packages\System.Net.Requests\ref\netstandard1.3\System.Net.Requests.dll @@ -1158,7 +1244,7 @@ - + ..\..\packages\System.ObjectModel\lib\netstandard1.3\System.ObjectModel.dll @@ -1167,7 +1253,7 @@ - + ..\..\packages\System.ObjectModel\ref\netstandard1.3\System.ObjectModel.dll @@ -1196,7 +1282,7 @@ - + ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll @@ -1227,7 +1313,7 @@ - + ..\..\packages\System.Reflection.Emit.ILGeneration\ref\netstandard1.0\System.Reflection.Emit.ILGeneration.dll @@ -1236,7 +1322,7 @@ - + ..\..\packages\System.Reflection.Emit.ILGeneration\lib\netstandard1.3\System.Reflection.Emit.ILGeneration.dll @@ -1267,7 +1353,7 @@ - + ..\..\packages\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.dll @@ -1278,7 +1364,7 @@ - + ..\..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.dll @@ -1298,7 +1384,34 @@ - + + + + ..\..\packages\System.Reflection.TypeExtensions\lib\netstandard1.3\System.Reflection.TypeExtensions.dll + True + True + + + + + + + ..\..\packages\System.Reflection.TypeExtensions\ref\netstandard1.3\System.Reflection.TypeExtensions.dll + False + True + + + + + + + ..\..\packages\System.Reflection.TypeExtensions\lib\netstandard1.5\System.Reflection.TypeExtensions.dll + True + True + + + + ..\..\packages\System.Reflection.TypeExtensions\ref\netstandard1.5\System.Reflection.TypeExtensions.dll @@ -1307,7 +1420,7 @@ - + ..\..\packages\System.Reflection.TypeExtensions\lib\netstandard2.0\System.Reflection.TypeExtensions.dll @@ -1316,7 +1429,7 @@ - + ..\..\packages\System.Reflection.TypeExtensions\ref\netstandard2.0\System.Reflection.TypeExtensions.dll @@ -1327,7 +1440,7 @@ - + ..\..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.dll @@ -1365,7 +1478,7 @@ - + ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll @@ -1394,7 +1507,7 @@ - + ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll @@ -1405,7 +1518,7 @@ - + ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll @@ -1416,7 +1529,7 @@ - + ..\..\packages\System.Runtime.InteropServices\ref\netcoreapp1.1\System.Runtime.InteropServices.dll @@ -1452,7 +1565,7 @@ - + ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll @@ -1472,7 +1585,7 @@ - + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\lib\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1481,7 +1594,7 @@ - + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\ref\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1510,7 +1623,7 @@ - + ..\..\packages\System.Runtime.Loader\lib\netstandard1.5\System.Runtime.Loader.dll @@ -1519,7 +1632,7 @@ - + ..\..\packages\System.Runtime.Loader\ref\netstandard1.5\System.Runtime.Loader.dll @@ -1530,7 +1643,7 @@ - + ..\..\packages\System.Runtime.Numerics\ref\netstandard1.1\System.Runtime.Numerics.dll @@ -1539,7 +1652,7 @@ - + ..\..\packages\System.Runtime.Numerics\lib\netstandard1.3\System.Runtime.Numerics.dll @@ -1639,7 +1752,34 @@ - + + + + ..\..\packages\System.Security.Cryptography.Algorithms\lib\net46\System.Security.Cryptography.Algorithms.dll + True + True + + + + + + + ..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.3\System.Security.Cryptography.Algorithms.dll + False + True + + + + + + + ..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.4\System.Security.Cryptography.Algorithms.dll + False + True + + + + ..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll @@ -1699,7 +1839,16 @@ - + + + + ..\..\packages\System.Security.Cryptography.Encoding\lib\net46\System.Security.Cryptography.Encoding.dll + True + True + + + + ..\..\packages\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.dll @@ -1748,7 +1897,16 @@ - + + + + ..\..\packages\System.Security.Cryptography.Primitives\lib\net46\System.Security.Cryptography.Primitives.dll + True + True + + + + ..\..\packages\System.Security.Cryptography.Primitives\lib\netstandard1.3\System.Security.Cryptography.Primitives.dll @@ -1757,7 +1915,7 @@ - + ..\..\packages\System.Security.Cryptography.Primitives\ref\netstandard1.3\System.Security.Cryptography.Primitives.dll @@ -1768,7 +1926,25 @@ - + + + + ..\..\packages\System.Security.Cryptography.X509Certificates\lib\net46\System.Security.Cryptography.X509Certificates.dll + True + True + + + + + + + ..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.3\System.Security.Cryptography.X509Certificates.dll + False + True + + + + ..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.4\System.Security.Cryptography.X509Certificates.dll @@ -1846,7 +2022,7 @@ - + ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll @@ -1866,7 +2042,7 @@ - + ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll @@ -1933,7 +2109,7 @@ - + ..\..\packages\System.Threading\lib\netstandard1.3\System.Threading.dll @@ -1942,7 +2118,7 @@ - + ..\..\packages\System.Threading\ref\netstandard1.3\System.Threading.dll @@ -1962,7 +2138,7 @@ - + ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll @@ -1973,7 +2149,7 @@ - + ..\..\packages\System.Threading.Tasks.Extensions\lib\netstandard1.0\System.Threading.Tasks.Extensions.dll @@ -1993,7 +2169,7 @@ - + ..\..\packages\System.Threading.Tasks.Parallel\ref\netstandard1.1\System.Threading.Tasks.Parallel.dll @@ -2002,7 +2178,7 @@ - + ..\..\packages\System.Threading.Tasks.Parallel\lib\netstandard1.3\System.Threading.Tasks.Parallel.dll @@ -2013,7 +2189,7 @@ - + ..\..\packages\System.Threading.Thread\lib\netstandard1.3\System.Threading.Thread.dll @@ -2022,7 +2198,7 @@ - + ..\..\packages\System.Threading.Thread\ref\netstandard1.3\System.Threading.Thread.dll @@ -2033,7 +2209,7 @@ - + ..\..\packages\System.Threading.ThreadPool\lib\netstandard1.3\System.Threading.ThreadPool.dll @@ -2042,7 +2218,7 @@ - + ..\..\packages\System.Threading.ThreadPool\ref\netstandard1.3\System.Threading.ThreadPool.dll @@ -2082,7 +2258,7 @@ - + ..\..\packages\System.Xml.ReaderWriter\lib\netstandard1.3\System.Xml.ReaderWriter.dll @@ -2091,7 +2267,7 @@ - + ..\..\packages\System.Xml.ReaderWriter\ref\netstandard1.3\System.Xml.ReaderWriter.dll @@ -2111,7 +2287,7 @@ - + ..\..\packages\System.Xml.XDocument\lib\netstandard1.3\System.Xml.XDocument.dll @@ -2120,7 +2296,7 @@ - + ..\..\packages\System.Xml.XDocument\ref\netstandard1.3\System.Xml.XDocument.dll diff --git a/paket.dependencies b/paket.dependencies index b404b5b699..4c0f9ced73 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -13,6 +13,7 @@ nuget FSharp.Compiler.Tools nuget NETStandard.Library >= 2.0 prerelease nuget Microsoft.NETCore.App >= 2.0 prerelease +nuget System.Net.Http.WinHttpHandler nuget Moq nuget FSCheck diff --git a/paket.lock b/paket.lock index 86c9994c9b..b77ef38f90 100644 --- a/paket.lock +++ b/paket.lock @@ -101,7 +101,7 @@ NUGET Microsoft.CodeAnalysis.Common (2.3.1) Microsoft.CodeAnalysis.VisualBasic (2.3.1) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) Microsoft.CodeAnalysis.Common (>= 2.3.1) - Microsoft.CSharp (4.4) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) + Microsoft.CSharp (4.4) - restriction: || (&& (< net20) (>= netstandard1.0) (< netstandard1.3)) (&& (< net20) (>= netstandard1.3)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) NETStandard.Library (>= 1.6.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< netstandard2.0) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) System.Dynamic.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< netstandard2.0) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) System.Reflection.TypeExtensions (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< netstandard2.0) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) @@ -210,15 +210,15 @@ NUGET Microsoft.NETCore.DotNetHostResolver (2.0) - restriction: >= netcoreapp1.0 Microsoft.NETCore.DotNetAppHost (>= 2.0) Microsoft.NETCore.Jit (2.0) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) - Microsoft.NETCore.Platforms (2.0) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (>= netcoreapp2.0) + Microsoft.NETCore.Platforms (2.0) - restriction: || (>= monoandroid) (>= monotouch) (&& (< net35) (>= netstandard1.3)) (&& (>= net45) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< net45) (>= netstandard1.2) (< portable-net451+win81+wpa81)) (&& (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< net45) (< netstandard1.2) (>= netstandard1.4) (< win8)) (&& (< net45) (< netstandard1.2) (>= netstandard1.5) (< win8)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< net45) (>= netstandard1.3) (< portable-net451+win81+wpa81)) (&& (< net45) (< netstandard1.3) (>= netstandard1.4) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< net45) (>= netstandard1.4) (< portable-net451+win81+wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< portable-net451+win81+wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard2.0)) (&& (>= net451) (< netstandard1.1)) (&& (>= net451) (< netstandard1.3)) (&& (>= net46) (< netstandard1.1)) (&& (>= net46) (< netstandard1.4)) (>= net461) (>= netcoreapp1.0) (&& (>= netcoreapp1.1) (< netstandard1.6)) (&& (>= netcoreapp1.1) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.0) (>= portable-net45+win8+wp8+wpa81) (< portable-net45+win8+wpa81)) (&& (< netstandard1.0) (>= portable-net45+win8+wpa81) (< portable-net451+win81+wpa81)) (&& (< netstandard1.0) (>= portable-net451+win81+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (< netstandard1.1) (>= netstandard1.2) (< win8)) (&& (< netstandard1.1) (>= netstandard1.3) (< win8)) (&& (< netstandard1.1) (>= netstandard1.4) (< win8)) (&& (< netstandard1.1) (>= netstandard1.5) (< win8)) (&& (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (< netstandard1.1) (>= uap10.0) (< win8)) (&& (< netstandard1.1) (< win8) (>= wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wpa81)) (&& (< netstandard1.2) (>= uap10.0) (< win8)) (&& (>= netstandard1.3) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (< netstandard1.3) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.3) (>= wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81)) (&& (< portable-net45+win8+wp8+wpa81) (>= uap10.0)) (&& (< portable-net45+win8+wpa81) (>= uap10.0)) (&& (< portable-net451+win81+wpa81) (>= uap10.0)) (>= uap10.1) (>= xamarinios) (>= xamarinmac) (>= xamarintvos) (>= xamarinwatchos) Microsoft.NETCore.Runtime.CoreCLR (2.0) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) Microsoft.NETCore.Jit (>= 2.0) - Microsoft.NETCore.Targets (2.0) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + Microsoft.NETCore.Targets (2.0) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< win81) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.4) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.5) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81) (< win8)) (&& (< net45) (>= netstandard1.2) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.3) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.4) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.5) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.6) (< portable-net451+win81+wpa81)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netstandard1.0) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81) (< wp8)) (&& (>= netstandard1.1) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wpa81)) (&& (< netstandard1.2) (>= uap10.0) (< win8)) (&& (>= netstandard1.3) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (< netstandard1.3) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< win81) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81)) (&& (< portable-net45+win8+wp8+wpa81) (>= uap10.0)) (&& (< portable-net45+win8+wpa81) (>= uap10.0)) (&& (< portable-net451+win81+wpa81) (>= uap10.0)) Microsoft.VisualBasic (10.2) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) NETStandard.Library (>= 1.6.1) - restriction: || (&& (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.3) (< netstandard2.0) (< win8) (< wpa81) (< xamarinmac)) (< portable-net45+win8+wpa81) System.Dynamic.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard1.3) (< netstandard2.0) (< win8) (< wpa81) (< xamarinmac)) (< portable-net45+win8+wpa81) System.Reflection.TypeExtensions (>= 4.3) - restriction: || (&& (< net45) (>= netstandard1.3) (< netstandard2.0) (< win8) (< wpa81) (< xamarinmac)) (< portable-net45+win8+wpa81) - Microsoft.Win32.Primitives (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (>= net46) (< netstandard1.4)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + Microsoft.Win32.Primitives (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (>= net46) (< netstandard1.4)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.0) (< netstandard1.6)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard1.6)) (&& (>= netcoreapp1.1) (< netstandard2.0)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) Microsoft.NETCore.Targets (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) @@ -324,7 +324,7 @@ NUGET runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: && (>= netcoreapp1.1) (< netcoreapp2.0) runtime.fedora.24-x64.runtime.native.System.Security.Cryptography (4.3.1) - restriction: && (>= netcoreapp1.0) (< netcoreapp1.1) runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: && (>= netcoreapp1.1) (< netcoreapp2.0) - runtime.native.System (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (>= netstandard1.3) (< portable-net451+win81+wpa81) (< win8)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) + runtime.native.System (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net35) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< netstandard1.0) (>= netstandard1.1) (>= portable-net451+win81+wpa81) (< win8)) (&& (< net45) (>= net451) (< netstandard1.3)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81) (< win8)) (&& (< net45) (>= netstandard1.3) (< portable-net451+win81+wpa81) (< win8)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (< netstandard1.0) (>= netstandard1.1) (< portable-net451+win81+wpa81) (< win8)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) runtime.native.System.IO.Compression (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (>= netstandard1.3) (< portable-net451+win81+wpa81) (< win8)) (&& (>= net46) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81)) (&& (< portable-net45+win8+wpa81) (>= uap10.0)) @@ -349,7 +349,7 @@ NUGET runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography (>= 4.3.1) runtime.native.System.Security.Cryptography.Apple (4.3) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple (>= 4.3) - runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: && (>= netcoreapp1.1) (< netcoreapp2.0) + runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.1) runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.1) runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.1) @@ -375,19 +375,19 @@ NUGET runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: && (>= netcoreapp1.1) (< netcoreapp2.0) runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography (4.3.1) - restriction: && (>= netcoreapp1.0) (< netcoreapp1.1) runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: && (>= netcoreapp1.1) (< netcoreapp2.0) - System.AppContext (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (>= net46) (< netstandard1.4)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.AppContext (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (>= net46) (< netstandard1.4)) (>= netcoreapp1.0) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net46) (>= netstandard1.3) (< netstandard1.6)) (&& (< monoandroid) (< netstandard1.3)) - System.Buffers (4.4) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) - System.Diagnostics.Debug (>= 4.3) - restriction: && (>= netstandard1.1) (< netstandard2.0) (< xamarinmac) - System.Diagnostics.Tracing (>= 4.3) - restriction: && (>= netstandard1.1) (< netstandard2.0) (< xamarinmac) - System.Resources.ResourceManager (>= 4.3) - restriction: && (>= netstandard1.1) (< netstandard2.0) (< xamarinmac) - System.Runtime (>= 4.3) - restriction: && (>= netstandard1.1) (< netstandard2.0) (< xamarinmac) - System.Threading (>= 4.3) - restriction: && (>= netstandard1.1) (< netstandard2.0) (< xamarinmac) - System.Collections (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.Buffers (4.5) - restriction: || (>= monoandroid) (>= monotouch) (&& (>= net45) (>= uap10.1)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (< netcoreapp2.0) (< netcoreapp2.1) (>= netstandard2.0)) (&& (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< net45) (>= netstandard1.3) (< portable-net451+win81+wpa81) (< win8)) (&& (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81)) (&& (>= net46) (< portable-net45+win8+wpa81)) (&& (< net46) (< netcoreapp2.0) (< netcoreapp2.1) (>= netstandard2.0)) (>= net461) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp2.0) (< netstandard1.1)) (&& (>= netcoreapp2.0) (< netstandard2.0)) (&& (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (< netstandard1.1) (>= netstandard2.0) (>= win8)) (&& (< netstandard1.1) (>= netstandard2.0) (< win8)) (&& (< netstandard1.1) (>= uap10.1)) (&& (>= netstandard1.2) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81)) (&& (>= netstandard2.0) (>= uap10.1)) (&& (< portable-net45+win8+wpa81) (>= uap10.0)) (&& (>= uap10.1) (< win8) (< wpa81)) (>= xamarinios) (>= xamarinmac) (>= xamarintvos) (>= xamarinwatchos) + System.Diagnostics.Debug (>= 4.3) - restriction: && (< net45) (>= netstandard1.1) (< netstandard2.0) (< win8) (< wpa81) + System.Diagnostics.Tracing (>= 4.3) - restriction: && (< net45) (>= netstandard1.1) (< netstandard2.0) (< win8) (< wpa81) + System.Resources.ResourceManager (>= 4.3) - restriction: && (< net45) (>= netstandard1.1) (< netstandard2.0) (< win8) (< wpa81) + System.Runtime (>= 4.3) - restriction: && (< net45) (>= netstandard1.1) (< netstandard2.0) (< win8) (< wpa81) + System.Threading (>= 4.3) - restriction: && (< net45) (>= netstandard1.1) (< netstandard2.0) (< win8) (< wpa81) + System.Collections (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net20) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< monotouch) (< net20) (>= netstandard1.4) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< monotouch) (< net20) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< netstandard2.0) (< uap10.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net20) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net20) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net20) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.6) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< wpa81)) (&& (< net35) (>= netstandard1.3)) (&& (< net45) (>= net46) (< netstandard1.3)) (&& (< net45) (>= net46) (< netstandard2.0)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.3) (< portable-net451+win81+wpa81) (< win8)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (< net45) (>= netstandard1.6) (< portable-net451+win81+wpa81)) (>= netcoreapp1.0) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard1.6)) (&& (>= netcoreapp1.1) (< netstandard2.0)) (&& (>= netcoreapp1.1) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81)) (&& (< portable-net45+win8+wp8+wpa81) (>= uap10.0)) (&& (< portable-net45+win8+wpa81) (>= uap10.0)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) - System.Collections.Concurrent (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.Collections.Concurrent (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.0) (< netstandard1.6)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard1.6)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) System.Collections (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wpa81) System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wpa81) System.Diagnostics.Tracing (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wpa81) @@ -400,14 +400,14 @@ NUGET System.Threading.Tasks (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81)) (< portable-net45+win8+wpa81) System.Collections.Immutable (1.4) - restriction: || (&& (>= monoandroid) (>= netcoreapp1.0)) (&& (>= monoandroid) (>= netcoreapp1.1)) (&& (>= monotouch) (>= netcoreapp1.0)) (&& (>= monotouch) (>= netcoreapp1.1)) (&& (>= netcoreapp1.0) (< netcoreapp1.1) (>= netstandard2.0)) (&& (>= netcoreapp1.0) (< netcoreapp1.1) (< netstandard2.0)) (&& (>= netcoreapp1.0) (< netstandard1.1)) (&& (>= netcoreapp1.0) (< portable-net45+win8)) (&& (>= netcoreapp1.0) (>= xamarinios)) (&& (>= netcoreapp1.0) (>= xamarinmac)) (&& (>= netcoreapp1.0) (>= xamarintvos)) (&& (>= netcoreapp1.0) (>= xamarinwatchos)) (&& (>= netcoreapp1.1) (< netcoreapp2.0) (>= netstandard2.0)) (&& (>= netcoreapp1.1) (< netstandard1.1)) (&& (>= netcoreapp1.1) (< netstandard2.0)) (&& (>= netcoreapp1.1) (< portable-net45+win8)) (&& (>= netcoreapp1.1) (>= xamarinios)) (&& (>= netcoreapp1.1) (>= xamarinmac)) (&& (>= netcoreapp1.1) (>= xamarintvos)) (&& (>= netcoreapp1.1) (>= xamarinwatchos)) NETStandard.Library (>= 1.6.1) - restriction: && (>= netstandard1.0) (< netstandard2.0) (< xamarinmac) - System.Collections.NonGeneric (4.3) - redirects: force, restriction: || (&& (< monoandroid) (< monotouch) (< net20) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net20) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< net20) (>= net462)) + System.Collections.NonGeneric (4.3) - redirects: force, restriction: || (&& (< monoandroid) (< monotouch) (< net20) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< monotouch) (< net35) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net20) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< net20) (>= net462)) System.Diagnostics.Debug (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Globalization (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Resources.ResourceManager (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Runtime.Extensions (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Threading (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.Collections.Specialized (4.3) - restriction: && (< net35) (>= netstandard1.3) + System.Collections.Specialized (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net20) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net20) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< net35) (>= netstandard1.3)) System.Collections.NonGeneric (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Globalization (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Globalization.Extensions (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) @@ -415,7 +415,7 @@ NUGET System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Runtime.Extensions (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Threading (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.ComponentModel (4.3) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) + System.ComponentModel (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net20) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net20) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net20) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net20) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< net35) (>= netstandard1.3)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.0) (< netstandard1.4)) (&& (>= netcoreapp1.0) (< portable-net45+win8)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard1.4)) (&& (>= netcoreapp1.1) (< netstandard2.0)) (&& (>= netcoreapp1.1) (< portable-net45+win8)) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) System.ComponentModel.Annotations (4.4) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) NETStandard.Library (>= 1.6.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.4) (< netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8)) (< portable-net45+win8) @@ -429,7 +429,7 @@ NUGET System.ComponentModel (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Resources.ResourceManager (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.ComponentModel.TypeConverter (4.3) - redirects: force, restriction: || (&& (< net20) (>= netstandard1.0) (< netstandard1.3)) (&& (< net20) (>= netstandard1.3)) + System.ComponentModel.TypeConverter (4.3) - redirects: force, restriction: || (&& (< net20) (>= netstandard1.0) (< netstandard1.3)) (&& (< net20) (>= netstandard1.3)) (&& (< net35) (>= netstandard1.3)) (>= netcoreapp1.0) System.Collections (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.5) (< win8) (< wp8) (< wpa81)) System.Collections.NonGeneric (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (>= net462) System.Collections.Specialized (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) @@ -447,17 +447,17 @@ NUGET System.Threading (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.5) (< win8) (< wp8) (< wpa81)) System.Configuration.ConfigurationManager (4.4.1) - restriction: && (< net45) (>= netstandard2.0) System.Security.Cryptography.ProtectedData (>= 4.4) - restriction: || (&& (< net461) (>= netstandard2.0)) (>= netcoreapp2.0) - System.Console (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (>= net46) (< netstandard1.4)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.Console (4.3) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (>= net46) (< netstandard1.4)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) Microsoft.NETCore.Targets (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.IO (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Text.Encoding (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.Diagnostics.Debug (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.Diagnostics.Debug (4.3) - restriction: || (&& (>= monoandroid) (>= netstandard1.1)) (&& (< monoandroid) (< net20) (>= netstandard1.3)) (&& (< monoandroid) (< net20) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard2.0) (< uap10.1)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.6) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< wpa81)) (>= monotouch) (&& (< net20) (>= net462)) (&& (< net45) (>= net46) (< netstandard2.0)) (&& (< net45) (>= net461) (< netstandard2.0)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.3) (< portable-net451+win81+wpa81) (< win8)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (< net45) (>= netstandard1.6) (< portable-net451+win81+wpa81)) (>= netcoreapp1.0) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard1.6)) (&& (>= netcoreapp1.1) (< netstandard2.0)) (&& (>= netcoreapp1.1) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81)) (&& (< portable-net45+win8+wp8+wpa81) (>= uap10.0)) (&& (< portable-net45+win8+wpa81) (>= uap10.0)) (>= xamarinios) (>= xamarinmac) (>= xamarintvos) (>= xamarinwatchos) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) - System.Diagnostics.DiagnosticSource (4.4.1) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) + System.Diagnostics.DiagnosticSource (4.4.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< netstandard2.0) (< uap10.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= net46) (< net461) (< netstandard2.0)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) System.Collections (>= 4.3) - restriction: || (&& (< net45) (< netcoreapp2.0) (>= netstandard1.3) (< xamarinmac)) (&& (< net45) (>= netstandard1.1) (< netstandard1.3)) System.Diagnostics.Debug (>= 4.3) - restriction: && (< net45) (< netcoreapp2.0) (>= netstandard1.3) (< xamarinmac) System.Diagnostics.Tracing (>= 4.3) - restriction: || (&& (< net45) (< netcoreapp2.0) (>= netstandard1.3) (< xamarinmac)) (&& (< net45) (>= netstandard1.1) (< netstandard1.3)) @@ -475,7 +475,7 @@ NUGET System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netstandard1.3)) System.Runtime.Extensions (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netstandard1.3)) System.Runtime.InteropServices (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.Diagnostics.Process (4.3) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) + System.Diagnostics.Process (4.3) - restriction: || (>= netcoreapp1.0) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.4) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) Microsoft.Win32.Primitives (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.4) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) Microsoft.Win32.Registry (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.4) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) @@ -502,7 +502,7 @@ NUGET System.Reflection (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Reflection.Metadata (>= 1.4.1) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.Diagnostics.Tools (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.Diagnostics.Tools (4.3) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.3) (< portable-net451+win81+wpa81) (< win8)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netstandard1.0) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wp8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wp8+wpa81)) (&& (< portable-net45+win8+wp8+wpa81) (>= uap10.0)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) @@ -516,11 +516,11 @@ NUGET System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Runtime.Extensions (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Threading (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.Diagnostics.Tracing (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.Diagnostics.Tracing (4.3) - restriction: || (&& (>= monoandroid) (>= netstandard1.1)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard2.0) (< uap10.1)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81)) (>= monotouch) (&& (< net45) (>= net46) (< netstandard1.3)) (&& (< net45) (>= net46) (< netstandard2.0)) (&& (< net45) (>= net461) (< netstandard2.0)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.3) (< portable-net451+win81+wpa81) (< win8)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.0) (< netstandard1.6)) (&& (>= netcoreapp1.0) (< portable-net45+win8+wpa81)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard1.6)) (&& (>= netcoreapp1.1) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81)) (&& (< portable-net45+win8+wpa81) (>= uap10.0)) (>= xamarinios) (>= xamarinmac) (>= xamarintvos) (>= xamarinwatchos) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (< portable-net45+win8+wpa81) Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (< portable-net45+win8+wpa81) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (< portable-net45+win8+wpa81) - System.Dynamic.Runtime (4.3) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) + System.Dynamic.Runtime (4.3) - restriction: || (&& (< net35) (>= netstandard1.3)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.0) (< portable-net45+win8+wpa81)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard2.0)) (&& (>= netcoreapp1.1) (< portable-net45+win8+wpa81)) System.Collections (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Linq (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) @@ -535,29 +535,29 @@ NUGET System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) System.Runtime.Extensions (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Threading (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) - System.Globalization (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.Globalization (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net20) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< monotouch) (< net20) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net20) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net20) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net20) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.6) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< wpa81)) (&& (< net20) (>= net462)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.3) (< portable-net451+win81+wpa81) (< win8)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (< net45) (>= netstandard1.6) (< portable-net451+win81+wpa81)) (>= netcoreapp1.0) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard1.6)) (&& (>= netcoreapp1.1) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81)) (&& (< portable-net45+win8+wp8+wpa81) (>= uap10.0)) (&& (< portable-net45+win8+wpa81) (>= uap10.0)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) - System.Globalization.Calendars (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (>= net46) (< netstandard1.4)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.Globalization.Calendars (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (>= net46) (< netstandard1.4)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.0) (< netstandard1.3)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard1.3)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) Microsoft.NETCore.Targets (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Globalization (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.Globalization.Extensions (4.3) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) + System.Globalization.Extensions (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net35) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Globalization (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Resources.ResourceManager (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Runtime.Extensions (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Runtime.InteropServices (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.IO (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.IO (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net20) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= net46) (< netstandard1.3)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.3) (< portable-net451+win81+wpa81) (< win8)) (&& (< net45) (>= netstandard1.5) (< portable-net451+win81+wpa81) (< win8)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (>= net46) (< portable-net45+win8+wpa81)) (>= netcoreapp1.0) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard1.3)) (&& (>= netcoreapp1.1) (< netstandard1.6)) (&& (>= netcoreapp1.1) (< netstandard2.0)) (&& (>= netcoreapp1.1) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (< netstandard1.3) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81)) (&& (< portable-net45+win8+wp8+wpa81) (>= uap10.0)) (&& (< portable-net45+win8+wpa81) (>= uap10.0)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) System.Text.Encoding (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) System.Threading.Tasks (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) - System.IO.Compression (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= net46) (< netstandard1.4)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.IO.Compression (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= net46) (< netstandard1.4)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) runtime.native.System (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) runtime.native.System.IO.Compression (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wpa81) @@ -583,7 +583,7 @@ NUGET System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Runtime.Extensions (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Text.Encoding (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.IO.FileSystem (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (>= net46) (< netstandard1.4)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.IO.FileSystem (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net35) (>= netstandard1.3)) (&& (< net45) (>= netstandard1.3) (< portable-net451+win81+wpa81) (< win8)) (&& (>= net46) (< netstandard1.4)) (&& (>= net46) (< portable-net45+win8+wp8+wpa81)) (>= netcoreapp1.0) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netstandard1.0) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wp8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wp8+wpa81)) (&& (< portable-net45+win8+wp8+wpa81) (>= uap10.0)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) Microsoft.NETCore.Targets (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.IO (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) @@ -592,7 +592,7 @@ NUGET System.Runtime.Handles (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Text.Encoding (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Threading.Tasks (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.IO.FileSystem.Primitives (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (>= net46) (< netstandard1.4)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.IO.FileSystem.Primitives (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net35) (>= netstandard1.3)) (&& (< net45) (>= netstandard1.3) (< portable-net451+win81+wpa81) (< win8)) (&& (>= net46) (< netstandard1.4)) (&& (>= net46) (< portable-net45+win8+wp8+wpa81)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netstandard1.0) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wp8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wp8+wpa81)) (&& (< portable-net45+win8+wp8+wpa81) (>= uap10.0)) System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.IO.FileSystem.Watcher (4.3) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) @@ -635,13 +635,13 @@ NUGET System.Runtime.InteropServices (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Threading (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Threading.Tasks (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.Linq (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.Linq (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net20) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net20) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.0) (< portable-net45+win8+wp8+wpa81)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) System.Collections (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.6) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.6) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) System.Runtime.Extensions (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) - System.Linq.Expressions (4.3) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) + System.Linq.Expressions (4.3) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) System.Collections (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Globalization (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) @@ -670,7 +670,7 @@ NUGET System.Runtime.Extensions (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wpa81) System.Threading (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wpa81) System.Threading.Tasks (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81)) (< portable-net45+win8+wpa81) - System.Linq.Queryable (4.3) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) + System.Linq.Queryable (4.3) - restriction: || (&& (< net45) (>= netstandard1.3)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) System.Collections (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Linq (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) @@ -679,7 +679,11 @@ NUGET System.Reflection.Extensions (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) - System.Net.Http (4.3.2) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) + System.Memory (4.5.1) - restriction: || (&& (< net46) (< netcoreapp2.1) (>= netstandard2.0)) (>= net461) (>= netcoreapp2.0) (>= uap10.1) + System.Buffers (>= 4.4) - restriction: || (>= monoandroid) (>= monotouch) (&& (>= net45) (< netstandard2.0)) (&& (< net45) (< netcoreapp2.0) (< netcoreapp2.1) (>= netstandard2.0)) (&& (< net45) (>= netstandard1.1) (< netstandard2.0) (< win8) (< wpa81)) (>= net461) (&& (< netstandard1.1) (>= portable-net45+win8+wpa81) (< win8)) (&& (< netstandard1.1) (>= win8)) (&& (< netstandard2.0) (< uap10.1) (>= wpa81)) (>= xamarinios) (>= xamarinmac) (>= xamarintvos) (>= xamarinwatchos) + System.Numerics.Vectors (>= 4.4) - restriction: || (&& (< net45) (< netcoreapp2.0) (< netcoreapp2.1) (>= netstandard2.0)) (>= net461) + System.Runtime.CompilerServices.Unsafe (>= 4.5) - restriction: || (>= monoandroid) (>= monotouch) (&& (>= net45) (< netstandard2.0)) (&& (< net45) (< netcoreapp2.1) (>= netstandard2.0)) (&& (< net45) (>= netstandard1.1) (< netstandard2.0) (< win8) (< wpa81)) (>= net461) (>= netcoreapp2.0) (&& (< netstandard1.1) (>= portable-net45+win8+wpa81) (< win8)) (&& (< netstandard1.1) (>= win8)) (&& (< netstandard2.0) (>= wpa81)) (>= uap10.1) (>= xamarinios) (>= xamarinmac) (>= xamarintvos) (>= xamarinwatchos) + System.Net.Http (4.3.2) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= net46) (< netstandard1.4)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.6) (< win8) (< wpa81)) (< portable-net45+win8+wpa81) runtime.native.System (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) runtime.native.System.Net.Http (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) @@ -706,6 +710,12 @@ NUGET System.Text.Encoding (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.6) (< win8) (< wpa81)) (< portable-net45+win8+wpa81) System.Threading (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.6) (< win8) (< wpa81)) (< portable-net45+win8+wpa81) System.Threading.Tasks (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.6) (< win8) (< wpa81)) (< portable-net45+win8+wpa81) + System.Net.Http.WinHttpHandler (4.5) + NETStandard.Library (>= 1.6.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< netstandard2.0) (< uap10.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= net46) (< net461) (< netstandard2.0)) + System.Buffers (>= 4.4) - restriction: || (>= monoandroid) (>= monotouch) (&& (< net46) (< netcoreapp2.0) (< netcoreapp2.1) (>= netstandard2.0)) (>= xamarinios) (>= xamarinmac) (>= xamarintvos) (>= xamarinwatchos) + System.Buffers (>= 4.5) - restriction: >= net461 + System.Diagnostics.DiagnosticSource (>= 4.4.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< netstandard2.0) (< uap10.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= net46) (< net461) (< netstandard2.0)) + System.Memory (>= 4.5) - restriction: || (&& (< net46) (< netcoreapp2.1) (>= netstandard2.0)) (>= net461) (>= netcoreapp2.0) (>= uap10.1) System.Net.NameResolution (4.3) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netstandard1.3)) runtime.native.System (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) @@ -721,12 +731,12 @@ NUGET System.Security.Principal.Windows (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Threading (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netstandard1.3)) System.Threading.Tasks (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netstandard1.3)) - System.Net.Primitives (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.Net.Primitives (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.0) (< netstandard1.3)) (&& (>= netcoreapp1.0) (< netstandard1.6)) (&& (>= netcoreapp1.0) (< portable-net45+win8+wpa81)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard1.3)) (&& (>= netcoreapp1.1) (< netstandard1.6)) (&& (>= netcoreapp1.1) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (>= netstandard1.0) (< netstandard1.1) (< win8) (< wp8)) (< portable-net45+win8+wp8+wpa81) Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (>= netstandard1.0) (< netstandard1.1) (< win8) (< wp8)) (< portable-net45+win8+wp8+wpa81) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (>= netstandard1.0) (< netstandard1.1) (< win8) (< wp8)) (< portable-net45+win8+wp8+wpa81) System.Runtime.Handles (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) - System.Net.Requests (4.3) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) + System.Net.Requests (4.3) - restriction: || (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Collections (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) @@ -781,15 +791,15 @@ NUGET System.Resources.ResourceManager (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Runtime.Extensions (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.Numerics.Vectors (4.4) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) + System.Numerics.Vectors (4.4) - restriction: || (&& (< net45) (< netcoreapp2.0) (< netcoreapp2.1) (>= netstandard2.0)) (>= net461) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netstandard2.0) (>= uap10.1)) NETStandard.Library (>= 1.6.1) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.0) (< netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.ObjectModel (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.ObjectModel (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.0) (< netstandard1.3)) (&& (>= netcoreapp1.0) (< portable-net45+win8+wp8+wpa81)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard1.3)) (&& (>= netcoreapp1.1) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) System.Collections (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) System.Threading (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) - System.Reflection (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.Reflection (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net20) (>= netstandard1.4) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< monotouch) (< net20) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< netstandard2.0) (< uap10.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net20) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net20) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net20) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.4) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.5) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< netstandard1.0) (>= portable-net451+win81+wpa81) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.2) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.4) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.5) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (< net35) (>= netstandard1.3)) (&& (>= net45) (< netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< net45) (>= net451) (< netstandard1.3)) (&& (< net45) (>= net46) (< netstandard1.3)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (>= net46) (< netstandard2.0)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.2) (< portable-net451+win81+wpa81) (< win8)) (&& (< net45) (>= netstandard1.3) (< portable-net451+win81+wpa81) (< win8)) (&& (< net45) (>= netstandard1.5) (< portable-net451+win81+wpa81) (< win8)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (>= net451) (< netstandard1.1)) (&& (>= net46) (< netstandard1.1)) (>= netcoreapp1.0) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard1.3)) (&& (>= netcoreapp1.1) (< netstandard1.4)) (&& (>= netcoreapp1.1) (< netstandard1.5)) (&& (>= netcoreapp1.1) (< netstandard1.6)) (&& (>= netcoreapp1.1) (< netstandard2.0)) (&& (>= netcoreapp1.1) (< portable-net45+win8+wp8+wpa81)) (&& (>= netcoreapp1.1) (< portable-net451+win81+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.0) (>= netstandard1.1) (< portable-net451+win81+wpa81) (< win8)) (&& (< netstandard1.0) (>= portable-net45+win8+wpa81) (< portable-net451+win81+wpa81) (< win8)) (&& (>= netstandard1.1) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (< netstandard1.1) (>= uap10.0) (< win8)) (&& (< netstandard1.1) (< win8) (>= wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wpa81)) (&& (< netstandard1.2) (>= uap10.0) (< win8)) (&& (>= netstandard1.3) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (< netstandard1.3) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81)) (&& (< portable-net45+win8+wp8+wpa81) (>= uap10.0)) (&& (< portable-net45+win8+wpa81) (>= uap10.0)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) System.IO (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) @@ -799,13 +809,13 @@ NUGET NETStandard.Library (>= 1.6.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netstandard1.3)) System.Reflection.Emit (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Reflection.Emit.ILGeneration (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.Reflection.Emit (4.3) - restriction: && (< net35) (>= netstandard1.3) + System.Reflection.Emit (4.3) - restriction: || (&& (< net35) (>= netstandard1.3)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard2.0)) System.IO (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Reflection (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Reflection.Emit.ILGeneration (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Reflection.Primitives (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.Reflection.Emit.ILGeneration (4.3) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) + System.Reflection.Emit.ILGeneration (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net35) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard2.0)) System.Reflection (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< wp8) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Reflection.Primitives (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< wp8) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< wp8) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) @@ -814,7 +824,7 @@ NUGET System.Reflection.Emit.ILGeneration (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< wp8) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Reflection.Primitives (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< wp8) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< wp8) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.Reflection.Extensions (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.Reflection.Extensions (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net20) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net20) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net20) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net20) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< monoandroid) (< netstandard1.0) (>= portable-net451+win81+wpa81) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.2) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.4) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.5) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (>= net45) (< netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< net45) (>= net451) (< netstandard1.3)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (>= net451) (< netstandard1.1)) (&& (>= net46) (< netstandard1.1)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.0) (< portable-net45+win8+wp8+wpa81)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.0) (>= netstandard1.1) (< portable-net451+win81+wpa81) (< win8)) (&& (< netstandard1.0) (>= portable-net45+win8+wpa81) (< portable-net451+win81+wpa81) (< win8)) (&& (< netstandard1.1) (>= uap10.0) (< win8)) (&& (< netstandard1.1) (< win8) (>= wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Reflection (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) @@ -822,11 +832,11 @@ NUGET System.Reflection.Metadata (1.5) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) NETStandard.Library (>= 1.6.1) - restriction: && (< monoandroid) (< monotouch) (>= netstandard1.1) (< netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Collections.Immutable (>= 1.4) - restriction: || (>= monoandroid) (>= monotouch) (&& (< netcoreapp2.0) (>= netstandard2.0)) (&& (>= netstandard1.1) (< netstandard2.0)) (&& (< netstandard1.1) (>= portable-net45+win8)) (&& (< portable-net45+win8) (>= portable-net45+win8+wpa81)) (>= xamarinios) (>= xamarinmac) (>= xamarintvos) (>= xamarinwatchos) - System.Reflection.Primitives (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.Reflection.Primitives (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net20) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< monotouch) (< net35) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net20) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net20) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net20) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.4) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.5) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.2) (< portable-net451+win81+wpa81) (< win8)) (&& (< net45) (>= netstandard1.3) (< portable-net451+win81+wpa81) (< win8)) (&& (< net45) (>= netstandard1.5) (< portable-net451+win81+wpa81) (< win8)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard1.3)) (&& (>= netcoreapp1.1) (< netstandard1.4)) (&& (>= netcoreapp1.1) (< netstandard1.5)) (&& (>= netcoreapp1.1) (< netstandard1.6)) (&& (>= netcoreapp1.1) (< netstandard2.0)) (&& (>= netcoreapp1.1) (< portable-net451+win81+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wpa81)) (&& (< netstandard1.2) (>= uap10.0) (< win8)) (&& (>= netstandard1.3) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (< netstandard1.3) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81)) (&& (< portable-net45+win8+wp8+wpa81) (>= uap10.0)) (&& (< portable-net45+win8+wpa81) (>= uap10.0)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) - System.Reflection.TypeExtensions (4.4) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) + System.Reflection.TypeExtensions (4.4) - restriction: || (&& (< monoandroid) (< monotouch) (< net20) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net20) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.3)) (>= netcoreapp1.0) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard2.0)) (&& (>= netcoreapp1.1) (< portable-net45+win8+wpa81)) System.Reflection (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.5) (< netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net46) (>= netstandard1.3) (< netstandard1.5)) (&& (< monoandroid) (< netstandard1.3)) System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.5) (< netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net46) (>= netstandard1.3) (< netstandard1.5)) (&& (< monoandroid) (< netstandard1.3)) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.5) (< netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net46) (>= netstandard1.3) (< netstandard1.5)) (&& (< monoandroid) (< netstandard1.3)) @@ -836,31 +846,32 @@ NUGET System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Text.Encoding (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Threading (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.Resources.ResourceManager (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.Resources.ResourceManager (4.3) - restriction: || (&& (>= monoandroid) (>= netstandard1.1)) (&& (< monoandroid) (< net20) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net20) (>= netstandard1.3)) (&& (< monoandroid) (< net20) (>= netstandard1.4)) (&& (< monoandroid) (< net20) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.6) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< wpa81)) (&& (< monoandroid) (< netstandard1.0) (>= portable-net451+win81+wpa81) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.2) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.4) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.5) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (>= monotouch) (&& (< net20) (>= net462)) (&& (>= net45) (< netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< net45) (>= net451) (< netstandard1.3)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (>= net461) (< netstandard2.0)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.3) (< portable-net451+win81+wpa81) (< win8)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (< net45) (>= netstandard1.6) (< portable-net451+win81+wpa81)) (&& (>= net451) (< netstandard1.1)) (&& (>= net46) (< netstandard1.1)) (>= netcoreapp1.0) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard1.3)) (&& (>= netcoreapp1.1) (< netstandard1.5)) (&& (>= netcoreapp1.1) (< netstandard1.6)) (&& (>= netcoreapp1.1) (< netstandard2.0)) (&& (>= netcoreapp1.1) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.0) (>= netstandard1.1) (< portable-net451+win81+wpa81) (< win8)) (&& (< netstandard1.0) (>= portable-net45+win8+wpa81) (< portable-net451+win81+wpa81) (< win8)) (&& (>= netstandard1.1) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (< netstandard1.1) (>= uap10.0) (< win8)) (&& (< netstandard1.1) (< win8) (>= wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81)) (&& (< portable-net45+win8+wp8+wpa81) (>= uap10.0)) (&& (< portable-net45+win8+wpa81) (>= uap10.0)) (>= xamarinios) (>= xamarinmac) (>= xamarintvos) (>= xamarinwatchos) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Globalization (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Reflection (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) - System.Runtime (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.Runtime (4.3) - restriction: || (&& (>= monoandroid) (>= netstandard1.1)) (&& (< monoandroid) (< net20) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net20) (>= netstandard1.3) (< netstandard1.4)) (&& (< monoandroid) (< net20) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net20) (>= netstandard1.4)) (&& (< monoandroid) (< net20) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard2.0) (< uap10.1)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< monoandroid) (< netstandard1.0) (>= portable-net451+win81+wpa81) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.2) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.4) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.5) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (>= monotouch) (&& (< net20) (>= net462)) (&& (>= net45) (< netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< net45) (>= net451) (< netstandard1.3)) (&& (< net45) (>= net46) (< netstandard1.3)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (>= net46) (< netstandard2.0)) (&& (< net45) (>= net461) (< netstandard2.0)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.2) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.3) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.4) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.5) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (< net45) (>= netstandard1.6) (< portable-net451+win81+wpa81)) (&& (>= net451) (< netstandard1.1)) (&& (>= net46) (< netstandard1.1)) (>= netcoreapp1.0) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard1.3)) (&& (>= netcoreapp1.1) (< netstandard1.5)) (&& (>= netcoreapp1.1) (< netstandard1.6)) (&& (>= netcoreapp1.1) (< netstandard2.0)) (&& (>= netcoreapp1.1) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.0) (>= netstandard1.1) (< portable-net451+win81+wpa81) (< win8)) (&& (< netstandard1.0) (>= portable-net45+win8+wpa81) (< portable-net451+win81+wpa81) (< win8)) (&& (>= netstandard1.1) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (< netstandard1.1) (>= uap10.0) (< win8)) (&& (< netstandard1.1) (< win8) (>= wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (< netstandard1.3) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< win81) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81)) (&& (< portable-net45+win8+wp8+wpa81) (>= uap10.0)) (&& (< portable-net45+win8+wpa81) (>= uap10.0)) (&& (< portable-net451+win81+wpa81) (>= uap10.0)) (>= xamarinios) (>= xamarinmac) (>= xamarintvos) (>= xamarinwatchos) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.2) (< win8) (< wp8)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.2) (< win8) (< wp8)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) - System.Runtime.Extensions (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.Runtime.CompilerServices.Unsafe (4.5.1) - restriction: || (&& (>= monoandroid) (>= netstandard2.0)) (&& (>= monotouch) (>= netstandard2.0)) (&& (< net45) (< netcoreapp2.1) (>= netstandard2.0)) (>= net461) (>= netcoreapp2.0) (&& (< netstandard1.1) (>= netstandard2.0) (>= win8)) (&& (< netstandard1.1) (>= netstandard2.0) (< win8)) (&& (>= netstandard2.0) (>= xamarinios)) (&& (>= netstandard2.0) (>= xamarinmac)) (&& (>= netstandard2.0) (>= xamarintvos)) (&& (>= netstandard2.0) (>= xamarinwatchos)) (>= uap10.1) + System.Runtime.Extensions (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net20) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< monotouch) (< net20) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< netstandard2.0) (< uap10.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net20) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net20) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net20) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.6) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< wpa81)) (&& (< net20) (>= net462)) (&& (< net35) (>= netstandard1.3)) (&& (< net45) (>= net46) (< netstandard2.0)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.3) (< portable-net451+win81+wpa81) (< win8)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (< net45) (>= netstandard1.6) (< portable-net451+win81+wpa81)) (>= netcoreapp1.0) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard1.6)) (&& (>= netcoreapp1.1) (< netstandard2.0)) (&& (>= netcoreapp1.1) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81)) (&& (< portable-net45+win8+wp8+wpa81) (>= uap10.0)) (&& (< portable-net45+win8+wpa81) (>= uap10.0)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) - System.Runtime.Handles (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.Runtime.Handles (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net35) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (>= netstandard1.3) (< portable-net451+win81+wpa81) (< win8)) (&& (>= net46) (< portable-net45+win8+wpa81)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.0) (< netstandard1.6)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard1.6)) (&& (>= netcoreapp1.1) (< netstandard2.0)) (&& (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81)) (&& (< portable-net45+win8+wpa81) (>= uap10.0)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) Microsoft.NETCore.Targets (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.Runtime.InteropServices (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.Runtime.InteropServices (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net35) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< monoandroid) (< netstandard1.0) (>= netstandard1.1) (>= portable-net451+win81+wpa81) (< win8)) (&& (< net45) (>= net451) (< netstandard1.3)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.3) (< portable-net451+win81+wpa81) (< win8)) (&& (>= net46) (< portable-net45+win8+wpa81)) (>= netcoreapp1.0) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard1.6)) (&& (>= netcoreapp1.1) (< netstandard2.0)) (&& (>= netcoreapp1.1) (< portable-net45+win8+wpa81)) (&& (< netstandard1.0) (>= netstandard1.1) (< portable-net451+win81+wpa81) (< win8)) (&& (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81)) (&& (< portable-net45+win8+wpa81) (>= uap10.0)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (>= netcoreapp1.1) (< portable-net45+win8+wpa81) Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (>= netcoreapp1.1) (< portable-net45+win8+wpa81) System.Reflection (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (>= netcoreapp1.1) (< portable-net45+win8+wpa81) System.Reflection.Primitives (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (>= netcoreapp1.1) (< portable-net45+win8+wpa81) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (>= net462) (>= netcoreapp1.1) (< portable-net45+win8+wpa81) System.Runtime.Handles (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (>= netcoreapp1.1) (< portable-net45+win8+wpa81) - System.Runtime.InteropServices.RuntimeInformation (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< monoandroid) (< netstandard1.0) (>= portable-net451+win81+wpa81)) (&& (>= net45) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= net451) (< netstandard1.3)) (&& (>= net46) (< netstandard1.4)) (&& (< netstandard1.0) (>= portable-net45+win8+wpa81) (< portable-net451+win81+wpa81)) (&& (< netstandard1.3) (>= wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.Runtime.InteropServices.RuntimeInformation (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< monoandroid) (< netstandard1.0) (>= portable-net451+win81+wpa81)) (&& (>= net45) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= net451) (< netstandard1.3)) (&& (>= net46) (< netstandard1.4)) (>= netcoreapp1.0) (&& (< netstandard1.0) (>= portable-net45+win8+wpa81) (< portable-net451+win81+wpa81)) (&& (< netstandard1.3) (>= wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< monoandroid) (< netstandard1.1) (< win8) runtime.native.System (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.1) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Reflection (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.1) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netstandard1.1) (< win8)) @@ -869,11 +880,11 @@ NUGET System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.1) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netstandard1.1) (< win8)) System.Runtime.InteropServices (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.1) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Threading (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.1) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netstandard1.1) (< win8)) - System.Runtime.Loader (4.3) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) + System.Runtime.Loader (4.3) - restriction: || (&& (< net20) (>= netstandard1.6)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) System.IO (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net462) (>= netstandard1.5) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Reflection (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net462) (>= netstandard1.5) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net462) (>= netstandard1.5) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.Runtime.Numerics (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.Runtime.Numerics (4.3) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard2.0)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) System.Globalization (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wpa81) System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wpa81) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81)) (< portable-net45+win8+wpa81) @@ -884,12 +895,12 @@ NUGET System.Resources.ResourceManager (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.4) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.4) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net46) (>= netstandard1.3) (< netstandard1.4)) System.Runtime.Serialization.Primitives (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (>= netstandard1.4) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netstandard1.3) (< netstandard1.4)) (>= net46) - System.Runtime.Serialization.Primitives (4.3) - redirects: force, restriction: || (&& (< net20) (>= netstandard1.0) (< netstandard1.3)) (&& (< net20) (>= netstandard1.3)) + System.Runtime.Serialization.Primitives (4.3) - redirects: force, restriction: || (&& (< monoandroid) (< monotouch) (< net20) (>= netstandard1.4) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< net20) (>= net46)) (&& (< net20) (>= netstandard1.0) (< netstandard1.3)) (&& (< net20) (>= netstandard1.3)) System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) System.Security.AccessControl (4.4) - restriction: || (&& (>= monoandroid) (>= netcoreapp1.0)) (&& (>= monoandroid) (>= netcoreapp1.1)) (&& (>= monotouch) (>= netcoreapp1.0)) (&& (>= monotouch) (>= netcoreapp1.1)) (&& (>= net461) (>= netcoreapp1.0)) (&& (>= net461) (>= netcoreapp1.1)) (&& (>= netcoreapp1.0) (< netcoreapp1.1) (>= netstandard2.0)) (&& (>= netcoreapp1.0) (>= xamarinios)) (&& (>= netcoreapp1.0) (>= xamarinmac)) (&& (>= netcoreapp1.0) (>= xamarintvos)) (&& (>= netcoreapp1.0) (>= xamarinwatchos)) (&& (>= netcoreapp1.1) (< netcoreapp2.0) (>= netstandard2.0)) (&& (>= netcoreapp1.1) (>= xamarinios)) (&& (>= netcoreapp1.1) (>= xamarinmac)) (&& (>= netcoreapp1.1) (>= xamarintvos)) (&& (>= netcoreapp1.1) (>= xamarinwatchos)) (&& (< netcoreapp1.1) (>= netcoreapp2.0)) System.Security.Principal.Windows (>= 4.4) - restriction: || (>= monoandroid) (>= monotouch) (&& (>= net46) (< netstandard2.0)) (&& (< net46) (>= netstandard1.3) (< netstandard2.0)) (&& (< net46) (>= netstandard2.0)) (>= net461) (>= netcoreapp2.0) (>= xamarinios) (>= xamarinmac) (>= xamarintvos) (>= xamarinwatchos) - System.Security.Claims (4.3) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.0) (< netstandard1.6)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard1.6)) + System.Security.Claims (4.3) - restriction: || (&& (>= net46) (>= netcoreapp1.0) (< netstandard2.0)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.0) (< netstandard1.6)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard1.6)) (&& (>= netcoreapp1.1) (< netstandard2.0)) System.Collections (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Globalization (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.IO (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) @@ -897,7 +908,7 @@ NUGET System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Runtime.Extensions (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Security.Principal (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.Security.Cryptography.Algorithms (4.3) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) + System.Security.Cryptography.Algorithms (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net35) (>= net46)) (&& (< net35) (>= netstandard1.3)) (&& (>= net46) (< netstandard1.4)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard2.0)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netstandard1.3)) runtime.native.System.Security.Cryptography.Apple (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) @@ -923,7 +934,7 @@ NUGET System.Security.Cryptography.Encoding (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.6) (< netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net46) (>= netstandard1.4) (< netstandard1.6)) System.Security.Cryptography.Primitives (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.6) (< netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net46) (>= netstandard1.3) (< netstandard1.4)) (&& (< monoandroid) (< net46) (>= netstandard1.4) (< netstandard1.6)) (&& (>= net46) (< netstandard1.4)) System.Text.Encoding (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.6) (< netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net46) (>= netstandard1.4) (< netstandard1.6)) - System.Security.Cryptography.Csp (4.3) - restriction: && (< net35) (>= netstandard1.3) + System.Security.Cryptography.Csp (4.3) - restriction: || (&& (< net35) (>= netstandard1.3)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.IO (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Reflection (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) @@ -937,7 +948,7 @@ NUGET System.Security.Cryptography.Primitives (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (>= net46) System.Text.Encoding (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Threading (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.Security.Cryptography.Encoding (4.3) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) + System.Security.Cryptography.Encoding (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net35) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (>= net46) (< netstandard1.4)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard2.0)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Collections (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) @@ -963,7 +974,7 @@ NUGET System.Security.Cryptography.Encoding (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net461) (>= netstandard1.6) (< netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Security.Cryptography.Primitives (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net461) (>= netstandard1.6) (< netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Text.Encoding (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net461) (>= netstandard1.6) (< netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.Security.Cryptography.Primitives (4.3) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) + System.Security.Cryptography.Primitives (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net35) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net35) (>= net46)) (&& (>= net46) (< netstandard1.4)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard2.0)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) System.Diagnostics.Debug (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Globalization (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.IO (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) @@ -973,7 +984,7 @@ NUGET System.Threading.Tasks (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Security.Cryptography.ProtectedData (4.4) NETStandard.Library (>= 1.6.1) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.Security.Cryptography.X509Certificates (4.3) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) + System.Security.Cryptography.X509Certificates (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (>= net46) (< netstandard1.4)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netstandard1.3)) runtime.native.System (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) runtime.native.System.Net.Http (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) @@ -999,9 +1010,9 @@ NUGET System.Security.Cryptography.Primitives (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netstandard1.3)) System.Text.Encoding (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netstandard1.3)) System.Threading (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netstandard1.3)) - System.Security.Principal (4.3) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.0) (< netstandard1.6)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard1.6)) + System.Security.Principal (4.3) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.0) (< netstandard1.6)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard1.6)) (&& (>= netcoreapp1.1) (< netstandard2.0)) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) - System.Security.Principal.Windows (4.4) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) + System.Security.Principal.Windows (4.4) - restriction: || (&& (>= monoandroid) (>= netcoreapp1.0)) (&& (>= monoandroid) (>= netcoreapp1.1)) (&& (>= monotouch) (>= netcoreapp1.0)) (&& (>= monotouch) (>= netcoreapp1.1)) (&& (>= net461) (>= netcoreapp1.0)) (&& (>= net461) (>= netcoreapp1.1)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.0) (>= xamarinios)) (&& (>= netcoreapp1.0) (>= xamarinmac)) (&& (>= netcoreapp1.0) (>= xamarintvos)) (&& (>= netcoreapp1.0) (>= xamarinwatchos)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (>= xamarinios)) (&& (>= netcoreapp1.1) (>= xamarinmac)) (&& (>= netcoreapp1.1) (>= xamarintvos)) (&& (>= netcoreapp1.1) (>= xamarinwatchos)) (&& (< netcoreapp1.1) (>= netcoreapp2.0)) Microsoft.Win32.Primitives (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Collections (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Diagnostics.Debug (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) @@ -1015,25 +1026,25 @@ NUGET System.Security.Principal (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Text.Encoding (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Threading (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.Text.Encoding (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.Text.Encoding (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net20) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= net46) (< netstandard1.3)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.3) (< portable-net451+win81+wpa81) (< win8)) (&& (< net45) (>= netstandard1.5) (< portable-net451+win81+wpa81) (< win8)) (&& (>= net46) (< portable-net45+win8+wpa81)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.0) (< netstandard1.3)) (&& (>= netcoreapp1.0) (< netstandard1.6)) (&& (>= netcoreapp1.0) (< portable-net45+win8+wpa81)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard1.3)) (&& (>= netcoreapp1.1) (< netstandard1.6)) (&& (>= netcoreapp1.1) (< netstandard2.0)) (&& (>= netcoreapp1.1) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (< netstandard1.3) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81)) (&& (< portable-net45+win8+wp8+wpa81) (>= uap10.0)) (&& (< portable-net45+win8+wpa81) (>= uap10.0)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) System.Text.Encoding.CodePages (4.4) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) NETStandard.Library (>= 1.6.1) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.Text.Encoding.Extensions (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.Text.Encoding.Extensions (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.3) (< portable-net451+win81+wpa81) (< win8)) (&& (>= net46) (< portable-net45+win8+wp8+wpa81)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netstandard1.0) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wp8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wp8+wpa81)) (&& (< portable-net45+win8+wp8+wpa81) (>= uap10.0)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) System.Text.Encoding (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) - System.Text.RegularExpressions (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.Text.RegularExpressions (4.3) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.3) (< portable-net451+win81+wpa81) (< win8)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (>= net46) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wp8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wp8+wpa81)) (&& (< portable-net45+win8+wp8+wpa81) (>= uap10.0)) System.Collections (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (< netcoreapp1.1) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Globalization (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (< netcoreapp1.1) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (< netcoreapp1.1) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.6) (< win8) (< wpa81)) (>= netcoreapp1.1) (< portable-net45+win8+wp8+wpa81) System.Runtime.Extensions (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (< netcoreapp1.1) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Threading (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (< netcoreapp1.1) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) - System.Threading (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.Threading (4.3) - restriction: || (&& (>= monoandroid) (>= netstandard1.1)) (&& (< monoandroid) (< net20) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net20) (>= netstandard1.3)) (&& (< monoandroid) (< net20) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard2.0) (< uap10.1)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.6) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< wpa81)) (&& (< monoandroid) (< netstandard1.0) (>= portable-net451+win81+wpa81) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.2) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.4) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.5) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (>= monotouch) (&& (< net20) (>= net462)) (&& (< net35) (>= netstandard1.3)) (&& (>= net45) (< netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< net45) (>= net451) (< netstandard1.3)) (&& (< net45) (>= net46) (< netstandard1.3)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (>= net46) (< netstandard2.0)) (&& (< net45) (>= net461) (< netstandard2.0)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.3) (< portable-net451+win81+wpa81) (< win8)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (< net45) (>= netstandard1.6) (< portable-net451+win81+wpa81)) (&& (>= net451) (< netstandard1.1)) (&& (>= net46) (< netstandard1.1)) (>= netcoreapp1.0) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard1.6)) (&& (>= netcoreapp1.1) (< netstandard2.0)) (&& (>= netcoreapp1.1) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.0) (>= netstandard1.1) (< portable-net451+win81+wpa81) (< win8)) (&& (< netstandard1.0) (>= portable-net45+win8+wpa81) (< portable-net451+win81+wpa81) (< win8)) (&& (>= netstandard1.1) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (< netstandard1.1) (>= uap10.0) (< win8)) (&& (< netstandard1.1) (< win8) (>= wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81)) (&& (< portable-net45+win8+wp8+wpa81) (>= uap10.0)) (&& (< portable-net45+win8+wpa81) (>= uap10.0)) (>= xamarinios) (>= xamarinmac) (>= xamarintvos) (>= xamarinwatchos) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) System.Threading.Tasks (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) System.Threading.Overlapped (4.3) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) @@ -1041,18 +1052,18 @@ NUGET System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (< net46) (>= netstandard1.3)) (< netstandard1.3) System.Runtime (>= 4.3) - restriction: || (&& (< net46) (>= netstandard1.3)) (< netstandard1.3) System.Runtime.Handles (>= 4.3) - restriction: || (&& (< net46) (>= netstandard1.3)) (< netstandard1.3) - System.Threading.Tasks (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.Threading.Tasks (4.3) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.3) (< portable-net451+win81+wpa81) (< win8)) (&& (< net45) (>= netstandard1.5) (< portable-net451+win81+wpa81) (< win8)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (>= net46) (< portable-net45+win8+wpa81)) (>= netcoreapp1.0) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netcoreapp1.1) (< netstandard1.3)) (&& (>= netcoreapp1.1) (< netstandard1.6)) (&& (>= netcoreapp1.1) (< netstandard2.0)) (&& (>= netcoreapp1.1) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (< netstandard1.3) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81)) (&& (< portable-net45+win8+wp8+wpa81) (>= uap10.0)) (&& (< portable-net45+win8+wpa81) (>= uap10.0)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) System.Threading.Tasks.Dataflow (4.8) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) NETStandard.Library (>= 1.6.1) - restriction: || (&& (>= netstandard1.0) (< netstandard1.1)) (&& (>= netstandard1.1) (< netstandard2.0) (< xamarinmac)) System.Dynamic.Runtime (>= 4.3) - restriction: || (&& (>= netstandard1.0) (< netstandard1.1)) (&& (>= netstandard1.1) (< netstandard2.0) (< xamarinmac)) - System.Threading.Tasks.Extensions (4.4) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) + System.Threading.Tasks.Extensions (4.4) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (>= netstandard1.3) (< portable-net451+win81+wpa81) (< win8)) (&& (>= net46) (< portable-net45+win8+wp8+wpa81)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netstandard1.0) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wp8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wp8+wpa81)) (&& (< portable-net45+win8+wp8+wpa81) (>= uap10.0)) System.Collections (>= 4.3) - restriction: && (>= netstandard1.0) (< netstandard2.0) (< xamarinmac) System.Runtime (>= 4.3) - restriction: && (>= netstandard1.0) (< netstandard2.0) (< xamarinmac) System.Threading.Tasks (>= 4.3) - restriction: && (>= netstandard1.0) (< netstandard2.0) (< xamarinmac) - System.Threading.Tasks.Parallel (4.3) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) + System.Threading.Tasks.Parallel (4.3) - restriction: || (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) System.Collections.Concurrent (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81)) (< portable-net45+win8+wpa81) System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wpa81) System.Diagnostics.Tracing (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wpa81) @@ -1061,18 +1072,18 @@ NUGET System.Runtime.Extensions (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wpa81) System.Threading (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wpa81) System.Threading.Tasks (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81)) (< portable-net45+win8+wpa81) - System.Threading.Thread (4.3) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) + System.Threading.Thread (4.3) - restriction: || (&& (< net20) (>= netstandard1.3) (< netstandard1.6)) (&& (< net20) (>= netstandard1.6)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (>= netcoreapp1.0) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.Threading.ThreadPool (4.3) - restriction: || (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) + System.Threading.ThreadPool (4.3) - restriction: || (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Runtime.Handles (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.Threading.Timer (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.Threading.Timer (4.3) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net451) (>= netstandard1.2) (< win81) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net451+win81+wpa81) Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net451) (>= netstandard1.2) (< win81) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net451+win81+wpa81) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net451) (>= netstandard1.2) (< win81) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net451+win81+wpa81) System.ValueTuple (4.4) - restriction: && (>= netcoreapp1.0) (< netcoreapp2.0) NETStandard.Library (>= 1.6.1) - restriction: && (< monoandroid) (< monotouch) (< net461) (>= netstandard1.0) (< netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.Xml.ReaderWriter (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= net46) (< netstandard1.4)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.Xml.ReaderWriter (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net20) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (< net45) (>= netstandard1.3) (< portable-net451+win81+wpa81) (< win8)) (&& (>= net46) (< netstandard1.4)) (>= netcoreapp1.0) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netstandard1.0) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.2) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (< netstandard1.3) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.4) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wp8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wp8+wpa81)) (&& (< portable-net45+win8+wp8+wpa81) (>= uap10.0)) System.Collections (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Globalization (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) @@ -1088,7 +1099,7 @@ NUGET System.Text.RegularExpressions (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Threading.Tasks (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) System.Threading.Tasks.Extensions (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) - System.Xml.XDocument (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) + System.Xml.XDocument (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< portable-net451+win81+wpa81)) (&& (>= netcoreapp1.0) (< netcoreapp1.1)) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) System.Collections (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Diagnostics.Tools (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) @@ -1101,7 +1112,7 @@ NUGET System.Text.Encoding (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Threading (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81) System.Xml.ReaderWriter (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (< portable-net45+win8+wp8+wpa81) - System.Xml.XmlDocument (4.3) - redirects: force, restriction: && (< net20) (>= netstandard1.3) + System.Xml.XmlDocument (4.3) - redirects: force, restriction: || (&& (< net20) (>= netstandard1.3)) (>= netcoreapp1.0) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) System.Collections (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Diagnostics.Debug (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Globalization (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) @@ -1112,7 +1123,7 @@ NUGET System.Text.Encoding (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Threading (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Xml.ReaderWriter (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.Xml.XPath (4.3) - version_in_path: true, restriction: >= netcoreapp1.0 + System.Xml.XPath (4.3) - version_in_path: true, restriction: || (&& (>= net46) (>= netcoreapp1.1)) (>= netcoreapp1.0) (&& (>= netcoreapp1.1) (< netcoreapp2.0)) System.Collections (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Diagnostics.Debug (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Globalization (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) @@ -1165,7 +1176,7 @@ NUGET Microsoft.NETCore.Platforms (2.0) - restriction: || (&& (>= monoandroid) (>= net461)) (&& (>= monotouch) (>= net461)) (&& (< net45) (>= net461) (>= netstandard1.5) (< netstandard1.6)) (&& (< net45) (>= net461) (< netstandard1.5)) (&& (>= net461) (< netstandard1.0)) (&& (>= net461) (< netstandard1.3)) (&& (>= net461) (< netstandard1.4)) (&& (>= net461) (< netstandard1.5) (>= uap10.0)) (&& (>= net461) (< netstandard2.0)) (&& (>= net461) (< portable-net45+win8+wpa81)) (&& (>= net461) (< portable-net451+win81+wpa81)) (&& (>= net461) (>= uap10.1)) (&& (>= net461) (>= xamarinios)) (&& (>= net461) (>= xamarinmac)) (&& (>= net461) (>= xamarintvos)) (&& (>= net461) (>= xamarinwatchos)) NETStandard.Library (2.0) - restriction: && (>= net461) (< netstandard2.0) Microsoft.NETCore.Platforms (>= 1.1) - Octokit (0.29) - content: none + Octokit (0.29) System.Collections.Immutable (1.4) NETStandard.Library (>= 1.6.1) - restriction: && (>= net461) (< netstandard2.0) System.Reflection.Metadata (1.5) diff --git a/src/Paket.Core.preview3/Paket.Core.fsproj b/src/Paket.Core.preview3/Paket.Core.fsproj index c9b427fb7e..1838e036c7 100644 --- a/src/Paket.Core.preview3/Paket.Core.fsproj +++ b/src/Paket.Core.preview3/Paket.Core.fsproj @@ -4,6 +4,7 @@ netstandard2.0 ..\Paket.Core NO_BOOTSTRAPPER;NO_CONFIGURATIONMANAGER;CUSTOM_WEBPROXY;$(DefineConstants) + true diff --git a/src/Paket.Core.preview3/paket.references b/src/Paket.Core.preview3/paket.references index 857f2e623a..ee433115d8 100644 --- a/src/Paket.Core.preview3/paket.references +++ b/src/Paket.Core.preview3/paket.references @@ -2,6 +2,7 @@ Newtonsoft.Json Mono.Cecil Chessie System.Security.Cryptography.ProtectedData +System.Net.Http.WinHttpHandler File:Globbing.fs . File:AssemblyReader.fs . diff --git a/src/Paket.Core/Common/NetUtils.fs b/src/Paket.Core/Common/NetUtils.fs index 79678d6ea3..85257a19d9 100644 --- a/src/Paket.Core/Common/NetUtils.fs +++ b/src/Paket.Core/Common/NetUtils.fs @@ -11,6 +11,7 @@ open Paket.Logging open Paket.Constants open Chessie.ErrorHandling open Paket.Domain +open Paket.Utils open FSharp.Polyfill open System.Net.Http @@ -341,35 +342,63 @@ let internal addHeader (client:HttpClient) (headerKey:string) (headerVal:string) client.DefaultRequestHeaders.Add(headerKey, headerVal) let createHttpClient (url,auth:Auth option) = - let handler = - new HttpClientHandler( - UseProxy = true, - Proxy = getDefaultProxyFor url) - handler.AutomaticDecompression <- DecompressionMethods.GZip ||| DecompressionMethods.Deflate - - let client = new HttpClient(handler) - match auth with - | None -> handler.UseDefaultCredentials <- true - | Some(Credentials({Username = username; Password = password; Type = AuthType.Basic})) -> - // htttp://stackoverflow.com/questions/16044313/webclient-httpwebrequest-with-basic-authentication-returns-404-not-found-for-v/26016919#26016919 - //this works ONLY if the server returns 401 first - //client DOES NOT send credentials on first request - //ONLY after a 401 - //client.Credentials <- new NetworkCredential(auth.Username,auth.Password) - - //so use THIS instead to send credentials RIGHT AWAY - let credentials = Convert.ToBase64String(Encoding.ASCII.GetBytes(username + ":" + password)) - client.DefaultRequestHeaders.Authorization <- - new System.Net.Http.Headers.AuthenticationHeaderValue("Basic", credentials) - | Some(Credentials({Username = username; Password = password; Type = AuthType.NTLM})) -> - let cred = System.Net.NetworkCredential(username,password) - handler.Credentials <- cred.GetCredential(new Uri(url), "NTLM") - | Some(Token token) -> - client.DefaultRequestHeaders.Authorization <- - new System.Net.Http.Headers.AuthenticationHeaderValue("token", token) - client.DefaultRequestHeaders.Add("user-agent", "Paket") - handler.UseProxy <- true - client + if isWindows then + // See https://github.com/dotnet/corefx/issues/31098 + let proxy = getDefaultProxyFor url + let handler = new WinHttpHandler(Proxy = proxy) + handler.AutomaticDecompression <- DecompressionMethods.GZip ||| DecompressionMethods.Deflate + + let client = new HttpClient(handler) + match auth with + | None -> handler.ServerCredentials <- CredentialCache.DefaultCredentials + | Some(Credentials({Username = username; Password = password; Type = AuthType.Basic})) -> + // see lengthy comment below. + let credentials = Convert.ToBase64String(Encoding.ASCII.GetBytes(username + ":" + password)) + client.DefaultRequestHeaders.Authorization <- + new System.Net.Http.Headers.AuthenticationHeaderValue("Basic", credentials) + | Some(Credentials({Username = username; Password = password; Type = AuthType.NTLM})) -> + let cred = System.Net.NetworkCredential(username,password) + handler.ServerCredentials <- cred.GetCredential(new Uri(url), "NTLM") + | Some(Token token) -> + client.DefaultRequestHeaders.Authorization <- + new System.Net.Http.Headers.AuthenticationHeaderValue("token", token) + client.DefaultRequestHeaders.Add("user-agent", "Paket") + // from https://github.com/dotnet/corefx/blob/b6b9a1ad24339266a27fef826233dbbe192cf254/src/System.Net.Http/src/System/Net/Http/HttpClientHandler.Windows.cs#L454-L477 + if isNull handler.Proxy then + handler.WindowsProxyUsePolicy <- WindowsProxyUsePolicy.UseWinInetProxy + else + handler.WindowsProxyUsePolicy <- WindowsProxyUsePolicy.UseCustomProxy + client + else + let handler = + new HttpClientHandler( + UseProxy = true, + Proxy = getDefaultProxyFor url) + handler.AutomaticDecompression <- DecompressionMethods.GZip ||| DecompressionMethods.Deflate + + let client = new HttpClient(handler) + match auth with + | None -> handler.UseDefaultCredentials <- true + | Some(Credentials({Username = username; Password = password; Type = AuthType.Basic})) -> + // http://stackoverflow.com/questions/16044313/webclient-httpwebrequest-with-basic-authentication-returns-404-not-found-for-v/26016919#26016919 + //this works ONLY if the server returns 401 first + //client DOES NOT send credentials on first request + //ONLY after a 401 + //client.Credentials <- new NetworkCredential(auth.Username,auth.Password) + + //so use THIS instead to send credentials RIGHT AWAY + let credentials = Convert.ToBase64String(Encoding.ASCII.GetBytes(username + ":" + password)) + client.DefaultRequestHeaders.Authorization <- + new System.Net.Http.Headers.AuthenticationHeaderValue("Basic", credentials) + | Some(Credentials({Username = username; Password = password; Type = AuthType.NTLM})) -> + let cred = System.Net.NetworkCredential(username,password) + handler.Credentials <- cred.GetCredential(new Uri(url), "NTLM") + | Some(Token token) -> + client.DefaultRequestHeaders.Authorization <- + new System.Net.Http.Headers.AuthenticationHeaderValue("token", token) + client.DefaultRequestHeaders.Add("user-agent", "Paket") + handler.UseProxy <- true + client #if USE_WEB_CLIENT_FOR_UPLOAD type CustomTimeoutWebClient(timeout) = diff --git a/src/Paket.Core/Paket.Core.fsproj b/src/Paket.Core/Paket.Core.fsproj index 0d52a9c654..5bc6524be3 100644 --- a/src/Paket.Core/Paket.Core.fsproj +++ b/src/Paket.Core/Paket.Core.fsproj @@ -15,6 +15,7 @@ ..\..\ true + true true @@ -45,7 +46,7 @@ - + <__paket__NETStandard_Library_targets>netstandard2.0\NETStandard.Library @@ -173,7 +174,7 @@ - + ..\..\packages\Chessie\lib\netstandard1.6\Chessie.dll @@ -193,7 +194,7 @@ - + ..\..\packages\FSharp.Core\lib\netstandard1.6\FSharp.Core.dll @@ -204,7 +205,21 @@ - + + + + True + + + + + + + True + + + + ..\..\packages\Microsoft.CSharp\ref\netstandard1.0\Microsoft.CSharp.dll @@ -213,7 +228,7 @@ - + ..\..\packages\Microsoft.CSharp\lib\netstandard1.3\Microsoft.CSharp.dll @@ -222,7 +237,7 @@ - + ..\..\packages\Microsoft.CSharp\lib\netstandard2.0\Microsoft.CSharp.dll @@ -231,7 +246,7 @@ - + ..\..\packages\Microsoft.CSharp\ref\netstandard2.0\Microsoft.CSharp.dll @@ -240,6 +255,34 @@ + + + + True + + + + + + + True + + + + + + + True + + + + + + + True + + + @@ -251,7 +294,7 @@ - + ..\..\packages\Microsoft.Win32.Primitives\ref\netstandard1.3\Microsoft.Win32.Primitives.dll @@ -310,7 +353,7 @@ - + ..\..\packages\Mono.Cecil\lib\netstandard1.3\Mono.Cecil.dll @@ -381,7 +424,7 @@ - + ..\..\packages\Newtonsoft.Json\lib\netstandard1.3\Newtonsoft.Json.dll @@ -390,7 +433,7 @@ - + ..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+win8+wp8+wpa81\Newtonsoft.Json.dll @@ -428,7 +471,7 @@ - + ..\..\packages\System.AppContext\lib\netstandard1.6\System.AppContext.dll @@ -437,7 +480,7 @@ - + ..\..\packages\System.AppContext\ref\netstandard1.6\System.AppContext.dll @@ -448,7 +491,7 @@ - + ..\..\packages\System.Buffers\lib\netstandard1.1\System.Buffers.dll @@ -457,7 +500,7 @@ - + ..\..\packages\System.Buffers\ref\netstandard1.1\System.Buffers.dll @@ -466,7 +509,7 @@ - + ..\..\packages\System.Buffers\lib\netstandard2.0\System.Buffers.dll @@ -475,7 +518,7 @@ - + ..\..\packages\System.Buffers\ref\netstandard2.0\System.Buffers.dll @@ -495,7 +538,7 @@ - + ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll @@ -515,7 +558,7 @@ - + ..\..\packages\System.Collections.Concurrent\lib\netstandard1.3\System.Collections.Concurrent.dll @@ -524,7 +567,7 @@ - + ..\..\packages\System.Collections.Concurrent\ref\netstandard1.3\System.Collections.Concurrent.dll @@ -535,7 +578,7 @@ - + ..\..\packages\System.Collections.NonGeneric\lib\netstandard1.3\System.Collections.NonGeneric.dll @@ -544,7 +587,7 @@ - + ..\..\packages\System.Collections.NonGeneric\ref\netstandard1.3\System.Collections.NonGeneric.dll @@ -575,7 +618,7 @@ - + ..\..\packages\System.ComponentModel\ref\netstandard1.0\System.ComponentModel.dll @@ -584,7 +627,7 @@ - + ..\..\packages\System.ComponentModel\lib\netstandard1.3\System.ComponentModel.dll @@ -662,7 +705,7 @@ - + ..\..\packages\System.Console\ref\netstandard1.3\System.Console.dll @@ -682,7 +725,7 @@ - + ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll @@ -693,7 +736,16 @@ - + + + + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\net46\System.Diagnostics.DiagnosticSource.dll + True + True + + + + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll @@ -704,7 +756,7 @@ - + ..\..\packages\System.Diagnostics.Tools\ref\netstandard1.0\System.Diagnostics.Tools.dll @@ -742,7 +794,7 @@ - + ..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.dll @@ -753,7 +805,7 @@ - + ..\..\packages\System.Dynamic.Runtime\lib\netstandard1.3\System.Dynamic.Runtime.dll @@ -762,7 +814,7 @@ - + ..\..\packages\System.Dynamic.Runtime\ref\netstandard1.3\System.Dynamic.Runtime.dll @@ -782,7 +834,7 @@ - + ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll @@ -802,7 +854,7 @@ - + ..\..\packages\System.Globalization.Calendars\ref\netstandard1.3\System.Globalization.Calendars.dll @@ -813,7 +865,7 @@ - + ..\..\packages\System.Globalization.Extensions\ref\netstandard1.3\System.Globalization.Extensions.dll @@ -842,7 +894,7 @@ - + ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll @@ -862,7 +914,7 @@ - + ..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll @@ -911,7 +963,7 @@ - + ..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll @@ -931,7 +983,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\lib\netstandard1.3\System.IO.FileSystem.Primitives.dll @@ -940,7 +992,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\ref\netstandard1.3\System.IO.FileSystem.Primitives.dll @@ -960,7 +1012,7 @@ - + ..\..\packages\System.Linq\lib\netstandard1.6\System.Linq.dll @@ -969,7 +1021,7 @@ - + ..\..\packages\System.Linq\ref\netstandard1.6\System.Linq.dll @@ -980,7 +1032,25 @@ - + + + + ..\..\packages\System.Linq.Expressions\ref\netstandard1.0\System.Linq.Expressions.dll + False + True + + + + + + + ..\..\packages\System.Linq.Expressions\ref\netstandard1.3\System.Linq.Expressions.dll + False + True + + + + ..\..\packages\System.Linq.Expressions\lib\netstandard1.6\System.Linq.Expressions.dll @@ -989,7 +1059,7 @@ - + ..\..\packages\System.Linq.Expressions\ref\netstandard1.6\System.Linq.Expressions.dll @@ -1000,7 +1070,7 @@ - + ..\..\packages\System.Linq.Queryable\ref\netstandard1.0\System.Linq.Queryable.dll @@ -1009,7 +1079,7 @@ - + ..\..\packages\System.Linq.Queryable\lib\netstandard1.3\System.Linq.Queryable.dll @@ -1020,7 +1090,45 @@ - + + + + ..\..\packages\System.Memory\lib\netstandard1.1\System.Memory.dll + True + True + + + + + + + ..\..\packages\System.Memory\lib\netstandard2.0\System.Memory.dll + True + True + + + + + + + ..\..\packages\System.Memory\ref\netstandard2.0\System.Memory.dll + False + True + + + + + + + + + ..\..\packages\System.Net.Http\ref\netstandard1.1\System.Net.Http.dll + False + True + + + + ..\..\packages\System.Net.Http\ref\netstandard1.3\System.Net.Http.dll @@ -1030,6 +1138,62 @@ + + + + + ..\..\packages\System.Net.Http.WinHttpHandler\lib\net46\System.Net.Http.WinHttpHandler.dll + True + True + + + + + + + ..\..\packages\System.Net.Http.WinHttpHandler\lib\net461\System.Net.Http.WinHttpHandler.dll + True + True + + + + + + + ..\..\packages\System.Net.Http.WinHttpHandler\lib\netstandard1.3\System.Net.Http.WinHttpHandler.dll + True + True + + + + + + + ..\..\packages\System.Net.Http.WinHttpHandler\ref\netstandard1.3\System.Net.Http.WinHttpHandler.dll + False + True + + + + + + + ..\..\packages\System.Net.Http.WinHttpHandler\lib\netstandard2.0\System.Net.Http.WinHttpHandler.dll + True + True + + + + + + + ..\..\packages\System.Net.Http.WinHttpHandler\ref\netstandard2.0\System.Net.Http.WinHttpHandler.dll + False + True + + + + @@ -1049,7 +1213,7 @@ - + ..\..\packages\System.Net.Primitives\ref\netstandard1.3\System.Net.Primitives.dll @@ -1060,7 +1224,7 @@ - + ..\..\packages\System.Net.Requests\ref\netstandard1.3\System.Net.Requests.dll @@ -1110,6 +1274,53 @@ + + + + + ..\..\packages\System.Numerics.Vectors\lib\net46\System.Numerics.Vectors.dll + True + True + + + + + + + ..\..\packages\System.Numerics.Vectors\lib\netstandard1.0\System.Numerics.Vectors.dll + True + True + + + + + + + ..\..\packages\System.Numerics.Vectors\ref\netstandard1.0\System.Numerics.Vectors.dll + False + True + + + + + + + ..\..\packages\System.Numerics.Vectors\lib\netstandard2.0\System.Numerics.Vectors.dll + True + True + + + + + + + ..\..\packages\System.Numerics.Vectors\ref\netstandard2.0\System.Numerics.Vectors.dll + False + True + + + + @@ -1120,7 +1331,7 @@ - + ..\..\packages\System.ObjectModel\lib\netstandard1.3\System.ObjectModel.dll @@ -1129,7 +1340,7 @@ - + ..\..\packages\System.ObjectModel\ref\netstandard1.3\System.ObjectModel.dll @@ -1158,7 +1369,7 @@ - + ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll @@ -1189,7 +1400,7 @@ - + ..\..\packages\System.Reflection.Emit.ILGeneration\ref\netstandard1.0\System.Reflection.Emit.ILGeneration.dll @@ -1198,7 +1409,7 @@ - + ..\..\packages\System.Reflection.Emit.ILGeneration\lib\netstandard1.3\System.Reflection.Emit.ILGeneration.dll @@ -1229,7 +1440,7 @@ - + ..\..\packages\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.dll @@ -1240,7 +1451,7 @@ - + ..\..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.dll @@ -1260,7 +1471,34 @@ - + + + + ..\..\packages\System.Reflection.TypeExtensions\lib\netstandard1.3\System.Reflection.TypeExtensions.dll + True + True + + + + + + + ..\..\packages\System.Reflection.TypeExtensions\ref\netstandard1.3\System.Reflection.TypeExtensions.dll + False + True + + + + + + + ..\..\packages\System.Reflection.TypeExtensions\lib\netstandard1.5\System.Reflection.TypeExtensions.dll + True + True + + + + ..\..\packages\System.Reflection.TypeExtensions\ref\netstandard1.5\System.Reflection.TypeExtensions.dll @@ -1269,7 +1507,7 @@ - + ..\..\packages\System.Reflection.TypeExtensions\lib\netstandard2.0\System.Reflection.TypeExtensions.dll @@ -1278,7 +1516,7 @@ - + ..\..\packages\System.Reflection.TypeExtensions\ref\netstandard2.0\System.Reflection.TypeExtensions.dll @@ -1289,7 +1527,7 @@ - + ..\..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.dll @@ -1327,7 +1565,7 @@ - + ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll @@ -1337,6 +1575,44 @@ + + + + + ..\..\packages\System.Runtime.CompilerServices.Unsafe\lib\netcoreapp2.0\System.Runtime.CompilerServices.Unsafe.dll + True + True + + + + + + + ..\..\packages\System.Runtime.CompilerServices.Unsafe\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll + True + True + + + + + + + ..\..\packages\System.Runtime.CompilerServices.Unsafe\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + True + True + + + + + + + ..\..\packages\System.Runtime.CompilerServices.Unsafe\ref\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + False + True + + + + @@ -1356,7 +1632,7 @@ - + ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll @@ -1367,7 +1643,7 @@ - + ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll @@ -1378,7 +1654,7 @@ - + ..\..\packages\System.Runtime.InteropServices\ref\netcoreapp1.1\System.Runtime.InteropServices.dll @@ -1414,7 +1690,7 @@ - + ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll @@ -1434,7 +1710,7 @@ - + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\lib\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1443,7 +1719,7 @@ - + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\ref\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1472,7 +1748,7 @@ - + ..\..\packages\System.Runtime.Numerics\ref\netstandard1.1\System.Runtime.Numerics.dll @@ -1481,7 +1757,7 @@ - + ..\..\packages\System.Runtime.Numerics\lib\netstandard1.3\System.Runtime.Numerics.dll @@ -1541,7 +1817,34 @@ - + + + + ..\..\packages\System.Security.Cryptography.Algorithms\lib\net46\System.Security.Cryptography.Algorithms.dll + True + True + + + + + + + ..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.3\System.Security.Cryptography.Algorithms.dll + False + True + + + + + + + ..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.4\System.Security.Cryptography.Algorithms.dll + False + True + + + + ..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll @@ -1601,7 +1904,16 @@ - + + + + ..\..\packages\System.Security.Cryptography.Encoding\lib\net46\System.Security.Cryptography.Encoding.dll + True + True + + + + ..\..\packages\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.dll @@ -1650,7 +1962,16 @@ - + + + + ..\..\packages\System.Security.Cryptography.Primitives\lib\net46\System.Security.Cryptography.Primitives.dll + True + True + + + + ..\..\packages\System.Security.Cryptography.Primitives\lib\netstandard1.3\System.Security.Cryptography.Primitives.dll @@ -1659,7 +1980,7 @@ - + ..\..\packages\System.Security.Cryptography.Primitives\ref\netstandard1.3\System.Security.Cryptography.Primitives.dll @@ -1670,7 +1991,25 @@ - + + + + ..\..\packages\System.Security.Cryptography.X509Certificates\lib\net46\System.Security.Cryptography.X509Certificates.dll + True + True + + + + + + + ..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.3\System.Security.Cryptography.X509Certificates.dll + False + True + + + + ..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.4\System.Security.Cryptography.X509Certificates.dll @@ -1690,7 +2029,7 @@ - + ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll @@ -1710,7 +2049,7 @@ - + ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll @@ -1777,7 +2116,7 @@ - + ..\..\packages\System.Threading\lib\netstandard1.3\System.Threading.dll @@ -1786,7 +2125,7 @@ - + ..\..\packages\System.Threading\ref\netstandard1.3\System.Threading.dll @@ -1806,7 +2145,7 @@ - + ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll @@ -1817,7 +2156,7 @@ - + ..\..\packages\System.Threading.Tasks.Extensions\lib\netstandard1.0\System.Threading.Tasks.Extensions.dll @@ -1837,7 +2176,7 @@ - + ..\..\packages\System.Threading.Tasks.Parallel\ref\netstandard1.1\System.Threading.Tasks.Parallel.dll @@ -1846,7 +2185,7 @@ - + ..\..\packages\System.Threading.Tasks.Parallel\lib\netstandard1.3\System.Threading.Tasks.Parallel.dll @@ -1857,7 +2196,7 @@ - + ..\..\packages\System.Threading.Thread\lib\netstandard1.3\System.Threading.Thread.dll @@ -1866,7 +2205,7 @@ - + ..\..\packages\System.Threading.Thread\ref\netstandard1.3\System.Threading.Thread.dll @@ -1877,7 +2216,7 @@ - + ..\..\packages\System.Threading.ThreadPool\lib\netstandard1.3\System.Threading.ThreadPool.dll @@ -1886,7 +2225,7 @@ - + ..\..\packages\System.Threading.ThreadPool\ref\netstandard1.3\System.Threading.ThreadPool.dll @@ -1926,7 +2265,7 @@ - + ..\..\packages\System.Xml.ReaderWriter\lib\netstandard1.3\System.Xml.ReaderWriter.dll @@ -1935,7 +2274,7 @@ - + ..\..\packages\System.Xml.ReaderWriter\ref\netstandard1.3\System.Xml.ReaderWriter.dll @@ -1955,7 +2294,7 @@ - + ..\..\packages\System.Xml.XDocument\lib\netstandard1.3\System.Xml.XDocument.dll @@ -1964,7 +2303,7 @@ - + ..\..\packages\System.Xml.XDocument\ref\netstandard1.3\System.Xml.XDocument.dll diff --git a/src/Paket.Core/paket.references b/src/Paket.Core/paket.references index 00c24884cd..245287369c 100644 --- a/src/Paket.Core/paket.references +++ b/src/Paket.Core/paket.references @@ -4,6 +4,7 @@ Mono.Cecil Chessie FSharp.Compiler.Tools System.Net.Http +System.Net.Http.WinHttpHandler File:Globbing.fs Common\ File:AssemblyReader.fs Common\ diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj index a5154de506..12d1197603 100644 --- a/src/Paket/Paket.fsproj +++ b/src/Paket/Paket.fsproj @@ -18,6 +18,7 @@ true 2003 + true true @@ -60,7 +61,7 @@ - + <__paket__NETStandard_Library_targets>netstandard2.0\NETStandard.Library @@ -105,7 +106,7 @@ --> - + ..\..\packages\Argu\lib\net45\Argu.dll @@ -125,7 +126,7 @@ - + ..\..\packages\Chessie\lib\net40\Chessie.dll @@ -134,7 +135,7 @@ - + ..\..\packages\Chessie\lib\netstandard1.6\Chessie.dll @@ -145,7 +146,7 @@ - + ..\..\packages\FSharp.Core\lib\net45\FSharp.Core.dll @@ -154,7 +155,7 @@ - + ..\..\packages\FSharp.Core\lib\netstandard1.6\FSharp.Core.dll @@ -174,7 +175,7 @@ - + ..\..\packages\Microsoft.Win32.Primitives\ref\netstandard1.3\Microsoft.Win32.Primitives.dll @@ -203,7 +204,7 @@ - + ..\..\packages\System.AppContext\lib\netstandard1.6\System.AppContext.dll @@ -212,7 +213,7 @@ - + ..\..\packages\System.AppContext\ref\netstandard1.6\System.AppContext.dll @@ -223,7 +224,7 @@ - + ..\..\packages\System.Buffers\lib\netstandard1.1\System.Buffers.dll @@ -232,7 +233,7 @@ - + ..\..\packages\System.Buffers\ref\netstandard1.1\System.Buffers.dll @@ -241,7 +242,7 @@ - + ..\..\packages\System.Buffers\lib\netstandard2.0\System.Buffers.dll @@ -250,7 +251,7 @@ - + ..\..\packages\System.Buffers\ref\netstandard2.0\System.Buffers.dll @@ -270,7 +271,7 @@ - + ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll @@ -290,7 +291,7 @@ - + ..\..\packages\System.Collections.Concurrent\lib\netstandard1.3\System.Collections.Concurrent.dll @@ -299,7 +300,7 @@ - + ..\..\packages\System.Collections.Concurrent\ref\netstandard1.3\System.Collections.Concurrent.dll @@ -339,7 +340,7 @@ - + ..\..\packages\System.Console\ref\netstandard1.3\System.Console.dll @@ -359,7 +360,7 @@ - + ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll @@ -370,7 +371,16 @@ - + + + + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\net46\System.Diagnostics.DiagnosticSource.dll + True + True + + + + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll @@ -381,7 +391,7 @@ - + ..\..\packages\System.Diagnostics.Tools\ref\netstandard1.0\System.Diagnostics.Tools.dll @@ -419,7 +429,7 @@ - + ..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.dll @@ -439,7 +449,7 @@ - + ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll @@ -459,7 +469,7 @@ - + ..\..\packages\System.Globalization.Calendars\ref\netstandard1.3\System.Globalization.Calendars.dll @@ -470,7 +480,7 @@ - + ..\..\packages\System.Globalization.Extensions\ref\netstandard1.3\System.Globalization.Extensions.dll @@ -499,7 +509,7 @@ - + ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll @@ -519,7 +529,7 @@ - + ..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll @@ -568,7 +578,7 @@ - + ..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll @@ -588,7 +598,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\lib\netstandard1.3\System.IO.FileSystem.Primitives.dll @@ -597,7 +607,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\ref\netstandard1.3\System.IO.FileSystem.Primitives.dll @@ -617,7 +627,7 @@ - + ..\..\packages\System.Linq\lib\netstandard1.6\System.Linq.dll @@ -626,7 +636,7 @@ - + ..\..\packages\System.Linq\ref\netstandard1.6\System.Linq.dll @@ -637,7 +647,25 @@ - + + + + ..\..\packages\System.Linq.Expressions\ref\netstandard1.0\System.Linq.Expressions.dll + False + True + + + + + + + ..\..\packages\System.Linq.Expressions\ref\netstandard1.3\System.Linq.Expressions.dll + False + True + + + + ..\..\packages\System.Linq.Expressions\lib\netstandard1.6\System.Linq.Expressions.dll @@ -646,7 +674,7 @@ - + ..\..\packages\System.Linq.Expressions\ref\netstandard1.6\System.Linq.Expressions.dll @@ -657,7 +685,7 @@ - + ..\..\packages\System.Linq.Queryable\ref\netstandard1.0\System.Linq.Queryable.dll @@ -666,7 +694,7 @@ - + ..\..\packages\System.Linq.Queryable\lib\netstandard1.3\System.Linq.Queryable.dll @@ -677,7 +705,16 @@ - + + + + ..\..\packages\System.Net.Http\ref\netstandard1.1\System.Net.Http.dll + False + True + + + + ..\..\packages\System.Net.Http\ref\netstandard1.3\System.Net.Http.dll @@ -706,7 +743,7 @@ - + ..\..\packages\System.Net.Primitives\ref\netstandard1.3\System.Net.Primitives.dll @@ -717,7 +754,7 @@ - + ..\..\packages\System.Net.Requests\ref\netstandard1.3\System.Net.Requests.dll @@ -777,7 +814,7 @@ - + ..\..\packages\System.ObjectModel\lib\netstandard1.3\System.ObjectModel.dll @@ -786,7 +823,7 @@ - + ..\..\packages\System.ObjectModel\ref\netstandard1.3\System.ObjectModel.dll @@ -815,7 +852,7 @@ - + ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll @@ -846,7 +883,7 @@ - + ..\..\packages\System.Reflection.Emit.ILGeneration\ref\netstandard1.0\System.Reflection.Emit.ILGeneration.dll @@ -855,7 +892,7 @@ - + ..\..\packages\System.Reflection.Emit.ILGeneration\lib\netstandard1.3\System.Reflection.Emit.ILGeneration.dll @@ -886,7 +923,7 @@ - + ..\..\packages\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.dll @@ -897,7 +934,7 @@ - + ..\..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.dll @@ -917,7 +954,34 @@ - + + + + ..\..\packages\System.Reflection.TypeExtensions\lib\netstandard1.3\System.Reflection.TypeExtensions.dll + True + True + + + + + + + ..\..\packages\System.Reflection.TypeExtensions\ref\netstandard1.3\System.Reflection.TypeExtensions.dll + False + True + + + + + + + ..\..\packages\System.Reflection.TypeExtensions\lib\netstandard1.5\System.Reflection.TypeExtensions.dll + True + True + + + + ..\..\packages\System.Reflection.TypeExtensions\ref\netstandard1.5\System.Reflection.TypeExtensions.dll @@ -926,7 +990,7 @@ - + ..\..\packages\System.Reflection.TypeExtensions\lib\netstandard2.0\System.Reflection.TypeExtensions.dll @@ -935,7 +999,7 @@ - + ..\..\packages\System.Reflection.TypeExtensions\ref\netstandard2.0\System.Reflection.TypeExtensions.dll @@ -946,7 +1010,7 @@ - + ..\..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.dll @@ -984,7 +1048,7 @@ - + ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll @@ -1013,7 +1077,7 @@ - + ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll @@ -1024,7 +1088,7 @@ - + ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll @@ -1035,7 +1099,7 @@ - + ..\..\packages\System.Runtime.InteropServices\ref\netcoreapp1.1\System.Runtime.InteropServices.dll @@ -1071,7 +1135,7 @@ - + ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll @@ -1091,7 +1155,7 @@ - + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\lib\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1100,7 +1164,7 @@ - + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\ref\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1129,7 +1193,7 @@ - + ..\..\packages\System.Runtime.Numerics\ref\netstandard1.1\System.Runtime.Numerics.dll @@ -1138,7 +1202,7 @@ - + ..\..\packages\System.Runtime.Numerics\lib\netstandard1.3\System.Runtime.Numerics.dll @@ -1149,7 +1213,34 @@ - + + + + ..\..\packages\System.Security.Cryptography.Algorithms\lib\net46\System.Security.Cryptography.Algorithms.dll + True + True + + + + + + + ..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.3\System.Security.Cryptography.Algorithms.dll + False + True + + + + + + + ..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.4\System.Security.Cryptography.Algorithms.dll + False + True + + + + ..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll @@ -1209,7 +1300,16 @@ - + + + + ..\..\packages\System.Security.Cryptography.Encoding\lib\net46\System.Security.Cryptography.Encoding.dll + True + True + + + + ..\..\packages\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.dll @@ -1258,7 +1358,16 @@ - + + + + ..\..\packages\System.Security.Cryptography.Primitives\lib\net46\System.Security.Cryptography.Primitives.dll + True + True + + + + ..\..\packages\System.Security.Cryptography.Primitives\lib\netstandard1.3\System.Security.Cryptography.Primitives.dll @@ -1267,7 +1376,7 @@ - + ..\..\packages\System.Security.Cryptography.Primitives\ref\netstandard1.3\System.Security.Cryptography.Primitives.dll @@ -1290,7 +1399,7 @@ - + True @@ -1340,7 +1449,25 @@ - + + + + ..\..\packages\System.Security.Cryptography.X509Certificates\lib\net46\System.Security.Cryptography.X509Certificates.dll + True + True + + + + + + + ..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.3\System.Security.Cryptography.X509Certificates.dll + False + True + + + + ..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.4\System.Security.Cryptography.X509Certificates.dll @@ -1360,7 +1487,7 @@ - + ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll @@ -1380,7 +1507,7 @@ - + ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll @@ -1447,7 +1574,7 @@ - + ..\..\packages\System.Threading\lib\netstandard1.3\System.Threading.dll @@ -1456,7 +1583,7 @@ - + ..\..\packages\System.Threading\ref\netstandard1.3\System.Threading.dll @@ -1476,7 +1603,7 @@ - + ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll @@ -1487,7 +1614,7 @@ - + ..\..\packages\System.Threading.Tasks.Extensions\lib\netstandard1.0\System.Threading.Tasks.Extensions.dll @@ -1507,7 +1634,7 @@ - + ..\..\packages\System.Threading.Tasks.Parallel\ref\netstandard1.1\System.Threading.Tasks.Parallel.dll @@ -1516,7 +1643,7 @@ - + ..\..\packages\System.Threading.Tasks.Parallel\lib\netstandard1.3\System.Threading.Tasks.Parallel.dll @@ -1527,7 +1654,7 @@ - + ..\..\packages\System.Threading.Thread\lib\netstandard1.3\System.Threading.Thread.dll @@ -1536,7 +1663,7 @@ - + ..\..\packages\System.Threading.Thread\ref\netstandard1.3\System.Threading.Thread.dll @@ -1547,7 +1674,7 @@ - + ..\..\packages\System.Threading.ThreadPool\lib\netstandard1.3\System.Threading.ThreadPool.dll @@ -1556,7 +1683,7 @@ - + ..\..\packages\System.Threading.ThreadPool\ref\netstandard1.3\System.Threading.ThreadPool.dll @@ -1596,7 +1723,7 @@ - + ..\..\packages\System.Xml.ReaderWriter\lib\netstandard1.3\System.Xml.ReaderWriter.dll @@ -1605,7 +1732,7 @@ - + ..\..\packages\System.Xml.ReaderWriter\ref\netstandard1.3\System.Xml.ReaderWriter.dll @@ -1625,7 +1752,7 @@ - + ..\..\packages\System.Xml.XDocument\lib\netstandard1.3\System.Xml.XDocument.dll @@ -1634,7 +1761,7 @@ - + ..\..\packages\System.Xml.XDocument\ref\netstandard1.3\System.Xml.XDocument.dll diff --git a/tests/Paket.Bootstrapper.Tests/Paket.Bootstrapper.Tests.csproj b/tests/Paket.Bootstrapper.Tests/Paket.Bootstrapper.Tests.csproj index 655f49433d..3ca1673d79 100644 --- a/tests/Paket.Bootstrapper.Tests/Paket.Bootstrapper.Tests.csproj +++ b/tests/Paket.Bootstrapper.Tests/Paket.Bootstrapper.Tests.csproj @@ -12,6 +12,7 @@ v4.5 512 + true true @@ -54,7 +55,7 @@ - + <__paket__NUnit3TestAdapter_props>net35\NUnit3TestAdapter @@ -67,7 +68,7 @@ - + <__paket__NETStandard_Library_targets>netstandard2.0\NETStandard.Library @@ -90,7 +91,7 @@ - + ..\..\packages\Castle.Core\lib\net45\Castle.Core.dll @@ -99,7 +100,7 @@ - + ..\..\packages\Castle.Core\lib\netstandard1.3\Castle.Core.dll @@ -133,7 +134,7 @@ - + ..\..\packages\Microsoft.Win32.Primitives\ref\netstandard1.3\Microsoft.Win32.Primitives.dll @@ -182,7 +183,7 @@ - + ..\..\packages\Moq\lib\net45\Moq.dll @@ -191,7 +192,7 @@ - + ..\..\packages\Moq\lib\netstandard1.3\Moq.dll @@ -234,7 +235,7 @@ - + ..\..\packages\NUnit\lib\net45\nunit.framework.dll @@ -252,7 +253,7 @@ - + ..\..\packages\NUnit\lib\netstandard1.6\nunit.framework.dll @@ -281,7 +282,7 @@ - + ..\..\packages\System.AppContext\lib\netstandard1.6\System.AppContext.dll @@ -290,7 +291,7 @@ - + ..\..\packages\System.AppContext\ref\netstandard1.6\System.AppContext.dll @@ -301,8 +302,11 @@ - + + + True + ..\..\packages\System.Buffers\lib\netstandard1.1\System.Buffers.dll True @@ -310,7 +314,7 @@ - + ..\..\packages\System.Buffers\ref\netstandard1.1\System.Buffers.dll @@ -319,7 +323,7 @@ - + ..\..\packages\System.Buffers\lib\netstandard2.0\System.Buffers.dll @@ -328,7 +332,7 @@ - + ..\..\packages\System.Buffers\ref\netstandard2.0\System.Buffers.dll @@ -348,7 +352,7 @@ - + ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll @@ -368,7 +372,7 @@ - + ..\..\packages\System.Collections.Concurrent\lib\netstandard1.3\System.Collections.Concurrent.dll @@ -377,7 +381,7 @@ - + ..\..\packages\System.Collections.Concurrent\ref\netstandard1.3\System.Collections.Concurrent.dll @@ -388,7 +392,7 @@ - + ..\..\packages\System.Collections.NonGeneric\lib\netstandard1.3\System.Collections.NonGeneric.dll @@ -397,7 +401,7 @@ - + ..\..\packages\System.Collections.NonGeneric\ref\netstandard1.3\System.Collections.NonGeneric.dll @@ -428,7 +432,7 @@ - + ..\..\packages\System.ComponentModel\ref\netstandard1.0\System.ComponentModel.dll @@ -437,7 +441,7 @@ - + ..\..\packages\System.ComponentModel\lib\netstandard1.3\System.ComponentModel.dll @@ -535,7 +539,7 @@ - + ..\..\packages\System.Console\ref\netstandard1.3\System.Console.dll @@ -555,7 +559,7 @@ - + ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll @@ -566,7 +570,16 @@ - + + + + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\net46\System.Diagnostics.DiagnosticSource.dll + True + True + + + + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll @@ -577,7 +590,7 @@ - + ..\..\packages\System.Diagnostics.Process\ref\netstandard1.4\System.Diagnostics.Process.dll @@ -588,7 +601,7 @@ - + ..\..\packages\System.Diagnostics.Tools\ref\netstandard1.0\System.Diagnostics.Tools.dll @@ -637,7 +650,7 @@ - + ..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.dll @@ -648,7 +661,7 @@ - + ..\..\packages\System.Dynamic.Runtime\lib\netstandard1.3\System.Dynamic.Runtime.dll @@ -657,7 +670,7 @@ - + ..\..\packages\System.Dynamic.Runtime\ref\netstandard1.3\System.Dynamic.Runtime.dll @@ -677,7 +690,7 @@ - + ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll @@ -697,7 +710,7 @@ - + ..\..\packages\System.Globalization.Calendars\ref\netstandard1.3\System.Globalization.Calendars.dll @@ -708,7 +721,7 @@ - + ..\..\packages\System.Globalization.Extensions\ref\netstandard1.3\System.Globalization.Extensions.dll @@ -737,7 +750,7 @@ - + ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll @@ -766,7 +779,7 @@ - + ..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll @@ -818,7 +831,7 @@ - + ..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll @@ -838,7 +851,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\lib\netstandard1.3\System.IO.FileSystem.Primitives.dll @@ -847,7 +860,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\ref\netstandard1.3\System.IO.FileSystem.Primitives.dll @@ -867,7 +880,7 @@ - + ..\..\packages\System.Linq\lib\netstandard1.6\System.Linq.dll @@ -876,7 +889,7 @@ - + ..\..\packages\System.Linq\ref\netstandard1.6\System.Linq.dll @@ -887,7 +900,25 @@ - + + + + ..\..\packages\System.Linq.Expressions\ref\netstandard1.0\System.Linq.Expressions.dll + False + True + + + + + + + ..\..\packages\System.Linq.Expressions\ref\netstandard1.3\System.Linq.Expressions.dll + False + True + + + + ..\..\packages\System.Linq.Expressions\lib\netstandard1.6\System.Linq.Expressions.dll @@ -896,7 +927,7 @@ - + ..\..\packages\System.Linq.Expressions\ref\netstandard1.6\System.Linq.Expressions.dll @@ -907,7 +938,7 @@ - + ..\..\packages\System.Linq.Queryable\ref\netstandard1.0\System.Linq.Queryable.dll @@ -916,7 +947,7 @@ - + ..\..\packages\System.Linq.Queryable\lib\netstandard1.3\System.Linq.Queryable.dll @@ -927,7 +958,23 @@ - + + + + True + + + + + + + ..\..\packages\System.Net.Http\ref\netstandard1.1\System.Net.Http.dll + False + True + + + + ..\..\packages\System.Net.Http\ref\netstandard1.3\System.Net.Http.dll @@ -956,7 +1003,7 @@ - + ..\..\packages\System.Net.Primitives\ref\netstandard1.3\System.Net.Primitives.dll @@ -996,7 +1043,7 @@ - + ..\..\packages\System.ObjectModel\lib\netstandard1.3\System.ObjectModel.dll @@ -1005,7 +1052,7 @@ - + ..\..\packages\System.ObjectModel\ref\netstandard1.3\System.ObjectModel.dll @@ -1034,7 +1081,7 @@ - + ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll @@ -1065,7 +1112,7 @@ - + ..\..\packages\System.Reflection.Emit.ILGeneration\ref\netstandard1.0\System.Reflection.Emit.ILGeneration.dll @@ -1074,7 +1121,7 @@ - + ..\..\packages\System.Reflection.Emit.ILGeneration\lib\netstandard1.3\System.Reflection.Emit.ILGeneration.dll @@ -1105,7 +1152,7 @@ - + ..\..\packages\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.dll @@ -1116,7 +1163,7 @@ - + ..\..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.dll @@ -1136,7 +1183,34 @@ - + + + + ..\..\packages\System.Reflection.TypeExtensions\lib\netstandard1.3\System.Reflection.TypeExtensions.dll + True + True + + + + + + + ..\..\packages\System.Reflection.TypeExtensions\ref\netstandard1.3\System.Reflection.TypeExtensions.dll + False + True + + + + + + + ..\..\packages\System.Reflection.TypeExtensions\lib\netstandard1.5\System.Reflection.TypeExtensions.dll + True + True + + + + ..\..\packages\System.Reflection.TypeExtensions\ref\netstandard1.5\System.Reflection.TypeExtensions.dll @@ -1145,7 +1219,7 @@ - + ..\..\packages\System.Reflection.TypeExtensions\lib\netstandard2.0\System.Reflection.TypeExtensions.dll @@ -1154,7 +1228,7 @@ - + ..\..\packages\System.Reflection.TypeExtensions\ref\netstandard2.0\System.Reflection.TypeExtensions.dll @@ -1165,7 +1239,7 @@ - + ..\..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.dll @@ -1203,7 +1277,7 @@ - + ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll @@ -1232,7 +1306,7 @@ - + ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll @@ -1243,7 +1317,7 @@ - + ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll @@ -1254,7 +1328,7 @@ - + ..\..\packages\System.Runtime.InteropServices\ref\netcoreapp1.1\System.Runtime.InteropServices.dll @@ -1290,7 +1364,7 @@ - + ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll @@ -1310,7 +1384,7 @@ - + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\lib\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1319,7 +1393,7 @@ - + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\ref\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1348,7 +1422,7 @@ - + ..\..\packages\System.Runtime.Loader\lib\netstandard1.5\System.Runtime.Loader.dll @@ -1357,7 +1431,7 @@ - + ..\..\packages\System.Runtime.Loader\ref\netstandard1.5\System.Runtime.Loader.dll @@ -1368,7 +1442,7 @@ - + ..\..\packages\System.Runtime.Numerics\ref\netstandard1.1\System.Runtime.Numerics.dll @@ -1377,7 +1451,7 @@ - + ..\..\packages\System.Runtime.Numerics\lib\netstandard1.3\System.Runtime.Numerics.dll @@ -1428,7 +1502,34 @@ - + + + + ..\..\packages\System.Security.Cryptography.Algorithms\lib\net46\System.Security.Cryptography.Algorithms.dll + True + True + + + + + + + ..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.3\System.Security.Cryptography.Algorithms.dll + False + True + + + + + + + ..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.4\System.Security.Cryptography.Algorithms.dll + False + True + + + + ..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll @@ -1488,7 +1589,16 @@ - + + + + ..\..\packages\System.Security.Cryptography.Encoding\lib\net46\System.Security.Cryptography.Encoding.dll + True + True + + + + ..\..\packages\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.dll @@ -1537,7 +1647,16 @@ - + + + + ..\..\packages\System.Security.Cryptography.Primitives\lib\net46\System.Security.Cryptography.Primitives.dll + True + True + + + + ..\..\packages\System.Security.Cryptography.Primitives\lib\netstandard1.3\System.Security.Cryptography.Primitives.dll @@ -1546,7 +1665,7 @@ - + ..\..\packages\System.Security.Cryptography.Primitives\ref\netstandard1.3\System.Security.Cryptography.Primitives.dll @@ -1557,7 +1676,25 @@ - + + + + ..\..\packages\System.Security.Cryptography.X509Certificates\lib\net46\System.Security.Cryptography.X509Certificates.dll + True + True + + + + + + + ..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.3\System.Security.Cryptography.X509Certificates.dll + False + True + + + + ..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.4\System.Security.Cryptography.X509Certificates.dll @@ -1635,7 +1772,7 @@ - + ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll @@ -1655,7 +1792,7 @@ - + ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll @@ -1722,7 +1859,7 @@ - + ..\..\packages\System.Threading\lib\netstandard1.3\System.Threading.dll @@ -1731,7 +1868,7 @@ - + ..\..\packages\System.Threading\ref\netstandard1.3\System.Threading.dll @@ -1751,7 +1888,7 @@ - + ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll @@ -1762,7 +1899,7 @@ - + ..\..\packages\System.Threading.Tasks.Extensions\lib\netstandard1.0\System.Threading.Tasks.Extensions.dll @@ -1782,7 +1919,7 @@ - + ..\..\packages\System.Threading.Thread\lib\netstandard1.3\System.Threading.Thread.dll @@ -1791,7 +1928,7 @@ - + ..\..\packages\System.Threading.Thread\ref\netstandard1.3\System.Threading.Thread.dll @@ -1802,7 +1939,7 @@ - + ..\..\packages\System.Threading.ThreadPool\lib\netstandard1.3\System.Threading.ThreadPool.dll @@ -1811,7 +1948,7 @@ - + ..\..\packages\System.Threading.ThreadPool\ref\netstandard1.3\System.Threading.ThreadPool.dll @@ -1854,7 +1991,7 @@ - + ..\..\packages\System.Xml.ReaderWriter\lib\netstandard1.3\System.Xml.ReaderWriter.dll @@ -1863,7 +2000,7 @@ - + ..\..\packages\System.Xml.ReaderWriter\ref\netstandard1.3\System.Xml.ReaderWriter.dll @@ -1883,7 +2020,7 @@ - + ..\..\packages\System.Xml.XDocument\lib\netstandard1.3\System.Xml.XDocument.dll @@ -1892,7 +2029,7 @@ - + ..\..\packages\System.Xml.XDocument\ref\netstandard1.3\System.Xml.XDocument.dll diff --git a/tests/Paket.Tests/Paket.Tests.fsproj b/tests/Paket.Tests/Paket.Tests.fsproj index eb5292c0bc..08223b161b 100644 --- a/tests/Paket.Tests/Paket.Tests.fsproj +++ b/tests/Paket.Tests/Paket.Tests.fsproj @@ -14,6 +14,7 @@ ..\..\ true + true true @@ -45,7 +46,7 @@ - + <__paket__NUnit3TestAdapter_props>net35\NUnit3TestAdapter @@ -58,7 +59,7 @@ - + <__paket__NETStandard_Library_targets>netstandard2.0\NETStandard.Library @@ -384,7 +385,7 @@ - + ..\..\packages\Argu\lib\net45\Argu.dll @@ -404,7 +405,7 @@ - + ..\..\packages\Chessie\lib\net40\Chessie.dll @@ -413,7 +414,7 @@ - + ..\..\packages\Chessie\lib\netstandard1.6\Chessie.dll @@ -424,7 +425,7 @@ - + ..\..\packages\FsCheck\lib\net452\FsCheck.dll @@ -433,7 +434,7 @@ - + ..\..\packages\FsCheck\lib\netstandard1.6\FsCheck.dll @@ -471,7 +472,7 @@ - + ..\..\packages\FSharp.Core\lib\net45\FSharp.Core.dll @@ -480,7 +481,7 @@ - + ..\..\packages\FSharp.Core\lib\netstandard1.6\FSharp.Core.dll @@ -491,7 +492,21 @@ - + + + + True + + + + + + + True + + + + ..\..\packages\Microsoft.CSharp\ref\netstandard1.0\Microsoft.CSharp.dll @@ -500,7 +515,7 @@ - + ..\..\packages\Microsoft.CSharp\lib\netstandard1.3\Microsoft.CSharp.dll @@ -509,7 +524,7 @@ - + ..\..\packages\Microsoft.CSharp\lib\netstandard2.0\Microsoft.CSharp.dll @@ -518,7 +533,7 @@ - + ..\..\packages\Microsoft.CSharp\ref\netstandard2.0\Microsoft.CSharp.dll @@ -527,6 +542,34 @@ + + + + True + + + + + + + True + + + + + + + True + + + + + + + True + + + @@ -549,7 +592,7 @@ - + ..\..\packages\Microsoft.Win32.Primitives\ref\netstandard1.3\Microsoft.Win32.Primitives.dll @@ -625,7 +668,7 @@ - + ..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll @@ -643,7 +686,7 @@ - + ..\..\packages\Newtonsoft.Json\lib\netstandard1.3\Newtonsoft.Json.dll @@ -652,7 +695,7 @@ - + ..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+win8+wp8+wpa81\Newtonsoft.Json.dll @@ -704,7 +747,7 @@ - + ..\..\packages\NUnit\lib\net45\nunit.framework.dll @@ -722,7 +765,7 @@ - + ..\..\packages\NUnit\lib\netstandard1.6\nunit.framework.dll @@ -751,7 +794,7 @@ - + ..\..\packages\System.AppContext\lib\netstandard1.6\System.AppContext.dll @@ -760,7 +803,7 @@ - + ..\..\packages\System.AppContext\ref\netstandard1.6\System.AppContext.dll @@ -771,7 +814,7 @@ - + ..\..\packages\System.Buffers\lib\netstandard1.1\System.Buffers.dll @@ -780,7 +823,7 @@ - + ..\..\packages\System.Buffers\ref\netstandard1.1\System.Buffers.dll @@ -789,7 +832,7 @@ - + ..\..\packages\System.Buffers\lib\netstandard2.0\System.Buffers.dll @@ -798,7 +841,7 @@ - + ..\..\packages\System.Buffers\ref\netstandard2.0\System.Buffers.dll @@ -818,7 +861,7 @@ - + ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll @@ -838,7 +881,7 @@ - + ..\..\packages\System.Collections.Concurrent\lib\netstandard1.3\System.Collections.Concurrent.dll @@ -847,7 +890,7 @@ - + ..\..\packages\System.Collections.Concurrent\ref\netstandard1.3\System.Collections.Concurrent.dll @@ -858,7 +901,7 @@ - + ..\..\packages\System.Collections.NonGeneric\lib\netstandard1.3\System.Collections.NonGeneric.dll @@ -867,7 +910,7 @@ - + ..\..\packages\System.Collections.NonGeneric\ref\netstandard1.3\System.Collections.NonGeneric.dll @@ -898,7 +941,7 @@ - + ..\..\packages\System.ComponentModel\ref\netstandard1.0\System.ComponentModel.dll @@ -907,7 +950,7 @@ - + ..\..\packages\System.ComponentModel\lib\netstandard1.3\System.ComponentModel.dll @@ -1025,7 +1068,7 @@ - + ..\..\packages\System.Console\ref\netstandard1.3\System.Console.dll @@ -1045,7 +1088,7 @@ - + ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll @@ -1056,7 +1099,16 @@ - + + + + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\net46\System.Diagnostics.DiagnosticSource.dll + True + True + + + + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll @@ -1067,7 +1119,7 @@ - + ..\..\packages\System.Diagnostics.Process\ref\netstandard1.4\System.Diagnostics.Process.dll @@ -1078,7 +1130,7 @@ - + ..\..\packages\System.Diagnostics.Tools\ref\netstandard1.0\System.Diagnostics.Tools.dll @@ -1116,7 +1168,7 @@ - + ..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.dll @@ -1127,7 +1179,7 @@ - + ..\..\packages\System.Dynamic.Runtime\lib\netstandard1.3\System.Dynamic.Runtime.dll @@ -1136,7 +1188,7 @@ - + ..\..\packages\System.Dynamic.Runtime\ref\netstandard1.3\System.Dynamic.Runtime.dll @@ -1156,7 +1208,7 @@ - + ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll @@ -1176,7 +1228,7 @@ - + ..\..\packages\System.Globalization.Calendars\ref\netstandard1.3\System.Globalization.Calendars.dll @@ -1187,7 +1239,7 @@ - + ..\..\packages\System.Globalization.Extensions\ref\netstandard1.3\System.Globalization.Extensions.dll @@ -1216,7 +1268,7 @@ - + ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll @@ -1245,7 +1297,7 @@ - + ..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll @@ -1297,7 +1349,7 @@ - + ..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll @@ -1317,7 +1369,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\lib\netstandard1.3\System.IO.FileSystem.Primitives.dll @@ -1326,7 +1378,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\ref\netstandard1.3\System.IO.FileSystem.Primitives.dll @@ -1346,7 +1398,7 @@ - + ..\..\packages\System.Linq\lib\netstandard1.6\System.Linq.dll @@ -1355,7 +1407,7 @@ - + ..\..\packages\System.Linq\ref\netstandard1.6\System.Linq.dll @@ -1366,7 +1418,25 @@ - + + + + ..\..\packages\System.Linq.Expressions\ref\netstandard1.0\System.Linq.Expressions.dll + False + True + + + + + + + ..\..\packages\System.Linq.Expressions\ref\netstandard1.3\System.Linq.Expressions.dll + False + True + + + + ..\..\packages\System.Linq.Expressions\lib\netstandard1.6\System.Linq.Expressions.dll @@ -1375,7 +1445,7 @@ - + ..\..\packages\System.Linq.Expressions\ref\netstandard1.6\System.Linq.Expressions.dll @@ -1386,7 +1456,7 @@ - + ..\..\packages\System.Linq.Queryable\ref\netstandard1.0\System.Linq.Queryable.dll @@ -1395,7 +1465,7 @@ - + ..\..\packages\System.Linq.Queryable\lib\netstandard1.3\System.Linq.Queryable.dll @@ -1406,7 +1476,23 @@ - + + + + True + + + + + + + ..\..\packages\System.Net.Http\ref\netstandard1.1\System.Net.Http.dll + False + True + + + + ..\..\packages\System.Net.Http\ref\netstandard1.3\System.Net.Http.dll @@ -1435,7 +1521,7 @@ - + ..\..\packages\System.Net.Primitives\ref\netstandard1.3\System.Net.Primitives.dll @@ -1446,7 +1532,7 @@ - + ..\..\packages\System.Net.Requests\ref\netstandard1.3\System.Net.Requests.dll @@ -1506,7 +1592,7 @@ - + ..\..\packages\System.ObjectModel\lib\netstandard1.3\System.ObjectModel.dll @@ -1515,7 +1601,7 @@ - + ..\..\packages\System.ObjectModel\ref\netstandard1.3\System.ObjectModel.dll @@ -1544,7 +1630,7 @@ - + ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll @@ -1575,7 +1661,7 @@ - + ..\..\packages\System.Reflection.Emit.ILGeneration\ref\netstandard1.0\System.Reflection.Emit.ILGeneration.dll @@ -1584,7 +1670,7 @@ - + ..\..\packages\System.Reflection.Emit.ILGeneration\lib\netstandard1.3\System.Reflection.Emit.ILGeneration.dll @@ -1615,7 +1701,7 @@ - + ..\..\packages\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.dll @@ -1626,7 +1712,7 @@ - + ..\..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.dll @@ -1646,7 +1732,34 @@ - + + + + ..\..\packages\System.Reflection.TypeExtensions\lib\netstandard1.3\System.Reflection.TypeExtensions.dll + True + True + + + + + + + ..\..\packages\System.Reflection.TypeExtensions\ref\netstandard1.3\System.Reflection.TypeExtensions.dll + False + True + + + + + + + ..\..\packages\System.Reflection.TypeExtensions\lib\netstandard1.5\System.Reflection.TypeExtensions.dll + True + True + + + + ..\..\packages\System.Reflection.TypeExtensions\ref\netstandard1.5\System.Reflection.TypeExtensions.dll @@ -1655,7 +1768,7 @@ - + ..\..\packages\System.Reflection.TypeExtensions\lib\netstandard2.0\System.Reflection.TypeExtensions.dll @@ -1664,7 +1777,7 @@ - + ..\..\packages\System.Reflection.TypeExtensions\ref\netstandard2.0\System.Reflection.TypeExtensions.dll @@ -1675,7 +1788,7 @@ - + ..\..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.dll @@ -1713,7 +1826,7 @@ - + ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll @@ -1742,7 +1855,7 @@ - + ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll @@ -1753,7 +1866,7 @@ - + ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll @@ -1764,7 +1877,7 @@ - + ..\..\packages\System.Runtime.InteropServices\ref\netcoreapp1.1\System.Runtime.InteropServices.dll @@ -1800,7 +1913,7 @@ - + ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll @@ -1820,7 +1933,7 @@ - + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\lib\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1829,7 +1942,7 @@ - + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\ref\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1858,7 +1971,7 @@ - + ..\..\packages\System.Runtime.Loader\lib\netstandard1.5\System.Runtime.Loader.dll @@ -1867,7 +1980,7 @@ - + ..\..\packages\System.Runtime.Loader\ref\netstandard1.5\System.Runtime.Loader.dll @@ -1878,7 +1991,7 @@ - + ..\..\packages\System.Runtime.Numerics\ref\netstandard1.1\System.Runtime.Numerics.dll @@ -1887,7 +2000,7 @@ - + ..\..\packages\System.Runtime.Numerics\lib\netstandard1.3\System.Runtime.Numerics.dll @@ -1987,7 +2100,34 @@ - + + + + ..\..\packages\System.Security.Cryptography.Algorithms\lib\net46\System.Security.Cryptography.Algorithms.dll + True + True + + + + + + + ..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.3\System.Security.Cryptography.Algorithms.dll + False + True + + + + + + + ..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.4\System.Security.Cryptography.Algorithms.dll + False + True + + + + ..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll @@ -2047,7 +2187,16 @@ - + + + + ..\..\packages\System.Security.Cryptography.Encoding\lib\net46\System.Security.Cryptography.Encoding.dll + True + True + + + + ..\..\packages\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.dll @@ -2096,7 +2245,16 @@ - + + + + ..\..\packages\System.Security.Cryptography.Primitives\lib\net46\System.Security.Cryptography.Primitives.dll + True + True + + + + ..\..\packages\System.Security.Cryptography.Primitives\lib\netstandard1.3\System.Security.Cryptography.Primitives.dll @@ -2105,7 +2263,7 @@ - + ..\..\packages\System.Security.Cryptography.Primitives\ref\netstandard1.3\System.Security.Cryptography.Primitives.dll @@ -2125,7 +2283,7 @@ - + ..\..\packages\System.Security.Cryptography.ProtectedData\lib\net461\System.Security.Cryptography.ProtectedData.dll @@ -2172,7 +2330,25 @@ - + + + + ..\..\packages\System.Security.Cryptography.X509Certificates\lib\net46\System.Security.Cryptography.X509Certificates.dll + True + True + + + + + + + ..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.3\System.Security.Cryptography.X509Certificates.dll + False + True + + + + ..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.4\System.Security.Cryptography.X509Certificates.dll @@ -2250,7 +2426,7 @@ - + ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll @@ -2270,7 +2446,7 @@ - + ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll @@ -2337,7 +2513,7 @@ - + ..\..\packages\System.Threading\lib\netstandard1.3\System.Threading.dll @@ -2346,7 +2522,7 @@ - + ..\..\packages\System.Threading\ref\netstandard1.3\System.Threading.dll @@ -2366,7 +2542,7 @@ - + ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll @@ -2377,7 +2553,7 @@ - + ..\..\packages\System.Threading.Tasks.Extensions\lib\netstandard1.0\System.Threading.Tasks.Extensions.dll @@ -2397,7 +2573,7 @@ - + ..\..\packages\System.Threading.Tasks.Parallel\ref\netstandard1.1\System.Threading.Tasks.Parallel.dll @@ -2406,7 +2582,7 @@ - + ..\..\packages\System.Threading.Tasks.Parallel\lib\netstandard1.3\System.Threading.Tasks.Parallel.dll @@ -2417,7 +2593,7 @@ - + ..\..\packages\System.Threading.Thread\lib\netstandard1.3\System.Threading.Thread.dll @@ -2426,7 +2602,7 @@ - + ..\..\packages\System.Threading.Thread\ref\netstandard1.3\System.Threading.Thread.dll @@ -2437,7 +2613,7 @@ - + ..\..\packages\System.Threading.ThreadPool\lib\netstandard1.3\System.Threading.ThreadPool.dll @@ -2446,7 +2622,7 @@ - + ..\..\packages\System.Threading.ThreadPool\ref\netstandard1.3\System.Threading.ThreadPool.dll @@ -2486,7 +2662,7 @@ - + ..\..\packages\System.Xml.ReaderWriter\lib\netstandard1.3\System.Xml.ReaderWriter.dll @@ -2495,7 +2671,7 @@ - + ..\..\packages\System.Xml.ReaderWriter\ref\netstandard1.3\System.Xml.ReaderWriter.dll @@ -2515,7 +2691,7 @@ - + ..\..\packages\System.Xml.XDocument\lib\netstandard1.3\System.Xml.XDocument.dll @@ -2524,7 +2700,7 @@ - + ..\..\packages\System.Xml.XDocument\ref\netstandard1.3\System.Xml.XDocument.dll From 7842e29541d207bd4494d541e21e6780da11ea28 Mon Sep 17 00:00:00 2001 From: Matthias Dittrich Date: Sun, 22 Jul 2018 10:36:25 +0200 Subject: [PATCH 61/86] and NO_WINCLIENTHANDLER and remove dependency because of net45 --- src/Paket.Core/Common/NetUtils.fs | 2 + src/Paket.Core/Paket.Core.fsproj | 174 +----------------------------- src/Paket.Core/paket.references | 1 - 3 files changed, 4 insertions(+), 173 deletions(-) diff --git a/src/Paket.Core/Common/NetUtils.fs b/src/Paket.Core/Common/NetUtils.fs index 85257a19d9..613e2590d3 100644 --- a/src/Paket.Core/Common/NetUtils.fs +++ b/src/Paket.Core/Common/NetUtils.fs @@ -342,6 +342,7 @@ let internal addHeader (client:HttpClient) (headerKey:string) (headerVal:string) client.DefaultRequestHeaders.Add(headerKey, headerVal) let createHttpClient (url,auth:Auth option) = +#if !NO_WINCLIENTHANDLER if isWindows then // See https://github.com/dotnet/corefx/issues/31098 let proxy = getDefaultProxyFor url @@ -370,6 +371,7 @@ let createHttpClient (url,auth:Auth option) = handler.WindowsProxyUsePolicy <- WindowsProxyUsePolicy.UseCustomProxy client else +#endif let handler = new HttpClientHandler( UseProxy = true, diff --git a/src/Paket.Core/Paket.Core.fsproj b/src/Paket.Core/Paket.Core.fsproj index 5bc6524be3..63cabbe6cd 100644 --- a/src/Paket.Core/Paket.Core.fsproj +++ b/src/Paket.Core/Paket.Core.fsproj @@ -22,7 +22,7 @@ false false ..\..\bin - TRACE;DEBUG;USE_WEB_CLIENT_FOR_UPLOAD + TRACE;DEBUG;USE_WEB_CLIENT_FOR_UPLOAD;NO_WINCLIENTHANDLER 3 update Project @@ -35,7 +35,7 @@ true true ..\..\bin - TRACE;USE_WEB_CLIENT_FOR_UPLOAD + TRACE;USE_WEB_CLIENT_FOR_UPLOAD;NO_WINCLIENTHANDLER 5 ..\..\bin\Paket.Core.XML true @@ -1089,35 +1089,6 @@ - - - - - ..\..\packages\System.Memory\lib\netstandard1.1\System.Memory.dll - True - True - - - - - - - ..\..\packages\System.Memory\lib\netstandard2.0\System.Memory.dll - True - True - - - - - - - ..\..\packages\System.Memory\ref\netstandard2.0\System.Memory.dll - False - True - - - - @@ -1138,62 +1109,6 @@ - - - - - ..\..\packages\System.Net.Http.WinHttpHandler\lib\net46\System.Net.Http.WinHttpHandler.dll - True - True - - - - - - - ..\..\packages\System.Net.Http.WinHttpHandler\lib\net461\System.Net.Http.WinHttpHandler.dll - True - True - - - - - - - ..\..\packages\System.Net.Http.WinHttpHandler\lib\netstandard1.3\System.Net.Http.WinHttpHandler.dll - True - True - - - - - - - ..\..\packages\System.Net.Http.WinHttpHandler\ref\netstandard1.3\System.Net.Http.WinHttpHandler.dll - False - True - - - - - - - ..\..\packages\System.Net.Http.WinHttpHandler\lib\netstandard2.0\System.Net.Http.WinHttpHandler.dll - True - True - - - - - - - ..\..\packages\System.Net.Http.WinHttpHandler\ref\netstandard2.0\System.Net.Http.WinHttpHandler.dll - False - True - - - - @@ -1274,53 +1189,6 @@ - - - - - ..\..\packages\System.Numerics.Vectors\lib\net46\System.Numerics.Vectors.dll - True - True - - - - - - - ..\..\packages\System.Numerics.Vectors\lib\netstandard1.0\System.Numerics.Vectors.dll - True - True - - - - - - - ..\..\packages\System.Numerics.Vectors\ref\netstandard1.0\System.Numerics.Vectors.dll - False - True - - - - - - - ..\..\packages\System.Numerics.Vectors\lib\netstandard2.0\System.Numerics.Vectors.dll - True - True - - - - - - - ..\..\packages\System.Numerics.Vectors\ref\netstandard2.0\System.Numerics.Vectors.dll - False - True - - - - @@ -1575,44 +1443,6 @@ - - - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe\lib\netcoreapp2.0\System.Runtime.CompilerServices.Unsafe.dll - True - True - - - - - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll - True - True - - - - - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - True - True - - - - - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe\ref\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - False - True - - - - diff --git a/src/Paket.Core/paket.references b/src/Paket.Core/paket.references index 245287369c..00c24884cd 100644 --- a/src/Paket.Core/paket.references +++ b/src/Paket.Core/paket.references @@ -4,7 +4,6 @@ Mono.Cecil Chessie FSharp.Compiler.Tools System.Net.Http -System.Net.Http.WinHttpHandler File:Globbing.fs Common\ File:AssemblyReader.fs Common\ From 434836129a5ef6bf995eb8f2bb50f16d84b66bbc Mon Sep 17 00:00:00 2001 From: Manuel Pfemeter Date: Mon, 23 Jul 2018 13:57:04 +0200 Subject: [PATCH 62/86] removes trailing whitespaces --- src/Paket.Core/embedded/Paket.Restore.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Paket.Core/embedded/Paket.Restore.targets b/src/Paket.Core/embedded/Paket.Restore.targets index e12083c13a..6be03acb32 100644 --- a/src/Paket.Core/embedded/Paket.Restore.targets +++ b/src/Paket.Core/embedded/Paket.Restore.targets @@ -71,7 +71,7 @@ false true - + true @@ -96,7 +96,7 @@ $(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references $(MSBuildProjectDirectory)\paket.references - + false true true From 6282a73e5e5dd0af5acb05fcdf3bbc2e14a84877 Mon Sep 17 00:00:00 2001 From: Ruh Ullah Shah Date: Fri, 27 Jul 2018 17:18:49 +0200 Subject: [PATCH 63/86] Support to enable for a nuget package --- docs/content/references-files.md | 5 +++++ src/Paket.Core/PaketConfigFiles/ProjectFile.fs | 10 +++++++--- src/Paket.Core/PaketConfigFiles/ReferencesFile.fs | 7 ++++--- src/Paket.Core/Versioning/Requirements.fs | 8 +++++++- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/docs/content/references-files.md b/docs/content/references-files.md index 04440ce87a..370ff63e2d 100644 --- a/docs/content/references-files.md +++ b/docs/content/references-files.md @@ -79,6 +79,11 @@ DotNetZip framework: >= net45 FSharp.Core redirects: on ``` +## Adding support for COM interop DLL +Follows the same syntax as the previous one: +`PkgName embed_interop_types: true` +In case it is not enabled, the default behavior is to drop `` from the project file. + ## Excluding libraries This option allows you to exclude libraries from being referenced in project files: diff --git a/src/Paket.Core/PaketConfigFiles/ProjectFile.fs b/src/Paket.Core/PaketConfigFiles/ProjectFile.fs index 094afc8e60..1ab5500150 100644 --- a/src/Paket.Core/PaketConfigFiles/ProjectFile.fs +++ b/src/Paket.Core/PaketConfigFiles/ProjectFile.fs @@ -723,7 +723,7 @@ module ProjectFile = AnalyzersNode : XmlElement } - let generateXml (model:InstallModel) (usedFrameworkLibs:HashSet) (aliases:Map) (copyLocal:bool option) (specificVersion:bool option) (importTargets:bool) (referenceCondition:string option) (allTargetProfiles:Set) (project:ProjectFile) : XmlContext = + let generateXml (model:InstallModel) (usedFrameworkLibs:HashSet) (aliases:Map) (embedInteropTypes:bool option) (copyLocal:bool option) (specificVersion:bool option) (importTargets:bool) (referenceCondition:string option) (allTargetProfiles:Set) (project:ProjectFile) : XmlContext = let references = getCustomReferenceAndFrameworkNodes project |> List.map (fun node -> node.Attributes.["Include"].InnerText.Split(',').[0]) @@ -767,6 +767,10 @@ module ProjectFile = | None -> n | Some(bool) -> addChild (createNodeSet "SpecificVersion" specificVersionSettings project) n |> addChild (createNodeSet "Paket" "True" project) + |> fun n -> + match embedInteropTypes with + | None -> n + | _ -> addChild (createNodeSet "EmbedInteropTypes" "True" project) n |> fun n -> match aliases with | None -> n @@ -1237,7 +1241,7 @@ module ProjectFile = let importTargets = defaultArg installSettings.ImportTargets true let allFrameworks = applyRestrictionsToTargets restrictionList KnownTargetProfiles.AllProfiles - generateXml projectModel usedFrameworkLibs installSettings.Aliases installSettings.CopyLocal installSettings.SpecificVersion importTargets installSettings.ReferenceCondition (set allFrameworks) project) + generateXml projectModel usedFrameworkLibs installSettings.Aliases installSettings.EmbedInteropTypes installSettings.CopyLocal installSettings.SpecificVersion importTargets installSettings.ReferenceCondition (set allFrameworks) project) for ctx in contexts do for chooseNode in ctx.ChooseNodes do @@ -1726,7 +1730,7 @@ type ProjectFile with member this.DeleteCustomModelNodes(model:InstallModel) = ProjectFile.deleteCustomModelNodes model this - member this.GenerateXml(model, usedFrameworkLibs:HashSet, aliases, copyLocal, specificVersion, importTargets, allTargetProfiles:#seq, referenceCondition) = ProjectFile.generateXml model usedFrameworkLibs aliases copyLocal specificVersion importTargets referenceCondition (set allTargetProfiles) this + member this.GenerateXml(model, usedFrameworkLibs:HashSet, aliases, embedInteropTypes, copyLocal, specificVersion, importTargets, allTargetProfiles:#seq, referenceCondition) = ProjectFile.generateXml model usedFrameworkLibs aliases embedInteropTypes copyLocal specificVersion importTargets referenceCondition (set allTargetProfiles) this member this.RemovePaketNodes () = ProjectFile.removePaketNodes this diff --git a/src/Paket.Core/PaketConfigFiles/ReferencesFile.fs b/src/Paket.Core/PaketConfigFiles/ReferencesFile.fs index 6d98adc7d8..9b236ea491 100644 --- a/src/Paket.Core/PaketConfigFiles/ReferencesFile.fs +++ b/src/Paket.Core/PaketConfigFiles/ReferencesFile.fs @@ -128,11 +128,12 @@ type ReferencesFile = { ReferencesFile.FromLines lines with FileName = fileName } with e -> raise (new Exception(sprintf "Could not parse reference file '%s': %s" fileName e.Message, e)) - member this.AddNuGetReference(groupName, packageName : PackageName, copyLocal: bool, specificVersion: bool, importTargets: bool, frameworkRestrictions, includeVersionInPath, downloadLicense, omitContent : bool, createBindingRedirects, referenceCondition) = + member this.AddNuGetReference(groupName, packageName : PackageName, embedInteropTypes: bool, copyLocal: bool, specificVersion: bool, importTargets: bool, frameworkRestrictions, includeVersionInPath, downloadLicense, omitContent : bool, createBindingRedirects, referenceCondition) = let package: PackageInstallSettings = { Name = packageName Settings = - { CopyLocal = if not copyLocal then Some copyLocal else None + { EmbedInteropTypes = if embedInteropTypes then Some embedInteropTypes else None + CopyLocal = if not copyLocal then Some copyLocal else None SpecificVersion = if not specificVersion then Some specificVersion else None CopyContentToOutputDirectory = None StorageConfig = None @@ -172,7 +173,7 @@ type ReferencesFile = { this with Groups = newGroups } member this.AddNuGetReference(groupName, packageName : PackageName) = - this.AddNuGetReference(groupName, packageName, true, true, true, ExplicitRestriction FrameworkRestriction.NoRestriction, false, false, false, None, null) + this.AddNuGetReference(groupName, packageName, false, true, true, true, ExplicitRestriction FrameworkRestriction.NoRestriction, false, false, false, None, null) member this.RemoveNuGetReference(groupName, packageName : PackageName) = let group = this.Groups.[groupName] diff --git a/src/Paket.Core/Versioning/Requirements.fs b/src/Paket.Core/Versioning/Requirements.fs index b81e5bf579..148584f70a 100644 --- a/src/Paket.Core/Versioning/Requirements.fs +++ b/src/Paket.Core/Versioning/Requirements.fs @@ -883,6 +883,7 @@ type InstallSettings = LicenseDownload: bool option ReferenceCondition : string option CreateBindingRedirects : BindingRedirectsSettings option + EmbedInteropTypes : bool option CopyLocal : bool option SpecificVersion : bool option StorageConfig : PackagesFolderGroupConfig option @@ -892,7 +893,8 @@ type InstallSettings = GenerateLoadScripts : bool option } static member Default = - { CopyLocal = None + { EmbedInteropTypes = None + CopyLocal = None SpecificVersion = None StorageConfig = None ImportTargets = None @@ -1046,6 +1048,10 @@ type InstallSettings = | x -> failwithf "Unknown copy_content_to_output_dir settings: %A" x Excludes = [] Aliases = Map.empty + EmbedInteropTypes = + match getPair "embed_interop_types" with + | Some "true" -> Some true + | _ -> None CopyLocal = match getPair "copy_local" with | Some "false" -> Some false From 9e40da3a2fb69fa4bcc426247d9f19bc0eda34eb Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Fri, 27 Jul 2018 18:02:39 +0200 Subject: [PATCH 64/86] fix VS bug opening the project (folder rendered multiple times) --- tests/Paket.Tests/Paket.Tests.fsproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Paket.Tests/Paket.Tests.fsproj b/tests/Paket.Tests/Paket.Tests.fsproj index eb5292c0bc..2c05a8b639 100644 --- a/tests/Paket.Tests/Paket.Tests.fsproj +++ b/tests/Paket.Tests/Paket.Tests.fsproj @@ -76,11 +76,11 @@ True FsUnit.fs - + From 80ed7d2b504e26085f62861063fc1159fd8b4530 Mon Sep 17 00:00:00 2001 From: Matthias Dittrich Date: Sat, 28 Jul 2018 12:17:10 +0200 Subject: [PATCH 65/86] fix tests? --- .../MyClassLibrary2/MyClassLibrary.csprojtemplate | 2 +- .../MyClassLibrary3/MyClassLibrary.csprojtemplate | 2 +- src/Paket.Core/PaketConfigFiles/PackagesConfigFile.fs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integrationtests/scenarios/i001219-props-files/before/MyClassLibrary/MyClassLibrary2/MyClassLibrary.csprojtemplate b/integrationtests/scenarios/i001219-props-files/before/MyClassLibrary/MyClassLibrary2/MyClassLibrary.csprojtemplate index 1d1ff3deac..9b398df2f3 100644 --- a/integrationtests/scenarios/i001219-props-files/before/MyClassLibrary/MyClassLibrary2/MyClassLibrary.csprojtemplate +++ b/integrationtests/scenarios/i001219-props-files/before/MyClassLibrary/MyClassLibrary2/MyClassLibrary.csprojtemplate @@ -291,7 +291,7 @@ - + ..\..\packages\Dapper\lib\net45\Dapper.dll diff --git a/integrationtests/scenarios/i001219-props-files/before/MyClassLibrary/MyClassLibrary3/MyClassLibrary.csprojtemplate b/integrationtests/scenarios/i001219-props-files/before/MyClassLibrary/MyClassLibrary3/MyClassLibrary.csprojtemplate index 1e0c6b9af9..9801a83596 100644 --- a/integrationtests/scenarios/i001219-props-files/before/MyClassLibrary/MyClassLibrary3/MyClassLibrary.csprojtemplate +++ b/integrationtests/scenarios/i001219-props-files/before/MyClassLibrary/MyClassLibrary3/MyClassLibrary.csprojtemplate @@ -291,7 +291,7 @@ - + ..\..\packages\Dapper\lib\net45\Dapper.dll diff --git a/src/Paket.Core/PaketConfigFiles/PackagesConfigFile.fs b/src/Paket.Core/PaketConfigFiles/PackagesConfigFile.fs index c444e315bf..eaaaa42b6c 100644 --- a/src/Paket.Core/PaketConfigFiles/PackagesConfigFile.fs +++ b/src/Paket.Core/PaketConfigFiles/PackagesConfigFile.fs @@ -17,7 +17,7 @@ let Read fileName = [for node in doc.SelectNodes("//package") -> let v = node.Attributes.["version"].Value { NugetPackage.Id = node.Attributes.["id"].Value - VersionRequirement = VersionRequirement.Parse v + VersionRequirement = VersionRequirement.VersionRequirement (VersionRange.Specific (SemVer.Parse v), PreReleaseStatus.All) Kind = NugetPackageKind.Package TargetFramework = node From 520d35ca6793e8e960ca3e3c7f628d39a1d1d05d Mon Sep 17 00:00:00 2001 From: Matthias Dittrich Date: Sat, 28 Jul 2018 12:21:40 +0200 Subject: [PATCH 66/86] fix project file (VS doesn't like splitted folders) --- tests/Paket.Tests/Paket.Tests.fsproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Paket.Tests/Paket.Tests.fsproj b/tests/Paket.Tests/Paket.Tests.fsproj index 08223b161b..daa32fd9ec 100644 --- a/tests/Paket.Tests/Paket.Tests.fsproj +++ b/tests/Paket.Tests/Paket.Tests.fsproj @@ -77,11 +77,11 @@ True FsUnit.fs - + @@ -229,8 +229,8 @@ - + PreserveNewest From 4891e885cbabd14943227f94205616dc07ba2654 Mon Sep 17 00:00:00 2001 From: Matthias Dittrich Date: Sat, 28 Jul 2018 12:24:38 +0200 Subject: [PATCH 67/86] adapt test --- tests/Paket.Tests/PackagesConfig/ReadConfig.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Paket.Tests/PackagesConfig/ReadConfig.fs b/tests/Paket.Tests/PackagesConfig/ReadConfig.fs index 282252dbea..a439cc185f 100644 --- a/tests/Paket.Tests/PackagesConfig/ReadConfig.fs +++ b/tests/Paket.Tests/PackagesConfig/ReadConfig.fs @@ -11,4 +11,4 @@ let ``can read xunit.visualstudio.packages.config``() = config.Id |> shouldEqual "xunit.runner.visualstudio" config.TargetFramework |> shouldEqual None - config.VersionRequirement.Range |> shouldEqual (VersionRange.Minimum (SemVer.Parse "2.0.1")) + config.VersionRequirement.Range |> shouldEqual (VersionRange.Specific (SemVer.Parse "2.0.1")) From 3ab13b967accc472deb5b3f178cb7e3da6b4c15d Mon Sep 17 00:00:00 2001 From: Matthias Dittrich Date: Sat, 28 Jul 2018 13:01:55 +0200 Subject: [PATCH 68/86] try to remove AutoGenerateBindingRedirects --- .../Paket.IntegrationTests/Paket.IntegrationTests.fsproj | 1 - src/Paket.Core.preview3/Paket.Core.fsproj | 1 - src/Paket.Core/Paket.Core.fsproj | 1 - src/Paket/Paket.fsproj | 1 - tests/Paket.Bootstrapper.Tests/Paket.Bootstrapper.Tests.csproj | 1 - tests/Paket.Tests/Paket.Tests.fsproj | 1 - 6 files changed, 6 deletions(-) diff --git a/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj b/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj index 7b878da55a..aa767eb03b 100644 --- a/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj +++ b/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj @@ -16,7 +16,6 @@ ..\..\ true - true true diff --git a/src/Paket.Core.preview3/Paket.Core.fsproj b/src/Paket.Core.preview3/Paket.Core.fsproj index 1838e036c7..c9b427fb7e 100644 --- a/src/Paket.Core.preview3/Paket.Core.fsproj +++ b/src/Paket.Core.preview3/Paket.Core.fsproj @@ -4,7 +4,6 @@ netstandard2.0 ..\Paket.Core NO_BOOTSTRAPPER;NO_CONFIGURATIONMANAGER;CUSTOM_WEBPROXY;$(DefineConstants) - true diff --git a/src/Paket.Core/Paket.Core.fsproj b/src/Paket.Core/Paket.Core.fsproj index 63cabbe6cd..4db42ce7c1 100644 --- a/src/Paket.Core/Paket.Core.fsproj +++ b/src/Paket.Core/Paket.Core.fsproj @@ -15,7 +15,6 @@ ..\..\ true - true true diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj index 12d1197603..80ca609528 100644 --- a/src/Paket/Paket.fsproj +++ b/src/Paket/Paket.fsproj @@ -18,7 +18,6 @@ true 2003 - true true diff --git a/tests/Paket.Bootstrapper.Tests/Paket.Bootstrapper.Tests.csproj b/tests/Paket.Bootstrapper.Tests/Paket.Bootstrapper.Tests.csproj index 3ca1673d79..8c1b03ba76 100644 --- a/tests/Paket.Bootstrapper.Tests/Paket.Bootstrapper.Tests.csproj +++ b/tests/Paket.Bootstrapper.Tests/Paket.Bootstrapper.Tests.csproj @@ -12,7 +12,6 @@ v4.5 512 - true true diff --git a/tests/Paket.Tests/Paket.Tests.fsproj b/tests/Paket.Tests/Paket.Tests.fsproj index daa32fd9ec..26fe566d79 100644 --- a/tests/Paket.Tests/Paket.Tests.fsproj +++ b/tests/Paket.Tests/Paket.Tests.fsproj @@ -14,7 +14,6 @@ ..\..\ true - true true From 4c432a4f68dc0f9c5f27721cb79893f17a29d469 Mon Sep 17 00:00:00 2001 From: Matthias Dittrich Date: Sat, 28 Jul 2018 13:23:53 +0200 Subject: [PATCH 69/86] fix --- .../MyClassLibrary2/MyClassLibrary.csprojtemplate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integrationtests/scenarios/i001219-props-files/before/MyClassLibrary/MyClassLibrary2/MyClassLibrary.csprojtemplate b/integrationtests/scenarios/i001219-props-files/before/MyClassLibrary/MyClassLibrary2/MyClassLibrary.csprojtemplate index 9b398df2f3..a6cf1a64c9 100644 --- a/integrationtests/scenarios/i001219-props-files/before/MyClassLibrary/MyClassLibrary2/MyClassLibrary.csprojtemplate +++ b/integrationtests/scenarios/i001219-props-files/before/MyClassLibrary/MyClassLibrary2/MyClassLibrary.csprojtemplate @@ -291,7 +291,7 @@ - + ..\..\packages\Dapper\lib\net45\Dapper.dll From c4c58c0cab65f503fee08d4584eddc8f02b3ed04 Mon Sep 17 00:00:00 2001 From: Matthias Dittrich Date: Sat, 28 Jul 2018 18:59:09 +0200 Subject: [PATCH 70/86] fix another test --- .../MyClassLibrary.csprojtemplate | 76 +++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/integrationtests/scenarios/i002335-razorengine/before/MyClassLibrary/MyClassLibrary/MyClassLibrary.csprojtemplate b/integrationtests/scenarios/i002335-razorengine/before/MyClassLibrary/MyClassLibrary/MyClassLibrary.csprojtemplate index 4d088b9616..a4725dbbef 100644 --- a/integrationtests/scenarios/i002335-razorengine/before/MyClassLibrary/MyClassLibrary/MyClassLibrary.csprojtemplate +++ b/integrationtests/scenarios/i002335-razorengine/before/MyClassLibrary/MyClassLibrary/MyClassLibrary.csprojtemplate @@ -376,7 +376,7 @@ - + ..\..\packages\net45\Microsoft.AspNet.Razor\lib\net45\System.Web.Razor.dll @@ -387,7 +387,7 @@ - + ..\..\packages\razor4\Microsoft.AspNetCore.Razor\lib\net451\Microsoft.AspNetCore.Razor.dll @@ -407,7 +407,7 @@ - + True @@ -455,7 +455,7 @@ - + ..\..\packages\razor4\System.AppContext\lib\net463\System.AppContext.dll @@ -493,7 +493,7 @@ - + ..\..\packages\razor4\System.Buffers\lib\netstandard1.1\System.Buffers.dll @@ -544,7 +544,7 @@ - + ..\..\packages\razor4\System.Console\lib\net46\System.Console.dll @@ -575,7 +575,7 @@ - + ..\..\packages\razor4\System.Diagnostics.DiagnosticSource\lib\net46\System.Diagnostics.DiagnosticSource.dll @@ -624,7 +624,7 @@ - + ..\..\packages\razor4\System.Diagnostics.Tracing\lib\net462\System.Diagnostics.Tracing.dll @@ -673,7 +673,7 @@ - + ..\..\packages\razor4\System.Globalization.Calendars\lib\net46\System.Globalization.Calendars.dll @@ -702,7 +702,7 @@ - + ..\..\packages\razor4\System.Globalization.Extensions\lib\net46\System.Globalization.Extensions.dll @@ -731,7 +731,7 @@ - + ..\..\packages\razor4\System.IO\lib\net462\System.IO.dll @@ -790,7 +790,7 @@ - + ..\..\packages\razor4\System.IO.Compression\lib\net46\System.IO.Compression.dll @@ -847,7 +847,7 @@ - + True @@ -888,7 +888,7 @@ - + ..\..\packages\razor4\System.IO.FileSystem\lib\net46\System.IO.FileSystem.dll @@ -917,7 +917,7 @@ - + ..\..\packages\razor4\System.IO.FileSystem.Primitives\lib\net46\System.IO.FileSystem.Primitives.dll @@ -955,7 +955,7 @@ - + ..\..\packages\razor4\System.Linq\lib\net463\System.Linq.dll @@ -1002,7 +1002,7 @@ - + ..\..\packages\razor4\System.Linq.Expressions\lib\net463\System.Linq.Expressions.dll @@ -1077,7 +1077,7 @@ - + ..\..\packages\razor4\System.Net.Http\lib\net46\System.Net.Http.dll @@ -1138,7 +1138,7 @@ - + ..\..\packages\razor4\System.Net.Sockets\lib\net46\System.Net.Sockets.dll @@ -1187,7 +1187,7 @@ - + ..\..\packages\razor4\System.Reflection\lib\net462\System.Reflection.dll @@ -1323,7 +1323,7 @@ - + ..\..\packages\razor4\System.Reflection.TypeExtensions\lib\net462\System.Reflection.TypeExtensions.dll @@ -1379,7 +1379,7 @@ - + True @@ -1420,7 +1420,7 @@ - + ..\..\packages\razor4\System.Runtime.Extensions\lib\net462\System.Runtime.Extensions.dll @@ -1485,7 +1485,7 @@ - + ..\..\packages\razor4\System.Runtime.InteropServices\lib\net463\System.Runtime.InteropServices.dll @@ -1523,7 +1523,7 @@ - + ..\..\packages\razor4\System.Runtime.InteropServices.RuntimeInformation\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1561,7 +1561,7 @@ - + True @@ -1629,7 +1629,7 @@ - + ..\..\packages\razor4\System.Security.Cryptography.Algorithms\lib\net463\System.Security.Cryptography.Algorithms.dll @@ -1708,7 +1708,7 @@ - + ..\..\packages\razor4\System.Security.Cryptography.Cng\lib\net463\System.Security.Cryptography.Cng.dll @@ -1737,7 +1737,7 @@ - + ..\..\packages\razor4\System.Security.Cryptography.Csp\lib\net46\System.Security.Cryptography.Csp.dll @@ -1766,7 +1766,7 @@ - + ..\..\packages\razor4\System.Security.Cryptography.Encoding\lib\net46\System.Security.Cryptography.Encoding.dll @@ -1786,7 +1786,7 @@ - + ..\..\packages\razor4\System.Security.Cryptography.OpenSsl\lib\netstandard1.6\System.Security.Cryptography.OpenSsl.dll @@ -1815,7 +1815,7 @@ - + ..\..\packages\razor4\System.Security.Cryptography.Primitives\lib\net46\System.Security.Cryptography.Primitives.dll @@ -1869,7 +1869,7 @@ - + ..\..\packages\razor4\System.Security.Cryptography.X509Certificates\lib\net461\System.Security.Cryptography.X509Certificates.dll @@ -1929,7 +1929,7 @@ - + ..\..\packages\razor4\System.Text.RegularExpressions\lib\net463\System.Text.RegularExpressions.dll @@ -2007,7 +2007,7 @@ - + ..\..\packages\razor4\System.Threading.Tasks.Extensions\lib\netstandard1.0\System.Threading.Tasks.Extensions.dll @@ -2027,7 +2027,7 @@ - + ..\..\packages\razor4\System.Threading.Thread\lib\net46\System.Threading.Thread.dll @@ -2083,7 +2083,7 @@ - + True @@ -2115,7 +2115,7 @@ - + True From 5bedefc4700b00b05460d31bbfd920b304921187 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Mon, 30 Jul 2018 07:33:13 +0200 Subject: [PATCH 71/86] RELEASE_NOTES --- RELEASE_NOTES.md | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 7ce8492510..d5e5ba2964 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,13 +1,8 @@ -#### 5.174.5 - 2018-07-17 +#### 5.175.0 - 2018-07-30 +* Allow addition of for NuGet packages - https://github.com/fsprojects/Paket/pull/3314 * BUGFIX: "-T" switch removed when isMacOS, because it is not valid on OSX - https://github.com/fsprojects/Paket/pull/3298 - -#### 5.174.4 - 2018-07-17 * BUGFIX: Fixed exception during restore when accessing missing folders - https://github.com/fsprojects/Paket/pull/3293 - -#### 5.174.3 - 2018-07-17 * BUGFIX: Reports NuGet download time correctly - https://github.com/fsprojects/Paket/pull/3304 - -#### 5.174.2 - 2018-07-06 * BUGFIX: Accept netstandard20 in Visual Studion integration - https://github.com/fsprojects/Paket/issues/3284 #### 5.174.0 - 2018-07-06 From 6b8d52c038f90f28e0279f91236488f4609569aa Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Mon, 30 Jul 2018 07:41:59 +0200 Subject: [PATCH 72/86] fix compile errors --- tests/Paket.Tests/InstallModel/Xml/CodeCracker.fs | 6 +++--- tests/Paket.Tests/InstallModel/Xml/ControlzEx.fs | 6 +++--- tests/Paket.Tests/InstallModel/Xml/EmptyLibs.fs | 2 +- tests/Paket.Tests/InstallModel/Xml/FSharp.Data.SqlClient.fs | 2 +- tests/Paket.Tests/InstallModel/Xml/Fantomas.fs | 2 +- tests/Paket.Tests/InstallModel/Xml/FantomasLib.fs | 2 +- tests/Paket.Tests/InstallModel/Xml/Fuchu.fs | 2 +- tests/Paket.Tests/InstallModel/Xml/GitInfoPlanter.fs | 2 +- tests/Paket.Tests/InstallModel/Xml/LibGit2Sharp.fs | 2 +- tests/Paket.Tests/InstallModel/Xml/Microsoft.Bcl.Build.fs | 2 +- tests/Paket.Tests/InstallModel/Xml/Plossum.fs | 2 +- tests/Paket.Tests/InstallModel/Xml/RefactoringEssentials.fs | 4 ++-- tests/Paket.Tests/InstallModel/Xml/RxXaml.fs | 2 +- tests/Paket.Tests/InstallModel/Xml/SQLite.fs | 2 +- tests/Paket.Tests/InstallModel/Xml/StyleCop.MSBuild.fs | 2 +- tests/Paket.Tests/InstallModel/Xml/System.Spatial.fs | 2 +- tests/Paket.Tests/InstallModel/Xml/SystemNetHttp.fs | 2 +- tests/Paket.Tests/InstallModel/Xml/SystemNetHttpForNet4.fs | 2 +- .../Xml/SystemNetHttpWithExistingFrameworkReferences.fs | 2 +- .../Xml/SystemNetHttpWithFrameworkReferences.fs | 2 +- tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs | 4 ++-- 21 files changed, 27 insertions(+), 27 deletions(-) diff --git a/tests/Paket.Tests/InstallModel/Xml/CodeCracker.fs b/tests/Paket.Tests/InstallModel/Xml/CodeCracker.fs index ffa4386173..da2444fa77 100644 --- a/tests/Paket.Tests/InstallModel/Xml/CodeCracker.fs +++ b/tests/Paket.Tests/InstallModel/Xml/CodeCracker.fs @@ -36,7 +36,7 @@ let ``should generate Xml for codecracker.CSharp``() = let project = ProjectFile.TryLoad("./ProjectFile/TestData/EmptyCsharpGuid.csprojtest") Assert.IsTrue(project.IsSome) - let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>() ,Map.empty,Some true,None,true,KnownTargetProfiles.AllProfiles,None) + let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>() ,Map.empty,None,Some true,None,true,KnownTargetProfiles.AllProfiles,None) ctx.AnalyzersNode |> (fun n -> n.OuterXml) |> normalizeXml @@ -57,7 +57,7 @@ let ``should generate Xml for codecracker.CSharp in VisualBasic project``() = let project = ProjectFile.TryLoad("./ProjectFile/TestData/EmptyVbGuid.vbprojtest") Assert.IsTrue(project.IsSome) - let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,None,true,KnownTargetProfiles.AllProfiles,None) + let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,Some true,None,true,KnownTargetProfiles.AllProfiles,None) ctx.AnalyzersNode |> (fun n -> n.OuterXml) |> normalizeXml @@ -88,7 +88,7 @@ let ``should generate Xml for codecracker.VisualBasic``() = let project = ProjectFile.TryLoad("./ProjectFile/TestData/EmptyVbGuid.vbprojtest") Assert.IsTrue(project.IsSome) - let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,None,true,KnownTargetProfiles.AllProfiles,None) + let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,Some true,None,true,KnownTargetProfiles.AllProfiles,None) ctx.AnalyzersNode |> (fun n -> n.OuterXml) |> normalizeXml diff --git a/tests/Paket.Tests/InstallModel/Xml/ControlzEx.fs b/tests/Paket.Tests/InstallModel/Xml/ControlzEx.fs index 1803feb79b..03e51a23b1 100644 --- a/tests/Paket.Tests/InstallModel/Xml/ControlzEx.fs +++ b/tests/Paket.Tests/InstallModel/Xml/ControlzEx.fs @@ -175,7 +175,7 @@ let ``should generate Xml without specific version for ControlzEx in CSharp proj let project = ProjectFile.TryLoad("./ProjectFile/TestData/EmptyCsharpGuid.csprojtest") Assert.IsTrue(project.IsSome) - let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,None,true,KnownTargetProfiles.AllProfiles,None) + let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,None,None,true,KnownTargetProfiles.AllProfiles,None) let result = ctx.ChooseNodes |> (fun n -> n.Head.OuterXml) @@ -201,7 +201,7 @@ let ``should generate Xml with specific version set to true for ControlzEx in CS let project = ProjectFile.TryLoad("./ProjectFile/TestData/EmptyCsharpGuid.csprojtest") Assert.IsTrue(project.IsSome) - let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,Some true,true,KnownTargetProfiles.AllProfiles,None) + let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,None,Some true,true,KnownTargetProfiles.AllProfiles,None) let result = ctx.ChooseNodes |> (fun n -> n.Head.OuterXml) @@ -227,7 +227,7 @@ let ``should generate Xml with specific version set to false for ControlzEx in C let project = ProjectFile.TryLoad("./ProjectFile/TestData/EmptyCsharpGuid.csprojtest") Assert.IsTrue(project.IsSome) - let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,Some false,true,KnownTargetProfiles.AllProfiles,None) + let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,None,Some false,true,KnownTargetProfiles.AllProfiles,None) let result = ctx.ChooseNodes |> (fun n -> n.Head.OuterXml) diff --git a/tests/Paket.Tests/InstallModel/Xml/EmptyLibs.fs b/tests/Paket.Tests/InstallModel/Xml/EmptyLibs.fs index b12dcaf0fa..c00a1ce45c 100644 --- a/tests/Paket.Tests/InstallModel/Xml/EmptyLibs.fs +++ b/tests/Paket.Tests/InstallModel/Xml/EmptyLibs.fs @@ -24,7 +24,7 @@ let ``should generate Xml for framework references and empty libs``() = [], Nuspec.Load(__SOURCE_DIRECTORY__ + "/../../Nuspec/EmptyLibs.nuspec")) - let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,None,true,KnownTargetProfiles.AllProfiles,None) + let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,Some true,None,true,KnownTargetProfiles.AllProfiles,None) ctx.ChooseNodes.Head.OuterXml |> normalizeXml |> shouldEqual (normalizeXml expected) diff --git a/tests/Paket.Tests/InstallModel/Xml/FSharp.Data.SqlClient.fs b/tests/Paket.Tests/InstallModel/Xml/FSharp.Data.SqlClient.fs index cd659a4084..5b55248810 100644 --- a/tests/Paket.Tests/InstallModel/Xml/FSharp.Data.SqlClient.fs +++ b/tests/Paket.Tests/InstallModel/Xml/FSharp.Data.SqlClient.fs @@ -46,7 +46,7 @@ let ``should generate Xml for FSharp.Data.SqlClient 1.4.4``() = [], Nuspec.Load(__SOURCE_DIRECTORY__ + @"\..\..\Nuspec\FSharp.Data.SqlClient.nuspec")) - let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,None,true,KnownTargetProfiles.AllProfiles,None) + let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,Some true,None,true,KnownTargetProfiles.AllProfiles,None) let currentXML = ctx.ChooseNodes.Head.OuterXml |> normalizeXml currentXML |> shouldEqual (normalizeXml expected) \ No newline at end of file diff --git a/tests/Paket.Tests/InstallModel/Xml/Fantomas.fs b/tests/Paket.Tests/InstallModel/Xml/Fantomas.fs index 29d410dd81..4997724204 100644 --- a/tests/Paket.Tests/InstallModel/Xml/Fantomas.fs +++ b/tests/Paket.Tests/InstallModel/Xml/Fantomas.fs @@ -30,7 +30,7 @@ let ``should generate Xml for Fantomas 1.5``() = [], Nuspec.Explicit ["FantomasLib.dll"]) - let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,None,true,KnownTargetProfiles.AllProfiles,None) + let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,Some true,None,true,KnownTargetProfiles.AllProfiles,None) ctx.ChooseNodes.Head.OuterXml |> normalizeXml |> shouldEqual (normalizeXml expected) diff --git a/tests/Paket.Tests/InstallModel/Xml/FantomasLib.fs b/tests/Paket.Tests/InstallModel/Xml/FantomasLib.fs index 77793b0aa9..503aa581d9 100644 --- a/tests/Paket.Tests/InstallModel/Xml/FantomasLib.fs +++ b/tests/Paket.Tests/InstallModel/Xml/FantomasLib.fs @@ -28,7 +28,7 @@ let ``should generate Xml for Fantomas 1.5``() = [], Nuspec.Explicit ["FantomasLib.dll"]) - let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some false,None,true,KnownTargetProfiles.AllProfiles,None) + let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,Some false,None,true,KnownTargetProfiles.AllProfiles,None) ctx.ChooseNodes.Head.OuterXml |> normalizeXml |> shouldEqual (normalizeXml expected) diff --git a/tests/Paket.Tests/InstallModel/Xml/Fuchu.fs b/tests/Paket.Tests/InstallModel/Xml/Fuchu.fs index de645954e9..de9ff9846a 100644 --- a/tests/Paket.Tests/InstallModel/Xml/Fuchu.fs +++ b/tests/Paket.Tests/InstallModel/Xml/Fuchu.fs @@ -28,7 +28,7 @@ let ``should generate Xml for Fuchu 0.4``() = [], Nuspec.All) - let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,None,true,KnownTargetProfiles.AllProfiles,None) + let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,Some true,None,true,KnownTargetProfiles.AllProfiles,None) ctx.ChooseNodes.Head.OuterXml |> normalizeXml |> shouldEqual (normalizeXml expected) diff --git a/tests/Paket.Tests/InstallModel/Xml/GitInfoPlanter.fs b/tests/Paket.Tests/InstallModel/Xml/GitInfoPlanter.fs index 409b526deb..dd512f0ef0 100644 --- a/tests/Paket.Tests/InstallModel/Xml/GitInfoPlanter.fs +++ b/tests/Paket.Tests/InstallModel/Xml/GitInfoPlanter.fs @@ -30,7 +30,7 @@ let ``should generate Xml for GitInfoPlanter2.0.0``() = [], Nuspec.All) - let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,None,true,KnownTargetProfiles.AllProfiles,None) + let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,Some true,None,true,KnownTargetProfiles.AllProfiles,None) ctx.ChooseNodes.Head.OuterXml |> normalizeXml |> shouldEqual (normalizeXml emptyReferences) diff --git a/tests/Paket.Tests/InstallModel/Xml/LibGit2Sharp.fs b/tests/Paket.Tests/InstallModel/Xml/LibGit2Sharp.fs index e09fe6d45f..80d17bc2b3 100644 --- a/tests/Paket.Tests/InstallModel/Xml/LibGit2Sharp.fs +++ b/tests/Paket.Tests/InstallModel/Xml/LibGit2Sharp.fs @@ -47,7 +47,7 @@ let ``should generate Xml for LibGit2Sharp 2.0.0``() = model.GetLegacyReferences(TargetProfile.SinglePlatform (DotNetFramework FrameworkVersion.V4)) |> Seq.map (fun f -> f.Path) |> shouldContain @"..\LibGit2Sharp\lib\net40\LibGit2Sharp.dll" - let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,None,true,KnownTargetProfiles.AllProfiles,None) + let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,Some true,None,true,KnownTargetProfiles.AllProfiles,None) ctx.ChooseNodes.Head.OuterXml |> normalizeXml |> shouldEqual (normalizeXml expectedReferenceNodes) diff --git a/tests/Paket.Tests/InstallModel/Xml/Microsoft.Bcl.Build.fs b/tests/Paket.Tests/InstallModel/Xml/Microsoft.Bcl.Build.fs index 650f5f0a7b..b25e1c60f0 100644 --- a/tests/Paket.Tests/InstallModel/Xml/Microsoft.Bcl.Build.fs +++ b/tests/Paket.Tests/InstallModel/Xml/Microsoft.Bcl.Build.fs @@ -21,7 +21,7 @@ let ``should not install targets node for Microsoft.Bcl.Build``() = model.GetTargetsFiles(TargetProfile.SinglePlatform (DotNetFramework FrameworkVersion.V4)) |> Seq.map (fun f -> f.Path) |> shouldContain @"..\Microsoft.Bcl.Build\build\Microsoft.Bcl.Build.targets" - let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,None,false,KnownTargetProfiles.AllProfiles,None) + let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,Some true,None,false,KnownTargetProfiles.AllProfiles,None) ctx.FrameworkSpecificPropsNodes |> Seq.length |> shouldEqual 0 ctx.FrameworkSpecificTargetsNodes |> Seq.length |> shouldEqual 0 diff --git a/tests/Paket.Tests/InstallModel/Xml/Plossum.fs b/tests/Paket.Tests/InstallModel/Xml/Plossum.fs index af870c1f42..7c78dbc99b 100644 --- a/tests/Paket.Tests/InstallModel/Xml/Plossum.fs +++ b/tests/Paket.Tests/InstallModel/Xml/Plossum.fs @@ -31,7 +31,7 @@ let ``should generate Xml for Plossum``() = [], Nuspec.All) - let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,None,true,KnownTargetProfiles.AllProfiles,None) + let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,Some true,None,true,KnownTargetProfiles.AllProfiles,None) ctx.ChooseNodes.Head.OuterXml |> normalizeXml |> shouldEqual (normalizeXml expected) \ No newline at end of file diff --git a/tests/Paket.Tests/InstallModel/Xml/RefactoringEssentials.fs b/tests/Paket.Tests/InstallModel/Xml/RefactoringEssentials.fs index aba5bceffe..7fdcb65724 100644 --- a/tests/Paket.Tests/InstallModel/Xml/RefactoringEssentials.fs +++ b/tests/Paket.Tests/InstallModel/Xml/RefactoringEssentials.fs @@ -28,7 +28,7 @@ let ``should generate Xml for RefactoringEssentials in CSharp project``() = let project = ProjectFile.TryLoad("./ProjectFile/TestData/EmptyCsharpGuid.csprojtest") Assert.IsTrue(project.IsSome) - let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,None,true,KnownTargetProfiles.AllProfiles,None) + let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,Some true,None,true,KnownTargetProfiles.AllProfiles,None) ctx.AnalyzersNode |> (fun n -> n.OuterXml) |> normalizeXml @@ -48,7 +48,7 @@ let ``should generate Xml for RefactoringEssentials in VisualBasic project``() = let project = ProjectFile.TryLoad("./ProjectFile/TestData/EmptyVbGuid.vbprojtest") Assert.IsTrue(project.IsSome) - let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,None,true,KnownTargetProfiles.AllProfiles,None) + let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,Some true,None,true,KnownTargetProfiles.AllProfiles,None) ctx.AnalyzersNode |> (fun n -> n.OuterXml) |> normalizeXml diff --git a/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs b/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs index 249354fa35..6e55f334dd 100644 --- a/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs +++ b/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs @@ -113,7 +113,7 @@ let ``should generate Xml for Rx-XAML 2.2.4 with correct framework assembly refe { AssemblyName = "System.Windows"; FrameworkRestrictions = makeOrList [FrameworkRestriction.Exactly(Silverlight SilverlightVersion.V5)] } { AssemblyName = "System.Windows"; FrameworkRestrictions = makeOrList [FrameworkRestriction.Exactly(WindowsPhone WindowsPhoneVersion.V7_5)] }]}) - let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,None,true,KnownTargetProfiles.AllProfiles,None) + let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,Some true,None,true,KnownTargetProfiles.AllProfiles,None) let currentXml = ctx.ChooseNodes.Head.OuterXml |> normalizeXml currentXml |> shouldEqual (normalizeXml expected) diff --git a/tests/Paket.Tests/InstallModel/Xml/SQLite.fs b/tests/Paket.Tests/InstallModel/Xml/SQLite.fs index 16a3d48bfa..06284d391c 100644 --- a/tests/Paket.Tests/InstallModel/Xml/SQLite.fs +++ b/tests/Paket.Tests/InstallModel/Xml/SQLite.fs @@ -179,7 +179,7 @@ let ``should generate Xml for SQLite``() = Nuspec.All) - let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,None,true,KnownTargetProfiles.AllProfiles,None) + let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,Some true,None,true,KnownTargetProfiles.AllProfiles,None) let currentXML = ctx.ChooseNodes.Head.OuterXml |> normalizeXml currentXML |> shouldEqual (normalizeXml expectedReferenceNodes) diff --git a/tests/Paket.Tests/InstallModel/Xml/StyleCop.MSBuild.fs b/tests/Paket.Tests/InstallModel/Xml/StyleCop.MSBuild.fs index 4824369b32..f3a686fe5f 100644 --- a/tests/Paket.Tests/InstallModel/Xml/StyleCop.MSBuild.fs +++ b/tests/Paket.Tests/InstallModel/Xml/StyleCop.MSBuild.fs @@ -28,7 +28,7 @@ let ``should generate Xml for StyleCop.MSBuild``() = model.GetTargetsFiles(TargetProfile.SinglePlatform (DotNetFramework FrameworkVersion.V2)) |> Seq.map (fun f -> f.Path) |> shouldContain @"..\StyleCop.MSBuild\build\StyleCop.MSBuild.Targets" - let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,None,true,KnownTargetProfiles.AllProfiles,None) + let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,Some true,None,true,KnownTargetProfiles.AllProfiles,None) ctx.FrameworkSpecificPropertyChooseNode.OuterXml |> normalizeXml diff --git a/tests/Paket.Tests/InstallModel/Xml/System.Spatial.fs b/tests/Paket.Tests/InstallModel/Xml/System.Spatial.fs index b9d313ecad..82ea4e6478 100644 --- a/tests/Paket.Tests/InstallModel/Xml/System.Spatial.fs +++ b/tests/Paket.Tests/InstallModel/Xml/System.Spatial.fs @@ -45,7 +45,7 @@ let ``should generate Xml for System.Spatial``() = @"..\System.Spatial\lib\sl4\zh-Hans\System.Spatial.resources.dll" ] |> Paket.InstallModel.ProcessingSpecs.fromLegacyList @"..\System.Spatial\",[],[],Nuspec.All) - let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,None,true,KnownTargetProfiles.AllProfiles,None) + let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,Some true,None,true,KnownTargetProfiles.AllProfiles,None) let currentXML = ctx.ChooseNodes.Head.OuterXml |> normalizeXml currentXML |> shouldEqual (normalizeXml expected) \ No newline at end of file diff --git a/tests/Paket.Tests/InstallModel/Xml/SystemNetHttp.fs b/tests/Paket.Tests/InstallModel/Xml/SystemNetHttp.fs index 83a8cadee8..98541b00bc 100644 --- a/tests/Paket.Tests/InstallModel/Xml/SystemNetHttp.fs +++ b/tests/Paket.Tests/InstallModel/Xml/SystemNetHttp.fs @@ -193,7 +193,7 @@ let ``should generate Xml for System.Net.Http 2.2.8``() = [], Nuspec.All) - let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,None,true,KnownTargetProfiles.AllProfiles,None) + let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,Some true,None,true,KnownTargetProfiles.AllProfiles,None) let currentXML = ctx.ChooseNodes.Head.OuterXml |> normalizeXml currentXML |> shouldEqual (normalizeXml expected) diff --git a/tests/Paket.Tests/InstallModel/Xml/SystemNetHttpForNet4.fs b/tests/Paket.Tests/InstallModel/Xml/SystemNetHttpForNet4.fs index 2c7753f0b1..81606a83c5 100644 --- a/tests/Paket.Tests/InstallModel/Xml/SystemNetHttpForNet4.fs +++ b/tests/Paket.Tests/InstallModel/Xml/SystemNetHttpForNet4.fs @@ -70,7 +70,7 @@ let ``should generate Xml for System.Net.Http 2.2.8``() = [], Nuspec.All) - let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,None,true,KnownTargetProfiles.AllProfiles,None) + let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,Some true,None,true,KnownTargetProfiles.AllProfiles,None) let currentXML = ctx.ChooseNodes.Head.OuterXml |> normalizeXml currentXML |> shouldEqual (normalizeXml expected) diff --git a/tests/Paket.Tests/InstallModel/Xml/SystemNetHttpWithExistingFrameworkReferences.fs b/tests/Paket.Tests/InstallModel/Xml/SystemNetHttpWithExistingFrameworkReferences.fs index 84349219f7..1ddd485035 100644 --- a/tests/Paket.Tests/InstallModel/Xml/SystemNetHttpWithExistingFrameworkReferences.fs +++ b/tests/Paket.Tests/InstallModel/Xml/SystemNetHttpWithExistingFrameworkReferences.fs @@ -72,7 +72,7 @@ let ``should generate Xml for System.Net.Http 2.2.8``() = [{ AssemblyName = "System.Net.Http"; FrameworkRestrictions = makeOrList [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V4_5))] } { AssemblyName = "System.Net.Http.WebRequest"; FrameworkRestrictions = makeOrList [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V4_5))] }]}) - let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/FrameworkAssemblies.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,None,true,KnownTargetProfiles.AllProfiles,None) + let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/FrameworkAssemblies.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,Some true,None,true,KnownTargetProfiles.AllProfiles,None) let currentXML = ctx.ChooseNodes.Head.OuterXml |> normalizeXml currentXML |> shouldEqual (normalizeXml expected) diff --git a/tests/Paket.Tests/InstallModel/Xml/SystemNetHttpWithFrameworkReferences.fs b/tests/Paket.Tests/InstallModel/Xml/SystemNetHttpWithFrameworkReferences.fs index fe4e23c96a..46caf53e5c 100644 --- a/tests/Paket.Tests/InstallModel/Xml/SystemNetHttpWithFrameworkReferences.fs +++ b/tests/Paket.Tests/InstallModel/Xml/SystemNetHttpWithFrameworkReferences.fs @@ -79,7 +79,7 @@ let ``should generate Xml for System.Net.Http 2.2.8``() = [{ AssemblyName = "System.Net.Http"; FrameworkRestrictions = makeOrList [FrameworkRestriction.AtLeast(DotNetFramework(FrameworkVersion.V4_5))] } { AssemblyName = "System.Net.Http.WebRequest"; FrameworkRestrictions = makeOrList [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V4_5))] }]}) - let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,None,true,KnownTargetProfiles.AllProfiles,None) + let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,Some true,None,true,KnownTargetProfiles.AllProfiles,None) let currentXML = ctx.ChooseNodes.Head.OuterXml |> normalizeXml currentXML |> shouldEqual (normalizeXml expected) diff --git a/tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs b/tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs index f6948348f6..b04e329e4c 100644 --- a/tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs +++ b/tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs @@ -38,7 +38,7 @@ let ``should generate Xml for xunit.runner.visualstudio 2.0.0``() = [], Nuspec.All) - let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,None,true,KnownTargetProfiles.AllProfiles,None) + let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,Some true,None,true,KnownTargetProfiles.AllProfiles,None) ctx.ChooseNodes.Head.OuterXml |> normalizeXml |> shouldEqual (normalizeXml emptyReferenceNodes) @@ -70,7 +70,7 @@ let ``should not generate Xml for xunit.runner.visualstudio 2.0.0 if import is d [], Nuspec.All) - let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,None,false,KnownTargetProfiles.AllProfiles,None) + let ctx = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,Some true,None,false,KnownTargetProfiles.AllProfiles,None) ctx.ChooseNodes.Head.OuterXml |> normalizeXml |> shouldEqual (normalizeXml emptyReferenceNodes) From d9607c18ecaa064f115d934a6ece2e104fab3edc Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Mon, 30 Jul 2018 07:46:29 +0200 Subject: [PATCH 73/86] fix compile errors --- .../InstallModel/Xml/Microsoft.CodeAnalysis.Analyzers.fs | 6 +++--- .../Xml/System.Security.Cryptography.Algorithms.fs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Paket.Tests/InstallModel/Xml/Microsoft.CodeAnalysis.Analyzers.fs b/tests/Paket.Tests/InstallModel/Xml/Microsoft.CodeAnalysis.Analyzers.fs index e6334aad1c..28ce820586 100644 --- a/tests/Paket.Tests/InstallModel/Xml/Microsoft.CodeAnalysis.Analyzers.fs +++ b/tests/Paket.Tests/InstallModel/Xml/Microsoft.CodeAnalysis.Analyzers.fs @@ -37,7 +37,7 @@ let ``should generate Xml for Microsoft.CodeAnalysis.Analyzers in CSharp project ensureDir() let project = ProjectFile.TryLoad("./ProjectFile/TestData/EmptyCsharpGuid.csprojtest") Assert.IsTrue(project.IsSome) - let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,None,true,KnownTargetProfiles.AllProfiles,None) + let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,Some true,None,true,KnownTargetProfiles.AllProfiles,None) ctx.AnalyzersNode |> (fun n -> n.OuterXml) |> normalizeXml @@ -58,7 +58,7 @@ let ``should generate Xml for RefactoringEssentials in VisualBasic project``() = ensureDir() let project = ProjectFile.TryLoad("./ProjectFile/TestData/EmptyVbGuid.vbprojtest") Assert.IsTrue(project.IsSome) - let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,None,true,KnownTargetProfiles.AllProfiles,None) + let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,Some true,None,true,KnownTargetProfiles.AllProfiles,None) ctx.AnalyzersNode |> (fun n -> n.OuterXml) |> normalizeXml @@ -78,7 +78,7 @@ let ``should generate Xml for Microsoft.CodeAnalysis.Analyzers 1.0.0-rc2``() = ensureDir() let project = ProjectFile.TryLoad("./ProjectFile/TestData/EmptyCsharpGuid.csprojtest") Assert.IsTrue(project.IsSome) - let ctx = project.Value.GenerateXml(oldModel, System.Collections.Generic.HashSet<_>(),Map.empty,Some true,None,true,KnownTargetProfiles.AllProfiles,None) + let ctx = project.Value.GenerateXml(oldModel, System.Collections.Generic.HashSet<_>(),Map.empty,None,Some true,None,true,KnownTargetProfiles.AllProfiles,None) ctx.AnalyzersNode |> (fun n -> n.OuterXml) |> normalizeXml 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 3a9906ead6..b63ffbd52c 100644 --- a/tests/Paket.Tests/InstallModel/Xml/System.Security.Cryptography.Algorithms.fs +++ b/tests/Paket.Tests/InstallModel/Xml/System.Security.Cryptography.Algorithms.fs @@ -93,7 +93,7 @@ let ``should generate Xml for System.Security.Cryptography.Algorithms in CSharp let project = ProjectFile.TryLoad("./ProjectFile/TestData/EmptyCsharpGuid.csprojtest") Assert.IsTrue(project.IsSome) - let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,None,true,KnownTargetProfiles.AllProfiles,None) + let ctx = project.Value.GenerateXml(model, System.Collections.Generic.HashSet<_>(),Map.empty,None,None,None,true,KnownTargetProfiles.AllProfiles,None) let result = ctx.ChooseNodes |> (fun n -> n.Head.OuterXml) From b3bf2fbf69c5dff17279431966b6cc9287044dbd Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Mon, 30 Jul 2018 07:55:43 +0200 Subject: [PATCH 74/86] Bump version to 5.175.0 --- src/Paket.Bootstrapper/Properties/AssemblyInfo.cs | 12 ++++++------ src/Paket.Core/AssemblyInfo.fs | 12 ++++++------ src/Paket/AssemblyInfo.fs | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index 2a5ba50e5b..0d2629d6d7 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.174.5")] -[assembly: AssemblyFileVersionAttribute("5.174.5")] -[assembly: AssemblyInformationalVersionAttribute("5.174.5")] +[assembly: AssemblyVersionAttribute("5.175.0")] +[assembly: AssemblyFileVersionAttribute("5.175.0")] +[assembly: AssemblyInformationalVersionAttribute("5.175.0")] 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.174.5"; - internal const System.String AssemblyFileVersion = "5.174.5"; - internal const System.String AssemblyInformationalVersion = "5.174.5"; + internal const System.String AssemblyVersion = "5.175.0"; + internal const System.String AssemblyFileVersion = "5.175.0"; + internal const System.String AssemblyInformationalVersion = "5.175.0"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index 4a7dfece64..3ca0db9a8c 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.174.5" - let [] AssemblyFileVersion = "5.174.5" - let [] AssemblyInformationalVersion = "5.174.5" + let [] AssemblyVersion = "5.175.0" + let [] AssemblyFileVersion = "5.175.0" + let [] AssemblyInformationalVersion = "5.175.0" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index 40222cc43e..28e4e60e3e 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.174.5" - let [] AssemblyFileVersion = "5.174.5" - let [] AssemblyInformationalVersion = "5.174.5" + let [] AssemblyVersion = "5.175.0" + let [] AssemblyFileVersion = "5.175.0" + let [] AssemblyInformationalVersion = "5.175.0" From 6fef60a1bec6c8cc075805b127e7bb4dd6dbd929 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Mon, 30 Jul 2018 10:18:02 +0200 Subject: [PATCH 75/86] RELEASE_NOTES --- .paket/Paket.Restore.targets | 4 ++-- RELEASE_NOTES.md | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets index e12083c13a..6be03acb32 100644 --- a/.paket/Paket.Restore.targets +++ b/.paket/Paket.Restore.targets @@ -71,7 +71,7 @@ false true - + true @@ -96,7 +96,7 @@ $(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references $(MSBuildProjectDirectory)\paket.references - + false true true diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index d5e5ba2964..69f143149e 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,6 @@ +#### 5.175.1 - 2018-07-30 +* BUGFIX: Revert impact of https://github.com/dotnet/corefx/issues/31098 by using WinHttpHandler - https://github.com/fsprojects/Paket/pull/3307 + #### 5.175.0 - 2018-07-30 * Allow addition of for NuGet packages - https://github.com/fsprojects/Paket/pull/3314 * BUGFIX: "-T" switch removed when isMacOS, because it is not valid on OSX - https://github.com/fsprojects/Paket/pull/3298 From 1796a40e4fe2d80635a8c55b8b36b1b9567b94d5 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Mon, 30 Jul 2018 10:24:39 +0200 Subject: [PATCH 76/86] Bump version to 5.175.1 --- src/Paket.Bootstrapper/Properties/AssemblyInfo.cs | 12 ++++++------ src/Paket.Core/AssemblyInfo.fs | 12 ++++++------ src/Paket/AssemblyInfo.fs | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index 0d2629d6d7..6c4785d351 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.175.0")] -[assembly: AssemblyFileVersionAttribute("5.175.0")] -[assembly: AssemblyInformationalVersionAttribute("5.175.0")] +[assembly: AssemblyVersionAttribute("5.175.1")] +[assembly: AssemblyFileVersionAttribute("5.175.1")] +[assembly: AssemblyInformationalVersionAttribute("5.175.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.175.0"; - internal const System.String AssemblyFileVersion = "5.175.0"; - internal const System.String AssemblyInformationalVersion = "5.175.0"; + internal const System.String AssemblyVersion = "5.175.1"; + internal const System.String AssemblyFileVersion = "5.175.1"; + internal const System.String AssemblyInformationalVersion = "5.175.1"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index 3ca0db9a8c..fb15fd02aa 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.175.0" - let [] AssemblyFileVersion = "5.175.0" - let [] AssemblyInformationalVersion = "5.175.0" + let [] AssemblyVersion = "5.175.1" + let [] AssemblyFileVersion = "5.175.1" + let [] AssemblyInformationalVersion = "5.175.1" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index 28e4e60e3e..0b08b3bfd8 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.175.0" - let [] AssemblyFileVersion = "5.175.0" - let [] AssemblyInformationalVersion = "5.175.0" + let [] AssemblyVersion = "5.175.1" + let [] AssemblyFileVersion = "5.175.1" + let [] AssemblyInformationalVersion = "5.175.1" From f215cf03f55235f2e78c0d75d3dba782b2794a7f Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Mon, 30 Jul 2018 10:42:00 +0200 Subject: [PATCH 77/86] RELEASE_NOTES --- RELEASE_NOTES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 69f143149e..9f6046113e 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,4 +1,4 @@ -#### 5.175.1 - 2018-07-30 +#### 5.175.2 - 2018-07-30 * BUGFIX: Revert impact of https://github.com/dotnet/corefx/issues/31098 by using WinHttpHandler - https://github.com/fsprojects/Paket/pull/3307 #### 5.175.0 - 2018-07-30 From c7fe132b52d606e4a5a4c875d642115342de740e Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Mon, 30 Jul 2018 10:46:41 +0200 Subject: [PATCH 78/86] Bump version to 5.175.2 --- src/Paket.Bootstrapper/Properties/AssemblyInfo.cs | 12 ++++++------ src/Paket.Core/AssemblyInfo.fs | 12 ++++++------ src/Paket/AssemblyInfo.fs | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index 6c4785d351..2d3e88b147 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.175.1")] -[assembly: AssemblyFileVersionAttribute("5.175.1")] -[assembly: AssemblyInformationalVersionAttribute("5.175.1")] +[assembly: AssemblyVersionAttribute("5.175.2")] +[assembly: AssemblyFileVersionAttribute("5.175.2")] +[assembly: AssemblyInformationalVersionAttribute("5.175.2")] 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.175.1"; - internal const System.String AssemblyFileVersion = "5.175.1"; - internal const System.String AssemblyInformationalVersion = "5.175.1"; + internal const System.String AssemblyVersion = "5.175.2"; + internal const System.String AssemblyFileVersion = "5.175.2"; + internal const System.String AssemblyInformationalVersion = "5.175.2"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index fb15fd02aa..7c4f00f2bb 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.175.1" - let [] AssemblyFileVersion = "5.175.1" - let [] AssemblyInformationalVersion = "5.175.1" + let [] AssemblyVersion = "5.175.2" + let [] AssemblyFileVersion = "5.175.2" + let [] AssemblyInformationalVersion = "5.175.2" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index 0b08b3bfd8..9ae5b9472d 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.175.1" - let [] AssemblyFileVersion = "5.175.1" - let [] AssemblyInformationalVersion = "5.175.1" + let [] AssemblyVersion = "5.175.2" + let [] AssemblyFileVersion = "5.175.2" + let [] AssemblyInformationalVersion = "5.175.2" From f8c9d87e6dec1cf433ed730453c77eb26031f23d Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Thu, 26 Jul 2018 19:00:02 +0200 Subject: [PATCH 79/86] add test --- .../Paket.IntegrationTests/PackSpecs.fs | 36 +++++++++++++++++++ .../before/MyProj.Common/Class1.cs | 8 +++++ .../before/MyProj.Common/MyProj.Common.csproj | 7 ++++ .../before/MyProj.Common/paket.references | 6 ++++ .../before/MyProj.Common/paket.template | 11 ++++++ .../before/MyProj.Main/Class1.cs | 8 +++++ .../before/MyProj.Main/MyProj.Main.csproj | 10 ++++++ .../before/MyProj.Main/paket.references | 6 ++++ .../before/MyProj.Main/paket.template | 11 ++++++ .../before/paket.dependencies | 14 ++++++++ .../before/paket.lock | 36 +++++++++++++++++++ 11 files changed, 153 insertions(+) create mode 100644 integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Common/Class1.cs create mode 100644 integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Common/MyProj.Common.csproj create mode 100644 integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Common/paket.references create mode 100644 integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Common/paket.template create mode 100644 integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Main/Class1.cs create mode 100644 integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Main/MyProj.Main.csproj create mode 100644 integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Main/paket.references create mode 100644 integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Main/paket.template create mode 100644 integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/paket.dependencies create mode 100644 integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/paket.lock diff --git a/integrationtests/Paket.IntegrationTests/PackSpecs.fs b/integrationtests/Paket.IntegrationTests/PackSpecs.fs index 550feb2e93..9f75f18756 100644 --- a/integrationtests/Paket.IntegrationTests/PackSpecs.fs +++ b/integrationtests/Paket.IntegrationTests/PackSpecs.fs @@ -9,6 +9,7 @@ open System.IO.Compression open Paket.Domain open Paket open Paket.NuGetCache +open Paket.Requirements let getDependencies(x:Paket.NuGet.NuGetPackageCache) = x.GetDependencies() @@ -583,6 +584,41 @@ let ``#3164 pack analyzer`` () = CleanDir rootPath + +[] +let ``#3165 pack multitarget with p2p`` () = + let scenario = "i003165-pack-multitarget-with-p2p" + prepareSdk scenario + let rootPath = scenarioTempPath scenario + + directDotnet true "build MyProj.Main -c Release" rootPath + |> Seq.iter (printfn "%A") + + let outPath = Path.Combine(rootPath, "out") + directPaket (sprintf """pack "%s" """ outPath) scenario + |> Seq.iter (printfn "%A") + + let nupkgPath = Path.Combine(outPath, "MyProj.Main.1.0.0.nupkg") + + if File.Exists nupkgPath |> not then Assert.Fail(sprintf "Expected '%s' to exist" nupkgPath) + let nuspec = NuGetLocal.getNuSpecFromNupgk nupkgPath + let depsByTfm byTfm = nuspec.Dependencies.Value |> Seq.choose (fun (pkgName,version,tfm) -> if (tfm.GetExplicitRestriction()) = byTfm then Some (pkgName,version) else None) |> Seq.toList + let pkgVer name version = (PackageName name), (VersionRequirement.Parse version) + + let tfmNET45 = FrameworkIdentifier.DotNetFramework(FrameworkVersion.V4_5) + CollectionAssert.AreEquivalent([ pkgVer "FSharp.Core" "3.1.2.5"; pkgVer "Argu" "4.2.1" ], depsByTfm (FrameworkRestriction.AtLeast(tfmNET45))) + + let tfmNETSTANDARD2_0 = FrameworkIdentifier.DotNetStandard(DotNetStandardVersion.V2_0) + CollectionAssert.AreEquivalent([ pkgVer "FSharp.Core" "4.5.1"; pkgVer "Argu" "5.1.0" ], depsByTfm (FrameworkRestriction.And [FrameworkRestriction.NotAtLeast(tfmNET45); FrameworkRestriction.AtLeast(tfmNETSTANDARD2_0)])) + + CollectionAssert.AreEquivalent([ pkgVer "MyProj.Common" "1.0.0" ], depsByTfm (FrameworkRestriction.Or [FrameworkRestriction.AtLeast(tfmNET45); FrameworkRestriction.AtLeast(tfmNETSTANDARD2_0)])) + + let unzippedNupkgPath = Path.Combine(outPath, "MyProj.Main") + ZipFile.ExtractToDirectory(nupkgPath, unzippedNupkgPath) + Path.Combine(unzippedNupkgPath, "lib", "net45", "MyProj.Main.dll") |> checkFileExists + Path.Combine(unzippedNupkgPath, "lib", "netstandard2.0", "MyProj.Main.dll") |> checkFileExists + + CleanDir rootPath [] [] diff --git a/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Common/Class1.cs b/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Common/Class1.cs new file mode 100644 index 0000000000..a196336c02 --- /dev/null +++ b/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Common/Class1.cs @@ -0,0 +1,8 @@ +using System; + +namespace MyProj.Common +{ + public class Class1 + { + } +} diff --git a/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Common/MyProj.Common.csproj b/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Common/MyProj.Common.csproj new file mode 100644 index 0000000000..79d8302f5e --- /dev/null +++ b/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Common/MyProj.Common.csproj @@ -0,0 +1,7 @@ + + + + netstandard2.0;net45 + + + \ No newline at end of file diff --git a/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Common/paket.references b/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Common/paket.references new file mode 100644 index 0000000000..3387a0ea2b --- /dev/null +++ b/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Common/paket.references @@ -0,0 +1,6 @@ +FSharp.Core +Suave + +group NetStandard + FSharp.Core + Suave diff --git a/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Common/paket.template b/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Common/paket.template new file mode 100644 index 0000000000..9b286d796f --- /dev/null +++ b/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Common/paket.template @@ -0,0 +1,11 @@ +type project +dependencies + framework: net45 + FSharp.Core >= LOCKEDVERSION + Suave >= LOCKEDVERSION + framework: netstandard2.0 + FSharp.Core >= LOCKEDVERSION-NetStandard + Suave >= LOCKEDVERSION-NetStandard +files + bin/Release/net45/MyProj.Common.dll ==> lib/net45 + bin/Release/netstandard2.0/MyProj.Common.dll ==> lib/netstandard2.0 diff --git a/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Main/Class1.cs b/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Main/Class1.cs new file mode 100644 index 0000000000..9a1729f132 --- /dev/null +++ b/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Main/Class1.cs @@ -0,0 +1,8 @@ +using System; + +namespace MyProj.Main +{ + public class Class1 + { + } +} diff --git a/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Main/MyProj.Main.csproj b/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Main/MyProj.Main.csproj new file mode 100644 index 0000000000..a3fa2eb35e --- /dev/null +++ b/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Main/MyProj.Main.csproj @@ -0,0 +1,10 @@ + + + + netstandard2.0;net45 + + + + + + \ No newline at end of file diff --git a/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Main/paket.references b/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Main/paket.references new file mode 100644 index 0000000000..d619cfd322 --- /dev/null +++ b/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Main/paket.references @@ -0,0 +1,6 @@ +FSharp.Core +Argu + +group NetStandard + FSharp.Core + Argu diff --git a/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Main/paket.template b/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Main/paket.template new file mode 100644 index 0000000000..2505f7f41d --- /dev/null +++ b/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/MyProj.Main/paket.template @@ -0,0 +1,11 @@ +type project +dependencies + framework: net45 + FSharp.Core >= LOCKEDVERSION + Argu >= LOCKEDVERSION + framework: netstandard2.0 + FSharp.Core >= LOCKEDVERSION-NetStandard + Argu >= LOCKEDVERSION-NetStandard +files + bin/Release/net45/MyProj.Main.dll ==> lib/net45 + bin/Release/netstandard2.0/MyProj.Main.dll ==> lib/netstandard2.0 diff --git a/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/paket.dependencies b/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/paket.dependencies new file mode 100644 index 0000000000..28b79a2f33 --- /dev/null +++ b/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/paket.dependencies @@ -0,0 +1,14 @@ +source https://www.nuget.org/api/v2 +framework: >= net45 + +nuget FSharp.Core >= 3.1.2.5 lowest_matching: true +nuget Suave +nuget Argu + +group NetStandard +source https://www.nuget.org/api/v2 +framework: netstandard2.0 + +nuget Suave +nuget FSharp.Core +nuget Argu diff --git a/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/paket.lock b/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/paket.lock new file mode 100644 index 0000000000..fc82b184f0 --- /dev/null +++ b/integrationtests/scenarios/i003165-pack-multitarget-with-p2p/before/paket.lock @@ -0,0 +1,36 @@ +RESTRICTION: >= net45 +NUGET + remote: https://www.nuget.org/api/v2 + Argu (4.2.1) + FSharp.Core (>= 3.1.2) + FSharp.Core (3.1.2.5) + Suave (1.1.3) + FSharp.Core (>= 3.1.2.5) + +GROUP NetStandard +RESTRICTION: == netstandard2.0 +NUGET + remote: https://www.nuget.org/api/v2 + Argu (5.1) + FSharp.Core (>= 4.3.2) + System.Configuration.ConfigurationManager (>= 4.4) + FSharp.Core (4.5.1) + Suave (2.4.3) + FSharp.Core (>= 4.0 < 5.0) + System.Buffers (4.5) + System.Configuration.ConfigurationManager (4.5) + System.Security.Cryptography.ProtectedData (>= 4.5) + System.Security.Permissions (>= 4.5) + System.Memory (4.5.1) + System.Buffers (>= 4.4) + System.Numerics.Vectors (>= 4.4) + System.Runtime.CompilerServices.Unsafe (>= 4.5) + System.Numerics.Vectors (4.5) + System.Runtime.CompilerServices.Unsafe (4.5.1) + System.Security.AccessControl (4.5) + System.Security.Principal.Windows (>= 4.5) + System.Security.Cryptography.ProtectedData (4.5) + System.Memory (>= 4.5) + System.Security.Permissions (4.5) + System.Security.AccessControl (>= 4.5) + System.Security.Principal.Windows (4.5) From b62de5d2f8931ecc11f5b1c309ba7a21f21318e9 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Mon, 30 Jul 2018 14:47:48 +0200 Subject: [PATCH 80/86] add p2p package dependencies to each nuspec dependency group --- src/Paket.Core/Packaging/PackageMetaData.fs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Paket.Core/Packaging/PackageMetaData.fs b/src/Paket.Core/Packaging/PackageMetaData.fs index 44408a06f1..8c8515ee70 100644 --- a/src/Paket.Core/Packaging/PackageMetaData.fs +++ b/src/Paket.Core/Packaging/PackageMetaData.fs @@ -131,8 +131,14 @@ let addDependency (templateFile : TemplateFile) (dependency : PackageName * Vers |> Option.isSome) |> function | Some _ -> opt.DependencyGroups - | None -> dependency |> addDependencyToFrameworkGroup None opt.DependencyGroups - + | None -> + match opt.DependencyGroups |> List.map (fun { Framework = tfm } -> tfm) with + | [] -> + dependency |> addDependencyToFrameworkGroup None opt.DependencyGroups + | tfms -> + // add to all dependency groups + (opt.DependencyGroups, tfms) + ||> List.fold (fun groups tfm -> dependency |> addDependencyToFrameworkGroup tfm groups) { FileName = templateFile.FileName Contents = CompleteInfo(core, { opt with DependencyGroups = newDeps }) } From ed259cdf98d2105edc11b0b3d35b6342dc4049da Mon Sep 17 00:00:00 2001 From: Christian Steinert Date: Tue, 31 Jul 2018 14:16:42 +0200 Subject: [PATCH 81/86] Removes faulty creation of directories during generate-load-scripts. --- src/Paket.Core/PublicAPI.fs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Paket.Core/PublicAPI.fs b/src/Paket.Core/PublicAPI.fs index 3c6de733ed..51b8624e3c 100644 --- a/src/Paket.Core/PublicAPI.fs +++ b/src/Paket.Core/PublicAPI.fs @@ -300,8 +300,6 @@ type Dependencies(dependenciesFileName: string) = let scriptPath = Path.Combine (rootDir.FullName , sd.PartialPath) if verbose then verbosefn "scriptpath - %s" scriptPath - let scriptDir = Path.GetDirectoryName scriptPath |> Path.GetFullPath |> DirectoryInfo - scriptDir.Create() if verbose then verbosefn "created - '%s'" (Path.Combine(rootDir.FullName , sd.PartialPath)) sd.Save rootDir From 420a6f5d3c7a0aafb8a9e350b0514bf88c8b4713 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Tue, 31 Jul 2018 16:31:16 +0200 Subject: [PATCH 82/86] Release Notes --- RELEASE_NOTES.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 9f6046113e..e9b3bae13f 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,4 +1,5 @@ -#### 5.175.2 - 2018-07-30 +#### 5.176.0 - 2018-07-31 +* paket pack with p2p dependencies and multitargeting - https://github.com/fsprojects/Paket/pull/3317 * BUGFIX: Revert impact of https://github.com/dotnet/corefx/issues/31098 by using WinHttpHandler - https://github.com/fsprojects/Paket/pull/3307 #### 5.175.0 - 2018-07-30 From a492f91d60cbbec20fe1a85b82f730519a7a6e38 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Tue, 31 Jul 2018 16:43:29 +0200 Subject: [PATCH 83/86] Bump version to 5.176.0 --- .ionide/symbolCache.db | Bin 0 -> 8192 bytes .../Properties/AssemblyInfo.cs | 12 ++++++------ src/Paket.Core/AssemblyInfo.fs | 12 ++++++------ src/Paket/AssemblyInfo.fs | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 .ionide/symbolCache.db diff --git a/.ionide/symbolCache.db b/.ionide/symbolCache.db new file mode 100644 index 0000000000000000000000000000000000000000..6e6e54fe0e51412bcb616d4ea824ce7a8a683050 GIT binary patch literal 8192 zcmeI#&r8EF6bJBR2!b&1=3yRkR1iJ*57=!P6w0Qy2d~-8FpxB*eFb;-;Gg5a;(ui7 zHvGZbT|CM6(Gt@4l0H5;CA~`wX|eRBQzWk0G2@)w2*DWR;q8TY8_oP+I|*Ym-xr)+ zp1$=%74N^Z@E{-n0SG_<0uX=z1Rwwb2teSk1YR!q;mKgYU$02btxi{N?rpUhdZT+8 zWm06(Fp*;O@vMI&zQx2?JylMNOg>~6KXWOmk`j|^5l?sKM&8yg-;tI1W6QdbX*ZfRkd&5v8f70i>K6j zid|u~)A@RX&L7<>B3*X3oUMwsZr6u1sjY22jL)NOy0dE4T@+V|Unsln_v=v4o4a|q c^dleu0SG_<0uX=z1Rwwb2tWV=5ctOeACVWC&Hw-a literal 0 HcmV?d00001 diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index 2d3e88b147..3dff471376 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.175.2")] -[assembly: AssemblyFileVersionAttribute("5.175.2")] -[assembly: AssemblyInformationalVersionAttribute("5.175.2")] +[assembly: AssemblyVersionAttribute("5.176.0")] +[assembly: AssemblyFileVersionAttribute("5.176.0")] +[assembly: AssemblyInformationalVersionAttribute("5.176.0")] 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.175.2"; - internal const System.String AssemblyFileVersion = "5.175.2"; - internal const System.String AssemblyInformationalVersion = "5.175.2"; + internal const System.String AssemblyVersion = "5.176.0"; + internal const System.String AssemblyFileVersion = "5.176.0"; + internal const System.String AssemblyInformationalVersion = "5.176.0"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index 7c4f00f2bb..8b16675e96 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.175.2" - let [] AssemblyFileVersion = "5.175.2" - let [] AssemblyInformationalVersion = "5.175.2" + let [] AssemblyVersion = "5.176.0" + let [] AssemblyFileVersion = "5.176.0" + let [] AssemblyInformationalVersion = "5.176.0" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index 9ae5b9472d..64f2fd3827 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.175.2" - let [] AssemblyFileVersion = "5.175.2" - let [] AssemblyInformationalVersion = "5.175.2" + let [] AssemblyVersion = "5.176.0" + let [] AssemblyFileVersion = "5.176.0" + let [] AssemblyInformationalVersion = "5.176.0" From 92b7e73171e02a7c007fd1d32d998ac494b35dc4 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Thu, 2 Aug 2018 11:21:15 +0200 Subject: [PATCH 84/86] Release Notes --- RELEASE_NOTES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index e9b3bae13f..db54c0b639 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,6 @@ +#### 5.176.1 - 2018-08-02 +* BUGFIX: Removed faulty creation of directories during `generate-load-scripts` - https://github.com/fsprojects/Paket/pull/3319 + #### 5.176.0 - 2018-07-31 * paket pack with p2p dependencies and multitargeting - https://github.com/fsprojects/Paket/pull/3317 * BUGFIX: Revert impact of https://github.com/dotnet/corefx/issues/31098 by using WinHttpHandler - https://github.com/fsprojects/Paket/pull/3307 From 38b50c108db386cbd64bd6d84bf54508b560869f Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Thu, 2 Aug 2018 11:33:01 +0200 Subject: [PATCH 85/86] Bump version to 5.176.1 --- src/Paket.Bootstrapper/Properties/AssemblyInfo.cs | 12 ++++++------ src/Paket.Core/AssemblyInfo.fs | 12 ++++++------ src/Paket/AssemblyInfo.fs | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index 3dff471376..7152764dbc 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.176.0")] -[assembly: AssemblyFileVersionAttribute("5.176.0")] -[assembly: AssemblyInformationalVersionAttribute("5.176.0")] +[assembly: AssemblyVersionAttribute("5.176.1")] +[assembly: AssemblyFileVersionAttribute("5.176.1")] +[assembly: AssemblyInformationalVersionAttribute("5.176.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.176.0"; - internal const System.String AssemblyFileVersion = "5.176.0"; - internal const System.String AssemblyInformationalVersion = "5.176.0"; + internal const System.String AssemblyVersion = "5.176.1"; + internal const System.String AssemblyFileVersion = "5.176.1"; + internal const System.String AssemblyInformationalVersion = "5.176.1"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index 8b16675e96..4f20ebc26b 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.176.0" - let [] AssemblyFileVersion = "5.176.0" - let [] AssemblyInformationalVersion = "5.176.0" + let [] AssemblyVersion = "5.176.1" + let [] AssemblyFileVersion = "5.176.1" + let [] AssemblyInformationalVersion = "5.176.1" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index 64f2fd3827..2e49504b45 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.176.0" - let [] AssemblyFileVersion = "5.176.0" - let [] AssemblyInformationalVersion = "5.176.0" + let [] AssemblyVersion = "5.176.1" + let [] AssemblyFileVersion = "5.176.1" + let [] AssemblyInformationalVersion = "5.176.1" From 3caa86b764af72167fd86b4266d09fd73db6549e Mon Sep 17 00:00:00 2001 From: Matthias Dittrich Date: Fri, 3 Aug 2018 18:34:49 +0200 Subject: [PATCH 86/86] Update storage setting I don't think the option can be considered beta anymore, additionally the default was not documented very well (but that piece is relevant because the default differs for FAKE 5) --- docs/content/dependencies-file.md | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/docs/content/dependencies-file.md b/docs/content/dependencies-file.md index 5a21998c91..f0b2920475 100644 --- a/docs/content/dependencies-file.md +++ b/docs/content/dependencies-file.md @@ -202,13 +202,13 @@ the Paket team noticed a dramatic increase of the well known "packages" folder. Historically one way was to tell Paket that you only want to compile for `framework: net45`. However, this doesn't prevent netstandard dependencies in all situations. On the other side more features are provided by Paket and the packages folder has become more and more redundant: + - Load scripts can reference the files in the global cache - csproj/fsproj files can references files in the global cache - netcore project files don't require any explicit dll-references + Therefore, the paket team decided to make the "packages" folder opt-out. -> This feature is currently considered beta - You can opt-out of generating the `packages` folder by using the `storage` option: ```paket @@ -219,8 +219,13 @@ source https://nuget.org/api/v2 nuget jQuery ``` -The storage option may be overriden by packages. -However, the behavior is undefined and may change (please open an issue if you depend on the current behavior or we break you). +The option may be overriden by packages. However, the behavior is undefined and may change (please open an issue if you depend on the current behavior or we break you). + +The storage option has three values: + +- `storage: packages` (the default, relevant for FAKE 5 where the default for inline-dependencies is `storage: none`) +- `storage: none` disable the packages folder and use the global NuGet cache (default in FAKE 5 inline-dependencies) +- `storage: symlink` use the packages folder but use symlinks instead of physical files ```paket // make a symlink instead copy the packages.