New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #3012 #3013

Merged
merged 3 commits into from May 8, 2018

Conversation

Projects
None yet
4 participants
@msatina

msatina commented Jan 25, 2018

fix #3012

Get TargetFramework(s) from runtime as a fallback in case they are not defined in csproj file.

Michal Satina Michal Satina
Get TargetFramework(s) from runtime as a fallback in case they are no…
…t defined in csproj file

Get TargetFramework(s) from runtime as a fallback in case they are not defined in csproj file directory.build.props .
@enricosada

enricosada requested changes Jan 25, 2018 edited

seems ok (i need to test it locally later)

@msatina awesome work, can you add an integration test?

like

[<Test>]
let ``#3000-a dotnet restore``() =
let scenario = "i003000-netcoreapp2"
let projectName = "c1"
let packageName = "AutoMapper"
let workingDir = scenarioTempPath scenario
let projectDir = workingDir @@ projectName
[ packageName; (packageName.ToLower()) ] |> Seq.iter clearPackage
prepareSdk scenario
directDotnet false "restore" projectDir |> ignore
directDotnet false "build --no-restore" projectDir |> ignore
for no TargetFramework in csproj, but in Directory.Build.props

@enricosada

This comment has been minimized.

Collaborator

enricosada commented Jan 25, 2018

as a note, VS need to fix this scenario probably #2863 (comment)

<!-- Do a global restore if required -->
<Exec Command='$(PaketBootStrapperCommand)' Condition="Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" />
<Exec Command='$(PaketCommand) restore' Condition=" '$(PaketRestoreRequired)' == 'true' " ContinueOnError="false" />

This comment has been minimized.

@matthid

matthid Jan 25, 2018

Member

Note that calling paket restore is by design here. We tweaked paket restore for maximum performance (including skipped command line parsing). With this change restore will most likely be a lot slower if stuff was already restored.

This comment has been minimized.

@matthid

matthid Jan 25, 2018

Member

What I'm trying to say is that we either need a different solution / carefully tweak performance for this case or some other trick

@forki

This comment has been minimized.

Member

forki commented Jan 31, 2018

ping

Michal Satina Michal Satina
@forki

This comment has been minimized.

Member

forki commented Feb 5, 2018

@forki

This comment has been minimized.

Member

forki commented May 2, 2018

thanks!

@forki forki merged commit c59ff07 into fsprojects:master May 8, 2018

1 of 2 checks passed

continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment