Skip to content

Commit f835244

Browse files
MrLujeMrLuje
authored
rollback Microsoft.VisualStudio.Threading and use VS's version (#28)
1 parent 7a8fc6d commit f835244

File tree

19 files changed

+551
-206
lines changed

19 files changed

+551
-206
lines changed

‎.paket/Paket.Restore.targets‎

Lines changed: 183 additions & 80 deletions
Large diffs are not rendered by default.

‎ViewTest/App.config‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,16 @@
229229
<assemblyIdentity name="Microsoft.VisualStudio.Services.WebApi" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
230230
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="15.0.0.0" />
231231
</dependentAssembly>
232+
<dependentAssembly>
233+
<Paket>True</Paket>
234+
<assemblyIdentity name="Microsoft.VisualStudio.Threading" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
235+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="15.8.0.0" />
236+
</dependentAssembly>
237+
<dependentAssembly>
238+
<Paket>True</Paket>
239+
<assemblyIdentity name="Microsoft.VisualStudio.Validation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
240+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="15.3.0.0" />
241+
</dependentAssembly>
232242
<dependentAssembly>
233243
<Paket>True</Paket>
234244
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

‎paket.dependencies‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ group vs14
2929
nuget Microsoft.VisualStudio.Shell.Immutable.12.0 < 15.0
3030
nuget Microsoft.VisualStudio.Shell.Immutable.14.0 < 15.0
3131
nuget Microsoft.VisualStudio.Shell.Interop.12.0 ~> 12.0
32-
nuget Microsoft.VisualStudio.Threading ~> 14.0
32+
nuget Microsoft.VisualStudio.Threading == 15.8.192 redirects: force, copy_local: false
3333

3434
group vs15
3535
framework: auto-detect
@@ -40,7 +40,7 @@ group vs15
4040
nuget Microsoft.VisualStudio.Shell.14.0 ~> 14.0 copy_local: false
4141
nuget Microsoft.VisualStudio.Shell.15.0 ~> 15.0 copy_local: false
4242
nuget Microsoft.VisualStudio.Shell.Interop.12.0 ~> 12.0
43-
nuget Microsoft.VisualStudio.Threading ~> 15.0
43+
nuget Microsoft.VisualStudio.Threading == 15.8.192 redirects: force, copy_local: false
4444

4545
group vs16
4646
framework: auto-detect
@@ -50,7 +50,7 @@ group vs16
5050
nuget Microsoft.VisualStudio.Shell.14.0 ~> 14.0 copy_local: false
5151
nuget Microsoft.VisualStudio.Shell.15.0 ~> 15.0 copy_local: false
5252
nuget Microsoft.VisualStudio.Shell.Interop.12.0 ~> 12.0
53-
nuget Microsoft.VisualStudio.Threading ~> 16.0
53+
nuget Microsoft.VisualStudio.Threading == 15.8.192 redirects: force, copy_local: false
5454

5555
group build-script
5656
framework: netstandard2.0
@@ -62,5 +62,4 @@ group build-script
6262
nuget Fake.Core.Target prerelease
6363
nuget Fake.IO.FileSystem prerelease
6464
nuget Selenium.Support
65-
nuget Selenium.WebDriver.ChromeDriver
66-
nuget Selenium.WebDriver
65+
nuget Selenium.WebDriver.ChromeDriver

‎paket.lock‎

