pre-release 1.0.34 support multi-targets in FileEncoding.csproj

myvas · May 5, 2022 · 289df1c · 289df1c
1 parent 50d7a01
commit 289df1c
Show file tree

Hide file tree

Showing 25 changed files with 630 additions and 64 deletions.
diff --git a/DISCUSS.md b/DISCUSS.md
@@ -0,0 +1,3 @@
+**DISCUSS**
+There are more and more new characters (e.g. emoji) appear in the comments, resources and elsewhere of soruce codes; An efficient and safe convention of interpreting a file into a human friendly visible artifact is required and more and more important in the future; The Unicode BOM is already an accept standard, so why people 'refuse' to use it? 
+
diff --git a/FileEncoding.sln b/FileEncoding.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.1.32328.378
+VisualStudioVersion = 17.1.32421.90
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_", "_", "{9DA5C298-1CA0-4A07-BAB1-0FE42C2C3153}"
 	ProjectSection(SolutionItems) = preProject
@@ -19,15 +19,21 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{70C55713-79A
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "FileEncoding.Shared", "src\FileEncoding.Shared\FileEncoding.Shared.shproj", "{8AC3A475-6792-4516-8D57-B9E17741B5F4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileEncoding.Vsix2019", "src\FileEncoding.Vsix2019\FileEncoding.Vsix2019.csproj", "{06B76B1F-9485-4B9F-9E35-438CA49F74C0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileEncoding", "src\FileEncoding\FileEncoding.csproj", "{7CBFE2DC-B573-47F5-B746-7E2217982965}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileEncoding.Vsix2022", "src\FileEncoding.Vsix2022\FileEncoding.Vsix2022.csproj", "{5DA3ECF3-5C2B-44FB-B98F-88C2B9966240}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileEncodingVS2019", "src\FileEncodingVS2019\FileEncodingVS2019.csproj", "{BA497A0C-1D9B-4189-8AAA-5C99BCE5B1B4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileEncodingVS2022", "src\FileEncodingVS2022\FileEncodingVS2022.csproj", "{5DA3ECF3-5C2B-44FB-B98F-88C2B9966240}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileEncodingVS2017", "src\FileEncodingVS2017\FileEncodingVS2017.csproj", "{1697853E-15E9-4BAB-91E8-F197C4C9EEC6}"
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		src\FileEncoding.Shared\FileEncoding.Shared.projitems*{06b76b1f-9485-4b9f-9e35-438ca49f74c0}*SharedItemsImports = 4
+		src\FileEncoding.Shared\FileEncoding.Shared.projitems*{1697853e-15e9-4bab-91e8-f197c4c9eec6}*SharedItemsImports = 4
 		src\FileEncoding.Shared\FileEncoding.Shared.projitems*{5da3ecf3-5c2b-44fb-b98f-88c2b9966240}*SharedItemsImports = 4
+		src\FileEncoding.Shared\FileEncoding.Shared.projitems*{7cbfe2dc-b573-47f5-b746-7e2217982965}*SharedItemsImports = 4
 		src\FileEncoding.Shared\FileEncoding.Shared.projitems*{8ac3a475-6792-4516-8d57-b9e17741b5f4}*SharedItemsImports = 13
+		src\FileEncoding.Shared\FileEncoding.Shared.projitems*{ba497a0c-1d9b-4189-8aaa-5c99bce5b1b4}*SharedItemsImports = 4
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -36,14 +42,22 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{06B76B1F-9485-4B9F-9E35-438CA49F74C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{06B76B1F-9485-4B9F-9E35-438CA49F74C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{06B76B1F-9485-4B9F-9E35-438CA49F74C0}.Debug|x86.ActiveCfg = Debug|x86
-		{06B76B1F-9485-4B9F-9E35-438CA49F74C0}.Debug|x86.Build.0 = Debug|x86
-		{06B76B1F-9485-4B9F-9E35-438CA49F74C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{06B76B1F-9485-4B9F-9E35-438CA49F74C0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{06B76B1F-9485-4B9F-9E35-438CA49F74C0}.Release|x86.ActiveCfg = Release|x86
-		{06B76B1F-9485-4B9F-9E35-438CA49F74C0}.Release|x86.Build.0 = Release|x86
+		{7CBFE2DC-B573-47F5-B746-7E2217982965}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7CBFE2DC-B573-47F5-B746-7E2217982965}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7CBFE2DC-B573-47F5-B746-7E2217982965}.Debug|x86.ActiveCfg = Debug|x86
+		{7CBFE2DC-B573-47F5-B746-7E2217982965}.Debug|x86.Build.0 = Debug|x86
+		{7CBFE2DC-B573-47F5-B746-7E2217982965}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7CBFE2DC-B573-47F5-B746-7E2217982965}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7CBFE2DC-B573-47F5-B746-7E2217982965}.Release|x86.ActiveCfg = Release|x86
+		{7CBFE2DC-B573-47F5-B746-7E2217982965}.Release|x86.Build.0 = Release|x86
+		{BA497A0C-1D9B-4189-8AAA-5C99BCE5B1B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA497A0C-1D9B-4189-8AAA-5C99BCE5B1B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA497A0C-1D9B-4189-8AAA-5C99BCE5B1B4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BA497A0C-1D9B-4189-8AAA-5C99BCE5B1B4}.Debug|x86.Build.0 = Debug|Any CPU
+		{BA497A0C-1D9B-4189-8AAA-5C99BCE5B1B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA497A0C-1D9B-4189-8AAA-5C99BCE5B1B4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA497A0C-1D9B-4189-8AAA-5C99BCE5B1B4}.Release|x86.ActiveCfg = Release|Any CPU
+		{BA497A0C-1D9B-4189-8AAA-5C99BCE5B1B4}.Release|x86.Build.0 = Release|Any CPU
 		{5DA3ECF3-5C2B-44FB-B98F-88C2B9966240}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5DA3ECF3-5C2B-44FB-B98F-88C2B9966240}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5DA3ECF3-5C2B-44FB-B98F-88C2B9966240}.Debug|x86.ActiveCfg = Debug|x86
