-
-
Notifications
You must be signed in to change notification settings - Fork 68
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch develop v10.0.0-211203.1328
- Loading branch information
Showing
114 changed files
with
2,856 additions
and
2,407 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| v9.3.7 | ||
| v10.0.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| using System.Reflection; | ||
|
|
||
| [assembly: AssemblyVersion("9.3.0.7")] | ||
| [assembly: AssemblyFileVersion("9.3.0.7")] | ||
| [assembly: AssemblyVersion("10.0.0.0")] | ||
| [assembly: AssemblyFileVersion("10.0.0.0")] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| namespace ACT.Hojoring.Debug | ||
| { | ||
| public static class Dummy | ||
| { | ||
| public static void Main() | ||
| { | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,11 @@ | ||
| <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd"> | ||
| <Costura | ||
| IncludeDebugSymbols="false"> | ||
| <ExcludeAssemblies> | ||
| ACT.SpecialSpellTimer* | ||
| ACT.TTSYukkuri* | ||
| ACT.UltraScouter* | ||
| ACT.XIVLog* | ||
| FFXIV.Framework | ||
| FFXIV.Framework.TTS.Server* | ||
| ACT.Hojoring.Common | ||
| ACT.Hojoring.Updater | ||
| RazorEngine | ||
| SLOBSharp | ||
| FFXIV_ACT_Plugin | ||
| FFXIV_ACT_Plugin.* | ||
| </ExcludeAssemblies> | ||
| IncludeDebugSymbols="true"> | ||
| <PreloadOrder> | ||
| ACT.Hojoring.Activator | ||
| </PreloadOrder> | ||
| <IncludeAssemblies> | ||
| ACT.Hojoring.Activator | ||
| </IncludeAssemblies> | ||
| </Costura> | ||
| </Weavers> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' < '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects> | ||
| <HasSharedItems>true</HasSharedItems> | ||
| <SharedGUID>9dd140fa-30bd-4e10-b61a-f8a5b8837643</SharedGUID> | ||
| </PropertyGroup> | ||
| <PropertyGroup Label="Configuration"> | ||
| <Import_RootNamespace>ACT.Hojoring.Shared</Import_RootNamespace> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <Compile Include="$(MSBuildThisFileDirectory)AssemblyResolver.cs" /> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup Label="Globals"> | ||
| <ProjectGuid>9dd140fa-30bd-4e10-b61a-f8a5b8837643</ProjectGuid> | ||
| <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion> | ||
| </PropertyGroup> | ||
| <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> | ||
| <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" /> | ||
| <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" /> | ||
| <PropertyGroup /> | ||
| <Import Project="ACT.Hojoring.Shared.projitems" Label="Shared" /> | ||
| <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" /> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.IO; | ||
| using System.Reflection; | ||
|
|
||
| namespace ACT.Hojoring.Shared | ||
| { | ||
| public static class AssemblyResolver | ||
| { | ||
| public static void Initialize( | ||
| Func<string> directoryResolver) | ||
| { | ||
| DirectoryResolvers.Add(directoryResolver); | ||
| AppDomain.CurrentDomain.AssemblyResolve += CustomAssemblyResolve; | ||
| } | ||
|
|
||
| private static readonly List<Func<string>> DirectoryResolvers = new List<Func<string>>(); | ||
|
|
||
| private static Assembly CustomAssemblyResolve(object sender, ResolveEventArgs e) | ||
| { | ||
| var dirs = new List<string>(); | ||
|
|
||
| foreach (var directoryResolver in DirectoryResolvers) | ||
| { | ||
| if (directoryResolver == null) | ||
| { | ||
| continue; | ||
| } | ||
|
|
||
| var baseDir = directoryResolver?.Invoke(); | ||
| if (string.IsNullOrEmpty(baseDir)) | ||
| { | ||
| continue; | ||
| } | ||
|
|
||
| dirs.Add(baseDir); | ||
| dirs.Add(Path.Combine(baseDir, "bin")); | ||
|
|
||
| var architect = Environment.Is64BitProcess ? "x64" : "x86"; | ||
| dirs.Add(Path.Combine(baseDir, $@"{architect}")); | ||
| dirs.Add(Path.Combine(baseDir, $@"bin\{architect}")); | ||
| } | ||
|
|
||
| // Directories プロパティで指定されたディレクトリを基準にアセンブリを検索する | ||
| foreach (var directory in dirs) | ||
| { | ||
| var asm = TryLoadAssembly(e.Name, directory, ".dll"); | ||
| if (asm != null) | ||
| { | ||
| return asm; | ||
| } | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
|
|
||
| private static Assembly TryLoadAssembly( | ||
| string assemblyName, | ||
| string directory, | ||
| string extension) | ||
| { | ||
| var asm = new AssemblyName(assemblyName); | ||
|
|
||
| var asmPath = Path.Combine(directory, asm.Name + extension); | ||
| if (File.Exists(asmPath)) | ||
| { | ||
| return Assembly.LoadFrom(asmPath); | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,8 @@ | ||
| <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd"> | ||
| <Costura IncludeDebugSymbols="true"> | ||
| <ExcludeAssemblies> | ||
| Advanced Combat Tracker | ||
| </ExcludeAssemblies> | ||
| <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd"> | ||
| <Costura | ||
| IncludeDebugSymbols="false"> | ||
| <PreloadOrder> | ||
| Octokit | ||
| </PreloadOrder> | ||
| </Costura> | ||
| </Weavers> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,11 @@ | ||
| <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd"> | ||
| <Costura | ||
| IncludeDebugSymbols="false"> | ||
| <ExcludeAssemblies> | ||
| ACT.SpecialSpellTimer* | ||
| ACT.TTSYukkuri* | ||
| ACT.UltraScouter* | ||
| ACT.XIVLog* | ||
| FFXIV.Framework | ||
| FFXIV.Framework.TTS.Server* | ||
| ACT.Hojoring.Common | ||
| ACT.Hojoring.Updater | ||
| RazorEngine | ||
| SLOBSharp | ||
| FFXIV_ACT_Plugin | ||
| FFXIV_ACT_Plugin.* | ||
| </ExcludeAssemblies> | ||
| <PreloadOrder> | ||
| ACT.Hojoring.Activator | ||
| </PreloadOrder> | ||
| <IncludeAssemblies> | ||
| ACT.Hojoring.Activator | ||
| </IncludeAssemblies> | ||
| </Costura> | ||
| </Weavers> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.