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

Commit0dffbff

Browse files
Merge branch 'dev15.8' into codelensfixes
2 parentsc8a617c +fed9b48 commit0dffbff

File tree

173 files changed

+2746
-768
lines changed

Some content is hidden

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

173 files changed

+2746
-768
lines changed

‎NuGet.Config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<addkey="myget.org dotnet-buildtools"value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
1616
<addkey="myget.org roslyn-tools"value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
1717
<addkey="api.nuget.org"value="https://api.nuget.org/v3/index.json" />
18-
<addkey="myget.org roslyn tools"value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
1918
<addkey="myget.org roslyn"value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
2019
<addkey="myget.org symreader-converter"value="https://dotnet.myget.org/F/symreader-converter/api/v3/index.json" />
2120
</packageSources>

‎build/config/AssemblySignToolData.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
}
5858
],
5959
"exclude": [
60-
"FSharp.Core.4.3.4.nupkg",
60+
"FSharp.Core.4.5.0.nupkg",
6161
"FSharp.Data.TypeProviders.dll",
6262
"Microsoft.Build.Conversion.Core.dll",
6363
"Microsoft.Build.dll",
@@ -68,7 +68,6 @@
6868
"Newtonsoft.Json.dll",
6969
"System.Collections.Immutable.dll",
7070
"System.Reflection.Metadata.dll",
71-
"System.ValueTuple.4.3.1.nupkg",
7271
"System.ValueTuple.4.4.0.nupkg",
7372
"System.ValueTuple.dll"
7473
]

‎build/targets/PackageVersions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<RoslynPackageVersion>$([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\..\RoslynPackageVersion.txt').Trim())</RoslynPackageVersion>
77

88
<!-- System.* packages-->
9-
<SystemCollectionsImmutablePackageVersion>1.3.1</SystemCollectionsImmutablePackageVersion>
9+
<SystemCollectionsImmutablePackageVersion>1.5.0</SystemCollectionsImmutablePackageVersion>
1010

1111
<!-- Roslyn packages-->
1212
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>$(RoslynPackageVersion)</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<ImportProject="..\netfx.props" />
77
<PropertyGroup>
88
<TargetFrameworks>net45</TargetFrameworks>
9+
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
910
<OutputPath>..\..\$(Configuration.ToLower())\fcs</OutputPath>
1011
<DefineConstants>$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
1112
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<ImportProject="..\netfx.props" />
77
<PropertyGroup>
88
<TargetFrameworks>net45</TargetFrameworks>
9+
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
910
<OutputPath>..\..\$(Configuration.ToLower())\fcs</OutputPath>
1011
</PropertyGroup>
1112
<PropertyGroup>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<PropertyGroup>
88
<OutputType>Exe</OutputType>
99
<TargetFrameworks>net45</TargetFrameworks>
10+
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1011
<DefineConstants>$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
1112
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
1213
<OtherFlags>$(OtherFlags) --staticlink:FSharp.Core</OtherFlags>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<ImportProject="..\netfx.props" />
77
<PropertyGroup>
88
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
9+
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
910
<NoWarn>$(NoWarn);44;75;</NoWarn>
1011
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1112
<GenerateDocumentationFile>true</GenerateDocumentationFile>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<ImportProject="..\netfx.props" />
77
<PropertyGroup>
88
<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
9+
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
910
<DefineConstants>$(DefineConstants);COMPILER_SERVICE_AS_DLL</DefineConstants>
1011
<DefineConstants>$(DefineConstants);COMPILER</DefineConstants>
1112
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
@@ -635,8 +636,8 @@
635636
</ItemGroup>
636637
<ItemGroup>
637638
<PackageReferenceInclude="FSharp.Core"Version="4.1.*" />
638-
<PackageReferenceInclude="System.Collections.Immutable"Version="1.3.1" />
639-
<PackageReferenceInclude="System.Reflection.Metadata"Version="1.4.2" />
639+
<PackageReferenceInclude="System.Collections.Immutable"Version="1.5.0" />
640+
<PackageReferenceInclude="System.Reflection.Metadata"Version="1.6.0" />
640641
</ItemGroup>
641642
<ItemGroupCondition="'$(TargetFramework)' == 'netstandard2.0'">
642643
<PackageReferenceInclude="System.Diagnostics.Process"Version="4.1.0" />

‎fcs/samples/EditorService/EditorService.fsproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<ImportProject="..\..\netfx.props" />
44
<PropertyGroup>
55
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
6+
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
67
<OutputType>Exe</OutputType>
78
<IsPackable>false</IsPackable>
89
</PropertyGroup>
@@ -13,7 +14,7 @@
1314
<ItemGroup>
1415
<PackageReferenceInclude="FSharp.Core"Version="4.1.*" />
1516
<ProjectReferenceInclude="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
16-
<PackageReferenceInclude="System.Reflection.Metadata"Version="1.4.2" />
17+
<PackageReferenceInclude="System.Reflection.Metadata"Version="1.6.0" />
1718
</ItemGroup>
1819
<ItemGroupCondition="'$(TargetFramework)' == 'net46'">
1920
<ReferenceInclude="System.Runtime" />

‎fcs/samples/FscExe/FscExe.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<ImportProject="..\..\netfx.props" />
44
<PropertyGroup>
55
<TargetFrameworks>net46</TargetFrameworks>
6+
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
67
<OutputType>Exe</OutputType>
78
<IsPackable>false</IsPackable>
89
<DefineConstants>$(DefineConstants);RESIDENT_COMPILER</DefineConstants>

0 commit comments

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