Update to latest .net5

MapleRecall · Sep 2, 2021 · 36934b5 · 36934b5
1 parent e6de6f6
commit 36934b5
Show file tree

Hide file tree

Showing 16 changed files with 59 additions and 2,936 deletions.
diff --git a/Dalamud.Injector/EntryPoint.cs b/Dalamud.Injector/EntryPoint.cs
@@ -238,7 +238,7 @@ private static DalamudStartInfo GetStartInfo(string arg, Process process)
             else
             {
                 var ffxivDir = Path.GetDirectoryName(process.MainModule.FileName);
-                var appDataDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
+                var appDataDir = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "..");
                 var xivlauncherDir = Path.Combine(appDataDir, "XIVLauncher");
 
                 var gameVerStr = File.ReadAllText(Path.Combine(ffxivDir, "ffxivgame.ver"));
@@ -252,7 +252,7 @@ private static DalamudStartInfo GetStartInfo(string arg, Process process)
                     DefaultPluginDirectory = Path.Combine(xivlauncherDir, "devPlugins"),
                     AssetDirectory = Path.Combine(xivlauncherDir, "dalamudAssets"),
                     GameVersion = gameVer,
-                    Language = ClientLanguage.English,
+                    Language = ClientLanguage.ChineseSimplified,
                     OptOutMbCollection = false,
                 };
 

diff --git a/Dalamud.Injector/Program.cs b/Dalamud.Injector/Program.cs
diff --git a/Dalamud.Updater/FormMain.Designer.cs b/Dalamud.Updater/FormMain.Designer.cs
diff --git a/Dalamud.sln b/Dalamud.sln
@@ -150,6 +150,14 @@ Global
 		{05AB2F46-268B-4915-806F-DDF813E2D59D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{05AB2F46-268B-4915-806F-DDF813E2D59D}.Release|x64.ActiveCfg = Release|Any CPU
 		{05AB2F46-268B-4915-806F-DDF813E2D59D}.Release|x64.Build.0 = Release|Any CPU
+		{D204ACDB-A714-4690-97A5-340595FF9B4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D204ACDB-A714-4690-97A5-340595FF9B4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D204ACDB-A714-4690-97A5-340595FF9B4F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D204ACDB-A714-4690-97A5-340595FF9B4F}.Debug|x64.Build.0 = Debug|Any CPU
+		{D204ACDB-A714-4690-97A5-340595FF9B4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D204ACDB-A714-4690-97A5-340595FF9B4F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D204ACDB-A714-4690-97A5-340595FF9B4F}.Release|x64.ActiveCfg = Release|Any CPU
+		{D204ACDB-A714-4690-97A5-340595FF9B4F}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Dalamud/ClientLanguageExtensions.cs b/Dalamud/ClientLanguageExtensions.cs
@@ -20,6 +20,7 @@ public static Lumina.Data.Language ToLumina(this ClientLanguage language)
                 ClientLanguage.English => Lumina.Data.Language.English,
                 ClientLanguage.German => Lumina.Data.Language.German,
                 ClientLanguage.French => Lumina.Data.Language.French,
+                ClientLanguage.ChineseSimplified => Lumina.Data.Language.ChineseSimplified,
                 _ => throw new ArgumentOutOfRangeException(nameof(language)),
             };
         }

diff --git a/Dalamud/Dalamud.csproj b/Dalamud/Dalamud.csproj
@@ -88,10 +88,6 @@
         <ProjectReference Include="..\lib\ImGuiScene\ImGuiScene\ImGuiScene.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-        <AdditionalFiles Include="..\stylecop.json" />
-    </ItemGroup>
-
     <ItemGroup>
         <Compile Update="Properties\Resources.Designer.cs">
             <DesignTime>True</DesignTime>
@@ -146,4 +142,19 @@
         <!-- writes the attribute to the customAssemblyInfo file -->
         <WriteCodeFragment Language="C#" OutputFile="$(CustomAssemblyInfoFile)" AssemblyAttributes="@(AssemblyAttributes)" />
     </Target>
+    <ItemGroup>
+      <None Remove="C:\Users\z_y_p\.nuget\packages\reloaded.assembler\1.0.10\build\FASMX64.DLL" />
+    </ItemGroup>
+    <ItemGroup>
+      <None Remove="C:\Users\z_y_p\.nuget\packages\reloaded.assembler\1.0.10\build\FASM-LICENSE.TXT" />
+    </ItemGroup>
+    <ItemGroup>
+      <None Remove="C:\Users\z_y_p\.nuget\packages\reloaded.assembler\1.0.10\build\FASM.DLL" />
+    </ItemGroup>
+    <ItemGroup>
+      <None Remove="C:\Users\z_y_p\.nuget\packages\reloaded.assembler\1.0.10\build\Reloaded.Assembler.targets" />
+    </ItemGroup>
+    <ItemGroup>
+      <None Remove="C:\Users\z_y_p\.nuget\packages\reloaded.assembler\1.0.10\build\Reloaded.Assembler.targets" />
+    </ItemGroup>
 </Project>