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

Commit526b097

Browse files
committed
Merge branch 'vs2017-rtm'
2 parents507ea9e +12b2d16 commit526b097

File tree

11 files changed

+112
-76
lines changed

11 files changed

+112
-76
lines changed

‎.nuget/NuGet.Config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
<addkey="myget.org roslyn-tools"value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
1515
<addkey="api.nuget.org"value="https://api.nuget.org/v3/index.json" />
1616
<addkey="vctools"value="https://vcppdogfooding.azurewebsites.net/nuget/" />
17+
<addkey="myget.org roslyn tools"value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
18+
<addkey="myget.org roslyn"value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
1719
<addkey="artifacts"value="../artifacts" />
1820
</packageSources>
1921
</configuration>

‎src/FSharpSource.Settings.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
<FsiToolExe>fsi.exe</FsiToolExe>
124124
<FsLexToolExe>fslex.exe</FsLexToolExe>
125125
<FsYaccToolExe>fsyacc.exe</FsYaccToolExe>
126-
<RoslynVersion>2.0.0-rc2</RoslynVersion>
126+
<RoslynVersion>2.0.0-rc3-61324-01</RoslynVersion>
127127
<RoslynVSBinariesVersion>14.0</RoslynVSBinariesVersion>
128128
<RoslynVSPackagesVersion>14.3.25407</RoslynVSPackagesVersion>
129129

‎src/Microbuild.Settings.targets‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,28 @@
226226
<CompileInclude="@(TempCompile)" />
227227
</ItemGroup>
228228
</Target>
229-
229+
230+
<TargetName="GetVsixPackageVersion"Outputs="$(VsixPackageVersion)">
231+
<PropertyGroup>
232+
<!--
233+
234+
Given $(BUILD_BUILDNUMBER) = '20161225.1'
235+
Given $(MicroBuildAssemblyVersion) = '15.4.1.0'
236+
237+
Then $(BuildTimeStamp_Day) = 161225
238+
Then $(BuildTimeStamp_Number) = 01
239+
Then $(BuildTimeStamp) = 16122501
240+
Then $(MicroBuildAssemblyVersion_WithoutRevision) = 15.4.1
241+
Then $(VsixPackageVersion) = 15.4.1.16122501
242+
243+
-->
244+
<BuildTimeStamp_Day>$(BUILD_BUILDNUMBER.Split('.')[0].Substring(2))</BuildTimeStamp_Day>
245+
<BuildTimeStamp_Number>$(BUILD_BUILDNUMBER.Split('.')[1].PadLeft(2, '0'))</BuildTimeStamp_Number>
246+
<BuildTimeStamp>$(BuildTimeStamp_Day)$(BuildTimeStamp_Number)</BuildTimeStamp>
247+
<MicroBuildAssemblyVersion_WithoutRevision>$(MicroBuildAssemblyVersion.Substring(0, $(MicroBuildAssemblyVersion.LastIndexOf('.'))))</MicroBuildAssemblyVersion_WithoutRevision>
248+
<VsixPackageVersion>$(MicroBuildAssemblyVersion_WithoutRevision).$(BuildTimeStamp)</VsixPackageVersion>
249+
</PropertyGroup>
250+
</Target>
251+
230252
<ImportProject="..\packages\MicroBuild.Core.$(MicroBuildCoreVersion)\build\MicroBuild.Core.targets" />
231253
</Project>

‎vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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
<PackageManifestVersion="2.0.0"xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011"xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
44
<Metadata>
5-
<IdentityId="VisualFSharp"Version="15.4.1.0"Language="en-US"Publisher="Microsoft.VisualFSharpTools" />
5+
<IdentityId="VisualFSharp"Version="|%CurrentProject%;GetVsixPackageVersion|"Language="en-US"Publisher="Microsoft.VisualFSharpTools" />
66
<DisplayName>Visual F# Tools</DisplayName>
77
<Descriptionxml:space="preserve">Deploy Visual F# Tools templates to Visual Studio</Description>
88
<PackageId>Microsoft.FSharp.VSIX.Full.Core</PackageId>

‎vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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
<PackageManifestVersion="2.0.0"xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011"xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
44
<Metadata>
5-
<IdentityId="VisualFSharp"Version="15.4.1.9055"Language="en-US"Publisher="Microsoft.VisualFSharpTools" />
5+
<IdentityId="VisualFSharp"Version="42.42.42.42"Language="en-US"Publisher="Microsoft.VisualFSharpTools" />
66
<DisplayName>Visual F# Tools</DisplayName>
77
<Descriptionxml:space="preserve">Deploy Visual F# Tools templates to Visual Studio</Description>
88
<PackageId>Microsoft.FSharp.VSIX.OpenSource.Core</PackageId>

