From a83e57b222e9b9e16e73222343dbf55b5d091f41 Mon Sep 17 00:00:00 2001 From: PsychoPast Date: Fri, 28 Jan 2022 20:23:13 +0200 Subject: [PATCH 1/4] Added support for vs2022 without breaking 2017 and 2019 (hopefully) --- Constants.cs | 3 ++- DiscordRPforVS.csproj | 14 +++++++------- Properties/AssemblyInfo.cs | 8 ++++---- Properties/Settings.Designer.cs | 10 +++++----- VSPackage.Designer.cs | 34 ++++++++++++++++----------------- app.config | 8 ++++---- source.extension.vsixmanifest | 27 ++++++++++++++++++++------ 7 files changed, 60 insertions(+), 44 deletions(-) diff --git a/Constants.cs b/Constants.cs index 9983767..a97f84e 100644 --- a/Constants.cs +++ b/Constants.cs @@ -39,7 +39,8 @@ public static class Constants public static readonly Dictionary IdeVersions = new Dictionary { { 15, "2017" }, - { 16, "2019" } + { 16, "2019" }, + { 17, "2022" } }; } } diff --git a/DiscordRPforVS.csproj b/DiscordRPforVS.csproj index 786b223..e233d5e 100644 --- a/DiscordRPforVS.csproj +++ b/DiscordRPforVS.csproj @@ -26,7 +26,7 @@ Properties DiscordRPforVS DiscordRPforVS - v4.7.2 + v4.8 true true true @@ -124,10 +124,10 @@ - 1.0.169 + 1.0.175 - - 3.3.0-beta2.final + + 6.0.0 runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -135,13 +135,13 @@ 1.1.57 - 16.0.206 + 17.0.32112.339 - 15.5.31 + 17.0.34 - 16.8.8 + 17.0.5234 runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 18c3bc3..c4f310a 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -2,8 +2,8 @@ using System.Resources; using System.Runtime.InteropServices; -[assembly: AssemblyTitle("A Discord Rich Presence extension for Visual Studio 2017 and 2019")] -[assembly: AssemblyDescription("A Discord Rich Presence extension for Visual Studio 2017 and 2019")] +[assembly: AssemblyTitle("A Discord Rich Presence extension for Visual Studio 2017, 2019 and 2022")] +[assembly: AssemblyDescription("A Discord Rich Presence extension for Visual Studio 2017, 2019 and 2022")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("1TheNikita")] [assembly: AssemblyProduct("Discord Rich Presence VS extension")] @@ -11,6 +11,6 @@ [assembly: AssemblyTrademark("1TheNikita")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] -[assembly: AssemblyVersion("6.0.0")] -[assembly: AssemblyFileVersion("6.0.0")] +[assembly: AssemblyVersion("6.0.1")] +[assembly: AssemblyFileVersion("6.0.1")] [assembly: NeutralResourcesLanguage("en")] \ No newline at end of file diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs index 51303f8..d1cd69c 100644 --- a/Properties/Settings.Designer.cs +++ b/Properties/Settings.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// Этот код создан программой. -// Исполняемая версия:4.0.30319.42000 +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // -// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае -// повторной генерации кода. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -12,7 +12,7 @@ namespace DiscordRPforVS.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")] public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/VSPackage.Designer.cs b/VSPackage.Designer.cs index b737fe3..ef2372c 100644 --- a/VSPackage.Designer.cs +++ b/VSPackage.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// Этот код создан программой. -// Исполняемая версия:4.0.30319.42000 +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // -// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае -// повторной генерации кода. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -13,13 +13,13 @@ namespace DiscordRPforVS { /// - /// Класс ресурса со строгой типизацией для поиска локализованных строк и т.д. + /// A strongly-typed resource class, for looking up localized strings, etc. /// - // Этот класс создан автоматически классом StronglyTypedResourceBuilder - // с помощью такого средства, как ResGen или Visual Studio. - // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen - // с параметром /str или перестройте свой проект VS. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class VSPackage { @@ -33,7 +33,7 @@ internal VSPackage() { } /// - /// Возвращает кэшированный экземпляр ResourceManager, использованный этим классом. + /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] public static global::System.Resources.ResourceManager ResourceManager { @@ -47,8 +47,8 @@ internal VSPackage() { } /// - /// Перезаписывает свойство CurrentUICulture текущего потока для всех - /// обращений к ресурсу с помощью этого класса ресурса со строгой типизацией. + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] public static global::System.Globalization.CultureInfo Culture { @@ -61,7 +61,7 @@ internal VSPackage() { } /// - /// Ищет локализованную строку, похожую на Discord Rich Presence. + /// Looks up a localized string similar to Discord Rich Presence. /// public static string _110 { get { @@ -70,7 +70,7 @@ public static string _110 { } /// - /// Ищет локализованную строку, похожую на A Discord Rich Presence extension for Visual Studio 2017 and 2019.. + /// Looks up a localized string similar to A Discord Rich Presence extension for Visual Studio 2017 and 2019.. /// public static string _112 { get { @@ -79,7 +79,7 @@ public static string _112 { } /// - /// Поиск локализованного ресурса типа System.Drawing.Icon, аналогичного (Значок). + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// public static System.Drawing.Icon _400 { get { @@ -89,7 +89,7 @@ public static System.Drawing.Icon _400 { } /// - /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// public static System.Drawing.Bitmap Logo { get { diff --git a/app.config b/app.config index 6e49dcf..9ef1de8 100644 --- a/app.config +++ b/app.config @@ -1,8 +1,8 @@ - + -
+
@@ -40,6 +40,6 @@ - + - \ No newline at end of file + diff --git a/source.extension.vsixmanifest b/source.extension.vsixmanifest index db4e936..f4ed303 100644 --- a/source.extension.vsixmanifest +++ b/source.extension.vsixmanifest @@ -1,9 +1,9 @@ - + Discord Rich Presence - A Discord Rich Presence extension for Visual Studio 2017 and 2019. + A Discord Rich Presence extension for Visual Studio 2017, 2019 and 2022. https://marketplace.visualstudio.com/items?itemName=1TheNikita.drpcvs2019 Resources\LICENSE.txt https://github.com/1TheNikita/Visual-Studio/blob/master/CHANGELOG.md @@ -12,15 +12,30 @@ development,discord,discordrpc,presence,rich,rpc,visual - - - + + x86 + + + x86 + + + x86 + + + amd64 + + + amd64 + + + amd64 + - + From 3c958e3e3513dafee0b21a73de4686a202f1ba9e Mon Sep 17 00:00:00 2001 From: PsychoPast Date: Fri, 28 Jan 2022 20:30:50 +0200 Subject: [PATCH 2/4] Update readme --- CHANGELOG.md | 3 +++ README.md | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71656a2..3c1f4c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## [v5.5.5] (28-01-2022) +###### Added support for Visual Studio 2022! + ## [v5.5.4] (26-09-2021) ###### Fixed error message "bad exception"! diff --git a/README.md b/README.md index 0222c12..195633c 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@

