Updated project to .NET Framework 4.7.2

Updated PostBuildStep to be a bit smarter
xeropresence · Nov 8, 2019 · 2eab7f7 · 2eab7f7
1 parent 9e840f9
commit 2eab7f7
Show file tree

Hide file tree

Showing 12 changed files with 99 additions and 39 deletions.
diff --git a/DFAssist.Contracts/DFAssist.Contracts.csproj b/DFAssist.Contracts/DFAssist.Contracts.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>DFAssist.Contracts</RootNamespace>
     <AssemblyName>DFAssist.Contracts</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
@@ -33,6 +33,26 @@
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\Release\libs\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>..\Release\libs\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/DFAssist.Core/DFAssist.Core.csproj b/DFAssist.Core/DFAssist.Core.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>DFAssist.Core</RootNamespace>
     <AssemblyName>DFAssist.Core</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
@@ -33,6 +33,26 @@
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\Release\libs\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>..\Release\libs\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="PresentationCore" />
     <Reference Include="System" />

diff --git a/DFAssist.Loader/DFAssist.csproj b/DFAssist.Loader/DFAssist.csproj
@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>DFAssist.Loader</RootNamespace>
     <AssemblyName>DFAssist</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -32,6 +33,26 @@
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\Release\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>..\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Advanced Combat Tracker">
       <HintPath>..\..\ffxiv_actor\ActorConsole\bin\Debug\ACT\Advanced Combat Tracker.exe</HintPath>
@@ -61,4 +82,8 @@
   <PropertyGroup>
     <PostBuildEvent>call $(SolutionDir)PostBuildStep.bat $(TargetDir) $(SolutionDir)$(ProjectName)\</PostBuildEvent>
   </PropertyGroup>
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+  </PropertyGroup>
 </Project>
diff --git a/DFAssist.WinToast/DFAssist.WinToast.vcxproj b/DFAssist.WinToast/DFAssist.WinToast.vcxproj
@@ -72,7 +72,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\Release\</OutDir>
+    <OutDir>..\Release\libs\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
@@ -82,7 +82,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\Release\</OutDir>
+    <OutDir>..\Release\libs\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -97,6 +97,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>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)</AdditionalDependencies>
+      <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -149,6 +150,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>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)</AdditionalDependencies>
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

diff --git 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
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
   </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <probing privatePath="libs" />
+      <probing privatePath="libs"/>
     </assemblyBinding>
   </runtime>
   <system.net>

diff --git a/DFAssist/DFAssist.Plugin.csproj b/DFAssist/DFAssist.Plugin.csproj
@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>DFAssist</RootNamespace>
     <AssemblyName>DFAssist.Plugin</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <NuGetPackageImportStamp>
@@ -38,15 +38,15 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\Release\</OutputPath>
+    <OutputPath>..\Release\libs\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>..\Release\</OutputPath>
+    <OutputPath>..\Release\libs\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x64</PlatformTarget>

diff --git a/DFAssist/Properties/Resources.Designer.cs b/DFAssist/Properties/Resources.Designer.cs
diff --git a/DFAssist/Properties/Settings.Designer.cs b/DFAssist/Properties/Settings.Designer.cs
diff --git 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! :)"
diff --git 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.<br>
 *It works only on windows 10 and, for the moment, only with final fantasy in Borderless Windowed Mode.*<br>

diff --git 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"