Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit8d33c74

Browse files
authored
Merge pull requestdotnet#4436 from Microsoft/merges/master-to-dev15.7
Merge master to dev15.7
2 parents5f2565c +351ac03 commit8d33c74

File tree

73 files changed

+241
-598
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+241
-598
lines changed

‎VisualFSharp.sln‎

Lines changed: 16 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion =15.0.27130.2024
4+
VisualStudioVersion =15.0.27130.2036
55
MinimumVisualStudioVersion =10.0.40219.1
66
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler.Private","src\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj","{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
77
EndProject
@@ -114,17 +114,17 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLFile", "vsintegration\It
114114
EndProject
115115
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Vsix","Vsix","{141F6C23-E1B1-4D89-9F10-F0B8AD58E71F}"
116116
EndProject
117-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="VisualFSharpFull","vsintegration\Vsix\VisualFSharpFull\VisualFSharpFull.csproj","{59ADCE46-9740-4079-834D-9A03A3494EBC}"
117+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="VisualFSharpFull","vsintegration\Vsix\VisualFSharpFull\VisualFSharpFull.csproj","{59ADCE46-9740-4079-834D-9A03A3494EBC}"
118118
EndProject
119-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="VisualFSharpOpenSource","vsintegration\Vsix\VisualFSharpOpenSource\VisualFSharpOpenSource.csproj","{E6A45CDF-B408-420F-B475-74611BEFC52B}"
119+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="VisualFSharpOpenSource","vsintegration\Vsix\VisualFSharpOpenSource\VisualFSharpOpenSource.csproj","{E6A45CDF-B408-420F-B475-74611BEFC52B}"
120120
EndProject
121121
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="HostedCompilerServer","tests\fsharpqa\testenv\src\HostedCompilerServer\HostedCompilerServer.fsproj","{4239EFEA-E746-446A-BF7A-51FCBAB13946}"
122122
EndProject
123123
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="ILComparer","tests\fsharpqa\testenv\src\ILComparer\ILComparer.fsproj","{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}"
124124
EndProject
125125
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Utils","Utils","{D086C8C6-D00D-4C3B-9AB2-A4286C9F5922}"
126126
EndProject
127-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="LanguageServiceProfiling","vsintegration\Utils\LanguageServiceProfiling\LanguageServiceProfiling.fsproj","{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}"
127+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") ="LanguageServiceProfiling","vsintegration\Utils\LanguageServiceProfiling\LanguageServiceProfiling.fsproj","{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}"
128128
EndProject
129129
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="FSharp.UIResources","vsintegration\src\FSharp.UIResources\FSharp.UIResources.csproj","{C4586A06-1402-48BC-8E35-A1B8642F895B}"
130130
EndProject
@@ -140,8 +140,6 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Build.UnitTests", "t
140140
EndProject
141141
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="PEVerify","tests\fsharpqa\testenv\src\PEVerify\PEVerify.csproj","{B0689A4E-07D8-494D-A0C8-791CB1D74E54}"
142142
EndProject
143-
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") ="AssemblyVersionCheck","tests\fsharpqa\testenv\src\AssemblyVersionCheck\AssemblyVersionCheck.fsproj","{2BE9DC57-34C1-4196-9392-A5F189E6B95A}"
144-
EndProject
145143
Global
146144
GlobalSection(SolutionConfigurationPlatforms) =preSolution
147145
Debug|Any CPU=Debug|Any CPU
@@ -648,10 +646,10 @@ Global
648646
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Debug|Any CPU.Build.0=Debug|Any CPU
649647
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Debug|x86.ActiveCfg=Debug|Any CPU
650648
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Debug|x86.Build.0=Debug|Any CPU
651-
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
652-
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|Any CPU.Build.0=Proto|Any CPU
653-
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|x86.ActiveCfg=Proto|Any CPU
654-
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|x86.Build.0=Proto|Any CPU
649+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|Any CPU.ActiveCfg=Release|Any CPU
650+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|Any CPU.Build.0=Release|Any CPU
651+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|x86.ActiveCfg=Release|Any CPU
652+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|x86.Build.0=Release|Any CPU
655653
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Release|Any CPU.ActiveCfg=Release|Any CPU
656654
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Release|Any CPU.Build.0=Release|Any CPU
657655
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Release|x86.ActiveCfg=Release|Any CPU
@@ -660,10 +658,10 @@ Global
660658
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Debug|Any CPU.Build.0=Debug|Any CPU
661659
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Debug|x86.ActiveCfg=Debug|Any CPU
662660
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Debug|x86.Build.0=Debug|Any CPU
663-
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
664-
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|Any CPU.Build.0=Proto|Any CPU
665-
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|x86.ActiveCfg=Proto|Any CPU
666-
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|x86.Build.0=Proto|Any CPU
661+
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|Any CPU.ActiveCfg=Release|Any CPU
662+
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|Any CPU.Build.0=Release|Any CPU
663+
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|x86.ActiveCfg=Release|Any CPU
664+
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|x86.Build.0=Release|Any CPU
667665
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Release|Any CPU.ActiveCfg=Release|Any CPU
668666
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Release|Any CPU.Build.0=Release|Any CPU
669667
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Release|x86.ActiveCfg=Release|Any CPU
@@ -696,10 +694,10 @@ Global
696694
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Debug|Any CPU.Build.0=Debug|Any CPU
697695
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Debug|x86.ActiveCfg=Debug|Any CPU
698696
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Debug|x86.Build.0=Debug|Any CPU
699-
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
700-
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Proto|Any CPU.Build.0=Proto|Any CPU
701-
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Proto|x86.ActiveCfg=Proto|Any CPU
702-
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Proto|x86.Build.0=Proto|Any CPU
697+
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Proto|Any CPU.ActiveCfg=Release|Any CPU
698+
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Proto|Any CPU.Build.0=Release|Any CPU
699+
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Proto|x86.ActiveCfg=Release|Any CPU
700+
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Proto|x86.Build.0=Release|Any CPU
703701
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Release|Any CPU.ActiveCfg=Release|Any CPU
704702
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Release|Any CPU.Build.0=Release|Any CPU
705703
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Release|x86.ActiveCfg=Release|Any CPU
@@ -776,18 +774,6 @@ Global
776774
{B0689A4E-07D8-494D-A0C8-791CB1D74E54}.Release|Any CPU.Build.0=Release|Any CPU
777775
{B0689A4E-07D8-494D-A0C8-791CB1D74E54}.Release|x86.ActiveCfg=Release|Any CPU
778776
{B0689A4E-07D8-494D-A0C8-791CB1D74E54}.Release|x86.Build.0=Release|Any CPU
779-
{2BE9DC57-34C1-4196-9392-A5F189E6B95A}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
780-
{2BE9DC57-34C1-4196-9392-A5F189E6B95A}.Debug|Any CPU.Build.0=Debug|Any CPU
781-
{2BE9DC57-34C1-4196-9392-A5F189E6B95A}.Debug|x86.ActiveCfg=Debug|Any CPU
782-
{2BE9DC57-34C1-4196-9392-A5F189E6B95A}.Debug|x86.Build.0=Debug|Any CPU
783-
{2BE9DC57-34C1-4196-9392-A5F189E6B95A}.Proto|Any CPU.ActiveCfg=Debug|Any CPU
784-
{2BE9DC57-34C1-4196-9392-A5F189E6B95A}.Proto|Any CPU.Build.0=Debug|Any CPU
785-
{2BE9DC57-34C1-4196-9392-A5F189E6B95A}.Proto|x86.ActiveCfg=Debug|Any CPU
786-
{2BE9DC57-34C1-4196-9392-A5F189E6B95A}.Proto|x86.Build.0=Debug|Any CPU
787-
{2BE9DC57-34C1-4196-9392-A5F189E6B95A}.Release|Any CPU.ActiveCfg=Release|Any CPU
788-
{2BE9DC57-34C1-4196-9392-A5F189E6B95A}.Release|Any CPU.Build.0=Release|Any CPU
789-
{2BE9DC57-34C1-4196-9392-A5F189E6B95A}.Release|x86.ActiveCfg=Release|Any CPU
790-
{2BE9DC57-34C1-4196-9392-A5F189E6B95A}.Release|x86.Build.0=Release|Any CPU
791777
EndGlobalSection
792778
GlobalSection(SolutionProperties) =preSolution
793779
HideSolutionNode =FALSE
@@ -852,7 +838,6 @@ Global
852838
{0385564F-07B4-4264-AB8A-17C393E9140C} ={F6DAEE9A-8BE1-4C4A-BC83-09215517C7DA}
853839
{400FAB03-786E-40CC-85A8-04B0C2869B14} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
854840
{B0689A4E-07D8-494D-A0C8-791CB1D74E54} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
855-
{2BE9DC57-34C1-4196-9392-A5F189E6B95A} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
856841
EndGlobalSection
857842
GlobalSection(ExtensibilityGlobals) =postSolution
858843
SolutionGuid ={48EDBBBE-C8EE-4E3C-8B19-97184A487B37}

‎build-everything.proj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@
3636
</ItemGroup>
3737
<PropertyGroupCondition="'$(BUILD_VS)'=='1'">
3838
<RestoreVSIntegration>true</RestoreVSIntegration>
39+
<RestoreLanguageServiceProfiling>true</RestoreLanguageServiceProfiling>
3940
<RestoreVSIntegrationItemTemplates>true</RestoreVSIntegrationItemTemplates>
4041
<RestoreVSIntegrationProjectTemplates>true</RestoreVSIntegrationProjectTemplates>
42+
<RestoreVSIntegrationVsix>true</RestoreVSIntegrationVsix>
4143
</PropertyGroup>
4244

4345
<ItemGroupCondition="'$(BUILD_FCS)'=='1'">
@@ -111,10 +113,12 @@
111113

112114
<ItemGroup>
113115
<ProjectsToRestoreInclude="tests/fsharpqa/testenv/src/PEVerify/PEVerify.csproj"Condition="'$(RestorePEVerify)' == 'true'" />
116+
<ProjectsToRestoreInclude="vsintegration/Utils/LanguageServiceProfiling/LanguageServiceProfiling.fsproj"Condition="'$(RestoreLanguageServiceProfiling)' == 'true'" />
114117
<ProjectsToRestoreInclude="vsintegration/fsharp-vsintegration-src-build.proj"Condition="'$(RestoreVSIntegration)' == 'true'" />
115118
<ProjectsToRestoreInclude="vsintegration/fsharp-vsintegration-unittests-build.proj"Condition="'$(RestoreVSIntegrationUnitTests)' == 'true'" />
116119
<ProjectsToRestoreInclude="vsintegration/fsharp-vsintegration-item-templates-build.proj"Condition="'$(RestoreVSIntegrationItemTemplates)' == 'true'" />
117120
<ProjectsToRestoreInclude="vsintegration/fsharp-vsintegration-project-templates-build.proj"Condition="'$(RestoreVSIntegrationProjectTemplates)' == 'true'" />
121+
<ProjectsToRestoreInclude="vsintegration/fsharp-vsintegration-vsix-build.proj"Condition="'$(RestoreVSIntegrationVsix)' == 'true'" />
118122
</ItemGroup>
119123

120124
<PropertyGroup>

‎build.cmd‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -624,11 +624,6 @@ if "%RestorePackages%" == "true" (
624624
%_nugetexe% restore packages.config!_nugetoptions!
625625
@if ERRORLEVEL1echo Error: Nuget restore failed&&goto :failure
626626

627-
if"%BUILD_VS%"=="1" (
628-
%_nugetexe% restore vsintegration\packages.config!_nugetoptions!
629-
@if ERRORLEVEL1echo Error: Nuget restore failed&&goto :failure
630-
)
631-
632627
if"%BUILD_SETUP%"=="1" (
633628
%_nugetexe% restore setup\packages.config!_nugetoptions!
634629
@if ERRORLEVEL1echo Error: Nuget restore failed&&goto :failure
@@ -666,7 +661,6 @@ if "%NEEDS_DOTNET_CLI_TOOLS%" == "1" (
666661
%_dotnet20exe% restore -v:d build-everything.proj%msbuildflags%%BUILD_DIAG%
667662
)
668663

669-
670664
echo ----------- Done with package restore, starting dependency uptake check -------------
671665

672666
ifnot"%PB_PackageVersionPropsUrl%"=="" (
@@ -716,10 +710,10 @@ set path=%~dp0Tools\dotnet20\;%path%
716710

717711
set_fsiexe="packages\FSharp.Compiler.Tools.4.1.27\tools\fsi.exe"
718712
ifnotexist%_fsiexe%echo Error: Could not find%_fsiexe%&&goto :failure
719-
%_ngenexe% install%_fsiexe% /nologo
713+
%_ngenexe% install%_fsiexe% /nologo
720714

721715
ifnotexist%_nugetexe%echo Error: Could not find%_nugetexe%&&goto :failure
722-
%_ngenexe% install%_nugetexe% /nologo
716+
%_ngenexe% install%_nugetexe% /nologo
723717

724718
echo ---------------- Done with package restore, verify buildfrom source ---------------
725719
if"%BUILD_PROTO_WITH_CORECLR_LKG%"=="1" (

‎build.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
#!/bin/sh
22

33
make Configuration=release
4-

‎build/config/AssemblySignToolData.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"Microsoft.DiaSymReader.dll",
6767
"Microsoft.DiaSymReader.PortablePdb.dll",
6868
"Newtonsoft.Json.dll",
69-
"System.ValueTuple.4.3.1.nupkg",
69+
"System.ValueTuple.4.4.0.nupkg",
7070
"System.Collections.Immutable.dll",
7171
"System.Reflection.Metadata.dll",
7272
"System.ValueTuple.dll"

‎build/targets/AssemblyVersions.props‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,17 @@
1919
<_Build_Number>$(BUILD_BUILDNUMBER.Substring(9))</_Build_Number>
2020
<Build_FileVersion>$(_Build_Year).$(_Build_Month).$(_Build_Day).$(_Build_Number)</Build_FileVersion>
2121

22-
<FSCoreVersion>4.4.1.0</FSCoreVersion>
22+
<FSCoreVersion>4.4.3.0</FSCoreVersion>
23+
<FSProductVersion>10.1.1.0</FSProductVersion>
24+
<FSPackageVersion>10.1.4</FSPackageVersion>
25+
<VSAssemblyVersion>15.6.0.0</VSAssemblyVersion>
2326
<MicroBuildAssemblyVersionCondition="'$(MicroBuildAssemblyVersion)' == ''">$(FSCoreVersion)</MicroBuildAssemblyVersion>
24-
<MicroBuildAssemblyVersionCondition="'$(UseVsMicroBuildAssemblyVersion)' == 'true'">15.4.1.0</MicroBuildAssemblyVersion>
27+
28+
<!-- certain delivered F# VS assemblies use a specific MicroBuildAssemblyVersion, otherwise use FSCoreVersion-->
29+
<MicroBuildAssemblyVersionCondition="'$(UseFSharpProductVersion)' == 'true'">$(FSProductVersion)</MicroBuildAssemblyVersion>
30+
31+
<!-- certain delivered F# VS assemblies use a specific MicroBuildAssemblyVersion, otherwise use FSCoreVersion-->
32+
<MicroBuildAssemblyVersionCondition="'$(UseVsMicroBuildAssemblyVersion)' == 'true'">$(VSAssemblyVersion)</MicroBuildAssemblyVersion>
2533

2634
<!--
2735
@@ -43,4 +51,8 @@
4351
<VsixPackageVersion>$(MicroBuildAssemblyVersion_WithoutRevision).$(BuildTimeStamp)</VsixPackageVersion>
4452
<NuGetPackageVersionSuffix>$(BuildTimeStamp_Date)-$(BuildTimeStamp_Number)</NuGetPackageVersionSuffix>
4553
</PropertyGroup>
54+
55+
<TargetName="GetVsixPackageVersion"Outputs="$(VsixPackageVersion)">
56+
</Target>
57+
4658
</Project>

‎fcs/FSharp.Compiler.Service.ProjectCracker/FSharp.Compiler.Service.ProjectCracker.fsproj‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,6 @@
1818
<PackageIconUrl>https://raw.github.com/fsharp/FSharp.Compiler.Service/master/misc/logo.png</PackageIconUrl>
1919
<PackageTags>F#, compiler, msbuild</PackageTags>
2020
</PropertyGroup>
21-
<ItemGroup>
22-
<ReferenceInclude="mscorlib" />
23-
<ReferenceInclude="System" />
24-
<ReferenceInclude="System.Core" />
25-
<ReferenceInclude="System.Numerics" />
26-
<ReferenceInclude="System.Runtime.Serialization" />
27-
<ReferenceInclude="System.Xml" />
28-
<!-- we build the nuget against FSHarp.Core 4.4.0.0 instead of our latest to allow use in wider range of F# tools-->
29-
<ReferenceInclude="FSharp.Core">
30-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
31-
<Private>false</Private>
32-
</Reference>
33-
</ItemGroup>
3421
<ItemGroup>
3522
<CompileInclude="..\FSharp.Compiler.Service.ProjectCrackerTool\ProjectCrackerOptions.fs">
3623
<Link>ProjectCrackerOptions.fs</Link>

‎fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -651,13 +651,7 @@
651651
<ReferenceInclude="System.IO, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
652652
<ReferenceInclude="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
653653
<ReferenceInclude="System.ValueTuple">
654-
<HintPath>$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
655-
</Reference>
656-
657-
<!-- we build the nuget against FSHarp.Core 4.4.0.0 instead of our latest to allow use in wider range of F# tools-->
658-
<ReferenceInclude="FSharp.Core">
659-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
660-
<Private>false</Private>
654+
<HintPath>$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
661655
</Reference>
662656
</ItemGroup>
663657
<ImportProject="$(FSharpSourcesRoot)\scripts\fssrgen.targets"Condition="'$(TargetFramework)' != ''" />

‎fcs/samples/EditorService/EditorService.fsproj‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -6,40 +6,6 @@
66
<OutputType>Exe</OutputType>
77
<IsPackable>false</IsPackable>
88
</PropertyGroup>
9-
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
10-
<DebugSymbols>true</DebugSymbols>
11-
<DebugType>full</DebugType>
12-
<Optimize>false</Optimize>
13-
<Tailcalls>false</Tailcalls>
14-
<OutputPath>bin\Debug\</OutputPath>
15-
<DefineConstants>DEBUG;TRACE</DefineConstants>
16-
<WarningLevel>3</WarningLevel>
17-
<PlatformTarget>AnyCPU</PlatformTarget>
18-
<DocumentationFile>bin\Debug\EditorService.xml</DocumentationFile>
19-
<Prefer32Bit>true</Prefer32Bit>
20-
</PropertyGroup>
21-
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
22-
<DebugType>pdbonly</DebugType>
23-
<Optimize>true</Optimize>
24-
<Tailcalls>true</Tailcalls>
25-
<OutputPath>bin\Release\</OutputPath>
26-
<DefineConstants>TRACE</DefineConstants>
27-
<WarningLevel>3</WarningLevel>
28-
<PlatformTarget>AnyCPU</PlatformTarget>
29-
<DocumentationFile>bin\Release\EditorService.xml</DocumentationFile>
30-
<Prefer32Bit>true</Prefer32Bit>
31-
</PropertyGroup>
32-
<ItemGroup>
33-
<!-- we build the nuget against FSHarp.Core 4.4.0.0 instead of our latest to allow use in wider range of F# tools-->
34-
<ReferenceInclude="FSharp.Core">
35-
<HintPath>$(SolutionDir)\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
36-
<Private>false</Private>
37-
</Reference>
38-
<ReferenceInclude="mscorlib" />
39-
<ReferenceInclude="System" />
40-
<ReferenceInclude="System.Core" />
41-
<ReferenceInclude="System.Numerics" />
42-
</ItemGroup>
439
<ItemGroup>
4410
<CompileInclude="Program.fs" />
4511
<NoneInclude="App.config" />

‎packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<packageid="System.Reflection.Metadata"version="1.4.2" />
2020
<packageid="Microsoft.DiaSymReader.PortablePdb"version="1.2.0" />
2121
<packageid="Microsoft.DiaSymReader"version="1.1.0" />
22-
<packageid="System.ValueTuple"version="4.3.1" />
22+
<packageid="System.ValueTuple"version="4.4.0" />
2323
<packageid="Microsoft.VisualFSharp.Msbuild.15.0"version="1.0.1" />
2424
<packageid="Microsoft.Build"version="14.3.0" />
2525
<packageid="Microsoft.Build.Framework"version="14.3.0" />

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp