rollback Microsoft.VisualStudio.Threading and use VS's version (#28)

MrLuje · Apr 23, 2020 · f835244 · f835244
1 parent 7a8fc6d
commit f835244
Show file tree

Hide file tree

Showing 19 changed files with 551 additions and 206 deletions.
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
diff --git a/ViewTest/App.config b/ViewTest/App.config
@@ -229,6 +229,16 @@
     <assemblyIdentity name="Microsoft.VisualStudio.Services.WebApi" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
     <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="15.0.0.0" />
   </dependentAssembly>
+  <dependentAssembly>
+    <Paket>True</Paket>
+    <assemblyIdentity name="Microsoft.VisualStudio.Threading" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="15.8.0.0" />
+  </dependentAssembly>
+  <dependentAssembly>
+    <Paket>True</Paket>
+    <assemblyIdentity name="Microsoft.VisualStudio.Validation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="15.3.0.0" />
+  </dependentAssembly>
   <dependentAssembly>
     <Paket>True</Paket>
     <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

diff --git a/paket.dependencies b/paket.dependencies
@@ -29,7 +29,7 @@ group vs14
 	nuget Microsoft.VisualStudio.Shell.Immutable.12.0 < 15.0
 	nuget Microsoft.VisualStudio.Shell.Immutable.14.0 < 15.0
 	nuget Microsoft.VisualStudio.Shell.Interop.12.0 ~> 12.0
-	nuget Microsoft.VisualStudio.Threading ~> 14.0
+	nuget Microsoft.VisualStudio.Threading == 15.8.192 redirects: force, copy_local: false
 
 group vs15
 	framework: auto-detect
@@ -40,7 +40,7 @@ group vs15
 	nuget Microsoft.VisualStudio.Shell.14.0 ~> 14.0 copy_local: false
 	nuget Microsoft.VisualStudio.Shell.15.0 ~> 15.0 copy_local: false
 	nuget Microsoft.VisualStudio.Shell.Interop.12.0 ~> 12.0
-	nuget Microsoft.VisualStudio.Threading ~> 15.0
+	nuget Microsoft.VisualStudio.Threading == 15.8.192 redirects: force, copy_local: false
 
 group vs16
 	framework: auto-detect
@@ -50,7 +50,7 @@ group vs16
 	nuget Microsoft.VisualStudio.Shell.14.0 ~> 14.0 copy_local: false
 	nuget Microsoft.VisualStudio.Shell.15.0 ~> 15.0 copy_local: false
 	nuget Microsoft.VisualStudio.Shell.Interop.12.0 ~> 12.0
-	nuget Microsoft.VisualStudio.Threading ~> 16.0
+	nuget Microsoft.VisualStudio.Threading == 15.8.192 redirects: force, copy_local: false
 
 group build-script
 	framework: netstandard2.0
@@ -62,5 +62,4 @@ group build-script
 	nuget Fake.Core.Target prerelease
 	nuget Fake.IO.FileSystem prerelease
 	nuget Selenium.Support
-	nuget Selenium.WebDriver.ChromeDriver
-	nuget Selenium.WebDriver
+	nuget Selenium.WebDriver.ChromeDriver
diff --git a/paket.lock b/paket.lock
@@ -99,11 +99,11 @@ NUGET
       FSharp.Core (>= 4.7)
       Selenium.WebDriver (>= 3.141)
       System.Drawing.Common (>= 4.6)
-    Fake (5.16)
+    FAKE (5.16)
     Fake.Api.GitHub (5.19.1)
       FSharp.Core (>= 4.7)
       Octokit (>= 0.36)
-    Fake.Core (5.16)
+    FAKE.Core (5.16)
     Fake.Core.CommandLineParsing (5.20.0-alpha.1566)
       FParsec (>= 1.1.1)
       FSharp.Core (>= 4.7)
@@ -262,10 +262,12 @@ NUGET
       Microsoft.VisualStudio.OLE.Interop (>= 7.10.6071)
     Microsoft.VisualStudio.TextManager.Interop.8.0 (8.0.50728) - copy_local: false
       Microsoft.VisualStudio.Shell.Interop (>= 7.10.6072)
-    Microsoft.VisualStudio.Threading (14.1.131)
-      Microsoft.VisualStudio.Validation (>= 14.1.111)
+    Microsoft.VisualStudio.Threading (15.8.192) - redirects: force
+      Microsoft.VisualStudio.Threading.Analyzers (>= 15.8.192)
+      Microsoft.VisualStudio.Validation (>= 15.3.15)
+    Microsoft.VisualStudio.Threading.Analyzers (16.6.13) - redirects: force
     Microsoft.VisualStudio.Utilities (15.0.26607)
