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

Commit98372ab

Browse files
cloudRoutineKevinRansom
authored andcommitted
Blockstructure Service
1 parent0d54038 commit98372ab

File tree

8 files changed

+1061
-521
lines changed

8 files changed

+1061
-521
lines changed

‎src/fsharp/FSharp.Core/seq.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ namespace Microsoft.FSharp.Core.CompilerServices
542542
moduleRuntimeHelpers=
543543

544544
[<Struct; NoComparison; NoEquality>]
545-
typeinternalStructBox<'Twhen'T:equality>(value:'T)=
545+
typeinternalStructBox<'Twhen'T:equality>(value:'T)=
546546
memberx.Value= value
547547
static memberComparer=
548548
letgcomparer= HashIdentity.Structural<'T>

‎src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj‎

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.-->
33
<ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
44
<PropertyGroup>
@@ -28,15 +28,29 @@
2828
<IncludePkgdefInVSIXContainer>true</IncludePkgdefInVSIXContainer>
2929
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
3030
</PropertyGroup>
31+
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />
32+
<ImportProject="$(FsLexToolPath)\FsLexYacc.targets" />
33+
<ImportProject="$(VsSDKInstall)\Microsoft.VsSDK.targets"Condition="'$(AddVsSdkAttributesToSomeCoreComponents)' == 'true'" />
34+
<PropertyGroup>
35+
<OtherFlags>$(OtherFlags) /warnon:1182</OtherFlags>
36+
</PropertyGroup>
37+
<TargetName="GatherBinariesToBeSigned"AfterTargets="Localize"Condition="'$(UseGatherBinaries)' == 'true'">
38+
<ItemGroup>
39+
<BinariesToBeSignedInclude="$(OutDir)$(AssemblyName).dll" />
40+
<BinariesToBeSignedInclude="$(OutDir)localize\**\$(AssemblyName).resources.dll" />
41+
<FilesToSignInclude="@(BinariesToBeSigned)">
42+
<Authenticode>Microsoft</Authenticode>
43+
<StrongName>StrongName</StrongName>
44+
</FilesToSign>
45+
</ItemGroup>
46+
</Target>
3147
<ItemGroup>
3248
<FilesToLocalizeInclude="$(OutDir)$(AssemblyName).dll">
3349
<TranslationFile>$(FSharpSourcesRoot)\..\loc\lcl\{Lang}\$(AssemblyName).dll.lcl</TranslationFile>
3450
<LciCommentFile>$(FSharpSourcesRoot)\..\loc\lci\$(AssemblyName).dll.lci</LciCommentFile>
3551
<HasLceComments>false</HasLceComments>
3652
<InProject>false</InProject>
3753
</FilesToLocalize>
38-
</ItemGroup>
39-
<ItemGroup>
4054
<FsSrGenInclude="..\FSComp.txt">
4155
<Link>FSComp.txt</Link>
4256
</FsSrGen>
@@ -536,9 +550,6 @@
536550
<CompileInclude="..\MSBuildReferenceResolver.fs">
537551
<Link>Service/MSBuildReferenceResolver.fs</Link>
538552
</Compile>
539-
<CompileInclude="..\vs\ServiceStructure.fs">
540-
<Link>Service/ServiceStructure.fs</Link>
541-
</Compile>
542553
<CompileInclude="..\vs\ServiceAssemblyContent.fs">
543554
<Link>Service/ServiceAssemblyContent.fs</Link>
544555
</Compile>
@@ -592,31 +603,24 @@
592603
<HintPath>$(FSharpSourcesRoot)\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
593604
<Private>True</Private>
594605
</Reference>
595-
<ReferenceInclude="Microsoft.DiaSymReader.PortablePdb"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.PortablePdb.1.1.0\lib\portable-net45+win8\Microsoft.DiaSymReader.PortablePdb.dll</HintPath></Reference>
596-
<ReferenceInclude="Microsoft.DiaSymReader"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.1.0.8\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath></Reference>
597-
<ReferenceInclude="System.Reflection.Metadata"><HintPath>..\..\..\packages\System.Reflection.Metadata.1.4.1-beta-24227-04\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath></Reference>
598-
<ReferenceInclude="System.Collections.Immutable"><HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath></Reference>
599-
<ReferenceInclude="System.ValueTuple"><HintPath>..\..\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath></Reference>
600-
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" >
606+
<ReferenceInclude="Microsoft.DiaSymReader.PortablePdb">
607+
<HintPath>..\..\..\packages\Microsoft.DiaSymReader.PortablePdb.1.1.0\lib\portable-net45+win8\Microsoft.DiaSymReader.PortablePdb.dll</HintPath>
608+
</Reference>
609+
<ReferenceInclude="Microsoft.DiaSymReader">
610+
<HintPath>..\..\..\packages\Microsoft.DiaSymReader.1.0.8\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath>
611+
</Reference>
612+
<ReferenceInclude="System.Reflection.Metadata">
613+
<HintPath>..\..\..\packages\System.Reflection.Metadata.1.4.1-beta-24227-04\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
614+
</Reference>
615+
<ReferenceInclude="System.Collections.Immutable">
616+
<HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
617+
</Reference>
618+
<ReferenceInclude="System.ValueTuple">
619+
<HintPath>..\..\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
620+
</Reference>
621+
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
601622
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
602623
<Name>FSharp.Core</Name>
603624
</ProjectReference>
604625
</ItemGroup>
605-
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />
606-
<ImportProject="$(FsLexToolPath)\FsLexYacc.targets" />
607-
<ImportProject="$(VsSDKInstall)\Microsoft.VsSDK.targets"Condition="'$(AddVsSdkAttributesToSomeCoreComponents)' == 'true'"/>
608-
<PropertyGroup>
609-
<OtherFlags>$(OtherFlags) /warnon:1182</OtherFlags>
610-
</PropertyGroup>
611-
612-
<TargetName="GatherBinariesToBeSigned"AfterTargets="Localize"Condition="'$(UseGatherBinaries)' == 'true'">
613-
<ItemGroup>
614-
<BinariesToBeSignedInclude="$(OutDir)$(AssemblyName).dll" />
615-
<BinariesToBeSignedInclude="$(OutDir)localize\**\$(AssemblyName).resources.dll" />
616-
<FilesToSignInclude="@(BinariesToBeSigned)">
617-
<Authenticode>Microsoft</Authenticode>
618-
<StrongName>StrongName</StrongName>
619-
</FilesToSign>
620-
</ItemGroup>
621-
</Target>
622-
</Project>
626+
</Project>

0 commit comments

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