Skip to content

Add nuget package creation for fsharp assemblies #1737

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
KevinRansom merged 1 commit into from
Nov 13, 2016
Merged

Add nuget package creation for fsharp assemblies #1737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 1 deletion lkg/fsc/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"version": "1.0.1"
}
},
"imports": "dnxcore50"
}
},
"scripts": {
Expand Down
1 change: 0 additions & 1 deletion lkg/fsi/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"version": "1.0.1"
}
},
"imports": "dnxcore50"
}
},
"scripts": {
Expand Down
13 changes: 7 additions & 6 deletions src/fsharp/FSharp.Build/FSharp.Build.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@
<FX_NOLOADER>true</FX_NOLOADER>
</PropertyGroup>
<ItemGroup>
<FilesToLocalize Include="$(OutDir)$(AssemblyName).dll">
<TranslationFile>$(FSharpSourcesRoot)\..\loc\lcl\{Lang}\$(AssemblyName).dll.lcl</TranslationFile>
<LciCommentFile>$(FSharpSourcesRoot)\..\loc\lci\$(AssemblyName).dll.lci</LciCommentFile>
<HasLceComments>false</HasLceComments>
<InProject>false</InProject>
</FilesToLocalize>
<FilesToLocalize Include="$(OutDir)$(AssemblyName).dll">
<TranslationFile>$(FSharpSourcesRoot)\..\loc\lcl\{Lang}\$(AssemblyName).dll.lcl</TranslationFile>
<LciCommentFile>$(FSharpSourcesRoot)\..\loc\lci\$(AssemblyName).dll.lci</LciCommentFile>
<HasLceComments>false</HasLceComments>
<InProject>false</InProject>
</FilesToLocalize>
<PackageNuspec Include="Microsoft.FSharp.Build.netcore.nuspec" Condition="'$(TargetFramework)' == 'coreclr'" />
</ItemGroup>
<ItemGroup>
<FsSrGen Include="FSBuild.txt">
Expand Down
37 changes: 37 additions & 0 deletions src/fsharp/FSharp.Build/Microsoft.FSharp.Build.netcore.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>Microsoft.FSharp.Build.netcore</id>
<description>
.NET Core compatible version of the fsharp build task FSharp.Build.dll
Supported Platforms: - .NET Core (netstandard1.6)
</description>
<language>en-US</language>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<version>$version$</version>
<authors>$authors$</authors>
<licenseUrl>$licenseUrl$</licenseUrl>
<projectUrl>$projectUrl$</projectUrl>
<tags>$tags$</tags>
<dependencies>
<group>
<dependency id="Microsoft.Build" version="0.1.0-preview-00028-160627" />
<dependency id="Microsoft.Build.Framework" version="0.1.0-preview-00028-160627" />
<dependency id="Microsoft.Build.Tasks.Core" version="0.1.0-preview-00028-160627" />
<dependency id="Microsoft.Build.Utilities.Core" version="0.1.0-preview-00028-160627" />
<dependency id="Microsoft.NETCore.Platforms" version="1.0.1" />
<dependency id="Microsoft.Win32.Registry" version="4.0.0" />

<dependency id="System.AppContext" version="4.1.0" />
<dependency id="System.Diagnostics.Tools" version="4.0.0" />
<dependency id="System.Reflection.Primitives" version="4.0.0" />
<dependency id="System.Resources.ResourceManager" version="4.0.0" />
</group>
</dependencies>
</metadata>
<files>
<file src="FSharp.Build.dll" target="lib/netstandard1.6" />
<file src="Microsoft.FSharp.targets" target="content/any/netstandard1.6" />
<file src="Microsoft.Portable.FSharp.targets" target="content/any/netstandard1.6" />
</files>
</package>
6 changes: 6 additions & 0 deletions src/fsharp/FSharp.Build/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@
"System.Reflection.Primitives": "4.0.1",
"System.Resources.ResourceManager": "4.0.1"
},
"runtimes": {
"win7-x86": { },
"win7-x64": { },
"osx.10.11-x64": { },
"ubuntu.14.04-x64": { }
},
"frameworks": {
"netstandard1.6": {
"imports": "portable-net45+win8"
Expand Down
3 changes: 3 additions & 0 deletions src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
<AssemblyName>FSharp.Compiler.Interactive.Settings</AssemblyName>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<ItemGroup>
<PackageNuspec Include="Microsoft.FSharp.Compiler.Interactive.Settings.netcore.nuspec" Condition="'$(TargetFramework)' == 'coreclr'" />
</ItemGroup>
<ItemGroup>
<FsSrGen Include="..\FSInteractiveSettings.txt">
<Link>FSInteractiveSettings.txt</Link>
Expand Down
29 changes: 29 additions & 0 deletions ...mpiler.Interactive.Settings/Microsoft.FSharp.Compiler.Interactive.Settings.netcore.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>Microsoft.FSharp.Compiler.Interactive.Settings.netcore</id>
<description>
.NET Core compatible version of the fsharp compiler interactive settings dll
Supported Platforms: - .NET Core (netstandard1.6)
</description>
<language>en-US</language>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<version>$version$</version>
<authors>$authors$</authors>
<licenseUrl>$licenseUrl$</licenseUrl>
<projectUrl>$projectUrl$</projectUrl>
<tags>$tags$</tags>
<dependencies>
<group>
<dependency id="NETStandard.Library" version="1.6.0" />
<dependency id="System.Linq.Expressions" version="4.1.0" />
<dependency id="System.Reflection.TypeExtensions" version="4.1.0" />
<dependency id="System.Runtime.Loader" version="4.0.0" />
<dependency id="System.Threading.Thread" version="4.0.0" />
</group>
</dependencies>
</metadata>
<files>
<file src="FSharp.Compiler.Interactive.Settings.dll" target="lib/netstandard1.6" />
</files>
</package>
1 change: 0 additions & 1 deletion src/fsharp/FSharp.Compiler.Interactive.Settings/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1",
"NETStandard.Library": "1.6.0",
"System.Linq.Expressions": "4.1.0",
"System.Reflection.TypeExtensions": "4.1.0",
Expand Down
1 change: 1 addition & 0 deletions src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<HasLceComments>false</HasLceComments>
<InProject>false</InProject>
</FilesToLocalize>
<PackageNuspec Include="Microsoft.FSharp.Compiler.netcore.nuspec" Condition="'$(TargetFramework)' == 'coreclr'" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Compiler.dll.fs">
Expand Down
43 changes: 43 additions & 0 deletions src/fsharp/FSharp.Compiler/Microsoft.FSharp.Compiler.netcore.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>Microsoft.FSharp.Compiler.netcore</id>
<description>
.NET Core compatible version of the fsharp compiler dll
Supported Platforms: - .NET Core (netstandard1.6)
</description>
<language>en-US</language>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<version>$version$</version>
<authors>$authors$</authors>
<licenseUrl>$licenseUrl$</licenseUrl>
<projectUrl>$projectUrl$</projectUrl>
<tags>$tags$</tags>
<dependencies>
<group>
<dependency id="NETStandard.Library" version="1.6.0" />
<dependency id="System.Collections.Immutable" version="1.2.0" />
<dependency id="System.Diagnostics.Process" version="4.1.0" />
<dependency id="System.Diagnostics.TraceSource" version="4.0.0" />
<dependency id="System.Linq.Expressions" version="4.1.0" />
<dependency id="System.Linq.Queryable" version="4.0.1" />
<dependency id="System.Net.Requests" version="4.0.11" />
<dependency id="System.Reflection.Emit" version="4.0.1" />
<dependency id="System.Reflection.Metadata" version="1.4.1-beta-24227-04" />
<dependency id="System.Reflection.TypeExtensions" version="4.1.0" />
<dependency id="System.Runtime.InteropServices" version="4.1.0" />
<dependency id="System.Runtime.Loader" version="4.0.0" />
<dependency id="System.Security.Cryptography.Algorithms" version="4.2.0" />
<dependency id="System.Threading.Tasks.Parallel" version="4.0.1" />
<dependency id="System.Threading.Thread" version="4.0.0" />
<dependency id="System.Threading.ThreadPool" version="4.0.10" />
<dependency id="Microsoft.DiaSymReader.PortablePdb" version="1.1.0" />
<dependency id="Microsoft.DiaSymReader" version="1.0.8" />
<dependency id="System.ValueTuple" version="4.0.0-rc3-24212-01" />
</group>
</dependencies>
</metadata>
<files>
<file src="FSharp.Compiler.dll" target="lib/netstandard1.6" />
</files>
</package>
1 change: 0 additions & 1 deletion src/fsharp/FSharp.Compiler/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1",
"NETStandard.Library": "1.6.0",
"System.Collections.Immutable":"1.2.0",
"System.Diagnostics.Process": "4.1.0",
Expand Down