From 01c7191365e290618d9004ee042b02f328fcb3f7 Mon Sep 17 00:00:00 2001
From: Anairkoen Schno <aaron.cirr.com@gmail.com>
Date: Mon, 17 Aug 2020 17:00:40 -0500
Subject: [PATCH] Began move of BSIPA-Meta to SDK-style project

---
 BSIPA-Meta/BSIPA-Meta.csproj     | 101 ++++++++--------------------
 BSIPA-Meta/BSIPA-Meta_old.csproj | 110 +++++++++++++++++++++++++++++++
 BSIPA.sln                        |   2 +-
 3 files changed, 139 insertions(+), 74 deletions(-)
 create mode 100644 BSIPA-Meta/BSIPA-Meta_old.csproj

diff --git a/BSIPA-Meta/BSIPA-Meta.csproj b/BSIPA-Meta/BSIPA-Meta.csproj
index 3e2e4722..097f0a98 100644
--- a/BSIPA-Meta/BSIPA-Meta.csproj
+++ b/BSIPA-Meta/BSIPA-Meta.csproj
@@ -1,78 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Assemble" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x64-Net4</Platform>
-    <ProjectGuid>{880A3560-82CD-4836-996B-11BEFE6B44DB}</ProjectGuid>
-    <OutputType>Library</OutputType>
+    <TargetFrameworks>net35;net461</TargetFrameworks>
+    <Platforms>x86;x64</Platforms>
+    <Configurations>Debug;Release;Verbose;Verbose_Release</Configurations>
+    
     <RootNamespace>BSIPA_Meta</RootNamespace>
-    <AssemblyName>Meta Project</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <TargetFrameworkProfile />
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Platform)' == 'x86-Net4' Or '$(Platform)' == 'x86-Net3' ">
-    <ProxyPlatform>Win32</ProxyPlatform>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Platform)' == 'x64-Net4' Or '$(Platform)' == 'x64-Net3' ">
-    <ProxyPlatform>x64</ProxyPlatform>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Platform)' == 'x86-Net4' Or '$(Platform)' == 'x64-Net4' ">
-    <NetPlatform>Net4</NetPlatform>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Platform)' == 'x86-Net3' Or '$(Platform)' == 'x64-Net3' ">
-    <NetPlatform>Net3</NetPlatform>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <NoVerboseConfig>Debug</NoVerboseConfig>
-    <OtherConfig>Debug</OtherConfig>
-    <ProxyConfig>Release</ProxyConfig>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <NoVerboseConfig>Release</NoVerboseConfig>
-    <OtherConfig>Release</OtherConfig>
+  
+  <PropertyGroup>
+    <OutputPath>bin\$(Platform)\$(Configuration)\$(TargetFramework)</OutputPath>
+    
+    <IsVerbose>false</IsVerbose>
+    <IsVerbose Condition="'$(Configuration)' == 'Verbose' Or '$(Configuration)' == 'Verbose_Release'">true</IsVerbose>
+    
+    <NoVerboseConfig>$(Configuration)</NoVerboseConfig>
+    <NoVerboseConfig Condition="'$(IsVerbose)' == 'true' And '$(Configuration)' == 'Verbose'">Debug</NoVerboseConfig>
+    <NoVerboseConfig Condition="'$(IsVerbose)' == 'true' And '$(Configuration)' == 'Verbose_Release'">Release</NoVerboseConfig>
+    
     <ProxyConfig>Release</ProxyConfig>
+    <ProxyConfig Condition="'$(IsVerbose)' == 'true'">Verbose_Release</ProxyConfig>
+    
+    <ProxyPlatform>Win32</ProxyPlatform>
+    <ProxyPlatform Condition="'$(Platform)' == 'x64'">x64</ProxyPlatform>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Verbose' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <NoVerboseConfig>Debug</NoVerboseConfig>
-    <OtherConfig>Verbose</OtherConfig>
-    <ProxyConfig>Verbose_Release</ProxyConfig>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Verbose_Release' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <NoVerboseConfig>Release</NoVerboseConfig>
-    <OtherConfig>Verbose_Release</OtherConfig>
-    <ProxyConfig>Verbose_Release</ProxyConfig>
-  </PropertyGroup>
+  
   <Target Name="Restore" />
   <Target Name="Clean">
     <ItemGroup>
