Fix CI build.

Windower · Nov 8, 2016 · ad963b1 · ad963b1 · funkworkz · Nov 8, 2016
1 parent 0283e10
commit ad963b1
Show file tree

Hide file tree

Showing 16 changed files with 102 additions and 457 deletions.
diff --git a/ItemListUpgrade/ItemListUpgrade.csproj b/ItemListUpgrade/ItemListUpgrade.csproj
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{C80C8B59-0A38-4A7B-9C73-00603123B006}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -14,11 +13,6 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\POLUtils.snk</AssemblyOriginatorKeyFile>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -67,11 +61,4 @@
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
diff --git a/MassExtractor/MassExtractor.csproj b/MassExtractor/MassExtractor.csproj
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{C9683F0B-16CA-4CEF-907A-2802B5F12C43}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -14,11 +13,6 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\POLUtils.snk</AssemblyOriginatorKeyFile>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -71,11 +65,4 @@
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
diff --git 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
@@ -1,38 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AF3C3123-0BD1-4AD4-9AF4-FD0C33871901}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
     <AssemblyName>POLUtils</AssemblyName>
     <AssemblyOriginatorKeyFile>..\POLUtils.snk</AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>
-    </RootNamespace>
+    <RootNamespace />
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     <StartupObject>POLUtils.POLUtils</StartupObject>
     <SignAssembly>true</SignAssembly>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <BaseAddress>275212672</BaseAddress>
     <NoWarn>1607</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -44,7 +29,6 @@
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
-    <BaseAddress>275212672</BaseAddress>
     <Optimize>true</Optimize>
     <NoWarn>1607</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -54,20 +38,11 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System">
-      <Name>System</Name>
-      <Private>False</Private>
-    </Reference>
+    <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Drawing">
-      <Name>System.Drawing</Name>
-    </Reference>
-    <Reference Include="System.Windows.Forms">
-      <Name>System.Windows.Forms</Name>
-    </Reference>
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
     <ProjectReference Include="..\PlayOnline.Core\PlayOnline.Core.csproj">
       <Name>PlayOnline.Core</Name>
       <Project>{84C42502-1564-4617-B80C-ACE781051CE8}</Project>
@@ -146,7 +121,6 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>cd $(SolutionDir)</PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent />
   </PropertyGroup>
 </Project>
diff --git a/PlayOnline.Core/PlayOnline.Core.csproj b/PlayOnline.Core/PlayOnline.Core.csproj
@@ -1,33 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{84C42502-1564-4617-B80C-ACE781051CE8}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
     <AssemblyName>PlayOnline.Core</AssemblyName>
     <AssemblyOriginatorKeyFile>..\POLUtils.snk</AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
     <OutputType>Library</OutputType>
-    <RootNamespace>
-    </RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
+    <RootNamespace />
     <SignAssembly>true</SignAssembly>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -53,19 +36,11 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
+    <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Drawing">
-      <Name>System.Drawing</Name>
-    </Reference>
-    <Reference Include="System.Windows.Forms">
-      <Name>System.Windows.Forms</Name>
-    </Reference>
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Version.cs">
@@ -111,10 +86,4 @@
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
 </Project>
diff --git a/PlayOnline.FFXI.Utils.ConfigEditor/PlayOnline.FFXI.Utils.ConfigEditor.csproj b/PlayOnline.FFXI.Utils.ConfigEditor/PlayOnline.FFXI.Utils.ConfigEditor.csproj
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BB3E6667-1B22-4465-98DA-821815A4BA93}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -14,11 +12,6 @@
     <RootNamespace />
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -44,21 +37,11 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
-    <Reference Include="System.Drawing">
-      <Name>System.Drawing</Name>
-    </Reference>
-    <Reference Include="System.Windows.Forms">
-      <Name>System.Windows.Forms</Name>
-    </Reference>
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
     <ProjectReference Include="..\PlayOnline.Core\PlayOnline.Core.csproj">
       <Name>PlayOnline.Core</Name>
       <Project>{84C42502-1564-4617-B80C-ACE781051CE8}</Project>
@@ -93,10 +76,4 @@
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
 </Project>