-This extension enables on [Discord Rich Presence](https://discordapp.com/rich-presence) for Visual Studio 2017 and 2019. +This extension enables on [Discord Rich Presence](https://discordapp.com/rich-presence) for Visual Studio 2017, 2019 and 2022. As you're developing, this extension will automatically update your status on Discord to tell the world what you're coding. From 7933eb04de3f54495e4ef6c12455fb745add9018 Mon Sep 17 00:00:00 2001 From: Konnokai Date: Tue, 9 Aug 2022 21:33:49 +0800 Subject: [PATCH 3/4] add: zh-TW translate --- Translates.cs | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Translates.cs b/Translates.cs index 092904a..1010aa5 100644 --- a/Translates.cs +++ b/Translates.cs @@ -27,6 +27,7 @@ public static string Title(string translate) else if (translate == "ru-RU") { return "Discord Rich Presence настройки"; } else if (translate == "hu-HU") { return "Discord Rich Presence beállítások"; } else if (translate == "pl-PL") { return "Ustawienia Discord Rich Presence"; } + else if (translate == "zh-TW") { return "Discord Rich Presence 設定"; } else { return "Discord Rich Presence Settings"; } } @@ -41,6 +42,7 @@ public static string IsPresenceEnabled(string translate) else if (translate == "ru-RU") { return "Включить"; } else if (translate == "hu-HU") { return "Discord Rich Presence engedélyezése"; } else if (translate == "pl-PL") { return "Włącz Discord Rich Presence"; } + else if (translate == "zh-TW") { return "啟用 Discord Rich Presence"; } else { return "Enable Discord Rich Presence"; } } @@ -55,6 +57,7 @@ public static string IsFileNameShown(string translate) else if (translate == "ru-RU") { return "Показывать имя файла"; } else if (translate == "hu-HU") { return "Fájlnév megjelenítése"; } else if (translate == "pl-PL") { return "Pokazuj nazwę pliku"; } + else if (translate == "zh-TW") { return "顯示檔案名稱"; } else { return "Show file name"; } } @@ -69,6 +72,7 @@ public static string IsSolutionNameShown(string translate) else if (translate == "ru-RU") { return "Показывать имя проекта"; } else if (translate == "hu-HU") { return "Projekt nevének megjelenítése"; } else if (translate == "pl-PL") { return "Pokazuj nazwę rozwiązania"; } + else if (translate == "zh-TW") { return "顯示方案名稱"; } else { return "Show solution name"; } } @@ -83,6 +87,7 @@ public static string IsTimestampShown(string translate) else if (translate == "ru-RU") { return "Показывать время работы"; } else if (translate == "hu-HU") { return "Időbélyeg megjelenítése"; } else if (translate == "pl-PL") { return "Pokazuj czas pracy"; } + else if (translate == "zh-TW") { return "顯示經過時間"; } else { return "Show timestamp"; } } @@ -97,6 +102,7 @@ public static string IsTimestampResetEnabled(string translate) else if (translate == "ru-RU") { return "Перезапускать таймер при изменении файла"; } else if (translate == "hu-HU") { return "Időbélyeg visszaállítása fájl módosításkor"; } else if (translate == "pl-PL") { return "Resetuj czas pracy co zmianę pliku"; } + else if (translate == "zh-TW") { return "切換檔案時重製經過時間"; } else { return "Reset timestamp on file change"; } } @@ -111,6 +117,7 @@ public static string IsLanguageImageLarge(string translate) else if (translate == "ru-RU") { return "Большая картинка языка программирования"; } else if (translate == "hu-HU") { return "Nagy nyelv kép"; } else if (translate == "pl-PL") { return "Duży obraz języka programowania"; } + else if (translate == "zh-TW") { return "使用放大版的程式語言圖片"; } else { return "Large language image"; } } @@ -125,6 +132,7 @@ public static string SecretMode(string translate) else if (translate == "ru-RU") { return "Секретный режим"; } else if (translate == "hu-HU") { return "Titkos mód"; } else if (translate == "pl-PL") { return "Tryb tajny"; } + else if (translate == "zh-TW") { return "隱身模式"; } else { return "Secret mode"; } } @@ -139,6 +147,7 @@ public static string LoadOnStartup(string translate) else if (translate == "ru-RU") { return "Автоматический запуск"; } else if (translate == "hu-HU") { return "Automatikus indítás"; } else if (translate == "pl-PL") { return "Automatyczny start"; } + else if (translate == "zh-TW") { return "開啟時載入"; } else { return "Load on startup"; } } @@ -153,6 +162,7 @@ public static string UseEnglish(string translate) else if (translate == "ru-RU") { return "Использовать Английский язык"; } else if (translate == "hu-HU") { return "Angol nyelv használata"; } else if (translate == "pl-PL") { return "Używanie języka angielskiego"; } + else if (translate == "zh-TW") { return "使用英文翻譯"; } else { return "Use English language"; } } } @@ -168,6 +178,7 @@ public static string Settings(string translate) else if (translate == "ru-RU") { return "Настройки"; } else if (translate == "hu-HU") { return "Beállítások"; } else if (translate == "pl-PL") { return "Ustawienia"; } + else if (translate == "zh-TW") { return "設定"; } else { return "Settings"; } } @@ -182,6 +193,7 @@ public static string TextDocument(string translate) else if(translate == "ru-RU") { return "Текстовый"; } else if(translate == "hu-HU") { return "Szövegfájl"; } else if (translate == "pl-PL") { return "Tekstowy"; } + else if (translate == "zh-TW") { return "文字文件"; } else { return "Text"; } } @@ -196,6 +208,7 @@ public static string LogDocument(string translate) else if (translate == "ru-RU") { return "Log"; } else if (translate == "hu-HU") { return "Log fájl"; } else if (translate == "pl-PL") { return "Dziennik"; } + else if (translate == "zh-TW") { return "記錄"; } else { return "Log"; } } @@ -224,6 +237,7 @@ public static string Text(string translate) else if (translate == "ru-RU") { return "текст"; } else if (translate == "hu-HU") { return "szöveg"; } else if (translate == "pl-PL") { return "tekst"; } + else if (translate == "zh-TW") { return "文字"; } else { return "text"; } } @@ -238,6 +252,7 @@ public static string File(string translate) else if (translate == "ru-RU") { return "файл"; } else if (translate == "hu-HU") { return "fájl"; } else if (translate == "pl-PL") { return "plik"; } + else if (translate == "zh-TW") { return "檔案"; } else { return "file"; } } @@ -252,6 +267,7 @@ public static string LogError(string translate) else if (translate == "ru-RU") { return "Не удалось запустить RP"; } else if (translate == "hu-HU") { return "Nem sikerült elindítani az RP-t"; } else if (translate == "pl-PL") { return "Nie udało się uruchomić RP"; } + else if (translate == "zh-TW") { return "無法設定RP"; } else { return "Could not start RP"; } } @@ -266,6 +282,7 @@ public static string PresenceDetails(string translate) else if (translate == "ru-RU") { return "Я работаю над тем, о чем"; } else if (translate == "hu-HU") { return "Egy olyan projekten dolgozom,"; } else if (translate == "pl-PL") { return "Pracuję nad czymś, o czym"; } + else if (translate == "zh-TW") { return "我正在做些 *秘密* 的事情"; } else { return "I'm working on something you're"; } } @@ -280,6 +297,7 @@ public static string PresenceState(string translate) else if (translate == "ru-RU") { return "тебе не положено знать, извини."; } else if (translate == "hu-HU") { return "amit nem láthatsz, sajnálom."; } else if (translate == "pl-PL") { return "nie możesz wiedzieć, sorry."; } + else if (translate == "zh-TW") { return "但是你不能知道細節，抱歉"; } else { return "not allowed to know about, sorry."; } } @@ -308,6 +326,7 @@ public static string UnrecognizedExtension(string translate) if (translate == "ru-RU") { return "Незарегистрированное расширение"; } if (translate == "hu-HU") { return "Ismeretlen bővítmény"; } if (translate == "pl-PL") { return "Nierozpoznane rozszerzenie"; } + if (translate == "zh-TW") { return "未識別的副檔名"; } else { return "Unrecognized extension"; } } @@ -322,6 +341,7 @@ public static string NoFile(string translate) if (translate == "ru-RU") { return "Файл не выбран."; } if (translate == "hu-HU") { return "Nincs fájl."; } if (translate == "pl-PL") { return "Nie wybrano pliku."; } + if (translate == "zh-TW") { return "無檔案"; } else { return "No File."; } } @@ -336,6 +356,7 @@ public static string Idling(string translate) if (translate == "ru-RU") { return "Выбирает проект"; } if (translate == "hu-HU") { return "Üresjárat"; } if (translate == "pl-PL") { return "Bezczynność"; } + if (translate == "zh-TW") { return "閒置中"; } else { return "Idling"; } } @@ -350,6 +371,7 @@ public static string Developing(string translate) if (translate == "ru-RU") { return "Работает в проекте"; } if (translate == "hu-HU") { return "Fejleszti a következő fájlt: "; } if (translate == "pl-PL") { return "Pracuję nad"; } + if (translate == "zh-TW") { return "開發"; } else { return "Developing"; } } From fc41749da21a198549118ef51ffcd5d33c632a32 Mon Sep 17 00:00:00 2001 From: Konnokai Date: Tue, 9 Aug 2022 21:38:44 +0800 Subject: [PATCH 4/4] misc: add `Chinese (Traditional)` in README.MD --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 195633c..04b1b7e 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Here's a demonstration of how it looks in Discord * The ability to turn Rich Presence completely on or off. * The ability to toggle it starting up at startup. * The ability to use secret mode. -* Ability to use different languages. Available languages: English, Russian, Hungarian and Polish +* Ability to use different languages. Available languages: English, Russian, Hungarian, Polish and Chinese (Traditional) # Toggling Display A neat feature with this extension compared to others is you can completely customize your Rich Presence and display only what you want.