From e69b69336b0166b4f35739558e39f3414cf09dbf Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Thu, 29 Mar 2018 10:25:16 -0700 Subject: [PATCH 1/3] Remove VS-specific items from AdditionalFiles These will be replaced with equivalent lines in the VS SDK (perhaps vssdk-analyzers) and the CPS SDK. --- .../vs-threading.MainThreadAssertingMethods.txt | 4 +--- .../vs-threading.MainThreadSwitchingMethods.txt | 3 +-- .../AdditionalFiles/vs-threading.TypesRequiringMainThread.txt | 4 ---- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/Microsoft.VisualStudio.Threading.Analyzers/build/AdditionalFiles/vs-threading.MainThreadAssertingMethods.txt b/src/Microsoft.VisualStudio.Threading.Analyzers/build/AdditionalFiles/vs-threading.MainThreadAssertingMethods.txt index 69d739e1f..3e85fd688 100644 --- a/src/Microsoft.VisualStudio.Threading.Analyzers/build/AdditionalFiles/vs-threading.MainThreadAssertingMethods.txt +++ b/src/Microsoft.VisualStudio.Threading.Analyzers/build/AdditionalFiles/vs-threading.MainThreadAssertingMethods.txt @@ -1,3 +1 @@ -Microsoft.VisualStudio.Shell.ThreadHelper.ThrowIfNotOnUIThread -Microsoft.VisualStudio.ProjectSystem.IProjectThreadingService.VerifyOnUIThread -System.Windows.Threading.Dispatcher.VerifyAccess +System.Windows.Threading.Dispatcher.VerifyAccess diff --git a/src/Microsoft.VisualStudio.Threading.Analyzers/build/AdditionalFiles/vs-threading.MainThreadSwitchingMethods.txt b/src/Microsoft.VisualStudio.Threading.Analyzers/build/AdditionalFiles/vs-threading.MainThreadSwitchingMethods.txt index af6944f6a..c0d692076 100644 --- a/src/Microsoft.VisualStudio.Threading.Analyzers/build/AdditionalFiles/vs-threading.MainThreadSwitchingMethods.txt +++ b/src/Microsoft.VisualStudio.Threading.Analyzers/build/AdditionalFiles/vs-threading.MainThreadSwitchingMethods.txt @@ -1,2 +1 @@ -Microsoft.VisualStudio.ProjectSystem.IProjectThreadingService.SwitchToUIThread -Microsoft.VisualStudio.Threading.JoinableTaskFactory.SwitchToMainThreadAsync +Microsoft.VisualStudio.Threading.JoinableTaskFactory.SwitchToMainThreadAsync diff --git a/src/Microsoft.VisualStudio.Threading.Analyzers/build/AdditionalFiles/vs-threading.TypesRequiringMainThread.txt b/src/Microsoft.VisualStudio.Threading.Analyzers/build/AdditionalFiles/vs-threading.TypesRequiringMainThread.txt index 0ab645501..e69de29bb 100644 --- a/src/Microsoft.VisualStudio.Threading.Analyzers/build/AdditionalFiles/vs-threading.TypesRequiringMainThread.txt +++ b/src/Microsoft.VisualStudio.Threading.Analyzers/build/AdditionalFiles/vs-threading.TypesRequiringMainThread.txt @@ -1,4 +0,0 @@ -Microsoft.VisualStudio.Shell.Interop.* -Microsoft.VisualStudio.OLE.Interop.* -Microsoft.Internal.VisualStudio.Shell.Interop.* -!Microsoft.VisualStudio.Shell.Interop.IAsyncServiceProvider From fd07d866333993d88ceafaee01f06a62d3d7cda4 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Thu, 29 Mar 2018 11:06:55 -0700 Subject: [PATCH 2/3] Add release notes about new analyzers requirement in VS --- .../Microsoft.VisualStudio.Threading.Analyzers.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.VisualStudio.Threading.Analyzers/Microsoft.VisualStudio.Threading.Analyzers.csproj b/src/Microsoft.VisualStudio.Threading.Analyzers/Microsoft.VisualStudio.Threading.Analyzers.csproj index 8d23af3a4..fad80ed32 100644 --- a/src/Microsoft.VisualStudio.Threading.Analyzers/Microsoft.VisualStudio.Threading.Analyzers.csproj +++ b/src/Microsoft.VisualStudio.Threading.Analyzers/Microsoft.VisualStudio.Threading.Analyzers.csproj @@ -13,7 +13,7 @@ © Microsoft Corporation. All rights reserved. https://github.com/Microsoft/vs-threading https://aka.ms/VsExtensibilityIcon - https://go.microsoft.com/fwlink/?LinkID=746387 + In the v15.8 release, analyzers are incomplete in the context of Visual Studio without the Microsoft.VisualStudio.Sdk.Analyzers 15.8 package also installed. full From 7c7305a807d32311ac237533f58fe7475c87216e Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Thu, 29 Mar 2018 12:46:46 -0700 Subject: [PATCH 3/3] Update tests to keep passing when using VS types in sample code --- .../vs-threading.MainThreadAssertingMethods.mocks.txt | 1 + .../vs-threading.TypesRequiringMainThread.mocks.txt | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/Microsoft.VisualStudio.Threading.Analyzers.Tests/AdditionalFiles/vs-threading.MainThreadAssertingMethods.mocks.txt b/src/Microsoft.VisualStudio.Threading.Analyzers.Tests/AdditionalFiles/vs-threading.MainThreadAssertingMethods.mocks.txt index 59a4946ad..78aaebd42 100644 --- a/src/Microsoft.VisualStudio.Threading.Analyzers.Tests/AdditionalFiles/vs-threading.MainThreadAssertingMethods.mocks.txt +++ b/src/Microsoft.VisualStudio.Threading.Analyzers.Tests/AdditionalFiles/vs-threading.MainThreadAssertingMethods.mocks.txt @@ -1 +1,2 @@ Test.VerifyOnUIThread +Microsoft.VisualStudio.Shell.ThreadHelper.ThrowIfNotOnUIThread diff --git a/src/Microsoft.VisualStudio.Threading.Analyzers.Tests/AdditionalFiles/vs-threading.TypesRequiringMainThread.mocks.txt b/src/Microsoft.VisualStudio.Threading.Analyzers.Tests/AdditionalFiles/vs-threading.TypesRequiringMainThread.mocks.txt index 492f7d507..782bbf71c 100644 --- a/src/Microsoft.VisualStudio.Threading.Analyzers.Tests/AdditionalFiles/vs-threading.TypesRequiringMainThread.mocks.txt +++ b/src/Microsoft.VisualStudio.Threading.Analyzers.Tests/AdditionalFiles/vs-threading.TypesRequiringMainThread.mocks.txt @@ -2,3 +2,7 @@ !TestNS.FreeThreadedType !TestNS2.FreeThreadedType TestNS2.* +Microsoft.VisualStudio.Shell.Interop.* +Microsoft.VisualStudio.OLE.Interop.* +Microsoft.Internal.VisualStudio.Shell.Interop.* +!Microsoft.VisualStudio.Shell.Interop.IAsyncServiceProvider