Skip to content

Commit 5f68276

Browse files
cloudRoutinecloudRoutine
committed
adjust generation and tracking for netcore projects
1 parent 9a22f84 commit 5f68276

File tree

11 files changed

+131
-7
lines changed

11 files changed

+131
-7
lines changed

‎.gitignore

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
## Ignore Generated netcore projects
22

3-
src/netcore/
3+
src/netcore/**/app.config
4+
src/netcore/**/*.fsproj
45

56
## paket.references for generated projects should be tracked
6-
!src/netcore/**/paket.references
7+
#!src/netcore/**/paket.references
8+
#!src/netcore/**/*.paket.references
79

810

911
## Ignore Visual Studio temporary files, build results, and

‎FSharp.Editing.sln

+13
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{9B0032
1313
EndProject
1414
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{BF60BC93-E09B-4E5F-9D85-95A519479D54}"
1515
ProjectSection(SolutionItems) = preProject
16+
.gitattributes = .gitattributes
17+
.gitignore = .gitignore
1618
.travis.yml = .travis.yml
1719
appveyor.yml = appveyor.yml
1820
build.cmd = build.cmd
@@ -50,6 +52,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{0A9C
5052
scripts\XLinq.fsx = scripts\XLinq.fsx
5153
EndProjectSection
5254
EndProject
55+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "netcore", "netcore", "{59F8A114-BECB-4E99-A9D7-BD51159CE94A}"
56+
ProjectSection(SolutionItems) = preProject
57+
src\netcore\FSharp.Editing.Client\FSharp.Editing.Client.paket.references = src\netcore\FSharp.Editing.Client\FSharp.Editing.Client.paket.references
58+
src\netcore\FSharp.Editing.Core\FSharp.Editing.Core.paket.references = src\netcore\FSharp.Editing.Core\FSharp.Editing.Core.paket.references
59+
src\netcore\FSharp.Editing.Messages\FSharp.Editing.Messages.paket.references = src\netcore\FSharp.Editing.Messages\FSharp.Editing.Messages.paket.references
60+
src\netcore\FSharp.Editing\FSharp.Editing.paket.references = src\netcore\FSharp.Editing\FSharp.Editing.paket.references
61+
src\netcore\FSharp.Editing.ProjectInspector\FSharp.Editing.ProjectInspector.paket.references = src\netcore\FSharp.Editing.ProjectInspector\FSharp.Editing.ProjectInspector.paket.references
62+
src\netcore\FSharp.Editing.Server\FSharp.Editing.Server.paket.references = src\netcore\FSharp.Editing.Server\FSharp.Editing.Server.paket.references
63+
src\netcore\TestConsole\TestConsole.paket.references = src\netcore\TestConsole\TestConsole.paket.references
64+
EndProjectSection
65+
EndProject
5366
Global
5467
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5568
Debug|Any CPU = Debug|Any CPU

‎build.fsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ Target "DotnetRestoreTools" ^ fun _ ->
221221
Target "DotnetGenerate" ^ fun _ ->
222222
GenNetcore.generateNetcoreProjects __SOURCE_DIRECTORY__
223223

224-
let netcoreFiles = !! "src/*.netcore/*.fsproj" |> Seq.toList
224+
let netcoreFiles = !! "src/netcore/*/*.fsproj" |> Seq.toList
225225

226226
Target "DotnetRestore" ^ fun _ ->
227227
try netcoreFiles |> Seq.iter ^ fun proj ->

‎scripts/GenNetcore.fsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ let extractInfo (fsprojPath:string) =
6464
let fsprojName = fsprojPath |> Path.GetFileNameWithoutExtension
6565
let netcoreProj = fsprojName + ".fsproj"
6666
let netcoreDir = "netcore" </> (DirectoryInfo(Path.GetDirectoryName fsprojPath)).Name
67-
let adjustPath srcpath = sprintf @"..\%s\%s" fsprojName srcpath
67+
let adjustPath srcpath = sprintf @"..\..\%s\%s" fsprojName srcpath
6868

6969
let srcFiles =
7070
srcFiles |> Seq.map ^ fun (itemType,sourcePath,hintPath) ->
@@ -94,7 +94,7 @@ let extractInfo (fsprojPath:string) =
9494
let netcoreTemplate (info:FsProjInfo) =
9595

9696
let makeProjectRef projectPath =
97-
let dirName = "netcore" </> (DirectoryInfo(Path.GetDirectoryName projectPath)).Name
97+
let dirName = (DirectoryInfo(Path.GetDirectoryName projectPath)).Name
9898
let projName = (Path.GetFileNameWithoutExtension projectPath)
9999
XElem.singleAttr "ProjectReference" "Include" (sprintf @"..\%s\%s.fsproj" dirName projName)
100100

@@ -109,8 +109,8 @@ let netcoreTemplate (info:FsProjInfo) =
109109
XElem.make "AssemblyName" info.AssemblyName
110110
XElem.make "DefineConstants" "NETCORE"
111111
XElem.make "DebugType" "portable"
112-
XElem.make "OutputPath" @"..\..\build\$(TargetFramework)\$(Configuration)"
113-
XElem.make "DocumentationFile" @"..\..\build\$(TargetFramework)\$(Configuration)\$(AssemblyName).XML"
112+
XElem.make "OutputPath" @"..\..\..\build\$(TargetFramework)\$(Configuration)"
113+
XElem.make "DocumentationFile" @"..\..\..\build\$(TargetFramework)\$(Configuration)\$(AssemblyName).XML"
114114
XElem.make "PackageTargetFallback" "portable-net45+win8+wp8+wpa81"
115115
XElem.make "EnableDefaultCompileItems" "false"
116116
]

‎src/netcore/FSharp.Editing.Client/FSharp.Editing.Client.paket.references

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Newtonsoft.Json
2+
FSharp.Core
3+
System.IO.FileSystem
4+
System.IO.FileSystem.Primitives
5+
System.Reflection.TypeExtensions
6+
System.Runtime.Serialization.Primitives

‎src/netcore/FSharp.Editing.Core/FSharp.Editing.Core.paket.references

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Newtonsoft.Json
2+
wire
3+
4+
Microsoft.CodeAnalysis.Common framework:netstandard16
5+
Microsoft.CodeAnalysis.Workspaces.Common framework:netstandard16
6+
Microsoft.CodeAnalysis.Features framework:netstandard16
7+
8+
Microsoft.Extensions.Logging.Abstractions
9+
10+
11+
group netcore
12+
13+
FSharp.Core
14+
FSharp.Compiler.Service
15+
FSharp.NET.Sdk
16+
NETStandard.Library
17+
18+
System.Xml.ReaderWriter
19+
System.Xml.XDocument
20+

‎src/netcore/FSharp.Editing.Messages/FSharp.Editing.Messages.paket.references

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Newtonsoft.Json
2+
3+
group netcore
4+
5+
FSharp.Core
6+
FSharp.NET.Sdk

‎src/netcore/FSharp.Editing.ProjectInspector/FSharp.Editing.ProjectInspector.paket.references

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Microsoft.Build
2+
Microsoft.Build.Runtime
3+
4+
Microsoft.CodeAnalysis.Common framework: netstandard16
5+
Microsoft.CodeAnalysis.Workspaces.Common framework: netstandard16
6+
7+
Newtonsoft.Json
8+
9+
10+
group netcore
11+
12+
FSharp.Core
13+
FSharp.Compiler.Service
14+
FSharp.NET.Sdk
15+
System.Runtime
16+
Microsoft.NETCore.DotNetHostPolicy
17+
Microsoft.NETCore.Runtime.CoreCLR
18+
System.Runtime.Loader
19+
NETStandard.Library

‎src/netcore/FSharp.Editing.Server/FSharp.Editing.Server.paket.references

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
Microsoft.CodeAnalysis.Common framework: netstandard16
2+
3+
group netcore
4+
5+
FSharp.Core
6+
FSharp.NET.Sdk
7+
FSharp.Compiler.Service
8+
Microsoft.NETCore.DotNetHostPolicy
9+
Microsoft.NETCore.Runtime.CoreCLR
10+
11+
NETStandard.Library
12+
13+
System.Runtime.InteropServices.RuntimeInformation
14+
System.Runtime.Loader
15+
16+
Suave

‎src/netcore/FSharp.Editing/FSharp.Editing.paket.references

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
wire
2+
Newtonsoft.Json
3+
4+
Microsoft.Extensions.Logging.Abstractions
5+
6+
Microsoft.CodeAnalysis.Common framework:netstandard16
7+
Microsoft.CodeAnalysis.Workspaces.Common framework:netstandard16
8+
Microsoft.CodeAnalysis.Features framework:netstandard16
9+
10+
group netcore
11+
12+
13+
FSharp.Core
14+
FSharp.Compiler.Service
15+
FSharp.NET.Sdk
16+
NETStandard.Library
17+
System.Xml.XDocument
18+
19+
System.IO.FileSystem.Watcher
20+
System.Runtime.Extensions
21+
System.Runtime.InteropServices
22+
23+
Microsoft.Extensions.Options.ConfigurationExtensions
24+
Microsoft.Win32.Registry.AccessControl

‎src/netcore/TestConsole/TestConsole.paket.references

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
Microsoft.CodeAnalysis.Common framework:netstandard16
2+
Microsoft.CodeAnalysis.Workspaces.Common framework:netstandard16
3+
Microsoft.CodeAnalysis.Features framework:netstandard16
4+
5+
Microsoft.Build
6+
Newtonsoft.Json
7+
8+
9+
10+
group netcore
11+
12+
FSharp.Core
13+
FSharp.NET.Sdk
14+
FSharp.Compiler.Service
15+
Microsoft.NETCore.DotNetHostPolicy
16+
Microsoft.NETCore.Runtime.CoreCLR
17+
System.Runtime.Loader
18+
NETStandard.Library

0 commit comments

Comments
 (0)