2.19.0.2

Author: RobertvanderHulst

src/VisualStudio/ProjectPackage/ExternalAssemblies.cs

@@ -30,7 +30,7 @@
 [assembly: ProvideCodeBase(AssemblyName = "SQLitePCLRaw.batteries_v2")]
 [assembly: ProvideCodeBase(AssemblyName = "SQLitePCLRaw.provider.dynamic_cdecl")]
 #endif
-[assembly: ProvideCodeBase(AssemblyName = "System.Data.Sqlite")]
+[assembly: ProvideCodeBase(AssemblyName = "System.Data.SQLite")]
 
 [assembly: ProvideCodeBase(AssemblyName = "Serilog.Sinks.File")]
 [assembly: ProvideCodeBase(AssemblyName = "Serilog.Sinks.Debug")]

src/VisualStudio/ProjectPackage/ProjectPackage.csproj

@@ -18,7 +18,7 @@
     <AssemblyName>XSharp.Project</AssemblyName>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
+    <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
     <GeneratePkgDefFile>true</GeneratePkgDefFile>
     <IncludeDebugSymbolsInLocalVSIXDeployment>true</IncludeDebugSymbolsInLocalVSIXDeployment>
     <CopyBuildOutputToOutputDirectory>true</CopyBuildOutputToOutputDirectory>
@@ -812,7 +812,7 @@
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
-  -->
   <Target Name="AfterBuild">
   </Target>
+  -->
 </Project>

src/VisualStudio/ProjectPackage/source.extension.vsixmanifest

@@ -1,8 +1,8 @@
 <?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="XSharp.ProjectSystem" Version="2.19.0.2" Language="en-US" Publisher="XSharp BV" />
-        <DisplayName>XSharp Visual Studio Integration</DisplayName>
+        <Identity Id="XSharp.ProjectSystem.2022" Version="2.19.0.2" Language="en-US" Publisher="XSharp BV" />
+        <DisplayName>XSharp VS Integration for 2022 and later</DisplayName>
         <Description xml:space="preserve">X# Visual Studio Integration.
 Includes a Project System, Language Service , Debugger Support, Custom Editors etc.</Description>
         <MoreInfo>http://www.xsharp.eu</MoreInfo>
@@ -13,33 +13,38 @@ Includes a Project System, Language Service , Debugger Support, Custom Editors e
         <Tags>XSharp, XBase, FoxPro, Visual Objects, Xbase++, Harbour</Tags>
     </Metadata>
     <Installation AllUsers="true" SystemComponent="true">
-        <InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Community" />
+        <InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Community" >
+            <ProductArchitecture>amd64</ProductArchitecture>
+        </InstallationTarget>
+        <InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Community" >
+            <ProductArchitecture>arm64</ProductArchitecture>
+        </InstallationTarget>
     </Installation>
     <Assets>
         <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" d:ProjectName="%CurrentProject%" d:VsixSubPath="ProjectSystem" />
-        <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" Path="|LanguageService|"  />
-        <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="LanguageService"  Path="|LanguageService|" />
+        <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" Path="|LanguageService2022|" />
+        <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="LanguageService2022" Path="|LanguageService2022|" />
         <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
         <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" d:ProjectName="%CurrentProject%" d:TargetPath="|%CurrentProject%;TemplateProjectOutputGroup|" Path="ItemTemplates" d:VsixSubPath="ItemTemplates" />
         <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="%CurrentProject%" d:TargetPath="|%CurrentProject%;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
-        <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="Debugger" Path="|Debugger|" AssemblyName="|Debugger;AssemblyName|" />
-        <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="AppDesigner" Path="|AppDesigner|" AssemblyName="|AppDesigner;AssemblyName|" />
-        <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="ProjectBase" Path="|ProjectBase|" AssemblyName="|ProjectBase;AssemblyName|" />
-        <Asset Type="DebuggerEngineExtension" d:Source="Project" d:ProjectName="%CurrentProject%" Path="XSharp.Debugger.vsdconfig" />
+        <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="Debugger2022" Path="|Debugger2022|" AssemblyName="|Debugger2022;AssemblyName|" />
+        <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="AppDesigner2022" Path="|AppDesigner2022|" AssemblyName="|AppDesigner2022;AssemblyName|" />
+        <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="ProjectBase2022" Path="|ProjectBase2022|" AssemblyName="|ProjectBase2022;AssemblyName|" />
+        <Asset Type="DebuggerEngineExtension" d:Source="Project" d:ProjectName="%CurrentProject%" Path="XSharp.Debugger2022.vsdconfig" />
         <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="File" Path="XSharp.MonoCecil.dll" AssemblyName="XSharp.MonoCecil, Version=0.11.4.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e" />
-        <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="Debugger.UI" Path="|Debugger.UI;PkgdefProjectOutputGroup|" />
-        <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="Debugger.UI" Path="|Debugger.UI|" AssemblyName="|Debugger.UI;AssemblyName|" />
-        <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="Debugger.UI" Path="|Debugger.UI|" />
-        <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="CodeGenerator" Path="|CodeGenerator|" AssemblyName="|CodeGenerator;AssemblyName|" />
+        <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="Debugger.UI2022" Path="|Debugger.UI2022;PkgdefProjectOutputGroup|" />
+        <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="Debugger.UI2022" Path="|Debugger.UI2022|" AssemblyName="|Debugger.UI2022;AssemblyName|" />
+        <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="Debugger.UI2022" Path="|Debugger.UI2022|" />
         <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="Debugger.Support" Path="|Debugger.Support|" AssemblyName="|Debugger.Support;AssemblyName|" />
+        <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="CodeGenerator" Path="|CodeGenerator|" AssemblyName="|CodeGenerator;AssemblyName|" />
     </Assets>
     <Content>
         <ProjectTemplate>ProjectTemplates</ProjectTemplate>
         <ItemTemplate>ItemTemplates</ItemTemplate>
     </Content>
     <Prerequisites>
-        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,17.0)" DisplayName="Visual Studio core editor" />
-        <Prerequisite Id="Microsoft.VisualStudio.Component.Roslyn.LanguageServices" Version="[15.0,17.0)" DisplayName="C# and Visual Basic" />
-        <Prerequisite Id="Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites" Version="[15.0,17.0)" DisplayName=".NET desktop development tools" />
+        <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" />
+        <Prerequisite Id="Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites" Version="[17.0,18.0)" DisplayName=".NET desktop development tools" />
     </Prerequisites>
 </PackageManifest>

src/VisualStudio/XSharpCodeModelXs/CodeModel.xsproj

@@ -178,7 +178,7 @@
       <Version>8.0.1</Version>
       <IncludeAssets>all</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="SQLitePCLRaw.lib.e_sqlite3" GeneratePathProperty="true" >
+    <PackageReference Include="SQLitePCLRaw.lib.e_sqlite3">
       <Version>2.1.6</Version>
       <IncludeAssets>all</IncludeAssets>
     </PackageReference>

src/VisualStudio/XSharpCodeModelXs/Database/XDatabase.prg

@@ -549,7 +549,7 @@ STATIC CLASS XDatabase
 
                     cmd:CommandText := "Delete from IncludeFiles where Id not in (select IdInclude from IncludeFilesPerFile)"
                     cmd:ExecuteScalar()
-                    CATCH e AS Exception
+                CATCH e AS Exception
                     Log("Error deleting orphaned files ")
                     XSettings.Exception(e, __FUNCTION__)
                 END TRY