‎vsintegration/packages.config‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<packageid="Microsoft.CodeAnalysis.Common"version="2.0.0-rc2"targetFramework="net46" />
4-
<packageid="Microsoft.CodeAnalysis.EditorFeatures"version="2.0.0-rc2"targetFramework="net46" />
5-
<packageid="Microsoft.CodeAnalysis.EditorFeatures.Text"version="2.0.0-rc2"targetFramework="net46" />
6-
<packageid="Microsoft.CodeAnalysis.Features"version="2.0.0-rc2"targetFramework="net46" />
7-
<packageid="Microsoft.CodeAnalysis.Workspaces.Common"version="2.0.0-rc2"targetFramework="net46" />
8-
<packageid="Microsoft.VisualStudio.LanguageServices"version="2.0.0-rc2"targetFramework="net46" />
3+
<packageid="Microsoft.CodeAnalysis.Common"version="2.0.0-rc3-61324-01"targetFramework="net46" />
4+
<packageid="Microsoft.CodeAnalysis.EditorFeatures"version="2.0.0-rc3-61324-01"targetFramework="net46" />
5+
<packageid="Microsoft.CodeAnalysis.EditorFeatures.Text"version="2.0.0-rc3-61324-01"targetFramework="net46" />
6+
<packageid="Microsoft.CodeAnalysis.Features"version="2.0.0-rc3-61324-01"targetFramework="net46" />
7+
<packageid="Microsoft.CodeAnalysis.Workspaces.Common"version="2.0.0-rc3-61324-01"targetFramework="net46" />
8+
<packageid="Microsoft.VisualStudio.LanguageServices"version="2.0.0-rc3-61324-01"targetFramework="net46" />
99
<packageid="Microsoft.Composition"version="1.0.27"targetFramework="net46" />
1010
<packageid="Microsoft.VisualStudio.Package.LanguageService.14.0"version="14.3.25407"targetFramework="net46" />
1111
<packageid="Microsoft.VisualStudio.Editor"version="14.3.25407"targetFramework="net46" />
@@ -21,7 +21,7 @@
2121
<packageid="Microsoft.VisualStudio.Language.StandardClassification"version="14.3.25407"targetFramework="net46" />
2222
<packageid="Microsoft.VisualStudio.Language.Intellisense"version="14.3.25407"targetFramework="net46" />
2323
<packageid="Microsoft.VisualStudio.Designer.Interfaces"version="1.1.4322" />
24-
<packageid="Microsoft.VSSDK.BuildTools"version="15.0.25929-RC2" />
24+
<packageid="Microsoft.VSSDK.BuildTools"version="15.0.26124-RC3" />
2525
<packageid="Roslyn.Microsoft.VisualStudio.ComponentModelHost"version="0.0.2"targetFramework="net46" />
2626
<packageid="Microsoft.VisualFSharp.Microsoft.VisualStudio.Shell.UI.Internal"version="14.0.25420"targetFramework="net46" />
2727
<packageid="RoslynDependencies.Microsoft.VisualStudio.Text.Internal"version="14.3.25407"targetFramework="net45" />

‎vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<CompileInclude="Navigation\GoToDefinitionService.fs" />
5757
<CompileInclude="Navigation\NavigationBarItemService.fs" />
5858
<CompileInclude="Navigation\NavigateToSearchService.fs" />
59-
<CompileInclude="Navigation\FindReferencesService.fs" />
59+
<CompileInclude="Navigation\FindUsagesService.fs" />
6060
<CompileInclude="BlockComment\CommentUncommentService.fs" />
6161
<CompileInclude="Structure\Structure.fs" />
6262
<CompileInclude="Structure\BlockStructureService.fs" />

‎vsintegration/src/FSharp.Editor/InlineRename/InlineRenameService.fs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ open System
66
openSystem.Composition
77
openSystem.Collections.Generic
88
openSystem.Collections.Immutable
9+
openSystem.Linq
910
openSystem.Threading
1011
openSystem.Threading.Tasks
1112

@@ -44,8 +45,8 @@ type internal DocumentLocations =
4445

4546
typeinternalInlineRenameLocationSet(locationsByDocument: DocumentLocations[],originalSolution: Solution)=
4647
interface IInlineRenameLocationSetwith
47-
member__.Locations:IList<InlineRenameLocation>=
48-
[|for docin locationsByDocumentdoyield! doc.Locations|]:>_
48+
member__.Locations:IList<InlineRenameLocation>=
49+
upcast[|for docin locationsByDocumentdoyield! doc.Locations|].ToList()
4950

5051
memberthis.GetReplacementsAsync(replacementText,_optionSet,cancellationToken):Task<IInlineRenameReplacementInfo>=
5152
let recapplyChanges i(solution:Solution)=
@@ -166,4 +167,4 @@ type internal InlineRenameService
166167
return! InlineRenameService.GetInlineRenameInfo(checkerProvider.Checker, projectInfoManager, document, sourceText, position, defines, options)
167168
}
168169
|> Async.map(Option.defaultValue FailureInlineRenameInfo.Instance)
169-
|> CommonRoslynHelpers.StartAsyncAsTask(cancellationToken)
170+
|> CommonRoslynHelpers.StartAsyncAsTask(cancellationToken)

‎vsintegration/src/FSharp.Editor/Navigation/FindReferencesService.fs‎renamed to ‎vsintegration/src/FSharp.Editor/Navigation/FindUsagesService.fs‎

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,22 @@ open System.Collections.Immutable
88
openSystem.Composition
99

1010
openMicrosoft.CodeAnalysis
11+
openMicrosoft.CodeAnalysis.Completion
1112
openMicrosoft.CodeAnalysis.Host.Mef
1213
openMicrosoft.CodeAnalysis.Editor
14+
openMicrosoft.CodeAnalysis.Editor.FindUsages
1315
openMicrosoft.CodeAnalysis.Editor.Host
1416
openMicrosoft.CodeAnalysis.Navigation
1517
openMicrosoft.CodeAnalysis.FindSymbols
16-
openMicrosoft.CodeAnalysis.FindReferences
17-
openMicrosoft.CodeAnalysis.Completion
18+
openMicrosoft.CodeAnalysis.FindUsages
1819

1920
openMicrosoft.VisualStudio.FSharp.LanguageService
2021

2122
openMicrosoft.FSharp.Compiler.Range
2223
openMicrosoft.FSharp.Compiler.SourceCodeServices
2324

24-
[<ExportLanguageService(typeof<IStreamingFindReferencesService>, FSharpCommonConstants.FSharpLanguageName); Shared>]
25-
typeinternalFSharpFindReferencesService
25+
[<ExportLanguageService(typeof<IFindUsagesService>, FSharpCommonConstants.FSharpLanguageName); Shared>]
26+
typeinternalFSharpFindUsagesService
2627
[<ImportingConstructor>]
2728
(
2829
checkerProvider: FSharpCheckerProvider,
@@ -50,7 +51,7 @@ type internal FSharpFindReferencesService
5051
return spans|> Array.choose id|> Array.toList
5152
}
5253

53-
letfindReferencedSymbolsAsync(document:Document,position:int,context:FindReferencesContext):Async<unit>=
54+
letfindReferencedSymbolsAsync(document:Document,position:int,context:IFindUsagesContext,allReferences:bool):Async<unit>=
5455
asyncMaybe{
5556
let!sourceText= document.GetTextAsync(context.CancellationToken)
5657
letchecker= checkerProvider.Checker
@@ -129,20 +130,25 @@ type internal FSharpFindReferencesService
129130
match declarationRangewith
130131
| Some declRangewhen declRange= symbolUse.RangeAlternate->()
131132
|_->
132-
let!referenceDocSpans= rangeToDocumentSpans(document.Project.Solution, symbolUse.RangeAlternate, context.CancellationToken)|> liftAsync
133-
match referenceDocSpanswith
134-
|[]->()
135-
|_->
136-
for referenceDocSpanin referenceDocSpansdo
137-
for definitionItemin definitionItemsdo
138-
letreferenceItem= SourceReferenceItem(definitionItem, referenceDocSpan)
139-
do! context.OnReferenceFoundAsync(referenceItem)|> Async.AwaitTask|> liftAsync
133+
// report a reference if we're interested in all _or_ if we're looking at an implementation
134+
if allReferences|| symbolUse.IsFromDispatchSlotImplementationthen
135+
let!referenceDocSpans= rangeToDocumentSpans(document.Project.Solution, symbolUse.RangeAlternate, context.CancellationToken)|> liftAsync
136+
match referenceDocSpanswith
137+
|[]->()
138+
|_->
139+
for referenceDocSpanin referenceDocSpansdo
140+
for definitionItemin definitionItemsdo
141+
letreferenceItem= SourceReferenceItem(definitionItem, referenceDocSpan)
142+
do! context.OnReferenceFoundAsync(referenceItem)|> Async.AwaitTask|> liftAsync
140143

141-
do! context.OnCompletedAsync()|> Async.AwaitTask|> liftAsync
144+
()
142145
}|> Async.Ignore
143146

144-
interfaceIStreamingFindReferencesServicewith
147+
interfaceIFindUsagesServicewith
145148
member__.FindReferencesAsync(document,position,context)=
146-
findReferencedSymbolsAsync(document, position, context)
149+
findReferencedSymbolsAsync(document, position, context,true)
150+
|> CommonRoslynHelpers.StartAsyncUnitAsTask(context.CancellationToken)
151+
member__.FindImplementationsAsync(document,position,context)=
152+
findReferencedSymbolsAsync(document, position, context,false)
147153
|> CommonRoslynHelpers.StartAsyncUnitAsTask(context.CancellationToken)
148154

Lines changed: 49 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,53 @@
11
<?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
<configuration>
4-
<appSettings>
5-
<addkey="fsharp-compiler-location"value="{FinalDir}" />
6-
</appSettings>
7-
<runtime>
8-
<assemblyBindingxmlns="urn:schemas-microsoft-com:asm.v1">
9-
<dependentAssembly>
10-
<assemblyIdentityname="EnvDTE"publicKeyToken="b03f5f7f11d50a3a"culture="neutral"/>
11-
<bindingRedirectoldVersion="7.0.3300.0"newVersion="8.0.0.0"/>
12-
</dependentAssembly>
13-
<dependentAssembly>
14-
<assemblyIdentityname="Microsoft.VisualStudio.Package.LanguageService.10.0"publicKeyToken="b03f5f7f11d50a3a"culture="neutral"/>
15-
<bindingRedirectoldVersion="2.0.0.0-11.0.0.0"newVersion="10.0.0.0"/>
16-
</dependentAssembly>
17-
<dependentAssembly>
18-
<assemblyIdentityname="Microsoft.VisualStudio.Shell.10.0"publicKeyToken="b03f5f7f11d50a3a"culture="neutral"/>
19-
<bindingRedirectoldVersion="2.0.0.0-10.0.0.0"newVersion="11.0.0.0"/>
20-
</dependentAssembly>
21-
<dependentAssembly>
22-
<assemblyIdentityname="Microsoft.Build.Framework"publicKeyToken="b03f5f7f11d50a3a"culture="neutral"/>
23-
<bindingRedirectoldVersion="2.0.0.0-{VisualStudioVersion}.0.0"newVersion="{VisualStudioVersion}.0.0"/>
24-
</dependentAssembly>
25-
<dependentAssembly>
26-
<assemblyIdentityname="Microsoft.Build.Utilities"publicKeyToken="b03f5f7f11d50a3a"culture="neutral"/>
27-
<bindingRedirectoldVersion="2.0.0.0-{VisualStudioVersion}.0.0"newVersion="{VisualStudioVersion}.0.0"/>
28-
</dependentAssembly>
29-
<dependentAssembly>
30-
<assemblyIdentityname="FSharp.Core"publicKeyToken="b03f5f7f11d50a3a"culture="neutral"/>
31-
<bindingRedirectoldVersion="2.0.0.0-4.4.1.0"newVersion="4.4.1.0"/>
32-
</dependentAssembly>
33-
<!-- VS Dlls with versions that Roslyn uses-->
34-
<dependentAssembly>
35-
<assemblyIdentityname="Microsoft.VisualStudio.Text.Internal"publicKeyToken="b03f5f7f11d50a3a"culture="neutral"/>
36-
<bindingRedirectoldVersion="14.0.0.0-15.0.0.0"newVersion="14.0.0.0"/>
37-
</dependentAssembly>
38-
<dependentAssembly>
39-
<assemblyIdentityname="Microsoft.VisualStudio.Platform.VSEditor"publicKeyToken="b03f5f7f11d50a3a"culture="neutral"/>
40-
<bindingRedirectoldVersion="14.0.0.0-15.0.0.0"newVersion="14.0.0.0"/>
41-
</dependentAssembly>
42-
<dependentAssembly>
43-
<assemblyIdentityname="Microsoft.VisualStudio.Platform.VSEditor.Interop"publicKeyToken="b03f5f7f11d50a3a"culture="neutral"/>
44-
<bindingRedirectoldVersion="14.0.0.0-15.0.0.0"newVersion="14.0.0.0"/>
45-
</dependentAssembly>
46-
</assemblyBinding>
47-
</runtime>
4+
<appSettings>
5+
<addkey="fsharp-compiler-location"value="{FinalDir}" />
6+
</appSettings>
7+
<runtime>
8+
<assemblyBindingxmlns="urn:schemas-microsoft-com:asm.v1">
9+
<dependentAssembly>
10+
<assemblyIdentityname="EnvDTE"publicKeyToken="b03f5f7f11d50a3a"culture="neutral" />
11+
<bindingRedirectoldVersion="7.0.3300.0"newVersion="8.0.0.0" />
12+
</dependentAssembly>
13+
<dependentAssembly>
14+
<assemblyIdentityname="Microsoft.VisualStudio.Package.LanguageService.10.0"publicKeyToken="b03f5f7f11d50a3a"culture="neutral" />
15+
<bindingRedirectoldVersion="2.0.0.0-11.0.0.0"newVersion="10.0.0.0" />
16+
</dependentAssembly>
17+
<dependentAssembly>
18+
<assemblyIdentityname="Microsoft.VisualStudio.Shell.10.0"publicKeyToken="b03f5f7f11d50a3a"culture="neutral" />
19+
<bindingRedirectoldVersion="2.0.0.0-10.0.0.0"newVersion="11.0.0.0" />
20+
</dependentAssembly>
21+
<dependentAssembly>
22+
<assemblyIdentityname="Microsoft.Build.Framework"publicKeyToken="b03f5f7f11d50a3a"culture="neutral" />
23+
<bindingRedirectoldVersion="2.0.0.0-{VisualStudioVersion}.0.0"newVersion="{VisualStudioVersion}.0.0" />
24+
</dependentAssembly>
25+
<dependentAssembly>
26+
<assemblyIdentityname="Microsoft.Build.Utilities"publicKeyToken="b03f5f7f11d50a3a"culture="neutral" />
27+
<bindingRedirectoldVersion="2.0.0.0-{VisualStudioVersion}.0.0"newVersion="{VisualStudioVersion}.0.0" />
28+
</dependentAssembly>
29+
<dependentAssembly>
30+
<assemblyIdentityname="FSharp.Core"publicKeyToken="b03f5f7f11d50a3a"culture="neutral" />
31+
<bindingRedirectoldVersion="2.0.0.0-4.4.1.0"newVersion="4.4.1.0" />
32+
</dependentAssembly>
33+
<!-- VS Dlls with versions that Roslyn uses-->
34+
<dependentAssembly>
35+
<assemblyIdentityname="Microsoft.VisualStudio.Text.Internal"publicKeyToken="b03f5f7f11d50a3a"culture="neutral" />
36+
<bindingRedirectoldVersion="14.0.0.0-15.0.0.0"newVersion="14.0.0.0" />
37+
</dependentAssembly>
38+
<dependentAssembly>
39+
<assemblyIdentityname="Microsoft.VisualStudio.Platform.VSEditor"publicKeyToken="b03f5f7f11d50a3a"culture="neutral" />
40+
<bindingRedirectoldVersion="14.0.0.0-15.0.0.0"newVersion="14.0.0.0" />
41+
</dependentAssembly>
42+
<dependentAssembly>
43+
<assemblyIdentityname="Microsoft.VisualStudio.Platform.VSEditor.Interop"publicKeyToken="b03f5f7f11d50a3a"culture="neutral" />
44+
<bindingRedirectoldVersion="14.0.0.0-15.0.0.0"newVersion="14.0.0.0" />
45+
</dependentAssembly>
46+
<!-- Microsoft.CodeAnalysis.Features requires 1.2.1 but the rest of F# uses 1.2.0-->
47+
<dependentAssembly>
48+
<assemblyIdentityname="System.Collections.Immutable"publicKeyToken="b03f5f7f11d50a3a"culture="neutral" />
49+
<bindingRedirectoldVersion="1.0.0.0-1.2.1.0"newVersion="1.2.0.0" />
50+
</dependentAssembly>
51+
</assemblyBinding>
52+
</runtime>
4853
</configuration>

0 commit comments

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