Lines changed: 51 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ NUGET
9999
FSharp.Core (>= 4.7)
100100
Selenium.WebDriver (>= 3.141)
101101
System.Drawing.Common (>= 4.6)
102-
Fake (5.16)
102+
FAKE (5.16)
103103
Fake.Api.GitHub (5.19.1)
104104
FSharp.Core (>= 4.7)
105105
Octokit (>= 0.36)
106-
Fake.Core (5.16)
106+
FAKE.Core (5.16)
107107
Fake.Core.CommandLineParsing (5.20.0-alpha.1566)
108108
FParsec (>= 1.1.1)
109109
FSharp.Core (>= 4.7)
@@ -262,10 +262,12 @@ NUGET
262262
Microsoft.VisualStudio.OLE.Interop (>= 7.10.6071)
263263
Microsoft.VisualStudio.TextManager.Interop.8.0 (8.0.50728) - copy_local: false
264264
Microsoft.VisualStudio.Shell.Interop (>= 7.10.6072)
265-
Microsoft.VisualStudio.Threading (14.1.131)
266-
Microsoft.VisualStudio.Validation (>= 14.1.111)
265+
Microsoft.VisualStudio.Threading (15.8.192) - redirects: force
266+
Microsoft.VisualStudio.Threading.Analyzers (>= 15.8.192)
267+
Microsoft.VisualStudio.Validation (>= 15.3.15)
268+
Microsoft.VisualStudio.Threading.Analyzers (16.6.13) - redirects: force
267269
Microsoft.VisualStudio.Utilities (15.0.26607)
268-
Microsoft.VisualStudio.Validation (15.5.31)
270+
Microsoft.VisualStudio.Validation (15.5.31) - redirects: force
269271
Newtonsoft.Json (12.0.3) - copy_local: false, redirects: force
270272
System.IdentityModel.Tokens.Jwt (6.5) - copy_local: false, redirects: force
271273
Microsoft.IdentityModel.JsonWebTokens (>= 6.5)
@@ -293,12 +295,23 @@ GROUP vs15
293295
RESTRICTION: == net48
294296
NUGET
295297
remote: https://api.nuget.org/v3/index.json
298+
MessagePack (2.1.115)
299+
MessagePack.Annotations (>= 2.1.115)
300+
Microsoft.Bcl.AsyncInterfaces (>= 1.0)
301+
System.Memory (>= 4.5.3)
302+
System.Reflection.Emit (>= 4.6)
303+
System.Reflection.Emit.Lightweight (>= 4.6)
304+
System.Runtime.CompilerServices.Unsafe (>= 4.5.2)
305+
System.Threading.Tasks.Extensions (>= 4.5.3)
306+
MessagePack.Annotations (2.1.115)
296307
Microsoft.AspNet.WebApi.Client (5.2.7) - copy_local: false, redirects: force
297308
Newtonsoft.Json (>= 6.0.4)
298309
Microsoft.AspNet.WebApi.Core (5.2.7) - copy_local: false, redirects: force
299310
Microsoft.AspNet.WebApi.Client (>= 5.2.7)
300311
Microsoft.Azure.Services.AppAuthentication (1.4) - copy_local: false, redirects: force
301312
Microsoft.IdentityModel.Clients.ActiveDirectory (>= 5.2)
313+
Microsoft.Bcl.AsyncInterfaces (1.1)
314+
System.Threading.Tasks.Extensions (>= 4.5.2)
302315
Microsoft.IdentityModel.Clients.ActiveDirectory (5.2.7) - copy_local: false, redirects: force
303316
System.Net.Http (>= 4.3.4)
304317
Microsoft.IdentityModel.JsonWebTokens (6.5) - copy_local: false, redirects: force
@@ -414,32 +427,40 @@ NUGET
414427
Microsoft.VisualStudio.OLE.Interop (>= 7.10.6071)
415428
Microsoft.VisualStudio.TextManager.Interop.8.0 (8.0.50728) - copy_local: false
416429
Microsoft.VisualStudio.Shell.Interop (>= 7.10.6072)
417-
Microsoft.VisualStudio.Threading (15.8.209)
418-
Microsoft.VisualStudio.Threading.Analyzers (>= 15.8.209)
430+
Microsoft.VisualStudio.Threading (15.8.192) - redirects: force
431+
Microsoft.VisualStudio.Threading.Analyzers (>= 15.8.192)
419432
Microsoft.VisualStudio.Validation (>= 15.3.15)
420-
Microsoft.VisualStudio.Threading.Analyzers (16.6.13)
433+
Microsoft.VisualStudio.Threading.Analyzers (16.6.13) - redirects: force
421434
Microsoft.VisualStudio.Utilities (15.9.28307)
422435
Microsoft.VisualStudio.Threading (>= 15.6.31)
423436
StreamJsonRpc (>= 1.3.23)
424-
Microsoft.VisualStudio.Validation (15.5.31) - copy_local: false
425-
Nerdbank.Streams (2.2.43)
426-
Microsoft.VisualStudio.Threading (>= 15.8.192)
437+
Microsoft.VisualStudio.Validation (15.5.31) - redirects: force
438+
Nerdbank.Streams (2.4.67)
439+
Microsoft.VisualStudio.Threading (>= 16.4.33)
440+
Microsoft.VisualStudio.Validation (>= 15.5.31)
427441
System.Buffers (>= 4.5)
428442
System.IO.Pipelines (>= 4.5.3)
429443
System.Net.WebSockets (>= 4.3)
444+
System.Runtime.CompilerServices.Unsafe (>= 4.6)
430445
System.ValueTuple (>= 4.5)
431446
Newtonsoft.Json (12.0.3) - copy_local: false, redirects: force
432-
StreamJsonRpc (2.0.208)
433-
Microsoft.VisualStudio.Threading (>= 15.8.209)
434-
Nerdbank.Streams (>= 2.2.26)
435-
Newtonsoft.Json (>= 9.0.1)
436-
System.IO.Pipelines (>= 4.5.3)
437-
System.Memory (>= 4.5.2)
438-
System.Net.Http (>= 4.3.3)
447+
StreamJsonRpc (2.3.103)
448+
MessagePack (>= 2.1.90)
449+
Microsoft.Bcl.AsyncInterfaces (>= 1.0)
450+
Microsoft.VisualStudio.Threading (>= 16.4.45)
451+
Nerdbank.Streams (>= 2.4.60)
452+
Newtonsoft.Json (>= 12.0.2)
453+
System.Collections.Immutable (>= 1.5)
454+
System.IO.Pipelines (>= 4.6)
455+
System.Memory (>= 4.5.3)
456+
System.Net.Http (>= 4.3.4)
439457
System.Net.WebSockets (>= 4.3)
440-
System.Reflection.Emit (>= 4.3)
441-
System.Threading.Tasks.Extensions (>= 4.5.2)
458+
System.Reflection.Emit (>= 4.6)
459+
System.Threading.Tasks.Dataflow (>= 4.9)
460+
System.Threading.Tasks.Extensions (>= 4.5.3)
442461
System.Buffers (4.5.1)
462+
System.Collections.Immutable (1.7)
463+
System.Memory (>= 4.5.3)
443464
System.IdentityModel.Tokens.Jwt (6.5) - copy_local: false, redirects: force
444465
Microsoft.IdentityModel.JsonWebTokens (>= 6.5)
445466
Microsoft.IdentityModel.Tokens (>= 6.5)
@@ -457,6 +478,7 @@ NUGET
457478
System.Net.WebSockets (4.3)
458479
System.Numerics.Vectors (4.5)
459480
System.Reflection.Emit (4.7)
481+
System.Reflection.Emit.Lightweight (4.7)
460482
System.Runtime (4.3.1) - copy_local: false, redirects: force
461483
System.Runtime.CompilerServices.Unsafe (4.7.1)
462484
System.Security.Cryptography.Algorithms (4.3.1) - copy_local: false, redirects: force
@@ -469,6 +491,7 @@ NUGET
469491
System.Security.Cryptography.X509Certificates (4.3.2) - copy_local: false, redirects: force
470492
System.Security.Cryptography.Algorithms (>= 4.3)
471493
System.Security.Cryptography.Encoding (>= 4.3)
494+
System.Threading.Tasks.Dataflow (4.11)
472495
System.Threading.Tasks.Extensions (4.5.4)
473496
System.Runtime.CompilerServices.Unsafe (>= 4.5.3)
474497
System.ValueTuple (4.5)
@@ -497,7 +520,7 @@ NUGET
497520
Newtonsoft.Json (>= 6.0.4)
498521
Microsoft.AspNet.WebApi.Core (5.2.7) - copy_local: false, redirects: force
499522
Microsoft.AspNet.WebApi.Client (>= 5.2.7)
500-
Microsoft.Bcl.AsyncInterfaces (1.1)
523+
Microsoft.Bcl.AsyncInterfaces (1.1) - copy_local: false
501524
System.Threading.Tasks.Extensions (>= 4.5.2)
502525
Microsoft.CodeAnalysis.BannedApiAnalyzers (2.9.8) - copy_local: false
503526
Microsoft.IdentityModel.Clients.ActiveDirectory (5.2.7) - copy_local: false, redirects: force
@@ -614,22 +637,16 @@ NUGET
614637
Microsoft.VisualStudio.OLE.Interop (>= 7.10.6071)
615638
Microsoft.VisualStudio.TextManager.Interop.8.0 (8.0.50728) - copy_local: false
616639
Microsoft.VisualStudio.Shell.Interop (>= 7.10.6072)
617-
Microsoft.VisualStudio.Threading (16.6.13)
618-
Microsoft.Bcl.AsyncInterfaces (>= 1.0)
619-
Microsoft.VisualStudio.Threading.Analyzers (>= 16.6.13)
620-
Microsoft.VisualStudio.Validation (>= 15.5.31)
621-
Microsoft.Win32.Registry (>= 4.6)
622-
System.Threading.Tasks.Extensions (>= 4.5.3)
623-
Microsoft.VisualStudio.Threading.Analyzers (16.6.13)
640+
Microsoft.VisualStudio.Threading (15.8.192) - redirects: force
641+
Microsoft.VisualStudio.Threading.Analyzers (>= 15.8.192)
642+
Microsoft.VisualStudio.Validation (>= 15.3.15)
643+
Microsoft.VisualStudio.Threading.Analyzers (16.6.13) - redirects: force
624644
Microsoft.VisualStudio.Utilities (16.5.29903.186) - copy_local: false
625645
Microsoft.VisualStudio.Threading (>= 16.5.132)
626646
Newtonsoft.Json (>= 12.0.2)
627647
StreamJsonRpc (>= 2.3.99)
628648
System.Threading.Tasks.Dataflow (>= 4.9)
629-
Microsoft.VisualStudio.Validation (15.5.31)
630-
Microsoft.Win32.Registry (4.7)
631-
System.Security.AccessControl (>= 4.7)
632-
System.Security.Principal.Windows (>= 4.7)
649+
Microsoft.VisualStudio.Validation (15.5.31) - redirects: force
633650
Nerdbank.Streams (2.4.67) - copy_local: false
634651
Microsoft.VisualStudio.Threading (>= 16.4.33)
635652
Microsoft.VisualStudio.Validation (>= 15.5.31)
@@ -677,9 +694,7 @@ NUGET
677694
System.Reflection.Metadata (1.8) - copy_local: false, redirects: force
678695
System.Collections.Immutable (>= 1.7)
679696
System.Runtime (4.3.1) - copy_local: false, redirects: force
680-
System.Runtime.CompilerServices.Unsafe (4.7.1)
681-
System.Security.AccessControl (4.7)
682-
System.Security.Principal.Windows (>= 4.7)
697+
System.Runtime.CompilerServices.Unsafe (4.7.1) - copy_local: false, redirects: force
683698
System.Security.Cryptography.Algorithms (4.3.1) - copy_local: false, redirects: force
684699
System.IO (>= 4.3)
685700
System.Runtime (>= 4.3)
@@ -690,8 +705,7 @@ NUGET
690705
System.Security.Cryptography.X509Certificates (4.3.2) - copy_local: false, redirects: force
691706
System.Security.Cryptography.Algorithms (>= 4.3)
692707
System.Security.Cryptography.Encoding (>= 4.3)
693-
System.Security.Principal.Windows (4.7)
694708
System.Threading.Tasks.Dataflow (4.11) - copy_local: false
695-
System.Threading.Tasks.Extensions (4.5.4)
709+
System.Threading.Tasks.Extensions (4.5.4) - copy_local: false, redirects: force
696710
System.Runtime.CompilerServices.Unsafe (>= 4.5.3)
697711
System.ValueTuple (4.5) - copy_local: false

