WIP Fix dotnetcore #2256
Closed
WIP Fix dotnetcore #2256
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… parsing logic simpler in future steps.
matthid
commented
Apr 19, 2017
src/Paket.Core/InstallModel.fs
Outdated
| if List.isEmpty installModel.CompileLibFolders then | ||
| // TODO: Ask forki about this wtf | ||
| let folders = calcLegacyReferenceLibFolders [{ FullPath ="lib/Default.dll"; PathWithinPackage = "lib/Default.dll" }] | ||
| { installModel with CompileLibFolders = folders } |
|
Urgs. I have no memory about that shit
Am 19.04.2017 12:25 schrieb "Matthias Dittrich" <[email protected]>:
… ***@***.**** commented on this pull request.
------------------------------
In src/Paket.Core/InstallModel.fs
<#2256 (comment)>:
> |> List.exists (fun t -> t >= min && t < max && t.IsSameCategoryAs(min)))
-
- let model =
- if List.isEmpty installModel.LegacyReferenceFileFolders then
- let folders = calcLibFolders installModel.PackageName ["lib/Default.dll"]
- { installModel with LegacyReferenceFileFolders = folders }
+
+ let model =
+ if List.isEmpty installModel.CompileLibFolders then
+ // TODO: Ask forki about this wtf
+ let folders = calcLegacyReferenceLibFolders [{ FullPath ="lib/Default.dll"; PathWithinPackage = "lib/Default.dll" }]
+ { installModel with CompileLibFolders = folders }
@forki <https://github.com/forki> ...
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#2256 (review)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AADgNA8ZaBzJJNm3VQTneVJfFcOi0KT7ks5rxeD-gaJpZM4NAUiv>
.
|
…uns the integration test suite
[WIP] Project Organization
Redirect order integration test
matthid
commented
Apr 23, 2017
| let path = Path.Combine(dir.FullName.ToLower(), subFolderName) | ||
| if dir.Exists then | ||
| dir.GetDirectories() | ||
| |> Array.filter (fun fi -> String.equalsIgnoreCase fi.FullName path) | ||
| |> Array.collect (fun dir -> dir.GetFiles(searchPattern, SearchOption.AllDirectories)) | ||
| |> Array.map (fun file -> | ||
| let fullPath = Path.GetFullPath file.FullName; |
matthid
commented
Apr 23, 2017
| Install Settings\n\ | ||
| %A" self.Name deps self.Source self.Settings | ||
| "%A\nDependencies -\n%s\nSource - %A\nInstall Settings\n%A" | ||
| self.Name deps self.Source self.Settings |
There was a problem hiding this comment.
Did you change this because the tooling is struggling with it :P
There was a problem hiding this comment.
yea it's the stupid error because of the backslash at the end of the line
matthid
commented
Apr 23, 2017
| member this.RemoveIfCompletelyEmpty() = InstallModel.removeIfCompletelyEmpty this | ||
|
|
||
| static member CreateFromLibs(packageName, packageVersion, frameworkRestrictions:FrameworkRestriction list, libs : UnparsedPackageFile seq, targetsFiles, analyzerFiles, nuspec : Nuspec) = | ||
| InstallModel.createFromLibs packageName packageVersion frameworkRestrictions libs targetsFiles analyzerFiles nuspec |
There was a problem hiding this comment.
Wow not even git recognizes that this file existed before and thinks it was deleted and added again :)
matthid
commented
Apr 23, 2017
| dep.SetAttributeValue(XName.Get "version", "0.0") | ||
| else | ||
| dep.SetAttributeValue(XName.Get "version", version) | ||
| dep |
There was a problem hiding this comment.
I hand-crafted @forki's fix in here because git wouldn't recognize this file anymore :)
|
@matthid I think you can close this in lieu of #2267 at this point |
|
Ok, let me include and test the appveyor package on fake... |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Same as #2252 but from within the fsprojects Repository to improve collaboration with @cloudRoutine.
This should remove various hacks added over the time when I was kind of offline.
TODO:
Breaks:
/Lib/...is lo longer supported (folder in nuget package needs to be/lib/...Currently runtime support is removed (see above)Adds:
InstallModelcan properly resolve reference and runtime assemblies (required in FAKE vNext for compilation and running of scripts)