Upgrade to Visual Studio 2022 - attempt 2

CommonAssemblyInfo.cs

@@ -13,31 +13,31 @@
 [assembly: AssemblyConfiguration("Release")]
 #endif 
 
-[assembly: AssemblyProduct(T4Toolbox.AssemblyInfo.Product)]
-[assembly: AssemblyDescription(T4Toolbox.AssemblyInfo.Description)]
-[assembly: AssemblyCompany("Oleg Sych")]
-[assembly: AssemblyCopyright("Copyright © Oleg Sych. All Rights Reserved.")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion(T4Toolbox.AssemblyInfo.Version)]
-[assembly: AssemblyFileVersion(T4Toolbox.AssemblyInfo.Version)]
+[assembly: AssemblyProduct("T$Toolbox")]
+[assembly: AssemblyDescription("T4Toolbox")]
+//[assembly: AssemblyCompany("Oleg Sych")]
+//[assembly: AssemblyCopyright("Copyright © Oleg Sych. All Rights Reserved.")]
+//[assembly: AssemblyTrademark("")]
+//[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("15.0.0.0")]
+[assembly: AssemblyFileVersion(T4Toolbox.VisualStudio.AssemblyInfo.Version)]
 [assembly: ComVisible(false)]
-[assembly: NeutralResourcesLanguage("en-US")]
+//[assembly: NeutralResourcesLanguage("en-US")]
 
 // Allow all projects in this solution to access each-other's internals by default. 
 // In many instances, we need this to enable testing as well as to access constants 
 // in T4Toolbox.AssemblyInfo class. Revisit this decision when the number of assemblies
 // in the project increases to the point where limiting access to internals within the 
 // solution becomes beneficial.
-[assembly: InternalsVisibleTo("T4Toolbox.DirectiveProcessors" + T4Toolbox.AssemblyInfo.PublicKey)]
-[assembly: InternalsVisibleTo("T4Toolbox.TemplateAnalysis" + T4Toolbox.AssemblyInfo.PublicKey)]
-[assembly: InternalsVisibleTo("T4Toolbox.TemplateAnalysis.Tests" + T4Toolbox.AssemblyInfo.PublicKey)]
-[assembly: InternalsVisibleTo("T4Toolbox.Tests" + T4Toolbox.AssemblyInfo.PublicKey)]
-[assembly: InternalsVisibleTo("T4Toolbox.VisualStudio" + T4Toolbox.AssemblyInfo.PublicKey)]
-[assembly: InternalsVisibleTo("T4Toolbox.VisualStudio.Editor" + T4Toolbox.AssemblyInfo.PublicKey)]
-[assembly: InternalsVisibleTo("T4Toolbox.VisualStudio.Editor.Tests" + T4Toolbox.AssemblyInfo.PublicKey)]
-[assembly: InternalsVisibleTo("T4Toolbox.VisualStudio.IntegrationTests" + T4Toolbox.AssemblyInfo.PublicKey)]
-[assembly: InternalsVisibleTo("T4Toolbox.VisualStudio.Tests" + T4Toolbox.AssemblyInfo.PublicKey)]
+//[assembly: InternalsVisibleTo("T4Toolbox.DirectiveProcessors" + T4Toolbox.AssemblyInfo.PublicKey)]
+//[assembly: InternalsVisibleTo("T4Toolbox.TemplateAnalysis" + T4Toolbox.AssemblyInfo.PublicKey)]
+//[assembly: InternalsVisibleTo("T4Toolbox.TemplateAnalysis.Tests" + T4Toolbox.AssemblyInfo.PublicKey)]
+//[assembly: InternalsVisibleTo("T4Toolbox.Tests" + T4Toolbox.AssemblyInfo.PublicKey)]
+//[assembly: InternalsVisibleTo("T4Toolbox.VisualStudio" + T4Toolbox.AssemblyInfo.PublicKey)]
+//[assembly: InternalsVisibleTo("T4Toolbox.VisualStudio.Editor" + T4Toolbox.AssemblyInfo.PublicKey)]
+//[assembly: InternalsVisibleTo("T4Toolbox.VisualStudio.Editor.Tests" + T4Toolbox.AssemblyInfo.PublicKey)]
+//[assembly: InternalsVisibleTo("T4Toolbox.VisualStudio.IntegrationTests" + T4Toolbox.AssemblyInfo.PublicKey)]
+//[assembly: InternalsVisibleTo("T4Toolbox.VisualStudio.Tests" + T4Toolbox.AssemblyInfo.PublicKey)]
 
 #if SIGN_ASSEMBLY
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]

