Skip to content

Commit a205063

Browse files
RobertvanderHulstRobertvanderHulst
committed
2.19.0.2
1 parent 5be8c02 commit a205063

5 files changed

Lines changed: 26 additions & 21 deletions

File tree

‎src/VisualStudio/ProjectPackage/ExternalAssemblies.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
[assembly: ProvideCodeBase(AssemblyName = "SQLitePCLRaw.batteries_v2")]
3131
[assembly: ProvideCodeBase(AssemblyName = "SQLitePCLRaw.provider.dynamic_cdecl")]
3232
#endif
33-
[assembly: ProvideCodeBase(AssemblyName = "System.Data.Sqlite")]
33+
[assembly: ProvideCodeBase(AssemblyName = "System.Data.SQLite")]
3434

3535
[assembly: ProvideCodeBase(AssemblyName = "Serilog.Sinks.File")]
3636
[assembly: ProvideCodeBase(AssemblyName = "Serilog.Sinks.Debug")]

‎src/VisualStudio/ProjectPackage/ProjectPackage.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<AssemblyName>XSharp.Project</AssemblyName>
1919
<IsWebBootstrapper>false</IsWebBootstrapper>
2020
<BootstrapperEnabled>true</BootstrapperEnabled>
21-
<IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
21+
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
2222
<GeneratePkgDefFile>true</GeneratePkgDefFile>
2323
<IncludeDebugSymbolsInLocalVSIXDeployment>true</IncludeDebugSymbolsInLocalVSIXDeployment>
2424
<CopyBuildOutputToOutputDirectory>true</CopyBuildOutputToOutputDirectory>
@@ -812,7 +812,7 @@
812812
</PropertyGroup>
813813
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
814814
Other similar extension points exist, see Microsoft.Common.targets.
815-
-->
816815
<Target Name="AfterBuild">
817816
</Target>
817+
-->
818818
</Project>

