Skip to content

Commit 4d6a6d3

Browse files
SajjadAlipoursoheilpro
SajjadAlipour
authored and
soheilpro
committed
Support VS 2022
1 parent a17c5a7 commit 4d6a6d3

File tree

3 files changed

+25
-37
lines changed

3 files changed

+25
-37
lines changed

‎Projects/Package/Sources/Xinq/Xinq.csproj‎

Lines changed: 14 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -61,38 +61,6 @@
6161
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
6262
<Prefer32Bit>false</Prefer32Bit>
6363
</PropertyGroup>
64-
<ItemGroup>
65-
<Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
66-
<SpecificVersion>False</SpecificVersion>
67-
</Reference>
68-
<Reference Include="EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
69-
<SpecificVersion>False</SpecificVersion>
70-
</Reference>
71-
<Reference Include="Microsoft.VisualStudio.OLE.Interop" />
72-
<Reference Include="Microsoft.VisualStudio.Package.LanguageService.15.0, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
73-
<Reference Include="Microsoft.VisualStudio.Shell.15.0, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
74-
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
75-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
76-
<SpecificVersion>False</SpecificVersion>
77-
<HintPath>C:\Program Files\Microsoft Visual Studio 2010 SDK SP1\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
78-
</Reference>
79-
<Reference Include="Microsoft.VisualStudio.Shell.Interop" />
80-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
81-
<EmbedInteropTypes>True</EmbedInteropTypes>
82-
</Reference>
83-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
84-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
85-
<Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
86-
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
87-
<Reference Include="System" />
88-
<Reference Include="System.Data" />
89-
<Reference Include="System.Design" />
90-
<Reference Include="System.Drawing" />
91-
<Reference Include="System.Windows.Forms" />
92-
<Reference Include="System.Xml" />
93-
<Reference Include="VSLangProj, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
94-
<Reference Include="VSLangProj80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
95-
</ItemGroup>
9664
<ItemGroup>
9765
<Compile Include="Document.cs" />
9866
<Compile Include="Microsoft.VisualStudio.Shell\ProvideXmlEditorChooserDesignerViewAttribute.cs" />
@@ -162,6 +130,20 @@
162130
<Install>true</Install>
163131
</BootstrapperPackage>
164132
</ItemGroup>
133+
<ItemGroup>
134+
<Reference Include="System.Drawing" />
135+
</ItemGroup>
136+
<ItemGroup>
137+
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.0.31902.203" ExcludeAssets="runtime">
138+
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
139+
</PackageReference>
140+
<PackageReference Include="Microsoft.VisualStudio.Shell.15.0">
141+
<Version>17.0.31902.203</Version>
142+
</PackageReference>
143+
<PackageReference Include="System.Xml.XmlDocument">
144+
<Version>4.3.0</Version>
145+
</PackageReference>
146+
</ItemGroup>
165147
<PropertyGroup>
166148
<TargetRegistryRoot>Software\Microsoft\VisualStudio\8.0Exp</TargetRegistryRoot>
167149
<RegisterOutputPackage>true</RegisterOutputPackage>

‎Projects/Package/Sources/Xinq/XinqPackage.cs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,33 @@
11
using System;
22
using System.Runtime.InteropServices;
3+
using System.Threading;
4+
using System.Threading.Tasks;
35
using Microsoft.VisualStudio;
46
using Microsoft.VisualStudio.Shell;
57
using Microsoft.VisualStudio.Shell.Interop;
68
using VSLangProj80;
79

810
namespace Xinq
911
{
10-
[PackageRegistration(UseManagedResourcesOnly = true)]
12+
[PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
1113
[InstalledProductRegistration("#110", "#112", "1.0.7", IconResourceID = 400)]
1214
[ProvideXmlEditorChooserDesignerView("Xinq Designer", "xinq", LogicalViewID.Designer, 0x60, DesignerLogicalViewEditor = typeof(XinqEditorFactory), Namespace = "http://schemas.microsoft.com/developer/vstemplate/2005", MatchExtensionAndNamespace = false)]
1315
[ProvideEditorLogicalView(typeof(XinqEditorFactory), LogicalViewID.Designer)]
1416
[ProvideEditorExtension(typeof(XinqEditorFactory), ".xinq", 32, ProjectGuid = vsContextGuids.vsContextGuidVCSProject, NameResourceID = 105)]
1517
[ProvideEditorExtension(typeof(XinqEditorFactory), ".xinq", 32, ProjectGuid = vsContextGuids.vsContextGuidVBProject, NameResourceID = 105)]
1618
[Guid(GuidList.XinqPackageGuidString)]
17-
internal sealed class XinqPackage : Package, IVsInstalledProduct
19+
internal sealed class XinqPackage : AsyncPackage, IVsInstalledProduct
1820
{
1921
private XinqEditorFactory _editorFactory;
2022

21-
protected override void Initialize()
23+
protected override async Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
2224
{
2325
base.Initialize();
2426

2527
_editorFactory = new XinqEditorFactory(this);
2628
RegisterEditorFactory(_editorFactory);
29+
30+
await JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
2731
}
2832

2933
public string GetResourceString(uint id)

‎Projects/Package/Sources/Xinq/source.extension.vsixmanifest‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@
77
<Icon>Resources\XinqPackage.ico</Icon>
88
</Metadata>
99
<Installation>
10-
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[12.0,)" />
10+
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0,)">
11+
<ProductArchitecture>amd64</ProductArchitecture>
12+
</InstallationTarget>
1113
</Installation>
1214
<Dependencies>
1315
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
1416
</Dependencies>
1517
<Prerequisites>
16-
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[12.0,)" DisplayName="Visual Studio core editor" />
18+
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[17.0,)" DisplayName="Visual Studio core editor" />
1719
</Prerequisites>
1820
<Assets>
1921
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />

0 commit comments

Comments
 (0)