@@ -90,10 +43,11 @@
     <Message Text="Packing..." Importance="High" />
     <Message Text="Results will be put in $(OutputPath)" Importance="High" />
     <ItemGroup>
-      <InputDlls Include="$(SolutionDir)IPA.Injector\bin\$(NetPlatform)\$(NoVerboseConfig)\**\*" Exclude="$(SolutionDir)IPA.Injector\bin\$(NetPlatform)\$(NoVerboseConfig)\Libraries\**\*" />
+      <InputDlls Include="$(SolutionDir)IPA.Injector\bin\$(NoVerboseConfig)\$(TargetFramework)\**\*" 
+                 Exclude="$(SolutionDir)IPA.Injector\bin\$(NoVerboseConfig)\$(TargetFramework)\Libraries\**\*" />
       <InputDlls Include="$(SolutionDir)Doorstop\Proxy\bin\$(ProxyPlatform)\$(ProxyConfig)\**\*.dll" />
       <InputDlls Include="$(SolutionDir)Doorstop\Proxy\bin\$(ProxyPlatform)\$(ProxyConfig)\**\*.pdb" />
-      <InputIPAFiles Include="$(SolutionDir)IPA\bin\$(OtherConfig)\**\*" />
+      <InputIPAFiles Include="$(SolutionDir)IPA\bin\$(Configuration)\**\*" />
     </ItemGroup>
     <Copy SourceFiles="@(InputDlls)" DestinationFolder="$(OutputPath)IPA\%(RecursiveDir)" />
     <Move SourceFiles="$(OutputPath)IPA\proxy.dll" DestinationFiles="$(OutputPath)IPA\winhttp.dll" />
@@ -107,4 +61,5 @@
     <Delete Files="@(BadFiles)" />
     <RemoveDir Directories="$(OutputPath)Libraries\" />
   </Target>
