Updates to new csproj file format and adds support for VS 2022

ExpandRegions.sln

@@ -1,28 +1,48 @@
 
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExpandRegions.Vsix.2019", "ExpandRegions\ExpandRegions.Vsix.2019\ExpandRegions.Vsix.2019.csproj", "{385A8ABF-958E-4172-B699-F78FC166C254}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExpandRegions", "ExpandRegions\ExpandRegions\ExpandRegions.csproj", "{3343DBB6-1BD1-4824-A369-BEA0F5A08FE3}"
+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
+		Debug|x64 = Debug|x64
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
 	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}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{385A8ABF-958E-4172-B699-F78FC166C254}.Debug|x64.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}.Release|x64.ActiveCfg = Release|Any CPU
+		{385A8ABF-958E-4172-B699-F78FC166C254}.Release|x64.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}.Debug|x64.ActiveCfg = Debug|x64
+		{F9D468F7-0E72-443A-9A0E-8E8FA2008715}.Debug|x64.Build.0 = Debug|x64
+		{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
+		{F9D468F7-0E72-443A-9A0E-8E8FA2008715}.Release|x64.ActiveCfg = Release|x64
+		{F9D468F7-0E72-443A-9A0E-8E8FA2008715}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {DBB9389E-EE09-49A2-916F-24B4DB716CE9}
+	EndGlobalSection
 EndGlobal

ExpandRegions/ExpandRegions.Shared/ExpandRegions.Shared.projitems

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>fbc00120-756e-4980-af6c-3f8a1985d116</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>ExpandRegions.Shared</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)Classifications\ActiveRegionClassification.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Classifications\ClassificationFormatDefinition.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Classifications\ClassifierProvider.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Classifications\InactiveRegionClassification.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Constants.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)RegionTextViewHandler.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tags\RegionTag.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tags\RegionTagger.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tags\RegionTaggerProvider.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)TextViewCreationListener.cs" />
+  </ItemGroup>
+</Project>

ExpandRegions/ExpandRegions.Shared/ExpandRegions.Shared.shproj

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>fbc00120-756e-4980-af6c-3f8a1985d116</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="ExpandRegions.Shared.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>

ExpandRegions/ExpandRegions.Vsix/ExpandRegions.Vsix.csproj → ExpandRegions/ExpandRegions.Vsix.2019/ExpandRegions.Vsix.2019.csproj

@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>14.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
+        <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    </PropertyGroup>
+    <PropertyGroup>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -24,19 +21,14 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <TargetFramework>net46</TargetFramework>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ProjectGuid>{385A8ABF-958E-4172-B699-F78FC166C254}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ExpandRegions.Vsix</RootNamespace>
-    <AssemblyName>ExpandRegions.Vsix</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <RootNamespace>ExpandRegions.Vsix.2019</RootNamespace>
     <GeneratePkgDefFile>false</GeneratePkgDefFile>
     <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
     <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
@@ -45,33 +37,11 @@
     <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
     <VSSDKTargetPlatformRegRootSuffix>Roslyn</VSSDKTargetPlatformRegRootSuffix>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
   <PropertyGroup>
     <StartAction>Program</StartAction>
     <StartProgram>$(DevEnvDir)devenv.exe</StartProgram>
     <StartArguments>/rootsuffix Roslyn</StartArguments>
   </PropertyGroup>
-  <ItemGroup>
-    <None Include="source.extension.vsixmanifest">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
       <Visible>False</Visible>
@@ -84,18 +54,23 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ExpandRegions\ExpandRegions.csproj">
-      <Project>{3343dbb6-1bd1-4824-a369-bea0f5a08fe3}</Project>
-      <Name>ExpandRegions</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <Content Include="license.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="15.0.26201" />
+    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.1.4054">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System.ComponentModel.Composition">
+      <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.ComponentModel.Composition.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <Import Project="..\ExpandRegions.Shared\ExpandRegions.Shared.projitems" Label="Shared" />
 </Project>

ExpandRegions/ExpandRegions.Vsix.2022/ExpandRegions.Vsix.2022.csproj

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
+        <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+        <Platforms>x64</Platforms>
+    </PropertyGroup>
+
+    <PropertyGroup>
+  </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net472</TargetFramework>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ExpandRegions.Vsix.2022</RootNamespace>
+    <GeneratePkgDefFile>false</GeneratePkgDefFile>
+    <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
+    <IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
+    <IncludeDebugSymbolsInLocalVSIXDeployment>true</IncludeDebugSymbolsInLocalVSIXDeployment>
+    <CopyBuildOutputToOutputDirectory>true</CopyBuildOutputToOutputDirectory>
+    <CopyOutputSymbolsToOutputDirectory>true</CopyOutputSymbolsToOutputDirectory>
+    <VSSDKTargetPlatformRegRootSuffix>Roslyn</VSSDKTargetPlatformRegRootSuffix>
+    </PropertyGroup>
+
+  <PropertyGroup>
+    <StartAction>Program</StartAction>
+    <StartProgram>$(DevEnvDir)devenv.exe</StartProgram>
+    <StartArguments>/rootsuffix Roslyn</StartArguments>
+  </PropertyGroup>
+  <ItemGroup>
+    <Content Include="license.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+      <PackageReference Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="17.1.386" />
+      <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.1.4054" />
+  </ItemGroup>
+  <Import Project="..\ExpandRegions.Shared\ExpandRegions.Shared.projitems" Label="Shared" />
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" />
+</Project>

ExpandRegions/ExpandRegions.Vsix.2022/source.extension.vsixmanifest

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011"
+                 xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
+    <Metadata>
+        <Identity Id="ExpandRegions..a148547e-90e8-4d4e-8754-e5dcc169ae4c" Version="1.1" Language="en-US"
+                  Publisher="Daniel Sabel" />
+        <DisplayName>ExpandRegions</DisplayName>
+        <Description xml:space="preserve">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.</Description>
+        <License>license.txt</License>
+    </Metadata>
+    <Installation>
+        <InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Pro">
+            <ProductArchitecture>amd64</ProductArchitecture>
+        </InstallationTarget>
+        <InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Community">
+            <ProductArchitecture>amd64</ProductArchitecture>
+        </InstallationTarget>
+        <InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Enterprise">
+            <ProductArchitecture>amd64</ProductArchitecture>
+        </InstallationTarget>
+
+    </Installation>
+    <Dependencies>
+        <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.6,)" />
+    </Dependencies>
+    <Assets>
+        <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
+        <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
+    </Assets>
+    <Prerequisites>
+        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[17.0,18.0)"
+                      DisplayName="Visual Studio core editor" />
+        <Prerequisite Id="Microsoft.VisualStudio.Component.Roslyn.LanguageServices" Version="[17.0,18.0)"
+                      DisplayName="C# and Visual Basic" />
+    </Prerequisites>
+</PackageManifest>