diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 50f1b350d9..952f058f78 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,4 +1,5 @@ -#### 7.0.0-alpha018 - 2022-12-17 +#### 7.0.0-alpha019 - 2022-12-20 +* Support for .NET 7.0 * Support as .NET 6.0 tool * Auto-Restore after paket install an paket update diff --git a/src/Paket.Core/Dependencies/NuGetCache.fs b/src/Paket.Core/Dependencies/NuGetCache.fs index 2c39984d35..25dbd94506 100644 --- a/src/Paket.Core/Dependencies/NuGetCache.fs +++ b/src/Paket.Core/Dependencies/NuGetCache.fs @@ -124,7 +124,7 @@ type NuGetPackageCache = Version: string CacheVersion: string } - static member CurrentCacheVersion = "5.226" + static member CurrentCacheVersion = "7.0" member this.WithDependencies (dependencies : (PackageName * VersionRequirement * FrameworkRestrictions) list) = { this with diff --git a/src/Paket.Core/Versioning/FrameworkHandling.fs b/src/Paket.Core/Versioning/FrameworkHandling.fs index eadfb48077..d49a4e759d 100644 --- a/src/Paket.Core/Versioning/FrameworkHandling.fs +++ b/src/Paket.Core/Versioning/FrameworkHandling.fs @@ -193,11 +193,11 @@ type Net7Os = static member TryParse (s:string) = [ - ("android",Net6Os.Android) - ("ios",Net6Os.IOs) - ("macos",Net6Os.MacOs) - ("tvos",Net6Os.TvOs) - ("watchos",Net6Os.WatchOs) + ("android",Net7Os.Android) + ("ios",Net7Os.IOs) + ("macos",Net7Os.MacOs) + ("tvos",Net7Os.TvOs) + ("watchos",Net7Os.WatchOs) ] |> Seq.tryFind(fun (k,_) -> s.StartsWith k) |> Option.map snd @@ -1073,8 +1073,10 @@ module FrameworkDetection = | "net35-Unity Full v3.5" -> Some (DotNetUnity DotNetUnityVersion.V3_5_Full) | MatchNetXDashWindows 5 Net5WindowsVersion.TryParse fm -> Some (DotNet5Windows fm) | MatchNetXDashWindows 6 Net6WindowsVersion.TryParse fm -> Some (DotNet6Windows fm) + | MatchNetXDashWindows 7 Net7WindowsVersion.TryParse fm -> Some (DotNet7Windows fm) | MatchNetXDashOs 5 Net5Os.TryParse fm -> Some (DotNet5WithOs fm) | MatchNetXDashOs 6 Net6Os.TryParse fm -> Some (DotNet6WithOs fm) + | MatchNetXDashOs 7 Net7Os.TryParse fm -> Some (DotNet7WithOs fm) | ModifyMatchTfm skipFullAndClient "net" FrameworkVersion.TryParse fm -> Some (DotNetFramework fm) // Backwards compat quirk (2017-08-20). | "uap101" -> Some (UAP UAPVersion.V10_1) diff --git a/src/Paket.Core/Versioning/PlatformMatching.fs b/src/Paket.Core/Versioning/PlatformMatching.fs index 701ec70652..62b96381aa 100644 --- a/src/Paket.Core/Versioning/PlatformMatching.fs +++ b/src/Paket.Core/Versioning/PlatformMatching.fs @@ -217,6 +217,9 @@ let getTargetCondition (target:TargetProfile) = | DotNetFramework(FrameworkVersion.V6) ->"$(TargetFrameworkIdentifier) == '.NETCoreApp'", "$(TargetFrameworkVersion) == 'v6.0'" | DotNetFramework(FrameworkVersion.V5) ->"$(TargetFrameworkIdentifier) == '.NETCoreApp'", "$(TargetFrameworkVersion) == 'v5.0'" | DotNetFramework(version) ->"$(TargetFrameworkIdentifier) == '.NETFramework'", sprintf "$(TargetFrameworkVersion) == '%O'" version + | DotNet7WithOs(os) ->"$(TargetFrameworkIdentifier) == '.NETCoreApp'", sprintf "($(TargetFrameworkVersion) == 'v7.0' And '$(TargetPlatformIdentifier)' == '%O')" os + | DotNet7Windows(Net7WindowsVersion.V7_0) ->"$(TargetFrameworkIdentifier) == '.NETCoreApp'", sprintf "($(TargetFrameworkVersion) == 'v7.0' And '$(TargetPlatformIdentifier)' == 'Windows')" + | DotNet7Windows(version) ->"$(TargetFrameworkIdentifier) == '.NETCoreApp'", sprintf "($(TargetFrameworkVersion) == 'v7.0' And '$(TargetPlatformIdentifier)' == 'Windows' And '$(TargetPlatformVersion)' == '%O')" version | DotNet6WithOs(os) ->"$(TargetFrameworkIdentifier) == '.NETCoreApp'", sprintf "($(TargetFrameworkVersion) == 'v6.0' And '$(TargetPlatformIdentifier)' == '%O')" os | DotNet6Windows(Net6WindowsVersion.V7_0) ->"$(TargetFrameworkIdentifier) == '.NETCoreApp'", sprintf "($(TargetFrameworkVersion) == 'v6.0' And '$(TargetPlatformIdentifier)' == 'Windows')" | DotNet6Windows(version) ->"$(TargetFrameworkIdentifier) == '.NETCoreApp'", sprintf "($(TargetFrameworkVersion) == 'v6.0' And '$(TargetPlatformIdentifier)' == 'Windows' And '$(TargetPlatformVersion)' == '%O')" version diff --git a/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs.actual.xml b/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs.actual.xml index e09e505509..c6c96a9ca6 100644 --- a/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs.actual.xml +++ b/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs.actual.xml @@ -24,7 +24,7 @@ - + ..\..\..\Rx-XAML\lib\portable-win81+wpa81\System.Reactive.Windows.Threading.dll diff --git a/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs.expected.xml b/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs.expected.xml index 96a4ed3ffc..c6c96a9ca6 100644 --- a/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs.expected.xml +++ b/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs.expected.xml @@ -1,77 +1,78 @@ + - - - - True - - - ..\..\..\Rx-XAML\lib\net40\System.Reactive.Windows.Threading.dll - True - True - - - - - - - True - - - ..\..\..\Rx-XAML\lib\net45\System.Reactive.Windows.Threading.dll - True - True - - - - - - - ..\..\..\Rx-XAML\lib\portable-win81+wpa81\System.Reactive.Windows.Threading.dll - True - True - - - - - - - True - - - ..\..\..\Rx-XAML\lib\sl5\System.Reactive.Windows.Threading.dll - True - True - - - - - - - ..\..\..\Rx-XAML\lib\windows8\System.Reactive.Windows.Threading.dll - True - True - - - - - - - True - - - ..\..\..\Rx-XAML\lib\windowsphone71\System.Reactive.Windows.Threading.dll - True - True - - - - - - - ..\..\..\Rx-XAML\lib\windowsphone8\System.Reactive.Windows.Threading.dll - True - True - - - + + + + True + + + ..\..\..\Rx-XAML\lib\net40\System.Reactive.Windows.Threading.dll + True + True + + + + + + + True + + + ..\..\..\Rx-XAML\lib\net45\System.Reactive.Windows.Threading.dll + True + True + + + + + + + ..\..\..\Rx-XAML\lib\portable-win81+wpa81\System.Reactive.Windows.Threading.dll + True + True + + + + + + + True + + + ..\..\..\Rx-XAML\lib\sl5\System.Reactive.Windows.Threading.dll + True + True + + + + + + + ..\..\..\Rx-XAML\lib\windows8\System.Reactive.Windows.Threading.dll + True + True + + + + + + + True + + + ..\..\..\Rx-XAML\lib\windowsphone71\System.Reactive.Windows.Threading.dll + True + True + + + + + + + ..\..\..\Rx-XAML\lib\windowsphone8\System.Reactive.Windows.Threading.dll + True + True + + + \ No newline at end of file