File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1- #### 3.26.2 - 03.11.2016
1+ #### 3.26.3 - 03.11.2016
22* BUGFIX: Paket doesn't reference libs for UWP apps - https://github.com/fsprojects/Paket/issues/2001
33
44#### 3.26.1 - 03.11.2016
Original file line number Diff line number Diff line change @@ -63,7 +63,6 @@ let gitRaw = environVarOrDefault "gitRaw" "https://raw.github.com/fsprojects"
6363
6464
6565let dotnetcliVersion = " 1.0.0-preview3-004031"
66-
6766let dotnetPath = DirectoryInfo " ./dotnetcore"
6867
6968// --------------------------------------------------------------------------------------
@@ -123,7 +122,11 @@ Target "AssemblyInfo" (fun _ ->
123122 csProjs |> Seq.iter genCSAssemblyInfo
124123)
125124
126- let dotnetExePath = if isWindows then " dotnetcore/dotnet.exe" else " dotnetcore/dotnet" |> FullName
125+ let dotnetExePath =
126+ // TODO: if isWindows then "dotnetcore/dotnet.exe" else "dotnetcore/dotnet" |> FullName
127+ match tryFindFileOnPath ( if isWindows then " dotnet.exe" else " dotnet" ) with
128+ | Some p -> p
129+ | None -> " "
127130
128131Target " InstallDotNetCore" ( fun _ ->
129132 let correctVersionInstalled =
Original file line number Diff line number Diff line change @@ -96,7 +96,7 @@ type UAPVersion =
9696 | V10
9797 override this.ToString () =
9898 match this with
99- | V10 -> " 10.0.14393.0 "
99+ | V10 -> " 10.0"
100100
101101
102102[<RequireQualifiedAccess>]
Original file line number Diff line number Diff line change @@ -181,7 +181,7 @@ let getTargetCondition (target:TargetProfile) =
181181 | MonoTouch -> " $(TargetFrameworkIdentifier) == 'MonoTouch'" , " "
182182 | MonoMac -> " $(TargetFrameworkIdentifier) == 'MonoMac'" , " "
183183 | XamariniOS -> " $(TargetFrameworkIdentifier) == 'Xamarin.iOS'" , " "
184- | UAP( version) -> " $(TargetPlatformIdentifier) == 'UAP'" , sprintf " $(TargetPlatformVersion) == '%O '" version
184+ | UAP( version) -> " $(TargetPlatformIdentifier) == 'UAP'" , sprintf " $(TargetPlatformVersion.StartsWith( '%O ')) " version
185185 | XamarinMac -> " $(TargetFrameworkIdentifier) == 'Xamarin.Mac'" , " "
186186 | Native( " " , " " ) -> " true" , " "
187187 | Native( " " , bits) -> ( sprintf " '$(Platform)'=='%s '" bits), " "
You can’t perform that action at this time.
0 commit comments