@@ -52,14 +66,24 @@ Global
 		{5DA3ECF3-5C2B-44FB-B98F-88C2B9966240}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5DA3ECF3-5C2B-44FB-B98F-88C2B9966240}.Release|x86.ActiveCfg = Release|x86
 		{5DA3ECF3-5C2B-44FB-B98F-88C2B9966240}.Release|x86.Build.0 = Release|x86
+		{1697853E-15E9-4BAB-91E8-F197C4C9EEC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1697853E-15E9-4BAB-91E8-F197C4C9EEC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1697853E-15E9-4BAB-91E8-F197C4C9EEC6}.Debug|x86.ActiveCfg = Debug|x86
+		{1697853E-15E9-4BAB-91E8-F197C4C9EEC6}.Debug|x86.Build.0 = Debug|x86
+		{1697853E-15E9-4BAB-91E8-F197C4C9EEC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1697853E-15E9-4BAB-91E8-F197C4C9EEC6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1697853E-15E9-4BAB-91E8-F197C4C9EEC6}.Release|x86.ActiveCfg = Release|x86
+		{1697853E-15E9-4BAB-91E8-F197C4C9EEC6}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{8AC3A475-6792-4516-8D57-B9E17741B5F4} = {70C55713-79A1-4163-B513-D365607C682E}
-		{06B76B1F-9485-4B9F-9E35-438CA49F74C0} = {70C55713-79A1-4163-B513-D365607C682E}
+		{7CBFE2DC-B573-47F5-B746-7E2217982965} = {70C55713-79A1-4163-B513-D365607C682E}
+		{BA497A0C-1D9B-4189-8AAA-5C99BCE5B1B4} = {70C55713-79A1-4163-B513-D365607C682E}
 		{5DA3ECF3-5C2B-44FB-B98F-88C2B9966240} = {70C55713-79A1-4163-B513-D365607C682E}
