diff --git a/ExpandRegions.sln b/ExpandRegions.sln
index a50ab11..d4ae677 100644
--- a/ExpandRegions.sln
+++ b/ExpandRegions.sln
@@ -1,28 +1,44 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26228.4
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32210.238
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExpandRegions.Vsix", "ExpandRegions\ExpandRegions.Vsix\ExpandRegions.Vsix.csproj", "{385A8ABF-958E-4172-B699-F78FC166C254}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExpandRegions", "ExpandRegions\ExpandRegions\ExpandRegions.csproj", "{3343DBB6-1BD1-4824-A369-BEA0F5A08FE3}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExpandRegions.Vsix.2019", "ExpandRegions\ExpandRegions.Vsix.2019\ExpandRegions.Vsix.2019.csproj", "{385A8ABF-958E-4172-B699-F78FC166C254}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExpandRegions.Vsix.2022", "ExpandRegions\ExpandRegions.Vsix.2022\ExpandRegions.Vsix.2022.csproj", "{F9D468F7-0E72-443A-9A0E-8E8FA2008715}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ExpandRegions.Shared", "ExpandRegions\ExpandRegions.Shared\ExpandRegions.Shared.shproj", "{FBC00120-756E-4980-AF6C-3F8A1985D116}"
+EndProject
Global
+ GlobalSection(SharedMSBuildProjectFiles) = preSolution
+ ExpandRegions\ExpandRegions.Shared\ExpandRegions.Shared.projitems*{385a8abf-958e-4172-b699-f78fc166c254}*SharedItemsImports = 5
+ ExpandRegions\ExpandRegions.Shared\ExpandRegions.Shared.projitems*{f9d468f7-0e72-443a-9a0e-8e8fa2008715}*SharedItemsImports = 5
+ ExpandRegions\ExpandRegions.Shared\ExpandRegions.Shared.projitems*{fbc00120-756e-4980-af6c-3f8a1985d116}*SharedItemsImports = 13
+ EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {385A8ABF-958E-4172-B699-F78FC166C254}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {385A8ABF-958E-4172-B699-F78FC166C254}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {385A8ABF-958E-4172-B699-F78FC166C254}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {385A8ABF-958E-4172-B699-F78FC166C254}.Release|Any CPU.Build.0 = Release|Any CPU
{3343DBB6-1BD1-4824-A369-BEA0F5A08FE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3343DBB6-1BD1-4824-A369-BEA0F5A08FE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3343DBB6-1BD1-4824-A369-BEA0F5A08FE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3343DBB6-1BD1-4824-A369-BEA0F5A08FE3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {385A8ABF-958E-4172-B699-F78FC166C254}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {385A8ABF-958E-4172-B699-F78FC166C254}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {385A8ABF-958E-4172-B699-F78FC166C254}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {385A8ABF-958E-4172-B699-F78FC166C254}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F9D468F7-0E72-443A-9A0E-8E8FA2008715}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F9D468F7-0E72-443A-9A0E-8E8FA2008715}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F9D468F7-0E72-443A-9A0E-8E8FA2008715}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F9D468F7-0E72-443A-9A0E-8E8FA2008715}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {DBB9389E-EE09-49A2-916F-24B4DB716CE9}
+ EndGlobalSection
EndGlobal
diff --git a/ExpandRegions/ExpandRegions/Classifications/ActiveRegionClassification.cs b/ExpandRegions/ExpandRegions.Shared/Classifications/ActiveRegionClassification.cs
similarity index 100%
rename from ExpandRegions/ExpandRegions/Classifications/ActiveRegionClassification.cs
rename to ExpandRegions/ExpandRegions.Shared/Classifications/ActiveRegionClassification.cs
diff --git a/ExpandRegions/ExpandRegions/Classifications/ClassificationFormatDefinition.cs b/ExpandRegions/ExpandRegions.Shared/Classifications/ClassificationFormatDefinition.cs
similarity index 100%
rename from ExpandRegions/ExpandRegions/Classifications/ClassificationFormatDefinition.cs
rename to ExpandRegions/ExpandRegions.Shared/Classifications/ClassificationFormatDefinition.cs
diff --git a/ExpandRegions/ExpandRegions/Classifications/ClassifierProvider.cs b/ExpandRegions/ExpandRegions.Shared/Classifications/ClassifierProvider.cs
similarity index 100%
rename from ExpandRegions/ExpandRegions/Classifications/ClassifierProvider.cs
rename to ExpandRegions/ExpandRegions.Shared/Classifications/ClassifierProvider.cs
diff --git a/ExpandRegions/ExpandRegions/Classifications/InactiveRegionClassification.cs b/ExpandRegions/ExpandRegions.Shared/Classifications/InactiveRegionClassification.cs
similarity index 100%
rename from ExpandRegions/ExpandRegions/Classifications/InactiveRegionClassification.cs
rename to ExpandRegions/ExpandRegions.Shared/Classifications/InactiveRegionClassification.cs
diff --git a/ExpandRegions/ExpandRegions/Constants.cs b/ExpandRegions/ExpandRegions.Shared/Constants.cs
similarity index 100%
rename from ExpandRegions/ExpandRegions/Constants.cs
rename to ExpandRegions/ExpandRegions.Shared/Constants.cs
diff --git a/ExpandRegions/ExpandRegions.Shared/ExpandRegions.Shared.projitems b/ExpandRegions/ExpandRegions.Shared/ExpandRegions.Shared.projitems
new file mode 100644
index 0000000..c494583
--- /dev/null
+++ b/ExpandRegions/ExpandRegions.Shared/ExpandRegions.Shared.projitems
@@ -0,0 +1,23 @@
+
+
+
+ $(MSBuildAllProjects);$(MSBuildThisFileFullPath)
+ true
+ fbc00120-756e-4980-af6c-3f8a1985d116
+
+
+ ExpandRegions.Shared
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ExpandRegions/ExpandRegions.Shared/ExpandRegions.Shared.shproj b/ExpandRegions/ExpandRegions.Shared/ExpandRegions.Shared.shproj
new file mode 100644
index 0000000..23fb8f5
--- /dev/null
+++ b/ExpandRegions/ExpandRegions.Shared/ExpandRegions.Shared.shproj
@@ -0,0 +1,13 @@
+
+
+
+ fbc00120-756e-4980-af6c-3f8a1985d116
+ 14.0
+
+
+
+
+
+
+
+
diff --git a/ExpandRegions/ExpandRegions/RegionTextViewHandler.cs b/ExpandRegions/ExpandRegions.Shared/RegionTextViewHandler.cs
similarity index 100%
rename from ExpandRegions/ExpandRegions/RegionTextViewHandler.cs
rename to ExpandRegions/ExpandRegions.Shared/RegionTextViewHandler.cs
diff --git a/ExpandRegions/ExpandRegions/Tags/RegionTag.cs b/ExpandRegions/ExpandRegions.Shared/Tags/RegionTag.cs
similarity index 100%
rename from ExpandRegions/ExpandRegions/Tags/RegionTag.cs
rename to ExpandRegions/ExpandRegions.Shared/Tags/RegionTag.cs
diff --git a/ExpandRegions/ExpandRegions/Tags/RegionTagger.cs b/ExpandRegions/ExpandRegions.Shared/Tags/RegionTagger.cs
similarity index 100%
rename from ExpandRegions/ExpandRegions/Tags/RegionTagger.cs
rename to ExpandRegions/ExpandRegions.Shared/Tags/RegionTagger.cs
diff --git a/ExpandRegions/ExpandRegions/Tags/RegionTaggerProvider.cs b/ExpandRegions/ExpandRegions.Shared/Tags/RegionTaggerProvider.cs
similarity index 100%
rename from ExpandRegions/ExpandRegions/Tags/RegionTaggerProvider.cs
rename to ExpandRegions/ExpandRegions.Shared/Tags/RegionTaggerProvider.cs
diff --git a/ExpandRegions/ExpandRegions/TextViewCreationListener.cs b/ExpandRegions/ExpandRegions.Shared/TextViewCreationListener.cs
similarity index 100%
rename from ExpandRegions/ExpandRegions/TextViewCreationListener.cs
rename to ExpandRegions/ExpandRegions.Shared/TextViewCreationListener.cs
diff --git a/ExpandRegions/ExpandRegions.Vsix/ExpandRegions.Vsix.csproj b/ExpandRegions/ExpandRegions.Vsix.2019/ExpandRegions.Vsix.2019.csproj
similarity index 51%
rename from ExpandRegions/ExpandRegions.Vsix/ExpandRegions.Vsix.csproj
rename to ExpandRegions/ExpandRegions.Vsix.2019/ExpandRegions.Vsix.2019.csproj
index 85ef216..5041378 100644
--- a/ExpandRegions/ExpandRegions.Vsix/ExpandRegions.Vsix.csproj
+++ b/ExpandRegions/ExpandRegions.Vsix.2019/ExpandRegions.Vsix.2019.csproj
@@ -1,13 +1,10 @@
-
-
-
- 15.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
- 14.0
-
+
+
+ 15.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+
+
publish\
true
Disk
@@ -24,19 +21,14 @@
false
true
-
- Debug
- AnyCPU
- AnyCPU
+ net46
2.0
{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
{385A8ABF-958E-4172-B699-F78FC166C254}
Library
Properties
- ExpandRegions.Vsix
- ExpandRegions.Vsix
- v4.6.1
+ ExpandRegions.Vsix.2019
false
false
false
@@ -45,33 +37,11 @@
false
Roslyn
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
Program
$(DevEnvDir)devenv.exe
/rootsuffix Roslyn
-
-
- Designer
-
-
False
@@ -84,18 +54,18 @@
false
-
-
- {3343dbb6-1bd1-4824-a369-bea0f5a08fe3}
- ExpandRegions
-
-
Always
true
-
-
+
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+
\ No newline at end of file
diff --git a/ExpandRegions/ExpandRegions.Vsix/license.txt b/ExpandRegions/ExpandRegions.Vsix.2019/license.txt
similarity index 100%
rename from ExpandRegions/ExpandRegions.Vsix/license.txt
rename to ExpandRegions/ExpandRegions.Vsix.2019/license.txt
diff --git a/ExpandRegions/ExpandRegions.Vsix/source.extension.vsixmanifest b/ExpandRegions/ExpandRegions.Vsix.2019/source.extension.vsixmanifest
similarity index 100%
rename from ExpandRegions/ExpandRegions.Vsix/source.extension.vsixmanifest
rename to ExpandRegions/ExpandRegions.Vsix.2019/source.extension.vsixmanifest
diff --git a/ExpandRegions/ExpandRegions.Vsix.2022/ExpandRegions.Vsix.2022.csproj b/ExpandRegions/ExpandRegions.Vsix.2022/ExpandRegions.Vsix.2022.csproj
new file mode 100644
index 0000000..a00d9ef
--- /dev/null
+++ b/ExpandRegions/ExpandRegions.Vsix.2022/ExpandRegions.Vsix.2022.csproj
@@ -0,0 +1,43 @@
+
+
+
+
+ 15.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+
+
+
+
+
+ net472
+ Library
+ Properties
+ ExpandRegions.Vsix.2022
+ false
+ false
+ false
+ false
+ true
+ true
+ Roslyn
+
+
+
+ Program
+ $(DevEnvDir)devenv.exe
+ /rootsuffix Roslyn
+
+
+
+ Always
+ true
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ExpandRegions/ExpandRegions.Vsix.2022/license.txt b/ExpandRegions/ExpandRegions.Vsix.2022/license.txt
new file mode 100644
index 0000000..714f93b
Binary files /dev/null and b/ExpandRegions/ExpandRegions.Vsix.2022/license.txt differ
diff --git a/ExpandRegions/ExpandRegions.Vsix.2022/source.extension.vsixmanifest b/ExpandRegions/ExpandRegions.Vsix.2022/source.extension.vsixmanifest
new file mode 100644
index 0000000..f58a7ad
--- /dev/null
+++ b/ExpandRegions/ExpandRegions.Vsix.2022/source.extension.vsixmanifest
@@ -0,0 +1,37 @@
+
+
+
+
+
+ ExpandRegions
+ This extension expands all regions in C# and Visual Basic when a file is opened. It's a slimmed down version of \"I Hate #Regions\" for VS2017/VS2019.
+ license.txt
+
+
+
+ amd64
+
+
+
+ amd64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ExpandRegions/ExpandRegions/ExpandRegions.csproj b/ExpandRegions/ExpandRegions/ExpandRegions.csproj
index 6116f9a..4054cde 100644
--- a/ExpandRegions/ExpandRegions/ExpandRegions.csproj
+++ b/ExpandRegions/ExpandRegions/ExpandRegions.csproj
@@ -1,55 +1,17 @@
-
-
+
- Debug
- AnyCPU
+ net46
{3343DBB6-1BD1-4824-A369-BEA0F5A08FE3}
Library
- Properties
ExpandRegions
- ExpandRegions
- v4.6.2
- 512
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
+
+ 2017
+ 1.0.0.0
+ 1.0.0.0
-
- ..\..\packages\Microsoft.VisualStudio.CoreUtility.15.0.26201\lib\net45\Microsoft.VisualStudio.CoreUtility.dll
- True
-
-
- ..\..\packages\Microsoft.VisualStudio.Text.Data.15.0.26201\lib\net45\Microsoft.VisualStudio.Text.Data.dll
- True
-
-
- ..\..\packages\Microsoft.VisualStudio.Text.Logic.15.0.26201\lib\net45\Microsoft.VisualStudio.Text.Logic.dll
- True
-
-
- ..\..\packages\Microsoft.VisualStudio.Text.UI.15.0.26201\lib\net45\Microsoft.VisualStudio.Text.UI.dll
- True
-
-
- ..\..\packages\Microsoft.VisualStudio.Text.UI.Wpf.15.0.26201\lib\net45\Microsoft.VisualStudio.Text.UI.Wpf.dll
- True
-
@@ -65,21 +27,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ 15.0.26201
+
-
\ No newline at end of file
diff --git a/ExpandRegions/ExpandRegions/Properties/AssemblyInfo.cs b/ExpandRegions/ExpandRegions/Properties/AssemblyInfo.cs
deleted file mode 100644
index b192978..0000000
--- a/ExpandRegions/ExpandRegions/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ExpandRegions")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ExpandRegions")]
-[assembly: AssemblyCopyright("Copyright © 2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("3343dbb6-1bd1-4824-a369-bea0f5a08fe3")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/ExpandRegions/ExpandRegions/app.config b/ExpandRegions/ExpandRegions/app.config
deleted file mode 100644
index cc204ae..0000000
--- a/ExpandRegions/ExpandRegions/app.config
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/ExpandRegions/ExpandRegions/packages.config b/ExpandRegions/ExpandRegions/packages.config
deleted file mode 100644
index 8b0845c..0000000
--- a/ExpandRegions/ExpandRegions/packages.config
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file