‎src/VisualStudio/ProjectPackage/source.extension.vsixmanifest‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<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">
33
<Metadata>
4-
<Identity Id="XSharp.ProjectSystem" Version="2.19.0.2" Language="en-US" Publisher="XSharp BV" />
5-
<DisplayName>XSharp Visual Studio Integration</DisplayName>
4+
<Identity Id="XSharp.ProjectSystem.2022" Version="2.19.0.2" Language="en-US" Publisher="XSharp BV" />
5+
<DisplayName>XSharp VS Integration for 2022 and later</DisplayName>
66
<Description xml:space="preserve">X# Visual Studio Integration.
77
Includes a Project System, Language Service , Debugger Support, Custom Editors etc.</Description>
88
<MoreInfo>http://www.xsharp.eu</MoreInfo>
@@ -13,33 +13,38 @@ Includes a Project System, Language Service , Debugger Support, Custom Editors e
1313
<Tags>XSharp, XBase, FoxPro, Visual Objects, Xbase++, Harbour</Tags>
1414
</Metadata>
1515
<Installation AllUsers="true" SystemComponent="true">
16-
<InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Community" />
16+
<InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Community" >
17+
<ProductArchitecture>amd64</ProductArchitecture>
18+
</InstallationTarget>
19+
<InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Community" >
20+
<ProductArchitecture>arm64</ProductArchitecture>
21+
</InstallationTarget>
1722
</Installation>
1823
<Assets>
1924
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" d:ProjectName="%CurrentProject%" d:VsixSubPath="ProjectSystem" />
20-
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" Path="|LanguageService|" />
21-
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="LanguageService" Path="|LanguageService|" />
25+
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" Path="|LanguageService2022|" />
26+
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="LanguageService2022" Path="|LanguageService2022|" />
2227
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
2328
<Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" d:ProjectName="%CurrentProject%" d:TargetPath="|%CurrentProject%;TemplateProjectOutputGroup|" Path="ItemTemplates" d:VsixSubPath="ItemTemplates" />
2429
<Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="%CurrentProject%" d:TargetPath="|%CurrentProject%;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
25-
<Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="Debugger" Path="|Debugger|" AssemblyName="|Debugger;AssemblyName|" />
26-
<Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="AppDesigner" Path="|AppDesigner|" AssemblyName="|AppDesigner;AssemblyName|" />
27-
<Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="ProjectBase" Path="|ProjectBase|" AssemblyName="|ProjectBase;AssemblyName|" />
28-
<Asset Type="DebuggerEngineExtension" d:Source="Project" d:ProjectName="%CurrentProject%" Path="XSharp.Debugger.vsdconfig" />
30+
<Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="Debugger2022" Path="|Debugger2022|" AssemblyName="|Debugger2022;AssemblyName|" />
31+
<Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="AppDesigner2022" Path="|AppDesigner2022|" AssemblyName="|AppDesigner2022;AssemblyName|" />
32+
<Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="ProjectBase2022" Path="|ProjectBase2022|" AssemblyName="|ProjectBase2022;AssemblyName|" />
33+
<Asset Type="DebuggerEngineExtension" d:Source="Project" d:ProjectName="%CurrentProject%" Path="XSharp.Debugger2022.vsdconfig" />
2934
<Asset Type="Microsoft.VisualStudio.Assembly" d:Source="File" Path="XSharp.MonoCecil.dll" AssemblyName="XSharp.MonoCecil, Version=0.11.4.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e" />
30-
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="Debugger.UI" Path="|Debugger.UI;PkgdefProjectOutputGroup|" />
31-
<Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="Debugger.UI" Path="|Debugger.UI|" AssemblyName="|Debugger.UI;AssemblyName|" />
32-
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="Debugger.UI" Path="|Debugger.UI|" />
33-
<Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="CodeGenerator" Path="|CodeGenerator|" AssemblyName="|CodeGenerator;AssemblyName|" />
35+
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="Debugger.UI2022" Path="|Debugger.UI2022;PkgdefProjectOutputGroup|" />
36+
<Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="Debugger.UI2022" Path="|Debugger.UI2022|" AssemblyName="|Debugger.UI2022;AssemblyName|" />
37+
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="Debugger.UI2022" Path="|Debugger.UI2022|" />
3438
<Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="Debugger.Support" Path="|Debugger.Support|" AssemblyName="|Debugger.Support;AssemblyName|" />
39+
<Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="CodeGenerator" Path="|CodeGenerator|" AssemblyName="|CodeGenerator;AssemblyName|" />
3540
</Assets>
3641
<Content>
3742
<ProjectTemplate>ProjectTemplates</ProjectTemplate>
3843
<ItemTemplate>ItemTemplates</ItemTemplate>
3944
</Content>
4045
<Prerequisites>
41-
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,17.0)" DisplayName="Visual Studio core editor" />
42-
<Prerequisite Id="Microsoft.VisualStudio.Component.Roslyn.LanguageServices" Version="[15.0,17.0)" DisplayName="C# and Visual Basic" />
43-
<Prerequisite Id="Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites" Version="[15.0,17.0)" DisplayName=".NET desktop development tools" />
46+
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[17.0,18.0)" DisplayName="Visual Studio core editor" />
47+
<Prerequisite Id="Microsoft.VisualStudio.Component.Roslyn.LanguageServices" Version="[17.0,18.0)" DisplayName="C# and Visual Basic" />
48+
<Prerequisite Id="Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites" Version="[17.0,18.0)" DisplayName=".NET desktop development tools" />
4449
</Prerequisites>
4550
</PackageManifest>

‎src/VisualStudio/XSharpCodeModelXs/CodeModel.xsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
<Version>8.0.1</Version>
179179
<IncludeAssets>all</IncludeAssets>
180180
</PackageReference>
181-
<PackageReference Include="SQLitePCLRaw.lib.e_sqlite3" GeneratePathProperty="true" >
181+
<PackageReference Include="SQLitePCLRaw.lib.e_sqlite3">
182182
<Version>2.1.6</Version>
183183
<IncludeAssets>all</IncludeAssets>
184184
</PackageReference>

‎src/VisualStudio/XSharpCodeModelXs/Database/XDatabase.prg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ STATIC CLASS XDatabase
549549

550550
cmd:CommandText := "Delete from IncludeFiles where Id not in (select IdInclude from IncludeFilesPerFile)"
551551
cmd:ExecuteScalar()
552-
CATCH e AS Exception
552+
CATCH e AS Exception
553553
Log("Error deleting orphaned files ")
554554
XSettings.Exception(e, __FUNCTION__)
555555
END TRY

0 commit comments

Comments
 (0)