Skip to content

Commit 35cf9f4

Browse files
sharwellsharwell
authored
Merge pull request #32 from sharwell/vs-2022
Update Visual Studio 2022 support
2 parents 4c9a814 + bafeed7 commit 35cf9f4

23 files changed

+218
-56
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Per-user files
22
*.csproj.user
3+
*.shproj.user
34

45
# Temporary files created by the IDE
56
.vs/

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</ItemGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Include="Codecov" Version="1.0.3" IncludeAssets="none" PrivateAssets="all" />
31+
<PackageReference Include="Codecov" Version="1.12.4" IncludeAssets="none" PrivateAssets="all" />
3232
<PackageReference Include="OpenCover" Version="4.6.519" IncludeAssets="none" PrivateAssets="all" />
3333
</ItemGroup>
3434

‎MouseFastScroll.sln

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27428.1
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.31220.325
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7939456F-2CC6-4242-96AB-E1C8D75C0D79}"
77
ProjectSection(SolutionItems) = preProject
@@ -20,7 +20,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tvl.VisualStudio.MouseFastS
2020
EndProject
2121
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tvl.VisualStudio.MouseFastScroll.UnitTests", "Tvl.VisualStudio.MouseFastScroll.UnitTests\Tvl.VisualStudio.MouseFastScroll.UnitTests.csproj", "{5630A9D3-6B83-473B-BCE7-FFEB6D2E1063}"
2222
EndProject
23+
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Tvl.VisualStudio.MouseFastScroll.Shared", "Tvl.VisualStudio.MouseFastScroll.Shared\Tvl.VisualStudio.MouseFastScroll.Shared.shproj", "{65C82E6D-9D7B-4EAB-AE31-697F75FB65F0}"
24+
EndProject
25+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tvl.VisualStudio.MouseFastScroll.11", "Tvl.VisualStudio.MouseFastScroll.11\Tvl.VisualStudio.MouseFastScroll.11.csproj", "{58D0B05E-C7DE-42EC-8B81-C579E3A8DA8E}"
26+
EndProject
27+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tvl.VisualStudio.MouseFastScroll.17", "Tvl.VisualStudio.MouseFastScroll.17\Tvl.VisualStudio.MouseFastScroll.17.csproj", "{E6D531AA-3538-4AAC-91CF-2CEE9243B6D8}"
28+
EndProject
2329
Global
30+
GlobalSection(SharedMSBuildProjectFiles) = preSolution
31+
Tvl.VisualStudio.MouseFastScroll.Shared\Tvl.VisualStudio.MouseFastScroll.Shared.projitems*{58d0b05e-c7de-42ec-8b81-c579e3a8da8e}*SharedItemsImports = 5
32+
Tvl.VisualStudio.MouseFastScroll.Shared\Tvl.VisualStudio.MouseFastScroll.Shared.projitems*{65c82e6d-9d7b-4eab-ae31-697f75fb65f0}*SharedItemsImports = 13
33+
Tvl.VisualStudio.MouseFastScroll.Shared\Tvl.VisualStudio.MouseFastScroll.Shared.projitems*{e6d531aa-3538-4aac-91cf-2cee9243b6d8}*SharedItemsImports = 5
34+
EndGlobalSection
2435
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2536
Debug|Any CPU = Debug|Any CPU
2637
Release|Any CPU = Release|Any CPU
@@ -38,6 +49,14 @@ Global
3849
{5630A9D3-6B83-473B-BCE7-FFEB6D2E1063}.Debug|Any CPU.Build.0 = Debug|Any CPU
3950
{5630A9D3-6B83-473B-BCE7-FFEB6D2E1063}.Release|Any CPU.ActiveCfg = Release|Any CPU
4051
{5630A9D3-6B83-473B-BCE7-FFEB6D2E1063}.Release|Any CPU.Build.0 = Release|Any CPU
52+
{58D0B05E-C7DE-42EC-8B81-C579E3A8DA8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
53+
{58D0B05E-C7DE-42EC-8B81-C579E3A8DA8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
54+
{58D0B05E-C7DE-42EC-8B81-C579E3A8DA8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
55+
{58D0B05E-C7DE-42EC-8B81-C579E3A8DA8E}.Release|Any CPU.Build.0 = Release|Any CPU
56+
{E6D531AA-3538-4AAC-91CF-2CEE9243B6D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
57+
{E6D531AA-3538-4AAC-91CF-2CEE9243B6D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
58+
{E6D531AA-3538-4AAC-91CF-2CEE9243B6D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
59+
{E6D531AA-3538-4AAC-91CF-2CEE9243B6D8}.Release|Any CPU.Build.0 = Release|Any CPU
4160
EndGlobalSection
4261
GlobalSection(SolutionProperties) = preSolution
4362
HideSolutionNode = FALSE

‎NuGet.config

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<clear />
5+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
6+
<add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
7+
</packageSources>
8+
</configuration>

‎Tvl.VisualStudio.MouseFastScroll.11/Properties/AssemblyInfo.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
2+
// Licensed under the Apache License, Version 2.0. See LICENSE.txt in the project root for license information.
3+
4+
using System;
5+
using System.Runtime.CompilerServices;
6+
using System.Runtime.InteropServices;
7+
8+
// General Information about an assembly is controlled through the following
9+
// set of attributes. Change these attribute values to modify the information
10+
// associated with an assembly.
11+
[assembly: CLSCompliant(false)]
12+
13+
// Setting ComVisible to false makes the types in this assembly not visible
14+
// to COM components. If you need to access a type in this assembly from
15+
// COM, set the ComVisible attribute to true on that type.
16+
[assembly: ComVisible(false)]
17+
18+
[assembly: InternalsVisibleTo("Tvl.VisualStudio.MouseFastScroll.UnitTests, PublicKey=00240000048000009400000006020000002400005253413100040000010001003d5ffdd6b31bbb97586ba049c04d02ee30d40fa7ce34d4cfadc9ea1a1cc9b02e80cbf8c50b4a428ad6839a25902cde0bf0059ae8afcb90e0ac863c6768d4d9d91ba0f6c96425299d92cc9e89e0575149bf4ac3fd223cec9bf176ce764a346d1b99a831cc5b51585bd72e3a9c478c358e79a6563ea654b0bef84a0ec2bd9567e9")]

‎Tvl.VisualStudio.MouseFastScroll.11/Tvl.VisualStudio.MouseFastScroll.11.csproj

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<Project>
2+
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
3+
4+
<PropertyGroup>
5+
<TargetFramework>net45</TargetFramework>
6+
<Description>Mouse Fast Scroll extension for Visual Studio 2012-2019</Description>
7+
<RootNamespace>Tvl.VisualStudio.MouseFastScroll</RootNamespace>
8+
</PropertyGroup>
9+
10+
<PropertyGroup>
11+
<GeneratePkgDefFile>false</GeneratePkgDefFile>
12+
<CreateVsixContainer>false</CreateVsixContainer>
13+
<DeployExtension>false</DeployExtension>
14+
</PropertyGroup>
15+
16+
<ItemGroup>
17+
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.0.2155-preview2" PrivateAssets="all" />
18+
<PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta006" PrivateAssets="all" />
19+
<PackageReference Include="VSSDK.CoreUtility" Version="11.0.4" />
20+
<PackageReference Include="VSSDK.Text" Version="11.0.4" />
21+
</ItemGroup>
22+
23+
<Import Project="..\Tvl.VisualStudio.MouseFastScroll.Shared\Tvl.VisualStudio.MouseFastScroll.Shared.projitems" Label="Shared" />
24+
25+
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
26+
27+
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="Exists('$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets')" />
28+
29+
</Project>

‎Tvl.VisualStudio.MouseFastScroll.17/Properties/AssemblyInfo.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
2+
// Licensed under the Apache License, Version 2.0. See LICENSE.txt in the project root for license information.
3+
4+
using System;
5+
using System.Runtime.CompilerServices;
6+
using System.Runtime.InteropServices;
7+
8+
// General Information about an assembly is controlled through the following
9+
// set of attributes. Change these attribute values to modify the information
10+
// associated with an assembly.
11+
[assembly: CLSCompliant(false)]
12+
13+
// Setting ComVisible to false makes the types in this assembly not visible
14+
// to COM components. If you need to access a type in this assembly from
15+
// COM, set the ComVisible attribute to true on that type.
16+
[assembly: ComVisible(false)]
17+
18+
[assembly: InternalsVisibleTo("Tvl.VisualStudio.MouseFastScroll.UnitTests, PublicKey=00240000048000009400000006020000002400005253413100040000010001003d5ffdd6b31bbb97586ba049c04d02ee30d40fa7ce34d4cfadc9ea1a1cc9b02e80cbf8c50b4a428ad6839a25902cde0bf0059ae8afcb90e0ac863c6768d4d9d91ba0f6c96425299d92cc9e89e0575149bf4ac3fd223cec9bf176ce764a346d1b99a831cc5b51585bd72e3a9c478c358e79a6563ea654b0bef84a0ec2bd9567e9")]

‎Tvl.VisualStudio.MouseFastScroll.17/Tvl.VisualStudio.MouseFastScroll.17.csproj

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<Project>
2+
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
3+
4+
<PropertyGroup>
5+
<TargetFramework>net472</TargetFramework>
6+
<Description>Mouse Fast Scroll extension for Visual Studio 2022</Description>
7+
<RootNamespace>Tvl.VisualStudio.MouseFastScroll</RootNamespace>
8+
</PropertyGroup>
9+
10+
<PropertyGroup>
11+
<GeneratePkgDefFile>false</GeneratePkgDefFile>
12+
<CreateVsixContainer>false</CreateVsixContainer>
13+
<DeployExtension>false</DeployExtension>
14+
</PropertyGroup>
15+
16+
<ItemGroup>
17+
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.0.2155-preview2" PrivateAssets="all" />
18+
<PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta006" PrivateAssets="all" />
19+
<PackageReference Include="Microsoft.VisualStudio.Sdk" Version="17.0.0-previews-1-31310-052" PrivateAssets="all" />
20+
</ItemGroup>
21+
22+
<Import Project="..\Tvl.VisualStudio.MouseFastScroll.Shared\Tvl.VisualStudio.MouseFastScroll.Shared.projitems" Label="Shared" />
23+
24+
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
25+
26+
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="Exists('$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets')" />
27+
28+
</Project>

‎Tvl.VisualStudio.MouseFastScroll.IntegrationTests/AbstractIdeIntegrationTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
1212
using Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Threading;
1313
using Xunit;
1414

15-
[VsTestSettings(UIThread = true)]
1615
public abstract class AbstractIdeIntegrationTest : IAsyncLifetime, IDisposable
1716
{
1817
private JoinableTaskContext _joinableTaskContext;

‎Tvl.VisualStudio.MouseFastScroll.IntegrationTests/VsFactTest.cs renamed to ‎Tvl.VisualStudio.MouseFastScroll.IntegrationTests/IdeFactTest.cs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,40 +7,38 @@ namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
77
using System.Threading;
88
using System.Threading.Tasks;
99
using System.Windows;
10-
using System.Windows.Threading;
1110
using Microsoft.VisualStudio.Shell.Interop;
1211
using Microsoft.VisualStudio.Threading;
13-
using Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Threading;
1412
using Xunit;
1513
using _DTE = EnvDTE._DTE;
1614
using DTE = EnvDTE.DTE;
1715
using ServiceProvider = Microsoft.VisualStudio.Shell.ServiceProvider;
1816

19-
public class VsFactTest : AbstractIdeIntegrationTest
17+
public class IdeFactTest : AbstractIdeIntegrationTest
2018
{
21-
[VsFact]
19+
[IdeFact]
2220
public void TestOpenAndCloseIDE()
2321
{
2422
Assert.Equal("devenv", Process.GetCurrentProcess().ProcessName);
2523
var dte = (DTE)ServiceProvider.GetService(typeof(_DTE));
2624
Assert.NotNull(dte);
2725
}
2826

29-
[VsFact]
27+
[IdeFact]
3028
public void TestRunsOnUIThread()
3129
{
3230
Assert.True(Application.Current.Dispatcher.CheckAccess());
3331
}
3432

35-
[VsFact]
33+
[IdeFact]
3634
public async Task TestRunsOnUIThreadAsync()
3735
{
3836
Assert.True(Application.Current.Dispatcher.CheckAccess());
3937
await Task.Yield();
4038
Assert.True(Application.Current.Dispatcher.CheckAccess());
4139
}
4240

43-
[VsFact]
41+
[IdeFact]
4442
public async Task TestYieldsToWorkAsync()
4543
{
4644
Assert.True(Application.Current.Dispatcher.CheckAccess());
@@ -52,7 +50,7 @@ public async Task TestYieldsToWorkAsync()
5250
Assert.True(Application.Current.Dispatcher.CheckAccess());
5351
}
5452

55-
[VsFact]
53+
[IdeFact]
5654
public async Task TestJoinableTaskFactoryAsync()
5755
{
5856
Assert.NotNull(JoinableTaskContext);
@@ -68,8 +66,7 @@ public async Task TestJoinableTaskFactoryAsync()
6866
Assert.Equal(Thread.CurrentThread, JoinableTaskContext.MainThread);
6967
}
7068

71-
#if DEBUG // https://github.com/josetr/VsixTesting/issues/3
72-
[VsFact(Version = "2012")]
69+
[IdeFact(MinVersion = VisualStudioVersion.VS2012, MaxVersion = VisualStudioVersion.VS2012)]
7370
public void TestJoinableTaskFactoryProvidedByTest()
7471
{
7572
var taskSchedulerServiceObject = ServiceProvider.GetService(typeof(SVsTaskSchedulerService));
@@ -83,9 +80,8 @@ public void TestJoinableTaskFactoryProvidedByTest()
8380

8481
Assert.NotNull(JoinableTaskContext);
8582
}
86-
#endif
8783

88-
[VsFact(Version = "2013-")]
84+
[IdeFact(MinVersion = VisualStudioVersion.VS2013)]
8985
public void TestJoinableTaskFactoryObtainedFromEnvironment()
9086
{
9187
var taskSchedulerServiceObject = ServiceProvider.GetService(typeof(SVsTaskSchedulerService));

0 commit comments

Comments
 (0)