‎vs-commitizen.Settings/vs-commitizen.Settings.csproj‎

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,14 +260,65 @@
260260
<Choose>
261261
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.8'">
262262
<ItemGroup>
263+
<Reference Include="WindowsBase">
264+
<Paket>True</Paket>
265+
</Reference>
263266
<Reference Include="Microsoft.VisualStudio.Threading">
264-
<HintPath>..\packages\vs14\Microsoft.VisualStudio.Threading\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
267+
<HintPath>..\packages\vs14\Microsoft.VisualStudio.Threading\lib\net46\Microsoft.VisualStudio.Threading.dll</HintPath>
265268
<Private>False</Private>
266269
<Paket>True</Paket>
267270
</Reference>
268271
</ItemGroup>
269272
</When>
270273
</Choose>
274+
<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" />
275+
<ItemGroup>
276+
<Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes.dll">
277+
<Paket>True</Paket>
278+
</Analyzer>
279+
<Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.dll">
280+
<Paket>True</Paket>
281+
</Analyzer>
282+
<Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\cs\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
283+
<Paket>True</Paket>
284+
</Analyzer>
285+
<Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\de\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
286+
<Paket>True</Paket>
287+
</Analyzer>
288+
<Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\es\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
289+
<Paket>True</Paket>
290+
</Analyzer>
291+
<Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\fr\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
292+
<Paket>True</Paket>
293+
</Analyzer>
294+
<Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\it\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
295+
<Paket>True</Paket>
296+
</Analyzer>
297+
<Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\ja\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
298+
<Paket>True</Paket>
299+
</Analyzer>
300+
<Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\ko\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
301+
<Paket>True</Paket>
302+
</Analyzer>
303+
<Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\pl\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
304+
<Paket>True</Paket>
305+
</Analyzer>
306+
<Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\pt-BR\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
307+
<Paket>True</Paket>
308+
</Analyzer>
309+
<Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\ru\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
310+
<Paket>True</Paket>
311+
</Analyzer>
312+
<Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\tr\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
313+
<Paket>True</Paket>
314+
</Analyzer>
315+
<Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\zh-Hans\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
316+
<Paket>True</Paket>
317+
</Analyzer>
318+
<Analyzer Include="..\packages\vs14\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\zh-Hant\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
319+
<Paket>True</Paket>
320+
</Analyzer>
321+
</ItemGroup>
271322
<Choose>
272323
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.8'">
273324
<ItemGroup>

‎vs-commitizen.Tests/paket.references‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
AutoFixture.AutoNSubstitute
1+
AutoFixture.AutoNSubstitute
22
AutoFixture.Xunit2
3-
NSubstitute
43
Shouldly
54
StructureMap
65
xunit
@@ -10,5 +9,4 @@ Xunit.StaFact
109
group vs15
1110
Microsoft.TeamFoundationServer.ExtendedClient copy_local: true
1211
Microsoft.VisualStudio.Shell.14.0 copy_local: true
13-
# Microsoft.VisualStudio.Shell.15.0 copy_local: true
1412
Microsoft.VisualStudio.Shell.Interop.12.0

0 commit comments

Comments
 (0)