+		{1697853E-15E9-4BAB-91E8-F197C4C9EEC6} = {70C55713-79A1-4163-B513-D365607C682E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {F940CDAB-2E10-43D0-BD7D-822158ACFDC0}

diff --git a/docs/Icon.png → Icon.png b/docs/Icon.png → Icon.png
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,22 +1,22 @@
-MIT License
-
-Copyright (c) 2021 genrwoody
-Copyright (c) 2022 Myvas Foundation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2021 genrwoody  
+Copyright (c) 2022 Myvas Foundation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/docs/screenshots/Preview.png → Preview.png b/docs/screenshots/Preview.png → Preview.png
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # FileEncoding
 
-[中文](./README.zh.md) | English
+[中文](README.zh.md) | English
 
 ## What's this?
 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.
@@ -15,7 +15,7 @@ Multi-targeting:
 
 ## Screenshots
 
-![Preview](docs/screenshots/Preview.png?raw=true "Preview")
+![Preview](Preview.png "Preview")
 
 NOTES:
 - **UTF-8** (without [BOM](https://docs.microsoft.com/en-us/globalization/encoding/byte-order-mark))
@@ -28,12 +28,12 @@ NOTES:
         1. BOM is actually the most efficient way of identifying an UTF-8 file.
         2. Most modern applications and standards support and encourage the use of BOM.
 
-**DISCUSS**: There are more and more new characters (e.g. emoji) appear in the comments, resources and elsewhere of soruce codes; An efficient and safe convention of interpreting a file into a human friendly visible artifact is required and more and more important in the future; The Unicode BOM is already an accept standard, so why people 'refuse' to use it? 
-
 ## License
-[MIT License](LICENSE.txt)
-
+[MIT License](LICENSE.txt)  
 ```
 Copyright (c) 2021 genrwoody
 Copyright (c) 2022 Myvas Foundation
-```
+```  
+This repo was forked from _FileEncoding_ by **genrwoody**;  This release version solved an issue of confusing display for locale encoding and re-publish by Myvas Foundation.
+
+See [README](https://github.com/myvas/FileEncoding) for details.
diff --git a/README.zh.md b/README.zh.md
@@ -1,6 +1,6 @@
 # FileEncoding
 
-中文 | [English](./README.md)
+中文 | [English](README.md)
 
 ## 介绍
 本 Visual Studio 扩展（vsix）在Visual Studio的编辑器边栏的右下角显示文档的编码, 点击后可修改为您指定的编码。
@@ -15,7 +15,7 @@
 
 ## Screenshots
 
-![Preview](docs/screenshots/Preview.png?raw=true "Preview")
+![Preview](Preview.png "Preview")
 
 网上关于UTF-8 BOM的讨论很多，以下观点仅供参考：
 - **UTF-8** (不带BOM)

diff --git a/docs/screenshots/Preview-1.0.20.png b/docs/screenshots/Preview-1.0.20.png
diff --git a/src/FileEncoding.Shared/EncodingExtensions.cs b/src/FileEncoding.Shared/EncodingExtensions.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Text;
 using Microsoft.VisualStudio.Text;
 

diff --git a/src/FileEncoding.Shared/EncodingMargin.cs b/src/FileEncoding.Shared/EncodingMargin.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Windows;

diff --git a/...ing.Vsix2019/FileEncoding.Vsix2019.csproj → ...coding.VS2019X/FileEncoding.VS2019.csproj b/...ing.Vsix2019/FileEncoding.Vsix2019.csproj → ...coding.VS2019X/FileEncoding.VS2019.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <MinimumVisualStudioVersion>17.0</MinimumVisualStudioVersion>
@@ -13,8 +13,8 @@
     <ProjectGuid>{06B76B1F-9485-4B9F-9E35-438CA49F74C0}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>FileEncoding2019</RootNamespace>
-    <AssemblyName>FileEncoding2019</AssemblyName>
+    <RootNamespace>FileEncoding</RootNamespace>
+    <AssemblyName>FileEncoding</AssemblyName>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <GeneratePkgDefFile>true</GeneratePkgDefFile>
     <UseCodebase>true</UseCodebase>
@@ -62,16 +62,16 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="16.0.206" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="16.0.206" />
     <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="16.10.32" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\docs\Icon.png">
+    <Content Include="..\..\Icon.png">
       <Link>%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="..\..\docs\screenshots\Preview.png">
+    <Content Include="..\..\Preview.png">
       <Link>%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
@@ -81,6 +81,16 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
+    <Content Include="..\..\README.md">
+      <Link>%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <Content Include="..\..\README.zh.md">
+      <Link>%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
   </ItemGroup>
   <Import Project="..\FileEncoding.Shared\FileEncoding.Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/...oding.Vsix2019/Properties/AssemblyInfo.cs → ...coding.VS2019X/Properties/AssemblyInfo.cs b/...oding.Vsix2019/Properties/AssemblyInfo.cs → ...coding.VS2019X/Properties/AssemblyInfo.cs
diff --git a/...ng.Vsix2019/source.extension.vsixmanifest → ...ing.VS2019X/source.extension.vsixmanifest b/...ng.Vsix2019/source.extension.vsixmanifest → ...ing.VS2019X/source.extension.vsixmanifest
@@ -1,14 +1,15 @@
 <?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="FileEncoding2019.ff8fe5f7-e5dc-4213-a1d1-91ec8d84a049" Version="1.0.32" Language="en-US" Publisher="Myvas" />
-        <DisplayName>FileEncoding 2019</DisplayName>
+        <Identity Id="FileEncoding.ff8fe5f7-e5dc-4213-a1d1-91ec8d84a052" Version="1.0.33" Language="en-US" Publisher="Myvas" />
+        <DisplayName>FileEncoding</DisplayName>
         <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>
         <MoreInfo>https://github.com/myvas/FileEncoding</MoreInfo>
         <License>LICENSE.txt</License>
+        <ReleaseNotes>https://github.com/myvas/FileEncoding/releases</ReleaseNotes>
         <Icon>Icon.png</Icon>
         <PreviewImage>Preview.png</PreviewImage>
-        <Tags>Encoding; charset</Tags>
+        <Tags>encoding; charset; UTF-8; BOM</Tags>
     </Metadata>
     <Installation>
         <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0, 17.0)">
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		DISCUSS
		There are more and more new characters (e.g. emoji) appear in the comments, resources and elsewhere of soruce codes; An efficient and safe convention of interpreting a file into a human friendly visible artifact is required and more and more important in the future; The Unicode BOM is already an accept standard, so why people 'refuse' to use it?