new csproj

MultipleMaids/MultipleMaids.csproj

@@ -1,61 +1,8 @@
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="packages\ILRepack.2.0.17\build\ILRepack.props" Condition="Exists('packages\ILRepack.2.0.17\build\ILRepack.props')" />
-=======
 <Project Sdk="Microsoft.NET.Sdk">
->>>>>>> upstream/master
   <PropertyGroup>
     <TargetFramework>net35</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
-    <AssemblyName>COM3D2.MultipleMaids.Plugin</AssemblyName>
-<<<<<<< HEAD
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>0.0.0.0</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-=======
->>>>>>> upstream/master
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Assembly-CSharp">
@@ -70,14 +17,6 @@
     <Reference Include="ExIni">
       <HintPath>lib\ExIni.dll</HintPath>
     </Reference>
-<<<<<<< HEAD
-    <Reference Include="SevenZip, Version=18.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\LZMA-SDK.18.1.0\lib\net20\SevenZip.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-=======
->>>>>>> upstream/master
     <Reference Include="UnityEngine">
       <HintPath>lib\UnityEngine.dll</HintPath>
     </Reference>
@@ -85,49 +24,4 @@
       <HintPath>lib\UnityInjector.dll</HintPath>
     </Reference>
   </ItemGroup>
-<<<<<<< HEAD
-  <ItemGroup>
-    <Compile Include="CM3D2\MultipleMaids\Plugin\MultipleMaids.Config.cs" />
-    <Compile Include="CM3D2\MultipleMaids\Plugin\MultipleMaids.Gui.cs" />
-    <Compile Include="CM3D2\MultipleMaids\Plugin\MultipleMaids.IK.cs" />
-    <Compile Include="CM3D2\MultipleMaids\Plugin\MultipleMaids.Init.cs" />
-    <Compile Include="CM3D2\MultipleMaids\Plugin\MultipleMaids.MaidUpdate.cs" />
-    <Compile Include="CM3D2\MultipleMaids\Plugin\MultipleMaids.Update.cs" />
-    <Compile Include="ComboBox2.cs" />
-    <Compile Include="MouseDrag.cs" />
-    <Compile Include="MouseDrag2.cs" />
-    <Compile Include="MouseDrag3.cs" />
-    <Compile Include="MouseDrag4.cs" />
-    <Compile Include="MouseDrag5.cs" />
-    <Compile Include="MouseDrag6.cs" />
-    <Compile Include="IK.cs" />
-    <Compile Include="ImportCM2.cs" />
-    <Compile Include="CM3D2\MultipleMaids\Plugin\MultipleMaids.cs" />
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="SaveManager.cs" />
-    <Compile Include="Util\Logger.cs" />
-    <Compile Include="Util\LZMA.cs" />
-    <Compile Include="Util\SimpleJSON.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('packages\ILRepack.2.0.17\build\ILRepack.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\ILRepack.2.0.17\build\ILRepack.props'))" />
-    <Error Condition="!Exists('packages\ILRepack.Lib.MSBuild.Task.2.0.17\build\ILRepack.Lib.MSBuild.Task.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\ILRepack.Lib.MSBuild.Task.2.0.17\build\ILRepack.Lib.MSBuild.Task.targets'))" />
-  </Target>
-  <Import Project="packages\ILRepack.Lib.MSBuild.Task.2.0.17\build\ILRepack.Lib.MSBuild.Task.targets" Condition="Exists('packages\ILRepack.Lib.MSBuild.Task.2.0.17\build\ILRepack.Lib.MSBuild.Task.targets')" />
-=======
->>>>>>> upstream/master
-</Project>
+</Project>