Skip to content

Commit 85ac849

Browse files
huangxiangyaohuangxiangyao
committed
Add multiple-targeting implementations (VS2022 and 2019)
1 parent 4d73420 commit 85ac849

13 files changed

+210
-9
lines changed

‎FileEncoding.sln‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,33 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_", "_", "{9DA5C298-1CA0-4A
1717
EndProject
1818
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{70C55713-79A1-4163-B513-D365607C682E}"
1919
EndProject
20-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileEncoding", "src\FileEncoding\FileEncoding.csproj", "{5DA3ECF3-5C2B-44FB-B98F-88C2B9966240}"
20+
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "FileEncoding.Shared", "src\FileEncoding.Shared\FileEncoding.Shared.shproj", "{8AC3A475-6792-4516-8D57-B9E17741B5F4}"
21+
EndProject
22+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileEncoding.Vsix2019", "src\FileEncoding.Vsix2019\FileEncoding.Vsix2019.csproj", "{06B76B1F-9485-4B9F-9E35-438CA49F74C0}"
23+
EndProject
24+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileEncoding.Vsix2022", "src\FileEncoding.Vsix2022\FileEncoding.Vsix2022.csproj", "{5DA3ECF3-5C2B-44FB-B98F-88C2B9966240}"
2125
EndProject
2226
Global
27+
GlobalSection(SharedMSBuildProjectFiles) = preSolution
28+
src\FileEncoding.Shared\FileEncoding.Shared.projitems*{06b76b1f-9485-4b9f-9e35-438ca49f74c0}*SharedItemsImports = 4
29+
src\FileEncoding.Shared\FileEncoding.Shared.projitems*{5da3ecf3-5c2b-44fb-b98f-88c2b9966240}*SharedItemsImports = 4
30+
src\FileEncoding.Shared\FileEncoding.Shared.projitems*{8ac3a475-6792-4516-8d57-b9e17741b5f4}*SharedItemsImports = 13
31+
EndGlobalSection
2332
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2433
Debug|Any CPU = Debug|Any CPU
2534
Debug|x86 = Debug|x86
2635
Release|Any CPU = Release|Any CPU
2736
Release|x86 = Release|x86
2837
EndGlobalSection
2938
GlobalSection(ProjectConfigurationPlatforms) = postSolution
39+
{06B76B1F-9485-4B9F-9E35-438CA49F74C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
40+
{06B76B1F-9485-4B9F-9E35-438CA49F74C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
41+
{06B76B1F-9485-4B9F-9E35-438CA49F74C0}.Debug|x86.ActiveCfg = Debug|x86
42+
{06B76B1F-9485-4B9F-9E35-438CA49F74C0}.Debug|x86.Build.0 = Debug|x86
43+
{06B76B1F-9485-4B9F-9E35-438CA49F74C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
44+
{06B76B1F-9485-4B9F-9E35-438CA49F74C0}.Release|Any CPU.Build.0 = Release|Any CPU
45+
{06B76B1F-9485-4B9F-9E35-438CA49F74C0}.Release|x86.ActiveCfg = Release|x86
46+
{06B76B1F-9485-4B9F-9E35-438CA49F74C0}.Release|x86.Build.0 = Release|x86
3047
{5DA3ECF3-5C2B-44FB-B98F-88C2B9966240}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3148
{5DA3ECF3-5C2B-44FB-B98F-88C2B9966240}.Debug|Any CPU.Build.0 = Debug|Any CPU
3249
{5DA3ECF3-5C2B-44FB-B98F-88C2B9966240}.Debug|x86.ActiveCfg = Debug|x86
@@ -40,6 +57,8 @@ Global
4057
HideSolutionNode = FALSE
4158
EndGlobalSection
4259
GlobalSection(NestedProjects) = preSolution
60+
{8AC3A475-6792-4516-8D57-B9E17741B5F4} = {70C55713-79A1-4163-B513-D365607C682E}
61+
{06B76B1F-9485-4B9F-9E35-438CA49F74C0} = {70C55713-79A1-4163-B513-D365607C682E}
4362
{5DA3ECF3-5C2B-44FB-B98F-88C2B9966240} = {70C55713-79A1-4163-B513-D365607C682E}
4463
EndGlobalSection
4564
GlobalSection(ExtensibilityGlobals) = postSolution

src/FileEncoding/EncodingExtensions.cs renamed to src/FileEncoding.Shared/EncodingExtensions.cs

File renamed without changes.

src/FileEncoding/EncodingMargin.cs renamed to src/FileEncoding.Shared/EncodingMargin.cs

File renamed without changes.

src/FileEncoding/EncodingMarginFactory.cs renamed to src/FileEncoding.Shared/EncodingMarginFactory.cs

File renamed without changes.

‎src/FileEncoding.Shared/FileEncoding.Shared.projitems‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
5+
<HasSharedItems>true</HasSharedItems>
6+
<SharedGUID>8ac3a475-6792-4516-8d57-b9e17741b5f4</SharedGUID>
7+
</PropertyGroup>
8+
<PropertyGroup Label="Configuration">
9+
<Import_RootNamespace>FileEncoding.Shared</Import_RootNamespace>
10+
</PropertyGroup>
11+
<ItemGroup>
12+
<Compile Include="$(MSBuildThisFileDirectory)EncodingExtensions.cs" />
13+
<Compile Include="$(MSBuildThisFileDirectory)EncodingMargin.cs" />
14+
<Compile Include="$(MSBuildThisFileDirectory)EncodingMarginFactory.cs" />
15+
<Compile Include="$(MSBuildThisFileDirectory)FileEncodingPackage.cs" />
16+
</ItemGroup>
17+
</Project>

‎src/FileEncoding.Shared/FileEncoding.Shared.shproj‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup Label="Globals">
4+
<ProjectGuid>8ac3a475-6792-4516-8d57-b9e17741b5f4</ProjectGuid>
5+
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
6+
</PropertyGroup>
7+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
8+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
9+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
10+
<PropertyGroup />
11+
<Import Project="FileEncoding.Shared.projitems" Label="Shared" />
12+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
13+
</Project>

src/FileEncoding/FileEncodingPackage.cs renamed to src/FileEncoding.Shared/FileEncodingPackage.cs

File renamed without changes.

‎src/FileEncoding.Vsix2019/FileEncoding.Vsix2019.csproj‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<MinimumVisualStudioVersion>17.0</MinimumVisualStudioVersion>
5+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
6+
</PropertyGroup>
7+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
8+
<PropertyGroup>
9+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
10+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
11+
<SchemaVersion>2.0</SchemaVersion>
12+
<ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
13+
<ProjectGuid>{06B76B1F-9485-4B9F-9E35-438CA49F74C0}</ProjectGuid>
14+
<OutputType>Library</OutputType>
15+
<AppDesignerFolder>Properties</AppDesignerFolder>
16+
<RootNamespace>FileEncoding2019</RootNamespace>
17+
<AssemblyName>FileEncoding2019</AssemblyName>
18+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
19+
<GeneratePkgDefFile>true</GeneratePkgDefFile>
20+
<UseCodebase>true</UseCodebase>
21+
<IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
22+
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
23+
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
24+
<CopyBuildOutputToOutputDirectory>true</CopyBuildOutputToOutputDirectory>
25+
<CopyOutputSymbolsToOutputDirectory>true</CopyOutputSymbolsToOutputDirectory>
26+
<StartAction>Program</StartAction>
27+
<StartProgram Condition="'$(DevEnvDir)' != ''">$(DevEnvDir)devenv.exe</StartProgram>
28+
<StartArguments>/rootsuffix Exp</StartArguments>
29+
</PropertyGroup>
30+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
31+
<DebugSymbols>true</DebugSymbols>
32+
<DebugType>full</DebugType>
33+
<Optimize>false</Optimize>
34+
<OutputPath>bin\Debug\</OutputPath>
35+
<DefineConstants>DEBUG;TRACE</DefineConstants>
36+
<ErrorReport>prompt</ErrorReport>
37+
<WarningLevel>4</WarningLevel>
38+
</PropertyGroup>
39+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
40+
<DebugType>pdbonly</DebugType>
41+
<Optimize>true</Optimize>
42+
<OutputPath>bin\Release\</OutputPath>
43+
<DefineConstants>TRACE</DefineConstants>
44+
<ErrorReport>prompt</ErrorReport>
45+
<WarningLevel>4</WarningLevel>
46+
</PropertyGroup>
47+
<ItemGroup>
48+
<Compile Include="Properties\AssemblyInfo.cs" />
49+
</ItemGroup>
50+
<ItemGroup>
51+
<None Include="source.extension.vsixmanifest">
52+
<SubType>Designer</SubType>
53+
</None>
54+
</ItemGroup>
55+
<ItemGroup>
56+
<Reference Include="PresentationCore" />
57+
<Reference Include="PresentationFramework" />
58+
<Reference Include="System" />
59+
<Reference Include="System.ComponentModel.Composition" />
60+
<Reference Include="System.Windows" />
61+
<Reference Include="System.Xaml" />
62+
<Reference Include="WindowsBase" />
63+
</ItemGroup>
64+
<ItemGroup>
65+
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="16.0.206" ExcludeAssets="runtime" />
66+
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="16.10.32" />
67+
</ItemGroup>
68+
<ItemGroup>
69+
<Content Include="..\..\docs\Icon.png">
70+
<Link>%(FileName)%(Extension)</Link>
71+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
72+
<IncludeInVSIX>true</IncludeInVSIX>
73+
</Content>
74+
<Content Include="..\..\docs\screenshots\Preview.png">
75+
<Link>%(FileName)%(Extension)</Link>
76+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
77+
<IncludeInVSIX>true</IncludeInVSIX>
78+
</Content>
79+
<Content Include="..\..\LICENSE.txt">
80+
<Link>%(FileName)%(Extension)</Link>
81+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
82+
<IncludeInVSIX>true</IncludeInVSIX>
83+
</Content>
84+
</ItemGroup>
85+
<Import Project="..\FileEncoding.Shared\FileEncoding.Shared.projitems" Label="Shared" />
86+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
87+
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
88+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
89+
Other similar extension points exist, see Microsoft.Common.targets.
90+
<Target Name="BeforeBuild">
91+
</Target>
92+
<Target Name="AfterBuild">
93+
</Target>
94+
-->
95+
</Project>

‎src/FileEncoding.Vsix2019/Properties/AssemblyInfo.cs‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
using System.Reflection;
2+
using System.Runtime.CompilerServices;
3+
using System.Runtime.InteropServices;
4+
5+
// General Information about an assembly is controlled through the following
6+
// set of attributes. Change these attribute values to modify the information
7+
// associated with an assembly.
8+
[assembly: AssemblyTitle("FileEncoding.Vsix2019")]
9+
[assembly: AssemblyDescription("")]
10+
[assembly: AssemblyConfiguration("")]
11+
[assembly: AssemblyCompany("")]
12+
[assembly: AssemblyProduct("FileEncoding.Vsix2019")]
13+
[assembly: AssemblyCopyright("")]
14+
[assembly: AssemblyTrademark("")]
15+
[assembly: AssemblyCulture("")]
16+
17+
// Setting ComVisible to false makes the types in this assembly not visible
18+
// to COM components. If you need to access a type in this assembly from
19+
// COM, set the ComVisible attribute to true on that type.
20+
[assembly: ComVisible(false)]
21+
22+
// Version information for an assembly consists of the following four values:
23+
//
24+
// Major Version
25+
// Minor Version
26+
// Build Number
27+
// Revision
28+
//
29+
// You can specify all the values or you can default the Build and Revision Numbers
30+
// by using the '*' as shown below:
31+
// [assembly: AssemblyVersion("1.0.*")]
32+
[assembly: AssemblyVersion("1.0.0.0")]
33+
[assembly: AssemblyFileVersion("1.0.0.0")]

‎src/FileEncoding.Vsix2019/source.extension.vsixmanifest‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<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">
3+
<Metadata>
4+
<Identity Id="FileEncoding2019.ff8fe5f7-e5dc-4213-a1d1-91ec8d84a049" Version="1.0.32" Language="en-US" Publisher="Myvas" />
5+
<DisplayName>FileEncoding 2019</DisplayName>
6+
<Description xml:space="preserve">This Visual Studio Extension will display the charset of current document at the right bottom margin of the editor; Click to popup a contextual menu with a list of encodings and choose the encoding that you want to convert the document to.</Description>
7+
<MoreInfo>https://github.com/myvas/FileEncoding</MoreInfo>
8+
<License>LICENSE.txt</License>
9+
<Icon>Icon.png</Icon>
10+
<PreviewImage>Preview.png</PreviewImage>
11+
<Tags>Encoding; charset</Tags>
12+
</Metadata>
13+
<Installation>
14+
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0, 17.0)">
15+
</InstallationTarget>
16+
</Installation>
17+
<Dependencies>
18+
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
19+
</Dependencies>
20+
<Prerequisites>
21+
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,17.0)" DisplayName="Visual Studio core editor" />
22+
</Prerequisites>
23+
<Assets>
24+
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
25+
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
26+
</Assets>
27+
</PackageManifest>

0 commit comments

Comments
 (0)