From ad963b16606027e48996f17d575bbc99b05f4c12 Mon Sep 17 00:00:00 2001 From: alphaONE2 Date: Tue, 8 Nov 2016 09:16:33 -0600 Subject: [PATCH] Fix CI build. --- ItemListUpgrade/ItemListUpgrade.csproj | 19 ++----- MassExtractor/MassExtractor.csproj | 19 ++----- POLUtils.sln | 28 +++++------ POLUtils/POLUtils.csproj | 42 +++------------- PlayOnline.Core/PlayOnline.Core.csproj | 45 +++-------------- .../PlayOnline.FFXI.Utils.ConfigEditor.csproj | 37 +++----------- .../PlayOnline.FFXI.Utils.DataBrowser.csproj | 49 +++---------------- .../PlayOnline.FFXI.Utils.EngrishOnry.csproj | 46 +++-------------- ...layOnline.FFXI.Utils.ItemComparison.csproj | 48 +++--------------- .../PlayOnline.FFXI.Utils.MacroManager.csproj | 48 +++--------------- .../PlayOnline.FFXI.Utils.NPCRenamer.csproj | 18 +------ ...yOnline.FFXI.Utils.StrangeApparatus.csproj | 18 +------ PlayOnline.FFXI/PlayOnline.FFXI.csproj | 49 +++---------------- PlayOnline.FFXI/Things/Item.cs | 5 +- .../PlayOnline.Utils.AudioManager.csproj | 48 +++--------------- .../PlayOnline.Utils.TetraViewer.csproj | 40 +++------------ 16 files changed, 102 insertions(+), 457 deletions(-) diff --git a/ItemListUpgrade/ItemListUpgrade.csproj b/ItemListUpgrade/ItemListUpgrade.csproj index b431919..411800a 100644 --- a/ItemListUpgrade/ItemListUpgrade.csproj +++ b/ItemListUpgrade/ItemListUpgrade.csproj @@ -1,10 +1,9 @@  - + + Debug - x64 - 9.0.30729 - 2.0 + AnyCPU {C80C8B59-0A38-4A7B-9C73-00603123B006} WinExe Properties @@ -14,11 +13,6 @@ true ..\POLUtils.snk v2.0 - - - - - 3.5 true @@ -67,11 +61,4 @@ - \ No newline at end of file diff --git a/MassExtractor/MassExtractor.csproj b/MassExtractor/MassExtractor.csproj index 705aabb..8a98d00 100644 --- a/MassExtractor/MassExtractor.csproj +++ b/MassExtractor/MassExtractor.csproj @@ -1,10 +1,9 @@  - + + Debug - x64 - 8.0.50727 - 2.0 + AnyCPU {C9683F0B-16CA-4CEF-907A-2802B5F12C43} Exe Properties @@ -14,11 +13,6 @@ true ..\POLUtils.snk v2.0 - - - - - 3.5 true @@ -71,11 +65,4 @@ - \ No newline at end of file diff --git a/POLUtils.sln b/POLUtils.sln index a115237..106e416 100644 --- a/POLUtils.sln +++ b/POLUtils.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30723.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A032E7DB-67AF-4ADF-9D15-085DBBCFA524}" ProjectSection(SolutionItems) = preProject @@ -55,14 +55,18 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C80C8B59-0A38-4A7B-9C73-00603123B006}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C80C8B59-0A38-4A7B-9C73-00603123B006}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C80C8B59-0A38-4A7B-9C73-00603123B006}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C80C8B59-0A38-4A7B-9C73-00603123B006}.Release|Any CPU.Build.0 = Release|Any CPU + {AF3C3123-0BD1-4AD4-9AF4-FD0C33871901}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AF3C3123-0BD1-4AD4-9AF4-FD0C33871901}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AF3C3123-0BD1-4AD4-9AF4-FD0C33871901}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AF3C3123-0BD1-4AD4-9AF4-FD0C33871901}.Release|Any CPU.Build.0 = Release|Any CPU {C9683F0B-16CA-4CEF-907A-2802B5F12C43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C9683F0B-16CA-4CEF-907A-2802B5F12C43}.Debug|Any CPU.Build.0 = Debug|Any CPU {C9683F0B-16CA-4CEF-907A-2802B5F12C43}.Release|Any CPU.ActiveCfg = Release|Any CPU {C9683F0B-16CA-4CEF-907A-2802B5F12C43}.Release|Any CPU.Build.0 = Release|Any CPU + {C80C8B59-0A38-4A7B-9C73-00603123B006}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C80C8B59-0A38-4A7B-9C73-00603123B006}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C80C8B59-0A38-4A7B-9C73-00603123B006}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C80C8B59-0A38-4A7B-9C73-00603123B006}.Release|Any CPU.Build.0 = Release|Any CPU {84C42502-1564-4617-B80C-ACE781051CE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {84C42502-1564-4617-B80C-ACE781051CE8}.Debug|Any CPU.Build.0 = Debug|Any CPU {84C42502-1564-4617-B80C-ACE781051CE8}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -71,14 +75,14 @@ Global {F98E06E7-A9BF-4E8A-9059-96DF4DD2BEEC}.Debug|Any CPU.Build.0 = Debug|Any CPU {F98E06E7-A9BF-4E8A-9059-96DF4DD2BEEC}.Release|Any CPU.ActiveCfg = Release|Any CPU {F98E06E7-A9BF-4E8A-9059-96DF4DD2BEEC}.Release|Any CPU.Build.0 = Release|Any CPU - {BB3E6667-1B22-4465-98DA-821815A4BA93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB3E6667-1B22-4465-98DA-821815A4BA93}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB3E6667-1B22-4465-98DA-821815A4BA93}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB3E6667-1B22-4465-98DA-821815A4BA93}.Release|Any CPU.Build.0 = Release|Any CPU {0E5DF1A6-9060-4E56-BCFC-6928AC4DB179}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0E5DF1A6-9060-4E56-BCFC-6928AC4DB179}.Debug|Any CPU.Build.0 = Debug|Any CPU {0E5DF1A6-9060-4E56-BCFC-6928AC4DB179}.Release|Any CPU.ActiveCfg = Release|Any CPU {0E5DF1A6-9060-4E56-BCFC-6928AC4DB179}.Release|Any CPU.Build.0 = Release|Any CPU + {BB3E6667-1B22-4465-98DA-821815A4BA93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BB3E6667-1B22-4465-98DA-821815A4BA93}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BB3E6667-1B22-4465-98DA-821815A4BA93}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BB3E6667-1B22-4465-98DA-821815A4BA93}.Release|Any CPU.Build.0 = Release|Any CPU {CBB91A27-923B-4853-9C7F-46B1955D436A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CBB91A27-923B-4853-9C7F-46B1955D436A}.Debug|Any CPU.Build.0 = Debug|Any CPU {CBB91A27-923B-4853-9C7F-46B1955D436A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,10 +111,6 @@ Global {5AE19CFB-270A-4CFA-A89A-E2EDB57CDA3A}.Debug|Any CPU.Build.0 = Debug|Any CPU {5AE19CFB-270A-4CFA-A89A-E2EDB57CDA3A}.Release|Any CPU.ActiveCfg = Release|Any CPU {5AE19CFB-270A-4CFA-A89A-E2EDB57CDA3A}.Release|Any CPU.Build.0 = Release|Any CPU - {AF3C3123-0BD1-4AD4-9AF4-FD0C33871901}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF3C3123-0BD1-4AD4-9AF4-FD0C33871901}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF3C3123-0BD1-4AD4-9AF4-FD0C33871901}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF3C3123-0BD1-4AD4-9AF4-FD0C33871901}.Release|Any CPU.Build.0 = Release|Any CPU {C6741D14-0E44-42BC-A17E-2966B9FBD28B}.Debug|Any CPU.ActiveCfg = Debug|x86 {C6741D14-0E44-42BC-A17E-2966B9FBD28B}.Release|Any CPU.ActiveCfg = Release|x86 {C6741D14-0E44-42BC-A17E-2966B9FBD28B}.Release|Any CPU.Build.0 = Release|x86 diff --git a/POLUtils/POLUtils.csproj b/POLUtils/POLUtils.csproj index 5f1a16e..e86adab 100644 --- a/POLUtils/POLUtils.csproj +++ b/POLUtils/POLUtils.csproj @@ -1,38 +1,23 @@  - + + - Local - 9.0.30729 - 2.0 {AF3C3123-0BD1-4AD4-9AF4-FD0C33871901} Debug AnyCPU - - POLUtils ..\POLUtils.snk - JScript - Grid - IE50 - false WinExe - - + OnBuildSuccess POLUtils.POLUtils true v2.0 - - - - - 3.5 true bin\Debug\ DEBUG;TRACE - 275212672 1607 full AnyCPU @@ -44,7 +29,6 @@ true bin\Release\ TRACE - 275212672 true 1607 pdbonly @@ -54,20 +38,11 @@ MinimumRecommendedRules.ruleset - - System - False - + - - System.Drawing - - - System.Windows.Forms - - - System.XML - + + + PlayOnline.Core {84C42502-1564-4617-B80C-ACE781051CE8} @@ -146,7 +121,6 @@ cd $(SolutionDir) - - + \ No newline at end of file diff --git a/PlayOnline.Core/PlayOnline.Core.csproj b/PlayOnline.Core/PlayOnline.Core.csproj index 4c54415..c960e27 100644 --- a/PlayOnline.Core/PlayOnline.Core.csproj +++ b/PlayOnline.Core/PlayOnline.Core.csproj @@ -1,33 +1,16 @@  - + + - Local - 8.0.50727 - 2.0 {84C42502-1564-4617-B80C-ACE781051CE8} Debug AnyCPU - - PlayOnline.Core ..\POLUtils.snk - JScript - Grid - IE50 - false Library - - - OnBuildSuccess - - + true v2.0 - - - - - 3.5 true @@ -53,19 +36,11 @@ MinimumRecommendedRules.ruleset - - System - + - - System.Drawing - - - System.Windows.Forms - - - System.XML - + + + @@ -111,10 +86,4 @@ - - - - - - \ No newline at end of file diff --git a/PlayOnline.FFXI.Utils.ConfigEditor/PlayOnline.FFXI.Utils.ConfigEditor.csproj b/PlayOnline.FFXI.Utils.ConfigEditor/PlayOnline.FFXI.Utils.ConfigEditor.csproj index 2e1db52..81624a9 100644 --- a/PlayOnline.FFXI.Utils.ConfigEditor/PlayOnline.FFXI.Utils.ConfigEditor.csproj +++ b/PlayOnline.FFXI.Utils.ConfigEditor/PlayOnline.FFXI.Utils.ConfigEditor.csproj @@ -1,9 +1,7 @@  - + + - Local - 8.0.50727 - 2.0 {BB3E6667-1B22-4465-98DA-821815A4BA93} Debug AnyCPU @@ -14,11 +12,6 @@ Properties v2.0 - - - - - 3.5 true @@ -44,21 +37,11 @@ MinimumRecommendedRules.ruleset - - System - - - System.Data - - - System.Drawing - - - System.Windows.Forms - - - System.XML - + + + + + PlayOnline.Core {84C42502-1564-4617-B80C-ACE781051CE8} @@ -93,10 +76,4 @@ - - - - - - \ No newline at end of file diff --git a/PlayOnline.FFXI.Utils.DataBrowser/PlayOnline.FFXI.Utils.DataBrowser.csproj b/PlayOnline.FFXI.Utils.DataBrowser/PlayOnline.FFXI.Utils.DataBrowser.csproj index 79ccbdb..687bc22 100644 --- a/PlayOnline.FFXI.Utils.DataBrowser/PlayOnline.FFXI.Utils.DataBrowser.csproj +++ b/PlayOnline.FFXI.Utils.DataBrowser/PlayOnline.FFXI.Utils.DataBrowser.csproj @@ -1,33 +1,16 @@  - + + - Local - 8.0.50727 - 2.0 {0E5DF1A6-9060-4E56-BCFC-6928AC4DB179} Debug x64 - - PlayOnline.FFXI.Utils.DataBrowser ..\POLUtils.snk - JScript - Grid - IE50 - false Library - - - OnBuildSuccess - - + true v2.0 - - - - - 3.5 true @@ -53,21 +36,11 @@ MinimumRecommendedRules.ruleset - - System - - - System.Data - - - System.Drawing - - - System.Windows.Forms - - - System.XML - + + + + + @@ -137,10 +110,4 @@ - - - - - - \ No newline at end of file diff --git a/PlayOnline.FFXI.Utils.EngrishOnry/PlayOnline.FFXI.Utils.EngrishOnry.csproj b/PlayOnline.FFXI.Utils.EngrishOnry/PlayOnline.FFXI.Utils.EngrishOnry.csproj index eac82d9..49c8b16 100644 --- a/PlayOnline.FFXI.Utils.EngrishOnry/PlayOnline.FFXI.Utils.EngrishOnry.csproj +++ b/PlayOnline.FFXI.Utils.EngrishOnry/PlayOnline.FFXI.Utils.EngrishOnry.csproj @@ -1,9 +1,7 @@  - + + - Local - 8.0.50727 - 2.0 {CBB91A27-923B-4853-9C7F-46B1955D436A} Debug AnyCPU @@ -11,23 +9,11 @@ PlayOnline.FFXI.Utils.EngrishOnry ..\POLUtils.snk - JScript - Grid - IE50 - false Library - - + OnOutputUpdated - - true v2.0 - - - - - 3.5 true @@ -53,21 +39,11 @@ MinimumRecommendedRules.ruleset - - System - - - System.Data - - - System.Drawing - - - System.Windows.Forms - - - System.XML - + + + + + PlayOnline.Core {84C42502-1564-4617-B80C-ACE781051CE8} @@ -99,10 +75,4 @@ - - - - - - \ No newline at end of file diff --git a/PlayOnline.FFXI.Utils.ItemComparison/PlayOnline.FFXI.Utils.ItemComparison.csproj b/PlayOnline.FFXI.Utils.ItemComparison/PlayOnline.FFXI.Utils.ItemComparison.csproj index 6f2f569..c2240ee 100644 --- a/PlayOnline.FFXI.Utils.ItemComparison/PlayOnline.FFXI.Utils.ItemComparison.csproj +++ b/PlayOnline.FFXI.Utils.ItemComparison/PlayOnline.FFXI.Utils.ItemComparison.csproj @@ -1,33 +1,17 @@  - + + - Local - 8.0.50727 - 2.0 {CA57295D-4CF1-4FE9-AB40-A2A1F8432BCA} Debug AnyCPU - - PlayOnline.FFXI.Utils.ItemComparison ..\POLUtils.snk - JScript - Grid - IE50 - false Library - - + OnBuildSuccess - - true v2.0 - - - - - 3.5 true @@ -53,21 +37,11 @@ MinimumRecommendedRules.ruleset - - System - - - System.Data - - - System.Drawing - - - System.Windows.Forms - - - System.XML - + + + + + PlayOnline.Core {84C42502-1564-4617-B80C-ACE781051CE8} @@ -99,10 +73,4 @@ - - - - - - \ No newline at end of file diff --git a/PlayOnline.FFXI.Utils.MacroManager/PlayOnline.FFXI.Utils.MacroManager.csproj b/PlayOnline.FFXI.Utils.MacroManager/PlayOnline.FFXI.Utils.MacroManager.csproj index 64f35c3..957e894 100644 --- a/PlayOnline.FFXI.Utils.MacroManager/PlayOnline.FFXI.Utils.MacroManager.csproj +++ b/PlayOnline.FFXI.Utils.MacroManager/PlayOnline.FFXI.Utils.MacroManager.csproj @@ -1,33 +1,17 @@  - + + - Local - 8.0.50727 - 2.0 {966ACE61-C745-4B5E-AFFA-31A50E24341B} Debug AnyCPU - - PlayOnline.FFXI.Utils.MacroManager ..\POLUtils.snk - JScript - Grid - IE50 - false Library - - + OnBuildSuccess - - true v2.0 - - - - - 3.5 true @@ -52,21 +36,11 @@ MinimumRecommendedRules.ruleset - - System - - - System.Data - - - System.Drawing - - - System.Windows.Forms - - - System.XML - + + + + + PlayOnline.Core {84C42502-1564-4617-B80C-ACE781051CE8} @@ -103,10 +77,4 @@ - - - - - - \ No newline at end of file diff --git a/PlayOnline.FFXI.Utils.NPCRenamer/PlayOnline.FFXI.Utils.NPCRenamer.csproj b/PlayOnline.FFXI.Utils.NPCRenamer/PlayOnline.FFXI.Utils.NPCRenamer.csproj index 5cd2aac..d011158 100644 --- a/PlayOnline.FFXI.Utils.NPCRenamer/PlayOnline.FFXI.Utils.NPCRenamer.csproj +++ b/PlayOnline.FFXI.Utils.NPCRenamer/PlayOnline.FFXI.Utils.NPCRenamer.csproj @@ -1,9 +1,7 @@  - + + - Local - 8.0.50727 - 2.0 {7A167973-DB45-472B-8983-F06B98CE1E70} Debug AnyCPU @@ -14,11 +12,6 @@ true ..\POLUtils.snk v2.0 - - - - - 3.5 true @@ -92,11 +85,4 @@ - \ No newline at end of file diff --git a/PlayOnline.FFXI.Utils.StrangeApparatus/PlayOnline.FFXI.Utils.StrangeApparatus.csproj b/PlayOnline.FFXI.Utils.StrangeApparatus/PlayOnline.FFXI.Utils.StrangeApparatus.csproj index 66ea50c..ec8d6d5 100644 --- a/PlayOnline.FFXI.Utils.StrangeApparatus/PlayOnline.FFXI.Utils.StrangeApparatus.csproj +++ b/PlayOnline.FFXI.Utils.StrangeApparatus/PlayOnline.FFXI.Utils.StrangeApparatus.csproj @@ -1,9 +1,7 @@  - + + - Local - 8.0.50727 - 2.0 {3B4721B1-F1AD-4F44-88C8-7AE5B25FEDDF} Debug AnyCPU @@ -14,11 +12,6 @@ Properties true v2.0 - - - - - 3.5 true @@ -79,11 +72,4 @@ - \ No newline at end of file diff --git a/PlayOnline.FFXI/PlayOnline.FFXI.csproj b/PlayOnline.FFXI/PlayOnline.FFXI.csproj index 5f2ab88..a603d08 100644 --- a/PlayOnline.FFXI/PlayOnline.FFXI.csproj +++ b/PlayOnline.FFXI/PlayOnline.FFXI.csproj @@ -1,33 +1,16 @@  - + + - Local - 9.0.21022 - 2.0 {F98E06E7-A9BF-4E8A-9059-96DF4DD2BEEC} Debug AnyCPU - - PlayOnline.FFXI ..\POLUtils.snk - JScript - Grid - IE50 - false Library - - - OnBuildSuccess - - + true v2.0 - - - - - 3.5 true @@ -53,21 +36,11 @@ MinimumRecommendedRules.ruleset - - System - - - System.Data - - - System.Drawing - - - System.Windows.Forms - - - System.XML - + + + + + PlayOnline.Core {84C42502-1564-4617-B80C-ACE781051CE8} @@ -271,10 +244,4 @@ - - - - - - \ No newline at end of file diff --git a/PlayOnline.FFXI/Things/Item.cs b/PlayOnline.FFXI/Things/Item.cs index cb9b0a1..0f3486b 100644 --- a/PlayOnline.FFXI/Things/Item.cs +++ b/PlayOnline.FFXI/Things/Item.cs @@ -1,8 +1,8 @@ // Copyright © 2004-2014 Tim Van Holder, Nevin Stepan, Windower Team -// +// // Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. // You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" // BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and limitations under the License. @@ -123,7 +123,6 @@ public static List AllFields private ushort? Unknown2_; private uint? Unknown3_; private uint? Unknown4_; - private uint? Unknown5_; #endregion diff --git a/PlayOnline.Utils.AudioManager/PlayOnline.Utils.AudioManager.csproj b/PlayOnline.Utils.AudioManager/PlayOnline.Utils.AudioManager.csproj index b8d5845..fabe024 100644 --- a/PlayOnline.Utils.AudioManager/PlayOnline.Utils.AudioManager.csproj +++ b/PlayOnline.Utils.AudioManager/PlayOnline.Utils.AudioManager.csproj @@ -1,33 +1,17 @@  - + + - Local - 8.0.50727 - 2.0 {C75FF527-FF4A-4F2B-8F86-69AA30E33C3A} Debug AnyCPU - - PlayOnline.Utils.AudioManager ..\POLUtils.snk - JScript - Grid - IE50 - false Library - - + OnBuildSuccess - - true v2.0 - - - - - 3.5 true @@ -53,21 +37,11 @@ MinimumRecommendedRules.ruleset - - System - - - System.Data - - - System.Drawing - - - System.Windows.Forms - - - System.XML - + + + + + PlayOnline.Core {84C42502-1564-4617-B80C-ACE781051CE8} @@ -119,10 +93,4 @@ - - - - - - \ No newline at end of file diff --git a/PlayOnline.Utils.TetraViewer/PlayOnline.Utils.TetraViewer.csproj b/PlayOnline.Utils.TetraViewer/PlayOnline.Utils.TetraViewer.csproj index 2ff0e9e..f1618e7 100644 --- a/PlayOnline.Utils.TetraViewer/PlayOnline.Utils.TetraViewer.csproj +++ b/PlayOnline.Utils.TetraViewer/PlayOnline.Utils.TetraViewer.csproj @@ -1,33 +1,17 @@  - + + - Local - 8.0.50727 - 2.0 {5AE19CFB-270A-4CFA-A89A-E2EDB57CDA3A} Debug AnyCPU - - PlayOnline.Utils.TetraViewer ..\POLUtils.snk - JScript - Grid - IE50 - false Library - - + OnBuildSuccess - - true v2.0 - - - - - 3.5 true @@ -53,15 +37,9 @@ MinimumRecommendedRules.ruleset - - System - - - System.Drawing - - - System.Windows.Forms - + + + PlayOnline.Core {84C42502-1564-4617-B80C-ACE781051CE8} @@ -88,10 +66,4 @@ - - - - - - \ No newline at end of file