README.md

@@ -1,5 +1,14 @@
 # T4 Toolbox
 
+Version 2022.0.0.1
+- Upgraded for Visual Studio 2022
+- Upgrading to new version of Visual Studio requires updating meta package called Microsoft.VisualStudio.Sdk - the package version is the same as VS version, for VS 2022 it is 17
+- The upgrade to version 2022 encountered an obstacle that the assembly `T4Toolbox` shared by other projects can't be discovered by visual studio at runtime and therefore the plugin can't be loaded
+- To overcome the obstacle the classes from `T4Toolbox` were moved to `T4Toolbox.VisualStudio` project, to folder `T4Toolbox`
+- Further version updates can follow the same approach, unless we find a reason why Visual Studio can't load the shared library
+
+
+
 T4 Toolbox extends the code generation functionality of the [T4](https://docs.microsoft.com/en-us/visualstudio/modeling/code-generation-and-t4-text-templates) 
 text templates in Visual Studio and allows you to:
 - Generate multiple output files from a single text template 

T4Toolbox.Common.props

@@ -7,7 +7,7 @@
     <AssemblyName>$(MSBuildProjectName)</AssemblyName>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <TargetFrameworkProfile />
     <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
@@ -19,8 +19,6 @@
     <FileAlignment>512</FileAlignment>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <OutputPath>bin\$(Configuration)\</OutputPath>
-    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)\T4Toolbox.Common.ruleset</CodeAnalysisRuleSet>
-    <StyleCopTreatErrorsAsWarnings>false</StyleCopTreatErrorsAsWarnings>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

T4Toolbox.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26430.16
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32526.322
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{42F21B27-CBA5-4FB6-A855-8B74F05F56CD}"
 	ProjectSection(SolutionItems) = preProject
@@ -10,9 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		CommonAssemblyInfo.cs = CommonAssemblyInfo.cs
 		LocalTestRun.testrunconfig = LocalTestRun.testrunconfig
 		README.md = README.md
-		Settings.StyleCop = Settings.StyleCop
 		T4Toolbox.Common.props = T4Toolbox.Common.props
