зеркало из https://github.com/dotnet/fsharp.git
Insert fsharp core into sdk (#12628)
* temp * Add FSharp.Core to Microsoft.FSharp.Compiler * Update Microsoft.FSharp.Compiler.nuspec * fix build * Add compiler.service to package.
This commit is contained in:
Kevin Ransom (msft)
GitHub
Родитель
355f24a916
Коммит
ead508f36a
21
FSharp.sln
21
FSharp.sln
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 16
|
||||
VisualStudioVersion = 16.0.28729.10
|
||||
# Visual Studio Version 17
|
||||
VisualStudioVersion = 17.1.32113.165
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Server.Shared", "src\fsharp\FSharp.Compiler.Server.Shared\FSharp.Compiler.Server.Shared.fsproj", "{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}"
|
||||
EndProject
|
||||
|
|
@ -43,10 +43,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{
|
|||
EndProject
|
||||
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Build.UnitTests", "tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj", "{53C0DAAD-158C-4658-8EC7-D7341530239F}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Packages", "Packages", "{3840F2E7-3898-45F7-8CF7-1E6829E56DB8}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.FSharp.Compiler", "src\fsharp\Microsoft.FSharp.Compiler\Microsoft.FSharp.Compiler.csproj", "{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}"
|
||||
EndProject
|
||||
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.DependencyManager.Nuget", "src\fsharp\FSharp.DependencyManager.Nuget\FSharp.DependencyManager.Nuget.fsproj", "{8B7BF62E-7D8C-4928-BE40-4E392A9EE851}"
|
||||
EndProject
|
||||
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Private.Scripting.UnitTests", "tests\FSharp.Compiler.Private.Scripting.UnitTests\FSharp.Compiler.Private.Scripting.UnitTests.fsproj", "{4FEDF286-0252-4EBC-9E75-879CCA3B85DC}"
|
||||
|
|
@ -268,18 +264,6 @@ Global
|
|||
{53C0DAAD-158C-4658-8EC7-D7341530239F}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{53C0DAAD-158C-4658-8EC7-D7341530239F}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{53C0DAAD-158C-4658-8EC7-D7341530239F}.Release|x86.Build.0 = Release|Any CPU
|
||||
{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}.Proto|Any CPU.Build.0 = Debug|Any CPU
|
||||
{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}.Proto|x86.ActiveCfg = Debug|Any CPU
|
||||
{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}.Proto|x86.Build.0 = Debug|Any CPU
|
||||
{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}.Release|x86.Build.0 = Release|Any CPU
|
||||
{8B7BF62E-7D8C-4928-BE40-4E392A9EE851}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{8B7BF62E-7D8C-4928-BE40-4E392A9EE851}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{8B7BF62E-7D8C-4928-BE40-4E392A9EE851}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
|
|
@ -453,7 +437,6 @@ Global
|
|||
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
|
||||
{88E2D422-6852-46E3-A740-83E391DC7973} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
|
||||
{53C0DAAD-158C-4658-8EC7-D7341530239F} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
|
||||
{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7} = {3840F2E7-3898-45F7-8CF7-1E6829E56DB8}
|
||||
{8B7BF62E-7D8C-4928-BE40-4E392A9EE851} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
|
||||
{4FEDF286-0252-4EBC-9E75-879CCA3B85DC} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
|
||||
{FAC5A3BF-C0D6-437A-868A-E962AA00B418} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 17
|
||||
VisualStudioVersion = 17.1.32113.165
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.FSharp.Compiler", "src\fsharp\Microsoft.FSharp.Compiler\Microsoft.FSharp.Compiler.csproj", "{BBEDE3FA-6E2C-4C53-8B61-FBB545CD4FFC}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{BBEDE3FA-6E2C-4C53-8B61-FBB545CD4FFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{BBEDE3FA-6E2C-4C53-8B61-FBB545CD4FFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{BBEDE3FA-6E2C-4C53-8B61-FBB545CD4FFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{BBEDE3FA-6E2C-4C53-8B61-FBB545CD4FFC}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {6FF31C5A-ED51-45C2-A405-5534CB7D283C}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 16
|
||||
VisualStudioVersion = 16.0.28729.10
|
||||
# Visual Studio Version 17
|
||||
VisualStudioVersion = 17.1.32113.165
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}"
|
||||
EndProject
|
||||
|
|
@ -140,10 +140,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.FSharp.IDE", "set
|
|||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.FSharp.SDK", "setup\Swix\Microsoft.FSharp.SDK\Microsoft.FSharp.SDK.csproj", "{9482211E-23D0-4BD0-9893-E4AA5559F67A}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{647810D0-5307-448F-99A2-E83917010DAE}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.FSharp.Compiler", "src\fsharp\Microsoft.FSharp.Compiler\Microsoft.FSharp.Compiler.csproj", "{04C59F6E-1C76-4F6A-AC21-2EA7F296A1B8}"
|
||||
EndProject
|
||||
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Private.Scripting.UnitTests", "tests\FSharp.Compiler.Private.Scripting.UnitTests\FSharp.Compiler.Private.Scripting.UnitTests.fsproj", "{09F56540-AFA5-4694-B7A6-0DBF6D4618C2}"
|
||||
EndProject
|
||||
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.DependencyManager.Nuget", "src\fsharp\FSharp.DependencyManager.Nuget\FSharp.DependencyManager.Nuget.fsproj", "{DFA30881-C0B1-4813-B087-C21B5AF9B77F}"
|
||||
|
|
@ -832,18 +828,6 @@ Global
|
|||
{9482211E-23D0-4BD0-9893-E4AA5559F67A}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{9482211E-23D0-4BD0-9893-E4AA5559F67A}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{9482211E-23D0-4BD0-9893-E4AA5559F67A}.Release|x86.Build.0 = Release|Any CPU
|
||||
{04C59F6E-1C76-4F6A-AC21-2EA7F296A1B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{04C59F6E-1C76-4F6A-AC21-2EA7F296A1B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{04C59F6E-1C76-4F6A-AC21-2EA7F296A1B8}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{04C59F6E-1C76-4F6A-AC21-2EA7F296A1B8}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{04C59F6E-1C76-4F6A-AC21-2EA7F296A1B8}.Proto|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{04C59F6E-1C76-4F6A-AC21-2EA7F296A1B8}.Proto|Any CPU.Build.0 = Release|Any CPU
|
||||
{04C59F6E-1C76-4F6A-AC21-2EA7F296A1B8}.Proto|x86.ActiveCfg = Release|Any CPU
|
||||
{04C59F6E-1C76-4F6A-AC21-2EA7F296A1B8}.Proto|x86.Build.0 = Release|Any CPU
|
||||
{04C59F6E-1C76-4F6A-AC21-2EA7F296A1B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{04C59F6E-1C76-4F6A-AC21-2EA7F296A1B8}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{04C59F6E-1C76-4F6A-AC21-2EA7F296A1B8}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{04C59F6E-1C76-4F6A-AC21-2EA7F296A1B8}.Release|x86.Build.0 = Release|Any CPU
|
||||
{09F56540-AFA5-4694-B7A6-0DBF6D4618C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{09F56540-AFA5-4694-B7A6-0DBF6D4618C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{09F56540-AFA5-4694-B7A6-0DBF6D4618C2}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
|
|
@ -1099,7 +1083,6 @@ Global
|
|||
{6BCFED7A-3F67-4180-B307-C7D69D191D8C} = {6235B3AF-774D-4EA1-8F37-789E767F6368}
|
||||
{E93E7D28-1C6B-4E04-BE83-68428CF7E039} = {6235B3AF-774D-4EA1-8F37-789E767F6368}
|
||||
{9482211E-23D0-4BD0-9893-E4AA5559F67A} = {6235B3AF-774D-4EA1-8F37-789E767F6368}
|
||||
{04C59F6E-1C76-4F6A-AC21-2EA7F296A1B8} = {647810D0-5307-448F-99A2-E83917010DAE}
|
||||
{09F56540-AFA5-4694-B7A6-0DBF6D4618C2} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
|
||||
{DFA30881-C0B1-4813-B087-C21B5AF9B77F} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
|
||||
{AA259A37-418F-4E18-87B2-C7D5F8C26CC4} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
|
||||
|
|
|
|||
|
|
@ -198,7 +198,7 @@ function Update-Arguments() {
|
|||
function BuildSolution([string] $solutionName) {
|
||||
Write-Host "${solutionName}:"
|
||||
|
||||
$bl = if ($binaryLog) { "/bl:" + (Join-Path $LogDir "Build.binlog") } else { "" }
|
||||
$bl = if ($binaryLog) { "/bl:" + (Join-Path $LogDir "Build.$solutionName.binlog") } else { "" }
|
||||
|
||||
$projects = Join-Path $RepoRoot $solutionName
|
||||
$officialBuildId = if ($official) { $env:BUILD_BUILDNUMBER } else { "" }
|
||||
|
|
@ -462,6 +462,9 @@ try {
|
|||
}
|
||||
}
|
||||
|
||||
if ($pack) {
|
||||
BuildSolution "Microsoft.FSharp.Compiler.sln"
|
||||
}
|
||||
if ($build) {
|
||||
VerifyAssemblyVersionsAndSymbols
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,26 +2,21 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<PreRelease>true</PreRelease>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>net5.0</TargetFramework>
|
||||
<NuspecFile>Microsoft.FSharp.Compiler.nuspec</NuspecFile>
|
||||
<IsPackable>true</IsPackable>
|
||||
<PackageDescription>.NET Core compatible version of the F# compiler fsc.exe.</PackageDescription>
|
||||
<PackageReleaseNotes>/blob/main/release-notes.md#FSharp-Tools-$(FSProductVersionReleaseNotesVersion)</PackageReleaseNotes>
|
||||
<NoDefaultExcludes>true</NoDefaultExcludes>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\fsc\fsc.fsproj">
|
||||
<AdditionalProperties>TargetFramework=net5.0</AdditionalProperties>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\fsi\fsi.fsproj">
|
||||
<AdditionalProperties>TargetFramework=net5.0</AdditionalProperties>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\FSharp.Build\FSharp.Build.fsproj">
|
||||
<AdditionalProperties>TargetFramework=netstandard2.0</AdditionalProperties>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj">
|
||||
<AdditionalProperties>TargetFramework=netstandard2.0</AdditionalProperties>
|
||||
</ProjectReference>
|
||||
<NuspecProperty Include="fSharpCorePreviewPackageVersion=$(FSCorePackageVersionValue)-$(VersionSuffix)" />
|
||||
<NuspecProperty Include="fSharpCorePackageVersion=$(FSCorePackageVersionValue)" />
|
||||
<NuspecProperty Include="fSharpCompilerServicePackagePreviewPackageVersion=$(FSharpCompilerServicePackageVersion)-$(VersionSuffix)" />
|
||||
<NuspecProperty Include="fSharpCompilerServicePackageVersion=$(FSharpCompilerServicePackageVersion)" />
|
||||
<NuspecProperty Include="artifactsPackagesDir=$(ArtifactsPackagesDir)" />
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="Build" />
|
||||
|
|
|
|||
|
|
@ -4,27 +4,7 @@
|
|||
$CommonMetadataElements$
|
||||
<language>en-US</language>
|
||||
<dependencies>
|
||||
<group targetFramework=".NET5.0">
|
||||
<dependency id="Microsoft.NETCore.Platforms" version="2.0.0" />
|
||||
<dependency id="NETStandard.Library" version="2.0.0" />
|
||||
<dependency id="System.Collections.Immutable" version="1.5.0" />
|
||||
<dependency id="System.Diagnostics.Process" version="4.3.0" />
|
||||
<dependency id="System.Diagnostics.TraceSource" version="4.3.0" />
|
||||
<dependency id="System.Linq.Expressions" version="4.3.0" />
|
||||
<dependency id="System.Linq.Queryable" version="4.3.0" />
|
||||
<dependency id="System.Net.Requests" version="4.3.0" />
|
||||
<dependency id="System.Reflection.Emit" version="4.3.0" />
|
||||
<dependency id="System.Reflection.Metadata" version="1.6.0" />
|
||||
<dependency id="System.Runtime.InteropServices" version="4.3.0" />
|
||||
<dependency id="System.Runtime.Loader" version="4.3.0" />
|
||||
<dependency id="System.Security.Cryptography.Algorithms" version="4.3.0" />
|
||||
<dependency id="System.Threading.Tasks.Parallel" version="4.3.0" />
|
||||
<dependency id="System.Threading.Thread" version="4.3.0" />
|
||||
<dependency id="System.Threading.ThreadPool" version="4.3.0" />
|
||||
<dependency id="System.ValueTuple" version="4.4.0" />
|
||||
<dependency id="System.Buffers" version="4.5.1" />
|
||||
<dependency id="System.Memory" version="4.5.4" />
|
||||
</group>
|
||||
<group targetFramework=".NET5.0" />
|
||||
</dependencies>
|
||||
<contentFiles>
|
||||
<files include="any\any\default.win32manifest" buildAction="Content" copyToOutput="true" flatten="false" />
|
||||
|
|
@ -74,5 +54,11 @@
|
|||
<file src="FSharp.Build\$Configuration$\netstandard2.0\**\FSharp.Build.resources.dll" target="lib\net5.0" />
|
||||
<file src="FSharp.DependencyManager.Nuget\$configuration$\netstandard2.0\**\FSharp.DependencyManager.Nuget.resources.dll"
|
||||
target="lib\net5.0" />
|
||||
<file src="$artifactsPackagesDir$Shipping\FSharp.Core.$fSharpCorePreviewPackageVersion$*nupkg" target="contentFiles\Shipping" />
|
||||
<file src="$artifactsPackagesDir$Release\FSharp.Core.$fSharpCorePackageVersion$*nupkg" target="contentFiles\Release" />
|
||||
<file src="$artifactsPackagesDir$Shipping\FSharp.Compiler.Service.$fSharpCompilerServicePreviewPackageVersion$*nupkg"
|
||||
target="contentFiles\Shipping" />
|
||||
<file src="$artifactsPackagesDir$Release\FSharp.Compiler.Service.$fSharpCompilerServicePackageVersion$*nupkg"
|
||||
target="contentFiles\Release" />
|
||||
</files>
|
||||
</package>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
// See https://aka.ms/new-console-template for more information
|
||||
return 0;
|
||||
Загрузка…
Ссылка в новой задаче