Переход на Net 9 и версия 3.6.2

OneCodeUnit · OneCodeUnit · commit 9fb8c3c448f5 · 2024-11-13T11:14:43.000+03:00
diff --git a/!publish.bat b/!publish.bat
@@ -1,3 +1,3 @@
-dotnet publish RimLangKit.csproj -p:PublishProfile=Properties\PublishProfiles\WinNet8.pubxml
-dotnet publish RimLangKit.csproj -p:PublishProfile=Properties\PublishProfiles\WinNet8Standalone.pubxml
+dotnet publish RimLangKit.csproj -p:PublishProfile=Properties\PublishProfiles\WinNet9.pubxml
+dotnet publish RimLangKit.csproj -p:PublishProfile=Properties\PublishProfiles\WinNet9Standalone.pubxml
 pause
diff --git a/MainForm.cs b/MainForm.cs
@@ -37,10 +37,10 @@ public MainForm()
             // Обновление настроек
             if (Settings.Default.firstLaunch)
             {
-                SendToInfoTextBox("Обновление настроек при первом запуске");
                 Settings.Default.Upgrade();
                 Settings.Default.firstLaunch = false;
                 Settings.Default.Save();
+                SendToInfoTextBox("Первый запуск. Обновление настроек завершено");
             }
 
             // Установка версии программы
@@ -53,7 +53,9 @@ public MainForm()
             {
                 version = version[..5];
                 if (version.EndsWith(".0", StringComparison.OrdinalIgnoreCase))
+                {
                     version = version[..^2];
+                }
             }
             VersionLabel.Text = "Версия " + version;
 
@@ -167,6 +169,7 @@ private void UpdateButton_Click(object sender, EventArgs e)
             else
             {
                 SendToInfoTextBox("Доступна новая версия программы. Её можно скачать на GitHub по ссылке справа");
+                SendToInfoTextBox($"{json.name}. Что нового?{Environment.NewLine}{json.body}");
                 UpdateButton.BackgroundImage = Properties.Resources.warn_c;
                 LinkLabelGithub.Visible = true;
             }