-</Project>
\ No newline at end of file
+  
+</Project>
diff --git a/BSIPA-Meta/BSIPA-Meta_old.csproj b/BSIPA-Meta/BSIPA-Meta_old.csproj
new file mode 100644
index 00000000..3e2e4722
--- /dev/null
+++ b/BSIPA-Meta/BSIPA-Meta_old.csproj
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Assemble" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x64-Net4</Platform>
+    <ProjectGuid>{880A3560-82CD-4836-996B-11BEFE6B44DB}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>BSIPA_Meta</RootNamespace>
+    <AssemblyName>Meta Project</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Deterministic>true</Deterministic>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'x86-Net4' Or '$(Platform)' == 'x86-Net3' ">
+    <ProxyPlatform>Win32</ProxyPlatform>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'x64-Net4' Or '$(Platform)' == 'x64-Net3' ">
+    <ProxyPlatform>x64</ProxyPlatform>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'x86-Net4' Or '$(Platform)' == 'x64-Net4' ">
+    <NetPlatform>Net4</NetPlatform>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'x86-Net3' Or '$(Platform)' == 'x64-Net3' ">
+    <NetPlatform>Net3</NetPlatform>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoVerboseConfig>Debug</NoVerboseConfig>
+    <OtherConfig>Debug</OtherConfig>
+    <ProxyConfig>Release</ProxyConfig>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoVerboseConfig>Release</NoVerboseConfig>
+    <OtherConfig>Release</OtherConfig>
+    <ProxyConfig>Release</ProxyConfig>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Verbose' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoVerboseConfig>Debug</NoVerboseConfig>
+    <OtherConfig>Verbose</OtherConfig>
+    <ProxyConfig>Verbose_Release</ProxyConfig>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Verbose_Release' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoVerboseConfig>Release</NoVerboseConfig>
+    <OtherConfig>Verbose_Release</OtherConfig>
+    <ProxyConfig>Verbose_Release</ProxyConfig>
+  </PropertyGroup>
+  <Target Name="Restore" />
+  <Target Name="Clean">
+    <ItemGroup>
+      <Files Include="$(OutputPath)**\*" />
+    </ItemGroup>
+    <Delete Files="@(Files)" />
+  </Target>
+  <Target Name="Rebuild">
+    <CallTarget Targets="Assemble" />
+  </Target>
+  <Target Name="Build">
+    <CallTarget Targets="Assemble" />
+  </Target>
+  <Target Name="Assemble" Returns="$(OutputPath)">
+    <Message Text="Packing..." Importance="High" />
+    <Message Text="Results will be put in $(OutputPath)" Importance="High" />
+    <ItemGroup>
+      <InputDlls Include="$(SolutionDir)IPA.Injector\bin\$(NetPlatform)\$(NoVerboseConfig)\**\*" Exclude="$(SolutionDir)IPA.Injector\bin\$(NetPlatform)\$(NoVerboseConfig)\Libraries\**\*" />
+      <InputDlls Include="$(SolutionDir)Doorstop\Proxy\bin\$(ProxyPlatform)\$(ProxyConfig)\**\*.dll" />
+      <InputDlls Include="$(SolutionDir)Doorstop\Proxy\bin\$(ProxyPlatform)\$(ProxyConfig)\**\*.pdb" />
+      <InputIPAFiles Include="$(SolutionDir)IPA\bin\$(OtherConfig)\**\*" />
+    </ItemGroup>
+    <Copy SourceFiles="@(InputDlls)" DestinationFolder="$(OutputPath)IPA\%(RecursiveDir)" />
+    <Move SourceFiles="$(OutputPath)IPA\proxy.dll" DestinationFiles="$(OutputPath)IPA\winhttp.dll" />
+    <Move Condition="Exists('$(OutputPath)IPA\proxy.pdb')" SourceFiles="$(OutputPath)IPA\proxy.pdb" DestinationFiles="$(OutputPath)IPA\winhttp.pdb" />
+    <Copy SourceFiles="@(InputIPAFiles)" DestinationFolder="$(OutputPath)%(RecursiveDir)" />
+    <ItemGroup>
+      <BadFiles Include="$(OutputPath)*.dll" />
+      <BadFiles Include="$(OutputPath)*.pdb" Condition="'$(Configuration)'=='Release' Or '$(Configuration)'=='Verbose_Release'" />
+      <BadFiles Include="$(OutputPath)IPA\*.pdb" Condition="'$(Configuration)'=='Release' Or '$(Configuration)'=='Verbose_Release'" />
+    </ItemGroup>
+    <Delete Files="@(BadFiles)" />
+    <RemoveDir Directories="$(OutputPath)Libraries\" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/BSIPA.sln b/BSIPA.sln
index 69a07b7b..e1d2621e 100644
--- a/BSIPA.sln
+++ b/BSIPA.sln
@@ -26,7 +26,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CollectDependencies", "BuildTools\CollectDependencies\CollectDependencies.csproj", "{5F33B310-DC8D-4C0D-877E-BAC3908DE10F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BSIPA-Meta", "BSIPA-Meta\BSIPA-Meta.csproj", "{880A3560-82CD-4836-996B-11BEFE6B44DB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BSIPA-Meta", "BSIPA-Meta\BSIPA-Meta.csproj", "{880A3560-82CD-4836-996B-11BEFE6B44DB}"
 	ProjectSection(ProjectDependencies) = postProject
 		{88609E16-731F-46C9-8139-6B1A7A83240D} = {88609E16-731F-46C9-8139-6B1A7A83240D}
 		{14092533-98BB-40A4-9AFC-27BB75672A70} = {14092533-98BB-40A4-9AFC-27BB75672A70}