diff --git a/DFAssist.Contracts/DFAssist.Contracts.csproj b/DFAssist.Contracts/DFAssist.Contracts.csproj index e6c928c..55d34ed 100644 --- a/DFAssist.Contracts/DFAssist.Contracts.csproj +++ b/DFAssist.Contracts/DFAssist.Contracts.csproj @@ -9,7 +9,7 @@ Properties DFAssist.Contracts DFAssist.Contracts - v4.6.2 + v4.7.2 512 true @@ -33,6 +33,26 @@ 4 x64 + + true + ..\Release\libs\ + DEBUG;TRACE + full + x64 + 7.3 + prompt + MinimumRecommendedRules.ruleset + + + ..\Release\libs\ + TRACE + true + pdbonly + x64 + 7.3 + prompt + MinimumRecommendedRules.ruleset + diff --git a/DFAssist.Core/DFAssist.Core.csproj b/DFAssist.Core/DFAssist.Core.csproj index 06f3a61..a2ea2b0 100644 --- a/DFAssist.Core/DFAssist.Core.csproj +++ b/DFAssist.Core/DFAssist.Core.csproj @@ -9,7 +9,7 @@ Properties DFAssist.Core DFAssist.Core - v4.6.2 + v4.7.2 512 true @@ -33,6 +33,26 @@ 4 x64 + + true + ..\Release\libs\ + DEBUG;TRACE + full + x64 + 7.3 + prompt + MinimumRecommendedRules.ruleset + + + ..\Release\libs\ + TRACE + true + pdbonly + x64 + 7.3 + prompt + MinimumRecommendedRules.ruleset + diff --git a/DFAssist.Loader/DFAssist.csproj b/DFAssist.Loader/DFAssist.csproj index 884cb2f..e9f0ea4 100644 --- a/DFAssist.Loader/DFAssist.csproj +++ b/DFAssist.Loader/DFAssist.csproj @@ -9,9 +9,10 @@ Properties DFAssist.Loader DFAssist - v4.6.2 + v4.7.2 512 true + true @@ -32,6 +33,26 @@ 4 x64 + + true + ..\Release\ + DEBUG;TRACE + full + x64 + 7.3 + prompt + MinimumRecommendedRules.ruleset + + + ..\Release\ + TRACE + true + pdbonly + x64 + 7.3 + prompt + MinimumRecommendedRules.ruleset + ..\..\ffxiv_actor\ActorConsole\bin\Debug\ACT\Advanced Combat Tracker.exe @@ -61,4 +82,8 @@ call $(SolutionDir)PostBuildStep.bat $(TargetDir) $(SolutionDir)$(ProjectName)\ + + + + \ No newline at end of file diff --git a/DFAssist.WinToast/DFAssist.WinToast.vcxproj b/DFAssist.WinToast/DFAssist.WinToast.vcxproj index 09162c2..f262148 100644 --- a/DFAssist.WinToast/DFAssist.WinToast.vcxproj +++ b/DFAssist.WinToast/DFAssist.WinToast.vcxproj @@ -72,7 +72,7 @@ true - ..\Release\ + ..\Release\libs\ true @@ -82,7 +82,7 @@ false - ..\Release\ + ..\Release\libs\ @@ -97,6 +97,7 @@ Windows true kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;WindowsApp.lib;%(AdditionalDependencies) + MachineX64 @@ -149,6 +150,7 @@ true kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;WindowsApp.lib;%(AdditionalDependencies) UseLinkTimeCodeGeneration + MachineX64 diff --git a/DFAssist.sln b/DFAssist.sln index 9286028..117f32a 100644 --- a/DFAssist.sln +++ b/DFAssist.sln @@ -48,14 +48,14 @@ Global {1D6BA59A-FB85-4ED2-90E1-DEB79FD5AFFC}.Release|x86.Build.0 = Release|Any CPU {67CE05FE-A32C-4149-9884-7DDC065690F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {67CE05FE-A32C-4149-9884-7DDC065690F9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {67CE05FE-A32C-4149-9884-7DDC065690F9}.Debug|x64.ActiveCfg = Debug|Any CPU - {67CE05FE-A32C-4149-9884-7DDC065690F9}.Debug|x64.Build.0 = Debug|Any CPU + {67CE05FE-A32C-4149-9884-7DDC065690F9}.Debug|x64.ActiveCfg = Debug|x64 + {67CE05FE-A32C-4149-9884-7DDC065690F9}.Debug|x64.Build.0 = Debug|x64 {67CE05FE-A32C-4149-9884-7DDC065690F9}.Debug|x86.ActiveCfg = Debug|Any CPU {67CE05FE-A32C-4149-9884-7DDC065690F9}.Debug|x86.Build.0 = Debug|Any CPU {67CE05FE-A32C-4149-9884-7DDC065690F9}.Release|Any CPU.ActiveCfg = Release|Any CPU {67CE05FE-A32C-4149-9884-7DDC065690F9}.Release|Any CPU.Build.0 = Release|Any CPU - {67CE05FE-A32C-4149-9884-7DDC065690F9}.Release|x64.ActiveCfg = Release|Any CPU - {67CE05FE-A32C-4149-9884-7DDC065690F9}.Release|x64.Build.0 = Release|Any CPU + {67CE05FE-A32C-4149-9884-7DDC065690F9}.Release|x64.ActiveCfg = Release|x64 + {67CE05FE-A32C-4149-9884-7DDC065690F9}.Release|x64.Build.0 = Release|x64 {67CE05FE-A32C-4149-9884-7DDC065690F9}.Release|x86.ActiveCfg = Release|Any CPU {67CE05FE-A32C-4149-9884-7DDC065690F9}.Release|x86.Build.0 = Release|Any CPU {E20D32F4-26E0-4B7A-B2FE-590FA4867E61}.Debug|Any CPU.ActiveCfg = Debug|Win32 @@ -70,26 +70,26 @@ Global {E20D32F4-26E0-4B7A-B2FE-590FA4867E61}.Release|x86.Build.0 = Release|Win32 {FD838217-AEDA-4C6A-A5D8-1E6B2D6F7F2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FD838217-AEDA-4C6A-A5D8-1E6B2D6F7F2C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD838217-AEDA-4C6A-A5D8-1E6B2D6F7F2C}.Debug|x64.ActiveCfg = Debug|Any CPU - {FD838217-AEDA-4C6A-A5D8-1E6B2D6F7F2C}.Debug|x64.Build.0 = Debug|Any CPU + {FD838217-AEDA-4C6A-A5D8-1E6B2D6F7F2C}.Debug|x64.ActiveCfg = Debug|x64 + {FD838217-AEDA-4C6A-A5D8-1E6B2D6F7F2C}.Debug|x64.Build.0 = Debug|x64 {FD838217-AEDA-4C6A-A5D8-1E6B2D6F7F2C}.Debug|x86.ActiveCfg = Debug|Any CPU {FD838217-AEDA-4C6A-A5D8-1E6B2D6F7F2C}.Debug|x86.Build.0 = Debug|Any CPU {FD838217-AEDA-4C6A-A5D8-1E6B2D6F7F2C}.Release|Any CPU.ActiveCfg = Release|Any CPU {FD838217-AEDA-4C6A-A5D8-1E6B2D6F7F2C}.Release|Any CPU.Build.0 = Release|Any CPU - {FD838217-AEDA-4C6A-A5D8-1E6B2D6F7F2C}.Release|x64.ActiveCfg = Release|Any CPU - {FD838217-AEDA-4C6A-A5D8-1E6B2D6F7F2C}.Release|x64.Build.0 = Release|Any CPU + {FD838217-AEDA-4C6A-A5D8-1E6B2D6F7F2C}.Release|x64.ActiveCfg = Release|x64 + {FD838217-AEDA-4C6A-A5D8-1E6B2D6F7F2C}.Release|x64.Build.0 = Release|x64 {FD838217-AEDA-4C6A-A5D8-1E6B2D6F7F2C}.Release|x86.ActiveCfg = Release|Any CPU {FD838217-AEDA-4C6A-A5D8-1E6B2D6F7F2C}.Release|x86.Build.0 = Release|Any CPU {67D5CCFB-C77F-4A77-A37D-ECCE57279150}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {67D5CCFB-C77F-4A77-A37D-ECCE57279150}.Debug|Any CPU.Build.0 = Debug|Any CPU - {67D5CCFB-C77F-4A77-A37D-ECCE57279150}.Debug|x64.ActiveCfg = Debug|Any CPU - {67D5CCFB-C77F-4A77-A37D-ECCE57279150}.Debug|x64.Build.0 = Debug|Any CPU + {67D5CCFB-C77F-4A77-A37D-ECCE57279150}.Debug|x64.ActiveCfg = Debug|x64 + {67D5CCFB-C77F-4A77-A37D-ECCE57279150}.Debug|x64.Build.0 = Debug|x64 {67D5CCFB-C77F-4A77-A37D-ECCE57279150}.Debug|x86.ActiveCfg = Debug|Any CPU {67D5CCFB-C77F-4A77-A37D-ECCE57279150}.Debug|x86.Build.0 = Debug|Any CPU {67D5CCFB-C77F-4A77-A37D-ECCE57279150}.Release|Any CPU.ActiveCfg = Release|Any CPU {67D5CCFB-C77F-4A77-A37D-ECCE57279150}.Release|Any CPU.Build.0 = Release|Any CPU - {67D5CCFB-C77F-4A77-A37D-ECCE57279150}.Release|x64.ActiveCfg = Release|Any CPU - {67D5CCFB-C77F-4A77-A37D-ECCE57279150}.Release|x64.Build.0 = Release|Any CPU + {67D5CCFB-C77F-4A77-A37D-ECCE57279150}.Release|x64.ActiveCfg = Release|x64 + {67D5CCFB-C77F-4A77-A37D-ECCE57279150}.Release|x64.Build.0 = Release|x64 {67D5CCFB-C77F-4A77-A37D-ECCE57279150}.Release|x86.ActiveCfg = Release|Any CPU {67D5CCFB-C77F-4A77-A37D-ECCE57279150}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection diff --git a/DFAssist/App.config b/DFAssist/App.config index 58ae9fc..b88fc9b 100644 --- a/DFAssist/App.config +++ b/DFAssist/App.config @@ -1,11 +1,11 @@ - + - + diff --git a/DFAssist/DFAssist.Plugin.csproj b/DFAssist/DFAssist.Plugin.csproj index 1444cf2..0233561 100644 --- a/DFAssist/DFAssist.Plugin.csproj +++ b/DFAssist/DFAssist.Plugin.csproj @@ -8,7 +8,7 @@ Library DFAssist DFAssist.Plugin - v4.6.2 + v4.7.2 512 @@ -38,7 +38,7 @@ true - ..\Release\ + ..\Release\libs\ DEBUG;TRACE full x64 @@ -46,7 +46,7 @@ MinimumRecommendedRules.ruleset - ..\Release\ + ..\Release\libs\ TRACE pdbonly x64 diff --git a/DFAssist/Properties/Resources.Designer.cs b/DFAssist/Properties/Resources.Designer.cs index df52a56..4c511a5 100644 --- a/DFAssist/Properties/Resources.Designer.cs +++ b/DFAssist/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace DFAssist.Properties { // 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", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/DFAssist/Properties/Settings.Designer.cs b/DFAssist/Properties/Settings.Designer.cs index 5f94cd6..2fc13a1 100644 --- a/DFAssist/Properties/Settings.Designer.cs +++ b/DFAssist/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace DFAssist.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", "16.3.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/PostBuildStep.bat b/PostBuildStep.bat index 734e976..3cae3e2 100644 --- a/PostBuildStep.bat +++ b/PostBuildStep.bat @@ -5,27 +5,17 @@ set libs=libs set pdb=pdb set data=data set loc=localization -echo %from% -echo %libs% -echo %pdb% -echo %data% -echo %loc% -echo %resources% echo "Creating folders if necessary..." if not exist %libs% mkdir %libs% if not exist %pdb% mkdir %pdb% if not exist %data% mkdir %data% if not exist %loc% mkdir %loc% -echo "Moving all dll files..." -move /Y %from%*.dll %libs% -move /Y %from%*.config %libs% echo "Moving pdb files..." move /Y %from%*.pdb %pdb% -echo "Deleteing all unused files..." -del /F /Q %from%*.* +move /Y %libs%\*.pdb %pdb% +echo "Deleting not needed files..." +for /f %%F in ('dir %libs% /b /a-d ^| findstr /vile ".dll"') do del "%%F" /F /S /Q echo "Copying files to resources" xcopy /S /Y %resources%data %data% xcopy /S /Y %resources%localization %loc% -echo "Moving DFAssist back to main directory..." -move /Y %libs%\DFAssist.dll %from%DFAssist.dll echo "All done! :)" \ No newline at end of file diff --git a/README.md b/README.md index 8955813..9f1f86e 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,9 @@ ![main](https://github.com/easly1989/ffxiv_act_dfassist/blob/master/images/main.png) +## .NET Framework 4.7.2 Required +To ensure that the plugins works correctly please install [.NET Framework 4.7.2](https://dotnet.microsoft.com/download/thank-you/net472) + ## About this Plugin A simple plugin to scout the next dungoeon/trial/raid (instance to be generic) you are going to enter.
*It works only on windows 10 and, for the moment, only with final fantasy in Borderless Windowed Mode.*
diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs index d403230..dc04929 100644 --- a/SharedAssemblyInfo.cs +++ b/SharedAssemblyInfo.cs @@ -35,12 +35,12 @@ // to distinguish one build from another. AssemblyFileVersion is specified // in AssemblyVersionInfo.cs so that it can be easily incremented by the // automated build process. -[assembly: AssemblyVersion("2.1.9")] +[assembly: AssemblyVersion("2.2.0")] // By default, the "Product version" shown in the file properties window is // the same as the value specified for AssemblyFileVersionAttribute. // Set AssemblyInformationalVersionAttribute to be the same as // AssemblyVersionAttribute so that the "Product version" in the file // properties window matches the version displayed in the GAC shell extension. -[assembly: AssemblyInformationalVersion("2.1.9")] // a.k.a. "Product version" +[assembly: AssemblyInformationalVersion("2.2.0")] // a.k.a. "Product version"