Skip to content

Merge master to dev16.1 #6252

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.

Sign up for GitHub

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

Merged
brettfo merged 7 commits into from
Feb 19, 2019
Merged

Merge master to dev16.1 #6252

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1bbb60a
fix package signing (#6207) (#6208)
brettfo Feb 7, 2019
84f7488
We don't ever set the value FCS_RETAIN_BACKGROUND_PARSE_RESULTS (#6212)
KevinRansom Feb 8, 2019
31a98b9
Ensure core tests pick up fsharp.core nuget packages from artifacts b…
KevinRansom Feb 8, 2019
b88055c
Update mono props: support OSX and more .NET Framework versions (#6181)
baronfel Feb 13, 2019
54c22cd
fix double-build of vsix packages (#6233)
brettfo Feb 17, 2019
7376e22
debug fixes (#6170)
dsyme Feb 19, 2019
fc15661
Merge branch 'dev16.1' into merges/master-to-dev16.1
brettfo Feb 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Ensure core tests pick up fsharp.core nuget packages from artifacts b… 
…uild (#6206)

* Ensure core tests pick up fsharp.core nuget packages from artifacts build

* Feedback
  • Loading branch information
@KevinRansom
KevinRansom authored Feb 8, 2019
commit 31a98b9c8064a57bc7f0b7d0edc1381efea98a14
10 changes: 7 additions & 3 deletions tests/fsharp/single-test.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ let generateOverrides =
</Project>"
template

let generateProjectArtifacts (pc:ProjectConfiguration) targetFramework =
let generateProjectArtifacts (pc:ProjectConfiguration) targetFramework configuration =
let computeSourceItems addDirectory addCondition (compileItem:CompileItem) sources =
let computeInclude src =
let fileName = if addDirectory then Path.Combine(pc.SourceDirectory, src) else src
Expand Down Expand Up @@ -130,6 +130,8 @@ let generateProjectArtifacts (pc:ProjectConfiguration) targetFramework =
<DefineConstants>FX_RESHAPED_REFLECTION</DefineConstants>
<DefineConstants Condition=""'$(OutputType)' == 'Script' and '$(FSharpTestCompilerVersion)' == 'coreclr'"">NETCOREAPP</DefineConstants>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<RestoreAdditionalProjectSources Condition = "" '$(RestoreAdditionalProjectSources)' == ''"">$(RestoreFromArtifactsPath)</RestoreAdditionalProjectSources>
<RestoreAdditionalProjectSources Condition = "" '$(RestoreAdditionalProjectSources)' != ''"">$(RestoreAdditionalProjectSources);$(RestoreFromArtifactsPath)</RestoreAdditionalProjectSources>
</PropertyGroup>

<!-- Utility sources -->
Expand Down Expand Up @@ -170,6 +172,8 @@ let generateProjectArtifacts (pc:ProjectConfiguration) targetFramework =
|> replaceTokens "$(OPTIMIZE)" optimize
|> replaceTokens "$(DEBUG)" debug
|> replaceTokens "$(TARGETFRAMEWORK)" targetFramework
|> replaceTokens "$(RestoreFromArtifactsPath)" (Path.GetFullPath(__SOURCE_DIRECTORY__) + "/../../artifacts/packages/" + configuration)

generateProjBody

let singleTestBuildAndRunCore cfg copyFiles p =
Expand Down Expand Up @@ -212,7 +216,7 @@ let singleTestBuildAndRunCore cfg copyFiles p =
let executeFsc testCompilerVersion targetFramework =
let propsBody = generateProps testCompilerVersion
emitFile propsFileName propsBody
let projectBody = generateProjectArtifacts pc targetFramework
let projectBody = generateProjectArtifacts pc targetFramework cfg.BUILD_CONFIG
emitFile projectFileName projectBody
use testOkFile = new FileGuard(Path.Combine(directory, "test.ok"))
exec { cfg with Directory = directory } cfg.DotNetExe (sprintf "run -f %s" targetFramework)
Expand All @@ -222,7 +226,7 @@ let singleTestBuildAndRunCore cfg copyFiles p =
let executeFsi testCompilerVersion targetFramework =
let propsBody = generateProps testCompilerVersion
emitFile propsFileName propsBody
let projectBody = generateProjectArtifacts pc targetFramework
let projectBody = generateProjectArtifacts pc targetFramework cfg.BUILD_CONFIG
emitFile projectFileName projectBody
use testOkFile = new FileGuard(Path.Combine(directory, "test.ok"))
exec { cfg with Directory = directory } cfg.DotNetExe "build /t:RunFSharpScript"
Expand Down