@@ -200,7 +203,7 @@ private void LinkLabelInfo_LinkClicked(object sender, LinkLabelLinkClickedEventA
 
         private void ButtonDarkMode_Click(object sender, EventArgs e)
         {
-            if (Settings.Default.darkTheme == true)
+            if (Settings.Default.darkTheme)
             {
                 Settings.Default["darkTheme"] = false;
                 SendToInfoTextBox("Хе-хе бой. Это светлая тема. Чтобы развидеть тёмную тему, перезапусти приложение.");
@@ -228,10 +231,13 @@ private void AdditionalFolderButton_Click(object sender, EventArgs e)
         private void SendToInfoTextBox(string text)
         {
             if (Settings.Default.lastTab == 0)
+            {
                 InfoTextBox.AppendText($"{Environment.NewLine}{text}");
+            }
             else
+            {
                 InfoTextBox2.AppendText($"{Environment.NewLine}{text}");
-
+            }
         }
 
         private void MainTabs_IndexChange(object sender, EventArgs e)
@@ -288,7 +294,9 @@ private void ActionHandler(string name, string mask, string code)
 
             InfoTextBox.AppendText($"{Environment.NewLine}{TimeSetter.PlaceTime()}Завершено. Обработано файлов - {count}");
             if (errCount != 0)
+            {
                 InfoTextBox.AppendText($"{Environment.NewLine}Пропущено файлов - {errCount}");
+            }
 
             // Постобработка
             switch (code)
@@ -324,12 +332,14 @@ private void FindChangesButton_Click(object sender, EventArgs e)
             string[] allFiles = Directory.GetFiles(DirectoryPath, "*.xml", SearchOption.AllDirectories);
             int count = 0;
             int errCount = 0;
-            (bool, string) result = (false, string.Empty);
+            (bool, string) result;
             foreach (string tempFile in allFiles)
             {
                 result = ChangesFinder.GetTranslationData(tempFile);
                 if (result.Item1)
+                {
                     count++;
+                }
                 else
                 {
                     errCount++;
@@ -345,7 +355,9 @@ private void FindChangesButton_Click(object sender, EventArgs e)
             {
                 result = ChangesFinder.GetModData(tempFile);
                 if (result.Item1)
+                {
                     count++;
+                }
                 else
                 {
                     errCount++;
@@ -365,19 +377,10 @@ private void CaseCreatorButton_Click(object sender, EventArgs e)
             string[] defTypeList = ["AbilityDef", "BodyDef", "BodyPartDef", "BodyPartGroupDef", "ChemicalDef", "FactionDef", "HediffDef", "MemeDef", "MentalBreakDef", "MentalFitDef", "MentalStateDef", "OrderedTakeGroupDef", "PawnCapacityDef", "PawnKindDef", "ScenarioDef", "SitePartDef", "SkillDef", "StyleCategoryDef", "ThingDef", "ToolCapacityDef", "WorldObjectDef", "XenotypeDef"];
             //Получение списка всех файлов в заданой директории и во всех вложенных подпапках за счёт SearchOption
             string[] allFiles = Directory.GetFiles(DirectoryPath, "*.xml", SearchOption.AllDirectories);
-            Dictionary<string, string> words = new();
+            Dictionary<string, string> words = [];
 
             // Поиск подходящей директории
-            string directory;
-            if (Directory.Exists(DirectoryPath + "\\Common"))
-            {
-                directory = DirectoryPath + "\\Common";
-            }
-            else
-            {
-                directory = DirectoryPath;
-            }
-
+            string directory = Directory.Exists(DirectoryPath + "\\Common") ? DirectoryPath + "\\Common" : DirectoryPath;
             int typeCount = 0;
             // Проверяется каждый подходящий DefType из списка
             foreach (string defType in defTypeList)
@@ -451,16 +454,18 @@ private void PreTranslatorButton_Click(object sender, EventArgs e)
                 }
                 result = PreTranslator.BuildDatabase(tempFile);
                 if (result.Item1)
+                {
                     count++;
+                }
                 else
                 {
                     errCount++;
                     InfoTextBox.AppendText($"{Environment.NewLine}{TimeSetter.PlaceTime()}{result.Item2} ({tempFile})");
                 }
             }
             InfoTextBox.AppendText($"{Environment.NewLine}{TimeSetter.PlaceTime()}Собрано {result.Item2} пар перевода. Обработано файлов - {count}. Пропущено файлов - {errCount}.");
-            
-            
+
+
             InfoTextBox.AppendText($"{Environment.NewLine}{TimeSetter.PlaceTime()}Начат предварительный перевод");
             allFiles = Directory.GetFiles(DirectoryPath, "*.xml", SearchOption.AllDirectories);
             count = 0;
@@ -469,7 +474,9 @@ private void PreTranslatorButton_Click(object sender, EventArgs e)
             {
                 result = PreTranslator.Translation(tempFile);
                 if (result.Item1)
+                {
                     count++;
+                }
                 else
                 {
                     errCount++;
diff --git a/Properties/PublishProfiles/WinNet9.pubxml b/Properties/PublishProfiles/WinNet9.pubxml
@@ -0,0 +1,19 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>x64</Platform>
+    <PublishDir>bin\Upload\Net8</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <_TargetId>Folder</_TargetId>
+    <TargetFramework>net9.0-windows7.0</TargetFramework>
+    <SelfContained>false</SelfContained>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <PublishSingleFile>true</PublishSingleFile>
+    <PublishReadyToRun>false</PublishReadyToRun>
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+</Project>
diff --git a/Properties/PublishProfiles/WinNet9Standalone.pubxml b/Properties/PublishProfiles/WinNet9Standalone.pubxml
@@ -0,0 +1,18 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>x64</Platform>
+    <PublishDir>bin\Upload\RimLangKit</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <_TargetId>Folder</_TargetId>
+    <TargetFramework>net9.0-windows7.0</TargetFramework>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>true</PublishSingleFile>
+    <PublishReadyToRun>false</PublishReadyToRun>
+  </PropertyGroup>
+</Project>
diff --git a/README.md b/README.md
@@ -6,8 +6,8 @@
 ## Системные требования
 | Файл  | ОС | .NET | ПЗУ |
 | ------------- | ------------- | ------------- | ------------- |
-| RimLangKit.exe | Windows 10 x64 1607 и новее | [.NET 8](https://dotnet.microsoft.com/ru-ru/download) (любой вариант) | < 1 Мб |
-| RimLangKit.7z | Windows 10 x64 1607 и новее | - | ~ 150 Мб |
+| RimLangKit.exe | Windows 10 x64 1607 и новее | [.NET 9](https://dotnet.microsoft.com/ru-ru/download) (любой вариант) | < 0.5 Мб |
+| RimLangKit.7z | Windows 10 x64 1607 и новее | - | ~ 120 Мб |
 
 Фактически программе ничто не мешает работать на x86 системах и (с минимальными правками кода) на более старых версиях Windows. 
 Я не публикую для них сборки из-за их непопулярности, но вы можете собрать себе желаемую версию из исходников.
diff --git a/RimLangKit.csproj b/RimLangKit.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -11,7 +11,7 @@
     <Platforms>x64</Platforms>
     <ApplicationIcon>images\icon.ico</ApplicationIcon>
     <PlatformTarget>x64</PlatformTarget>
-    <Version>$(VersionPrefix)3.6.1</Version>
+    <Version>$(VersionPrefix)3.6.2</Version>
     <RepositoryUrl>https://github.com/OneCodeUnit/RimLangKit</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <NeutralLanguage>ru</NeutralLanguage>
diff --git a/RimLanguageCore/Activities/CaseCreator.cs b/RimLanguageCore/Activities/CaseCreator.cs
@@ -21,7 +21,9 @@ private static List<string> WordsExtract(string file)
                 string nodeName = node.Name.ToString();
                 StringComparison nodeComparison = StringComparison.OrdinalIgnoreCase;
                 if ((nodeName.EndsWith(".label", nodeComparison) && !nodeName.Contains(".stages.") && !nodeName.Contains(".verbs.")) || nodeName.EndsWith(".chargeNoun", nodeComparison))
+                {
                     words.Add(node.Value);
+                }
             }
             return words;
         }
@@ -49,35 +51,22 @@ public static void CreateCase(string directoryPath, Dictionary<string, string> w
             foreach (var word in words)
             {
                 if (word.Value != defType)
+                {
                     continue;
+                }
 
                 string tempWord = word.Key;
                 Words result = MorpherHttpClient.GetMorpherWords(tempWord);
                 // Case.txt
-                string tempStringCase;
-                if (result is null)
-                {
-                    tempStringCase = $"{tempWord}; {tempWord}; {tempWord}; {tempWord}; {tempWord}; {tempWord}";
-                }
-                else
-                {
-                    tempStringCase = $"{tempWord}; {result.Р}; {result.Д}; {result.В}; {result.Т}; {result.П}";
-                }
+                string tempStringCase = result is null
+                    ? $"{tempWord}; {tempWord}; {tempWord}; {tempWord}; {tempWord}; {tempWord}"
+                    : $"{tempWord}; {result.Р}; {result.Д}; {result.В}; {result.Т}; {result.П}";
                 writerCase.WriteLine(tempStringCase);
 
                 // Plural.txt
-                if (result is null)
-                {
-                    tempStringCase = $"{tempWord}; {tempWord}";
-                }
-                else if (result.множественное is null)
-                {
-                    tempStringCase = string.Empty;
-                }
-                else
-                {
-                    tempStringCase = $"{tempWord}; {result.множественное.И}";
-                }
+                tempStringCase = result is null
+                    ? $"{tempWord}; {tempWord}"
+                    : result.множественное is null ? string.Empty : $"{tempWord}; {result.множественное.И}";
                 writerPlural.WriteLine(tempStringCase);
             }
             writerCase.WriteLine();
@@ -121,7 +110,9 @@ public static void CreateGender(string directoryPath, Dictionary<string, string>
             foreach (var word in words)
             {
                 if (word.Value != defType)
+                {
                     continue;
+                }
 
                 writerUndefined.WriteLine(word.Key);
             }
diff --git a/RimLanguageCore/Activities/ChangesFinder.cs b/RimLanguageCore/Activities/ChangesFinder.cs
@@ -18,7 +18,9 @@ public static (bool, string) GetTranslationData(string currentFile)
         {
             (bool, string) result = XmlErrorChecker.XmlErrorCheck(currentFile);
             if (!result.Item1)
+            {
                 return result;
+            }
 
             XmlReaderSettings settings = new() { DtdProcessing = DtdProcessing.Parse };
             XmlReader reader = XmlReader.Create(currentFile, settings);
@@ -56,7 +58,9 @@ public static (bool, string) GetModData(string currentFile)
         {
             (bool, string) result = XmlErrorChecker.XmlErrorCheck(currentFile);
             if (!result.Item1)
+            {
                 return result;
+            }
 
             XDocument xDoc = XDocument.Load(currentFile, LoadOptions.PreserveWhitespace);
             XElement root = xDoc.Element("LanguageData");
diff --git a/RimLanguageCore/Activities/CommentInserter.cs b/RimLanguageCore/Activities/CommentInserter.cs
@@ -10,7 +10,9 @@ public static (bool, string) CommentInserterActivity(string currentFile)
         {
             (bool, string) result = XmlErrorChecker.XmlErrorCheck(currentFile);
             if (!result.Item1)
+            {
                 return result;
+            }
 
             XDocument xDoc = XDocument.Load(currentFile, LoadOptions.PreserveWhitespace);
             XElement root = xDoc.Element("LanguageData");
diff --git a/RimLanguageCore/Activities/FileFixer.cs b/RimLanguageCore/Activities/FileFixer.cs
@@ -47,7 +47,9 @@ public static (bool, string) FileFixerActivity(string currentFile)
         public static string BrokenFilesWriterActivity()
         {
             if (BrokenFiles.Count == 0)
-                return ("Не найдено сломанных файлов");
+            {
+                return "Не найдено сломанных файлов";
+            }
 
             string currentDirectory = Directory.GetCurrentDirectory();
             StreamWriter sw = new(Path.Combine(currentDirectory + "\\BrokenFiles.txt"), false);
diff --git a/RimLanguageCore/Activities/NamesTranslator.cs b/RimLanguageCore/Activities/NamesTranslator.cs
@@ -36,7 +36,10 @@ public static (bool, string) NamesTranslatorActivity(string currentFile)
             {
                 // Чтение строки
                 string sourceLine = sourceText.ReadLine().Trim();
-                if (sourceLine is null) break;
+                if (sourceLine is null)
+                {
+                    break;
+                }
 
                 foreach (KeyValuePair<string, string> item in dictionaryStart)
                 {
@@ -96,10 +99,9 @@ public static (bool, string) NamesTranslatorActivity(string currentFile)
             // Завершение работы
             sourceText.Close();
             translatedText.Close();
-            if (errors == 0)
-                return (true, string.Empty);
-            else
-                return (false, errors + " имён записано с ошибкой. Ищите слова \"Ошибка\" в получившихся файлах");
+            return errors == 0
+                ? (true, string.Empty)
+                : (false, errors + " имён записано с ошибкой. Ищите слова \"Ошибка\" в получившихся файлах");
         }
 
         private static Dictionary<string, string> SetDictionary(string line)
diff --git a/RimLanguageCore/Activities/PreTranslator.cs b/RimLanguageCore/Activities/PreTranslator.cs
diff --git a/RimLanguageCore/Activities/TagCollector.cs b/RimLanguageCore/Activities/TagCollector.cs
diff --git a/RimLanguageCore/Misc/GitHubHttpClient.cs b/RimLanguageCore/Misc/GitHubHttpClient.cs
diff --git a/RimLanguageCore/Misc/XmlErrorChecker.cs b/RimLanguageCore/Misc/XmlErrorChecker.cs

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,9 @@ public static (bool, string) CommentInserterActivity(string currentFile)`
`10`	`10`	`{`
`11`	`11`	`(bool, string) result = XmlErrorChecker.XmlErrorCheck(currentFile);`
`12`	`12`	`if (!result.Item1)`
	`13`	`+ {`
`13`	`14`	`return result;`
	`15`	`+ }`
`14`	`16`
`15`	`17`	`XDocument xDoc = XDocument.Load(currentFile, LoadOptions.PreserveWhitespace);`
`16`	`18`	`XElement root = xDoc.Element("LanguageData");`