-    Microsoft.VisualStudio.Validation (15.5.31)
+    Microsoft.VisualStudio.Validation (15.5.31) - redirects: force
     Newtonsoft.Json (12.0.3) - copy_local: false, redirects: force
     System.IdentityModel.Tokens.Jwt (6.5) - copy_local: false, redirects: force
       Microsoft.IdentityModel.JsonWebTokens (>= 6.5)
@@ -293,12 +295,23 @@ GROUP vs15
 RESTRICTION: == net48
 NUGET
   remote: https://api.nuget.org/v3/index.json
+    MessagePack (2.1.115)
+      MessagePack.Annotations (>= 2.1.115)
+      Microsoft.Bcl.AsyncInterfaces (>= 1.0)
+      System.Memory (>= 4.5.3)
+      System.Reflection.Emit (>= 4.6)
+      System.Reflection.Emit.Lightweight (>= 4.6)
+      System.Runtime.CompilerServices.Unsafe (>= 4.5.2)
+      System.Threading.Tasks.Extensions (>= 4.5.3)
+    MessagePack.Annotations (2.1.115)
     Microsoft.AspNet.WebApi.Client (5.2.7) - copy_local: false, redirects: force
       Newtonsoft.Json (>= 6.0.4)
     Microsoft.AspNet.WebApi.Core (5.2.7) - copy_local: false, redirects: force
       Microsoft.AspNet.WebApi.Client (>= 5.2.7)
     Microsoft.Azure.Services.AppAuthentication (1.4) - copy_local: false, redirects: force
       Microsoft.IdentityModel.Clients.ActiveDirectory (>= 5.2)
+    Microsoft.Bcl.AsyncInterfaces (1.1)
+      System.Threading.Tasks.Extensions (>= 4.5.2)
     Microsoft.IdentityModel.Clients.ActiveDirectory (5.2.7) - copy_local: false, redirects: force
       System.Net.Http (>= 4.3.4)
     Microsoft.IdentityModel.JsonWebTokens (6.5) - copy_local: false, redirects: force
@@ -414,32 +427,40 @@ NUGET
       Microsoft.VisualStudio.OLE.Interop (>= 7.10.6071)
     Microsoft.VisualStudio.TextManager.Interop.8.0 (8.0.50728) - copy_local: false
       Microsoft.VisualStudio.Shell.Interop (>= 7.10.6072)
-    Microsoft.VisualStudio.Threading (15.8.209)
-      Microsoft.VisualStudio.Threading.Analyzers (>= 15.8.209)
+    Microsoft.VisualStudio.Threading (15.8.192) - redirects: force
+      Microsoft.VisualStudio.Threading.Analyzers (>= 15.8.192)
       Microsoft.VisualStudio.Validation (>= 15.3.15)
-    Microsoft.VisualStudio.Threading.Analyzers (16.6.13)
+    Microsoft.VisualStudio.Threading.Analyzers (16.6.13) - redirects: force
     Microsoft.VisualStudio.Utilities (15.9.28307)
       Microsoft.VisualStudio.Threading (>= 15.6.31)
       StreamJsonRpc (>= 1.3.23)
-    Microsoft.VisualStudio.Validation (15.5.31) - copy_local: false
-    Nerdbank.Streams (2.2.43)
-      Microsoft.VisualStudio.Threading (>= 15.8.192)
+    Microsoft.VisualStudio.Validation (15.5.31) - redirects: force
+    Nerdbank.Streams (2.4.67)
+      Microsoft.VisualStudio.Threading (>= 16.4.33)
+      Microsoft.VisualStudio.Validation (>= 15.5.31)
       System.Buffers (>= 4.5)
       System.IO.Pipelines (>= 4.5.3)
       System.Net.WebSockets (>= 4.3)
+      System.Runtime.CompilerServices.Unsafe (>= 4.6)
       System.ValueTuple (>= 4.5)
     Newtonsoft.Json (12.0.3) - copy_local: false, redirects: force
-    StreamJsonRpc (2.0.208)
-      Microsoft.VisualStudio.Threading (>= 15.8.209)
-      Nerdbank.Streams (>= 2.2.26)
-      Newtonsoft.Json (>= 9.0.1)
-      System.IO.Pipelines (>= 4.5.3)
-      System.Memory (>= 4.5.2)
-      System.Net.Http (>= 4.3.3)
+    StreamJsonRpc (2.3.103)
+      MessagePack (>= 2.1.90)
+      Microsoft.Bcl.AsyncInterfaces (>= 1.0)
+      Microsoft.VisualStudio.Threading (>= 16.4.45)
+      Nerdbank.Streams (>= 2.4.60)
+      Newtonsoft.Json (>= 12.0.2)
+      System.Collections.Immutable (>= 1.5)
+      System.IO.Pipelines (>= 4.6)
+      System.Memory (>= 4.5.3)
+      System.Net.Http (>= 4.3.4)
       System.Net.WebSockets (>= 4.3)
-      System.Reflection.Emit (>= 4.3)
-      System.Threading.Tasks.Extensions (>= 4.5.2)
+      System.Reflection.Emit (>= 4.6)
+      System.Threading.Tasks.Dataflow (>= 4.9)
+      System.Threading.Tasks.Extensions (>= 4.5.3)
     System.Buffers (4.5.1)
+    System.Collections.Immutable (1.7)
+      System.Memory (>= 4.5.3)
     System.IdentityModel.Tokens.Jwt (6.5) - copy_local: false, redirects: force
       Microsoft.IdentityModel.JsonWebTokens (>= 6.5)
       Microsoft.IdentityModel.Tokens (>= 6.5)
@@ -457,6 +478,7 @@ NUGET
     System.Net.WebSockets (4.3)
     System.Numerics.Vectors (4.5)
     System.Reflection.Emit (4.7)
+    System.Reflection.Emit.Lightweight (4.7)
     System.Runtime (4.3.1) - copy_local: false, redirects: force
     System.Runtime.CompilerServices.Unsafe (4.7.1)
     System.Security.Cryptography.Algorithms (4.3.1) - copy_local: false, redirects: force
@@ -469,6 +491,7 @@ NUGET
     System.Security.Cryptography.X509Certificates (4.3.2) - copy_local: false, redirects: force
       System.Security.Cryptography.Algorithms (>= 4.3)
       System.Security.Cryptography.Encoding (>= 4.3)
+    System.Threading.Tasks.Dataflow (4.11)
     System.Threading.Tasks.Extensions (4.5.4)
       System.Runtime.CompilerServices.Unsafe (>= 4.5.3)
     System.ValueTuple (4.5)
@@ -497,7 +520,7 @@ NUGET
       Newtonsoft.Json (>= 6.0.4)
     Microsoft.AspNet.WebApi.Core (5.2.7) - copy_local: false, redirects: force
       Microsoft.AspNet.WebApi.Client (>= 5.2.7)
-    Microsoft.Bcl.AsyncInterfaces (1.1)
+    Microsoft.Bcl.AsyncInterfaces (1.1) - copy_local: false
       System.Threading.Tasks.Extensions (>= 4.5.2)
     Microsoft.CodeAnalysis.BannedApiAnalyzers (2.9.8) - copy_local: false
     Microsoft.IdentityModel.Clients.ActiveDirectory (5.2.7) - copy_local: false, redirects: force
@@ -614,22 +637,16 @@ NUGET
       Microsoft.VisualStudio.OLE.Interop (>= 7.10.6071)
     Microsoft.VisualStudio.TextManager.Interop.8.0 (8.0.50728) - copy_local: false
       Microsoft.VisualStudio.Shell.Interop (>= 7.10.6072)
-    Microsoft.VisualStudio.Threading (16.6.13)
-      Microsoft.Bcl.AsyncInterfaces (>= 1.0)
-      Microsoft.VisualStudio.Threading.Analyzers (>= 16.6.13)
-      Microsoft.VisualStudio.Validation (>= 15.5.31)
-      Microsoft.Win32.Registry (>= 4.6)
-      System.Threading.Tasks.Extensions (>= 4.5.3)
-    Microsoft.VisualStudio.Threading.Analyzers (16.6.13)
+    Microsoft.VisualStudio.Threading (15.8.192) - redirects: force
+      Microsoft.VisualStudio.Threading.Analyzers (>= 15.8.192)
+      Microsoft.VisualStudio.Validation (>= 15.3.15)
+    Microsoft.VisualStudio.Threading.Analyzers (16.6.13) - redirects: force
     Microsoft.VisualStudio.Utilities (16.5.29903.186) - copy_local: false
       Microsoft.VisualStudio.Threading (>= 16.5.132)
       Newtonsoft.Json (>= 12.0.2)
       StreamJsonRpc (>= 2.3.99)
       System.Threading.Tasks.Dataflow (>= 4.9)
-    Microsoft.VisualStudio.Validation (15.5.31)
-    Microsoft.Win32.Registry (4.7)
-      System.Security.AccessControl (>= 4.7)
-      System.Security.Principal.Windows (>= 4.7)
+    Microsoft.VisualStudio.Validation (15.5.31) - redirects: force
     Nerdbank.Streams (2.4.67) - copy_local: false
       Microsoft.VisualStudio.Threading (>= 16.4.33)
       Microsoft.VisualStudio.Validation (>= 15.5.31)
