Skip to content
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

[WIP] - Build packagemanagement based on Steffen's Package manager design. #4042

Closed
wants to merge 8 commits into from
Closed

[WIP] - Build packagemanagement based on Steffen's Package manager design. #4042

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6852007
merge with master
KevinRansom Nov 28, 2017
b1fa89a
merge with master
forki Nov 28, 2017
3e13554
Merge branch 'master' of https://github.com/Microsoft/visualfsharp in…
KevinRansom Nov 28, 2017
c662690
Merge branch 'master' of https://github.com/Microsoft/visualfsharp in…
KevinRansom Nov 30, 2017
dc72b1a
Fix resources for buildfromsource
KevinRansom Nov 30, 2017
d1d0223
Merge branch 'forki-paket' of https://github.com/KevinRansom/visualfs…
KevinRansom Nov 30, 2017
c45341e
Cleanup
KevinRansom Dec 1, 2017
cc903d7
Feedback + fix fcs .netstandard build
KevinRansom Dec 4, 2017
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
1 change: 1 addition & 0 deletions fcs/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/FSharp.Compiler.Service.netstandard
6 changes: 6 additions & 0 deletions fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,12 @@
<Compile Include="$(FSharpSourcesRoot)\fsharp\IlxGen.fs">
<Link>CodeGen/IlxGen.fs</Link>
</Compile>
<Compile Include="$(FSharpSourcesRoot)\fsharp\DependencyManager.Integration.fsi">
<Link>Driver\DependencyManager.Integration.fsi</Link>
</Compile>
<Compile Include="$(FSharpSourcesRoot)\fsharp\DependencyManager.Integration.fs">
<Link>Driver\DependencyManager.Integration.fs</Link>
</Compile>
<Compile Include="$(FSharpSourcesRoot)\fsharp\CompileOps.fsi">
<Link>Driver/CompileOps.fsi</Link>
</Compile>
Expand Down
12 changes: 12 additions & 0 deletions src/buildfromsource/FSharp.Compiler.Private/FSComp.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4300,6 +4300,15 @@ type internal SR private() =
/// An error occurred while reading the F# metadata of assembly '%s'. A reserved construct was utilized. You may need to upgrade your F# compiler or use an earlier version of the assembly that doesn't make use of a specific construct.
/// (Originally from ..\FSComp.txt:1424)
static member pickleUnexpectedNonZero(a0 : System.String) = (3219, GetStringFunc("pickleUnexpectedNonZero",",,,%s,,,") a0)
/// The dependency manager extension %s could not be loaded. Message: %s
/// (Originally from ..\FSComp.txt:1425)
static member couldNotLoadDependencyManagerExtenstion(a0 : System.String, a1 : System.String) = (3220, GetStringFunc("couldNotLoadDependencyManagerExtenstion",",,,%s,,,%s,,,") a0 a1)
/// Package manager key '%s' was not registered in %s. Currently registered: %s
/// (Originally from ..\FSComp.txt:1426)
static member packageManagerUnknown(a0 : System.String, a1 : System.String, a2 : System.String) = (3221, GetStringFunc("packageManagerUnknown",",,,%s,,,%s,,,%s,,,") a0 a1 a2)
/// %s
/// (Originally from ..\FSComp.txt:1427)
static member packageManagerError(a0 : System.String) = (3222, GetStringFunc("packageManagerError",",,,%s,,,") a0)

/// Call this method once to validate that all known resources are valid; throws if not
static member RunStartupValidation() =
Expand Down Expand Up @@ -5698,4 +5707,7 @@ type internal SR private() =
ignore(GetString("notAFunctionButMaybeDeclaration"))
ignore(GetString("ArgumentsInSigAndImplMismatch"))
ignore(GetString("pickleUnexpectedNonZero"))
ignore(GetString("couldNotLoadDependencyManagerExtenstion"))
ignore(GetString("packageManagerUnknown"))
ignore(GetString("packageManagerError"))
()
9 changes: 9 additions & 0 deletions src/buildfromsource/FSharp.Compiler.Private/FSComp.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4303,4 +4303,13 @@
<data name="pickleUnexpectedNonZero" xml:space="preserve">
<value>An error occurred while reading the F# metadata of assembly '{0}'. A reserved construct was utilized. You may need to upgrade your F# compiler or use an earlier version of the assembly that doesn't make use of a specific construct.</value>
</data>
<data name="couldNotLoadDependencyManagerExtenstion" xml:space="preserve">
<value>The dependency manager extension {0} could not be loaded. Message: {1}</value>
</data>
<data name="packageManagerUnknown" xml:space="preserve">
<value>Package manager key '{0}' was not registered in {1}. Currently registered: {2}</value>
</data>
<data name="packageManagerError" xml:space="preserve">
<value>{0}</value>
</data>
</root>
9 changes: 7 additions & 2 deletions src/buildfromsource/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,12 @@
<Compile Include="$(FSharpSourcesRoot)\fsharp\IlxGen.fs">
<Link>CodeGen\IlxGen.fs</Link>
</Compile>

<Compile Include="$(FSharpSourcesRoot)\fsharp\DependencyManager.Integration.fsi">
<Link>Driver\DependencyManager.Integration.fsi</Link>
</Compile>
<Compile Include="$(FSharpSourcesRoot)\fsharp\DependencyManager.Integration.fs">
<Link>Driver\DependencyManager.Integration.fs</Link>
</Compile>
<!-- includes the core of the F# Compiler fsc.exe implementation -->
<Compile Include="$(FSharpSourcesRoot)\fsharp\CompileOps.fsi">
<Link>Driver\CompileOps.fsi</Link>
Expand Down Expand Up @@ -628,7 +633,6 @@
</Compile>
</ItemGroup>
<Import Project = "..\BuildFromSource.targets" />

<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
<PackageReference Include="System.Collections.Immutable" Version="1.3.1"></PackageReference>
Expand All @@ -638,6 +642,7 @@
<PackageReference Include="System.Linq.Queryable" Version="4.3.0"></PackageReference>
<PackageReference Include="System.Net.Requests" Version="4.3.0"></PackageReference>
<PackageReference Include="System.Reflection.Emit" Version="4.3.0"></PackageReference>
<PackageReference Include="System.Reflection.Extensions" Version="4.3.0"></PackageReference>
<PackageReference Include="System.Reflection.Metadata" Version="1.4.2"></PackageReference>
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0"></PackageReference>
<PackageReference Include="System.Runtime" Version="4.3.0"></PackageReference>
Expand Down
Loading