Skip to content

Commit 75a64d8

Browse files
committed
fix some tests
1 parent 6072992 commit 75a64d8

File tree

4 files changed

+49
-0
lines changed

4 files changed

+49
-0
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
namespace Sample_VS2013_FSharp_Library_net451
2+
3+
type Class1() =
4+
member this.X = "F#"
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"version": "1.0.0-*",
3+
"buildOptions": {
4+
"debugType": "portable",
5+
"compilerName": "fsc",
6+
"compile": {
7+
"includeFiles": [
8+
"Library1.fs"
9+
]
10+
}
11+
},
12+
"dependencies": {
13+
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-*"
14+
},
15+
"frameworks": {
16+
"netstandard1.6": {
17+
"dependencies": {
18+
"NETStandard.Library": "1.6.0"
19+
}
20+
}
21+
},
22+
"tools": {
23+
"dotnet-compile-fsc": {
24+
"version": "1.0.0-preview2-*",
25+
"imports": "dnxcore50"
26+
}
27+
}
28+
}

tests/service/Common.fs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ let mkProjectCommandLineArgs (dllName, fileNames) =
6666
yield "--noframework"
6767
yield "--debug:full"
6868
yield "--define:DEBUG"
69+
#if NETCOREAPP1_0
70+
yield "--targetprofile:netcore"
71+
#endif
6972
yield "--optimize-"
7073
yield "--out:" + dllName
7174
yield "--doc:test.xml"
@@ -77,6 +80,12 @@ let mkProjectCommandLineArgs (dllName, fileNames) =
7780
yield x
7881
let references =
7982
#if TODO_REWORK_ASSEMBLY_LOAD
83+
#if NETCOREAPP1_0
84+
Path.Combine(__SOURCE_DIRECTORY__, "../projects/Sample_NETCoreSDK_FSharp_Library_netstandard1.6/obj/Debug/netstandard1.6/dotnet-compile-fsc.rsp")
85+
|> File.ReadAllLines
86+
|> Array.filter (fun s -> s.StartsWith("-r:"))
87+
|> Array.map (fun s -> s.Replace("-r:",""))
88+
#else
8089
[ yield typeof<System.Object>.Assembly.Location; // mscorlib
8190
yield typeof<System.Console>.Assembly.Location; // System.Console
8291
yield typeof<System.ComponentModel.DefaultValueAttribute>.Assembly.Location; // System.Runtime
@@ -89,6 +98,7 @@ let mkProjectCommandLineArgs (dllName, fileNames) =
8998
yield typeof<System.Threading.Tasks.TaskExtensions>.Assembly.Location; // System.Threading.Tasks
9099
yield typeof<Microsoft.FSharp.Core.MeasureAttribute>.Assembly.Location; // FSharp.Core
91100
]
101+
#endif
92102
#else
93103
[ yield sysLib "mscorlib"
94104
yield sysLib "System"

tests/service/project.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,13 @@
6767
}
6868
},
6969

70+
"scripts": {
71+
"precompile": [
72+
"dotnet restore \"%project:Directory%/../projects/Sample_NETCoreSDK_FSharp_Library_netstandard1.6/project.json\"",
73+
"dotnet build \"%project:Directory%/../projects/Sample_NETCoreSDK_FSharp_Library_netstandard1.6/project.json\""
74+
]
75+
},
76+
7077
"tools": {
7178
"dotnet-compile-fsc": {
7279
"version": "1.0.0-preview2-*",

0 commit comments

Comments
 (0)