@@ -677,9 +694,7 @@ NUGET
     System.Reflection.Metadata (1.8) - copy_local: false, redirects: force
       System.Collections.Immutable (>= 1.7)
     System.Runtime (4.3.1) - copy_local: false, redirects: force
-    System.Runtime.CompilerServices.Unsafe (4.7.1)
-    System.Security.AccessControl (4.7)
-      System.Security.Principal.Windows (>= 4.7)
+    System.Runtime.CompilerServices.Unsafe (4.7.1) - copy_local: false, redirects: force
     System.Security.Cryptography.Algorithms (4.3.1) - copy_local: false, redirects: force
       System.IO (>= 4.3)
       System.Runtime (>= 4.3)
@@ -690,8 +705,7 @@ NUGET
     System.Security.Cryptography.X509Certificates (4.3.2) - copy_local: false, redirects: force
       System.Security.Cryptography.Algorithms (>= 4.3)
       System.Security.Cryptography.Encoding (>= 4.3)
-    System.Security.Principal.Windows (4.7)
     System.Threading.Tasks.Dataflow (4.11) - copy_local: false
-    System.Threading.Tasks.Extensions (4.5.4)
+    System.Threading.Tasks.Extensions (4.5.4) - copy_local: false, redirects: force
       System.Runtime.CompilerServices.Unsafe (>= 4.5.3)
     System.ValueTuple (4.5) - copy_local: false
diff --git a/vs-commitizen.Settings/vs-commitizen.Settings.csproj b/vs-commitizen.Settings/vs-commitizen.Settings.csproj
@@ -260,14 +260,65 @@
   <Choose>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.8'">
       <ItemGroup>
+        <Reference Include="WindowsBase">
+          <Paket>True</Paket>
+        </Reference>
         <Reference Include="Microsoft.VisualStudio.Threading">
-          <HintPath>..\packages\vs14\Microsoft.VisualStudio.Threading\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
+          <HintPath>..\packages\vs14\Microsoft.VisualStudio.Threading\lib\net46\Microsoft.VisualStudio.Threading.dll</HintPath>
           <Private>False</Private>
           <Paket>True</Paket>
         </Reference>
       </ItemGroup>
     </When>
   </Choose>
+  <Import Project="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\build\Microsoft.VisualStudio.Threading.Analyzers.targets" Condition="Exists('..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" Label="Paket" />
+  <ItemGroup>
+    <Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes.dll">
+      <Paket>True</Paket>
+    </Analyzer>
+    <Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.dll">
+      <Paket>True</Paket>
+    </Analyzer>
+    <Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\cs\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
+      <Paket>True</Paket>
+    </Analyzer>
+    <Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\de\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
+      <Paket>True</Paket>
+    </Analyzer>
+    <Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\es\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
+      <Paket>True</Paket>
+    </Analyzer>
+    <Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\fr\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
+      <Paket>True</Paket>
+    </Analyzer>
+    <Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\it\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
+      <Paket>True</Paket>
+    </Analyzer>
+    <Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\ja\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
+      <Paket>True</Paket>
+    </Analyzer>
+    <Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\ko\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
+      <Paket>True</Paket>
+    </Analyzer>
+    <Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\pl\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
+      <Paket>True</Paket>
+    </Analyzer>
+    <Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\pt-BR\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
+      <Paket>True</Paket>
+    </Analyzer>
+    <Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\ru\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
+      <Paket>True</Paket>
+    </Analyzer>
+    <Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\tr\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
+      <Paket>True</Paket>
+    </Analyzer>
+    <Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\zh-Hans\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
+      <Paket>True</Paket>
+    </Analyzer>
+    <Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\zh-Hant\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
+      <Paket>True</Paket>
+    </Analyzer>
+  </ItemGroup>
   <Choose>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.8'">
       <ItemGroup>

diff --git a/vs-commitizen.Tests/paket.references b/vs-commitizen.Tests/paket.references
@@ -1,6 +1,5 @@
-AutoFixture.AutoNSubstitute
+AutoFixture.AutoNSubstitute
 AutoFixture.Xunit2
-NSubstitute
 Shouldly
 StructureMap
 xunit
@@ -10,5 +9,4 @@ Xunit.StaFact
 group vs15
 	Microsoft.TeamFoundationServer.ExtendedClient copy_local: true
 	Microsoft.VisualStudio.Shell.14.0 copy_local: true
-	# Microsoft.VisualStudio.Shell.15.0 copy_local: true
 	Microsoft.VisualStudio.Shell.Interop.12.0