-		T4Toolbox.Common.ruleset = T4Toolbox.Common.ruleset
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3594248C-C8A9-4EAB-8E63-0914300D4ECE}"
@@ -33,100 +31,33 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{0658B25D
 		{82A7F48D-3B50-4B1E-B82E-3ADA8210C358} = {82A7F48D-3B50-4B1E-B82E-3ADA8210C358}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "T4Toolbox", "src\T4Toolbox\T4Toolbox.csproj", "{682E771A-76F7-4972-BBDC-1250B67F399B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "T4Toolbox.DirectiveProcessors", "src\T4Toolbox.DirectiveProcessors\T4Toolbox.DirectiveProcessors.csproj", "{E0282961-2D83-48CC-B4D4-8257449CF8F7}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "T4Toolbox.TemplateAnalysis", "src\T4Toolbox.TemplateAnalysis\T4Toolbox.TemplateAnalysis.csproj", "{65BF3FA7-6B2B-47DD-8FC1-BB25754F12D3}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "T4Toolbox.VisualStudio", "src\T4Toolbox.VisualStudio\T4Toolbox.VisualStudio.csproj", "{1E1E9161-CBE4-4538-928C-539AA5E70153}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "T4Toolbox.VisualStudio.ItemTemplates", "src\T4Toolbox.VisualStudio.ItemTemplates\T4Toolbox.VisualStudio.ItemTemplates.csproj", "{EA04B345-97BE-4A49-9C9C-3EBD4F5D2250}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "T4Toolbox.vsix", "src\T4Toolbox.vsix\T4Toolbox.vsix.csproj", "{8E492B04-AF03-4A88-9A5D-D34D2386A4E5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "T4Toolbox.TemplateAnalysis.Tests", "test\T4Toolbox.TemplateAnalysis.Tests\T4Toolbox.TemplateAnalysis.Tests.csproj", "{A5EF918A-982F-4357-8CF8-D01E7D98FD80}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "T4Toolbox.Tests", "test\T4Toolbox.Tests\T4Toolbox.Tests.csproj", "{2A05BF5E-B2B2-4222-91A3-BB86AE8A94CE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "T4Toolbox.VisualStudio.IntegrationTests", "test\T4Toolbox.VisualStudio.IntegrationTests\T4Toolbox.VisualStudio.IntegrationTests.csproj", "{846B29AB-AAA2-4080-B4B4-A440948CC61A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "T4Toolbox.VisualStudio.Tests", "test\T4Toolbox.VisualStudio.Tests\T4Toolbox.VisualStudio.Tests.csproj", "{7CBACA4C-728A-4818-839C-E22C24677AFA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "T4Toolbox.VisualStudio.Editor", "src\T4Toolbox.VisualStudio.Editor\T4Toolbox.VisualStudio.Editor.csproj", "{FDE953D3-AD27-4398-8EF4-293C0CEBDC3E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "T4Toolbox.VisualStudio.Editor.Tests", "test\T4Toolbox.VisualStudio.Editor.Tests\T4Toolbox.VisualStudio.Editor.Tests.csproj", "{E8BB5F81-8B2B-4DD4-BAAF-A22C26183F41}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{682E771A-76F7-4972-BBDC-1250B67F399B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{682E771A-76F7-4972-BBDC-1250B67F399B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{682E771A-76F7-4972-BBDC-1250B67F399B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{682E771A-76F7-4972-BBDC-1250B67F399B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E0282961-2D83-48CC-B4D4-8257449CF8F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E0282961-2D83-48CC-B4D4-8257449CF8F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E0282961-2D83-48CC-B4D4-8257449CF8F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E0282961-2D83-48CC-B4D4-8257449CF8F7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{65BF3FA7-6B2B-47DD-8FC1-BB25754F12D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{65BF3FA7-6B2B-47DD-8FC1-BB25754F12D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{65BF3FA7-6B2B-47DD-8FC1-BB25754F12D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{65BF3FA7-6B2B-47DD-8FC1-BB25754F12D3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1E1E9161-CBE4-4538-928C-539AA5E70153}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1E1E9161-CBE4-4538-928C-539AA5E70153}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1E1E9161-CBE4-4538-928C-539AA5E70153}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1E1E9161-CBE4-4538-928C-539AA5E70153}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EA04B345-97BE-4A49-9C9C-3EBD4F5D2250}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EA04B345-97BE-4A49-9C9C-3EBD4F5D2250}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EA04B345-97BE-4A49-9C9C-3EBD4F5D2250}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EA04B345-97BE-4A49-9C9C-3EBD4F5D2250}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8E492B04-AF03-4A88-9A5D-D34D2386A4E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8E492B04-AF03-4A88-9A5D-D34D2386A4E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8E492B04-AF03-4A88-9A5D-D34D2386A4E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8E492B04-AF03-4A88-9A5D-D34D2386A4E5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A5EF918A-982F-4357-8CF8-D01E7D98FD80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A5EF918A-982F-4357-8CF8-D01E7D98FD80}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A5EF918A-982F-4357-8CF8-D01E7D98FD80}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A5EF918A-982F-4357-8CF8-D01E7D98FD80}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2A05BF5E-B2B2-4222-91A3-BB86AE8A94CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2A05BF5E-B2B2-4222-91A3-BB86AE8A94CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2A05BF5E-B2B2-4222-91A3-BB86AE8A94CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2A05BF5E-B2B2-4222-91A3-BB86AE8A94CE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{846B29AB-AAA2-4080-B4B4-A440948CC61A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{846B29AB-AAA2-4080-B4B4-A440948CC61A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{846B29AB-AAA2-4080-B4B4-A440948CC61A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{846B29AB-AAA2-4080-B4B4-A440948CC61A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7CBACA4C-728A-4818-839C-E22C24677AFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7CBACA4C-728A-4818-839C-E22C24677AFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7CBACA4C-728A-4818-839C-E22C24677AFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7CBACA4C-728A-4818-839C-E22C24677AFA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FDE953D3-AD27-4398-8EF4-293C0CEBDC3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FDE953D3-AD27-4398-8EF4-293C0CEBDC3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FDE953D3-AD27-4398-8EF4-293C0CEBDC3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FDE953D3-AD27-4398-8EF4-293C0CEBDC3E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E8BB5F81-8B2B-4DD4-BAAF-A22C26183F41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E8BB5F81-8B2B-4DD4-BAAF-A22C26183F41}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E8BB5F81-8B2B-4DD4-BAAF-A22C26183F41}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E8BB5F81-8B2B-4DD4-BAAF-A22C26183F41}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{682E771A-76F7-4972-BBDC-1250B67F399B} = {3594248C-C8A9-4EAB-8E63-0914300D4ECE}
-		{E0282961-2D83-48CC-B4D4-8257449CF8F7} = {3594248C-C8A9-4EAB-8E63-0914300D4ECE}
-		{65BF3FA7-6B2B-47DD-8FC1-BB25754F12D3} = {3594248C-C8A9-4EAB-8E63-0914300D4ECE}
 		{1E1E9161-CBE4-4538-928C-539AA5E70153} = {3594248C-C8A9-4EAB-8E63-0914300D4ECE}
-		{EA04B345-97BE-4A49-9C9C-3EBD4F5D2250} = {3594248C-C8A9-4EAB-8E63-0914300D4ECE}
 		{8E492B04-AF03-4A88-9A5D-D34D2386A4E5} = {3594248C-C8A9-4EAB-8E63-0914300D4ECE}
-		{A5EF918A-982F-4357-8CF8-D01E7D98FD80} = {994DFDA5-97F7-4688-A2FA-6D8E7AB2BC18}
-		{2A05BF5E-B2B2-4222-91A3-BB86AE8A94CE} = {994DFDA5-97F7-4688-A2FA-6D8E7AB2BC18}
-		{846B29AB-AAA2-4080-B4B4-A440948CC61A} = {994DFDA5-97F7-4688-A2FA-6D8E7AB2BC18}
-		{7CBACA4C-728A-4818-839C-E22C24677AFA} = {994DFDA5-97F7-4688-A2FA-6D8E7AB2BC18}
-		{FDE953D3-AD27-4398-8EF4-293C0CEBDC3E} = {3594248C-C8A9-4EAB-8E63-0914300D4ECE}
-		{E8BB5F81-8B2B-4DD4-BAAF-A22C26183F41} = {994DFDA5-97F7-4688-A2FA-6D8E7AB2BC18}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {7F9BD0ED-69A9-4DE9-8A45-BBE9F8744A87}
 	EndGlobalSection
 EndGlobal

src/T4Toolbox.DirectiveProcessors/T4Toolbox.DirectiveProcessors.csproj

@@ -3,6 +3,8 @@
   <PropertyGroup>
     <ProjectGuid>{E0282961-2D83-48CC-B4D4-8257449CF8F7}</ProjectGuid>
     <OutputType>Library</OutputType>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <Import Project="..\..\T4Toolbox.Common.props" />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

src/T4Toolbox.TemplateAnalysis/T4Toolbox.TemplateAnalysis.csproj

@@ -8,6 +8,8 @@
     <YaccLexTools>..\..\packages\YaccLexTools.0.2.2\tools\</YaccLexTools>
     <GplexTool>"$(YaccLexTools)gplex.exe"</GplexTool>
     <GppgTool>"$(YaccLexTools)gppg.exe"</GppgTool>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />