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

Commit0bc0263

Browse files
authored
Merge pull request #3051 from KevinRansom/joinabletask
Use JoinableTask, ThreadHelper..Invoke is deprecated.
2 parentsdcaa169 +907863c commit0bc0263

File tree

10 files changed

+47
-11
lines changed

10 files changed

+47
-11
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@
646646
<Private>True</Private>
647647
</Reference>
648648
<ReferenceInclude="Microsoft.VisualStudio.Threading">
649-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.15.0.240\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
649+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.15.3.20\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
650650
</Reference>
651651
<ReferenceInclude="Microsoft.VisualStudio.Shell.Design, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
652652
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Design.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Shell.Design.dll</HintPath>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
<Private>True</Private>
148148
</Reference>
149149
<ReferenceInclude="Microsoft.VisualStudio.Threading">
150-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.15.0.240\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
150+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.15.3.20\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
151151
</Reference>
152152
<ReferenceInclude="Microsoft.VisualStudio.Editor, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
153153
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Editor.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Editor.dll</HintPath>

‎vsintegration/src/FSharp.LanguageService.Base/DocumentTask.cs‎

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
usingMicrosoft.VisualStudio.Shell.Interop;
1515
usingMicrosoft.VisualStudio.OLE.Interop;
1616
usingMicrosoft.VisualStudio.TextManager.Interop;
17+
usingMicrosoft.VisualStudio.Threading;
1718
usingMicrosoft.VisualStudio.Shell;
1819
usingIOleServiceProvider=Microsoft.VisualStudio.OLE.Interop.IServiceProvider;
1920
usingIServiceProvider=System.IServiceProvider;
@@ -161,14 +162,45 @@ public static void RunSync(Action a)
161162
}
162163
}
163164

165+
/// <summary>
166+
/// Local JoinableTaskContext
167+
/// ensuring non-reentrancy.
168+
/// </summary>
169+
privatestaticJoinableTaskContextjtc=null;
170+
privatestaticJoinableTaskFactoryJTF
171+
{
172+
get
173+
{
174+
if(jtc==null)
175+
{
176+
JoinableTaskContextj=null;
177+
if(VsTaskLibraryHelper.ServiceInstance==null)
178+
{
179+
j=newJoinableTaskContext();
180+
}
181+
else
182+
{
183+
j=ThreadHelper.JoinableTaskContext;
184+
}
185+
Interlocked.CompareExchange(refjtc,j,null);
186+
}
187+
188+
returnjtc.Factory;
189+
}
190+
}
191+
164192
/// <summary>
165193
/// Performs a callback on the UI thread and blocks until it is done, using the VS mechanism for
166194
/// ensuring non-reentrancy.
167195
/// </summary>
168196
[SuppressMessage("Microsoft.Design","CA1031:DoNotCatchGeneralExceptionTypes")]
169197
internalstaticTDoOnUIThread<T>(Func<T>callback)
170198
{
171-
returnMicrosoft.VisualStudio.Shell.ThreadHelper.Generic.Invoke<T>(callback);
199+
returnJTF.Run<T>(asyncdelegate
200+
{
201+
awaitJTF.SwitchToMainThreadAsync();
202+
returncallback();
203+
});
172204
}
173205

174206
/// <summary>
@@ -178,7 +210,11 @@ internal static T DoOnUIThread<T>(Func<T> callback)
178210
[SuppressMessage("Microsoft.Design","CA1031:DoNotCatchGeneralExceptionTypes")]
179211
internalstaticvoidDoOnUIThread(Actioncallback)
180212
{
181-
Microsoft.VisualStudio.Shell.ThreadHelper.Generic.Invoke(callback);
213+
JTF.Run(asyncdelegate
214+
{
215+
awaitJTF.SwitchToMainThreadAsync();
216+
callback();
217+
});
182218
}
183219
}
184220

‎vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
<Private>True</Private>
134134
</Reference>
135135
<ReferenceInclude="Microsoft.VisualStudio.Threading">
136-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.15.0.240\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
136+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.15.3.20\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
137137
</Reference>
138138
<ReferenceInclude="Microsoft.VisualStudio.Shell.Framework, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
139139
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Framework.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>

‎vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Framework.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
157157
</Reference>
158158
<ReferenceInclude="Microsoft.VisualStudio.Threading">
159-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.15.0.240\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
159+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.15.3.20\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
160160
</Reference>
161161
<ReferenceInclude="Microsoft.VisualStudio.Editor, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
162162
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Editor.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Editor.dll</HintPath>

‎vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
<Private>True</Private>
182182
</Reference>
183183
<ReferenceInclude="Microsoft.VisualStudio.Threading">
184-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.15.0.240\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
184+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.15.3.20\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
185185
</Reference>
186186
<ReferenceInclude="Microsoft.Build.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
187187
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Framework.dll</HintPath>

‎vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
<Private>True</Private>
141141
</Reference>
142142
<ReferenceInclude="Microsoft.VisualStudio.Threading">
143-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.15.0.240\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
143+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.15.3.20\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
144144
</Reference>
145145
<ReferenceInclude="Microsoft.VisualStudio.Utilities, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
146146
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Utilities.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>

‎vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173
<Private>True</Private>
174174
</Reference>
175175
<ReferenceInclude="Microsoft.VisualStudio.Threading">
176-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.15.0.240\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
176+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.15.3.20\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
177177
</Reference>
178178
<ReferenceInclude="Microsoft.VisualStudio.Editor, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
179179
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Editor.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Editor.dll</HintPath>

‎vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
<Private>True</Private>
129129
</Reference>
130130
<ReferenceInclude="Microsoft.VisualStudio.Threading">
131-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.15.0.240\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
131+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.15.3.20\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
132132
</Reference>
133133
<ReferenceInclude="Microsoft.VisualStudio.Text.UI.Wpf, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
134134
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.UI.Wpf.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Text.UI.Wpf.dll</HintPath>

‎vsintegration/tests/unittests/VisualFSharp.Unittests.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@
217217
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.Logic.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Text.Logic.dll</HintPath>
218218
</Reference>
219219
<ReferenceInclude="Microsoft.VisualStudio.Threading, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
220-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.14.1.131\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
220+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.15.3.20\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
221221
<Private>True</Private>
222222
</Reference>
223223
<ReferenceInclude="Microsoft.VisualStudio.Text.UI, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

0 commit comments

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