Skip to content

Commit

Permalink
add netcoreapp3.1 to frameworkPreference table
Browse files Browse the repository at this point in the history
  • Loading branch information
Yatao Li committed Feb 5, 2020
1 parent c3d19cf commit 78b595d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion src/ProjectCracker/ProjectCracker.fs
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ type private TFM =

match tfm with
| FX(INT ver) -> let ver = if ver < 100 then ver * 10 else ver
NetFX(ver)
in NetFX(ver)
| COREAPP(FL ver) -> NetCoreApp(int <| ver*100.0)
| STD(FL ver) -> NetStandard(int <| ver*100.0)
| _ -> Other
Expand Down Expand Up @@ -145,6 +145,7 @@ let private dotnetPackFolders =
dprintfn "dotnet pack folders: %A" dotnetPackFolders

let private frameworkPreference = [
"netcoreapp3.1", ".NETCoreApp,Version=v3.1";
"netcoreapp3.0", ".NETCoreApp,Version=v3.0";
"netcoreapp2.2", ".NETCoreApp,Version=v2.2";
"netcoreapp2.1", ".NETCoreApp,Version=v2.1";
Expand Down Expand Up @@ -623,6 +624,8 @@ let private parseProjectAssets(projectAssetsJson: FileInfo): ProjectAssets =
yield frameworkReference ]
| _ -> []

dprintfn "frameworkReferences: %A" frameworkReferences

// Find all package dlls
let packageDlls = seq {
for d in transitiveDependencies.Values do
Expand Down

0 comments on commit 78b595d

Please sign in to comment.