From 53fa4bd5bc020c7019e838e69b41e74c1bc9ee37 Mon Sep 17 00:00:00 2001
From: JohnCorby <williamforgames6@gmail.com>
Date: Wed, 25 May 2022 16:00:32 -0700
Subject: [PATCH] clean up csprojs

---
 NewHorizons/NewHorizons.csproj       | 45 ++++++++--------------------
 NewHorizons/NewHorizons.csproj.user  | 13 ++++----
 SchemaExporter/SchemaExporter.csproj | 18 +++++------
 3 files changed, 24 insertions(+), 52 deletions(-)

diff --git a/NewHorizons/NewHorizons.csproj b/NewHorizons/NewHorizons.csproj
index ed40419b..7548e84c 100644
--- a/NewHorizons/NewHorizons.csproj
+++ b/NewHorizons/NewHorizons.csproj
@@ -1,61 +1,40 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <ProjectGuid>{8A39F9E7-1A89-430C-9C3E-BDFB3B7E17DF}</ProjectGuid>
         <TargetFramework>net48</TargetFramework>
         <LangVersion>default</LangVersion>
-        <OutputPath>Build</OutputPath>
-        <AssemblyTitle>NewHorizons</AssemblyTitle>
-        <Product>NewHorizons</Product>
         <Copyright>Copyright © 2020</Copyright>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+        <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
         <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-        <DebugType>portable</DebugType>
         <NoWarn>1701;1702;1591</NoWarn>
     </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
         <DebugType>none</DebugType>
-        <NoWarn>1701;1702;1591</NoWarn>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="HarmonyX" Version="2.10.0"/>
-        <PackageReference Include="OWML" Version="2.3.3"/>
-        <PackageReference Include="OuterWildsGameLibs" Version="1.1.12.168"/>
-        <Reference Include="System.ComponentModel.Annotations">
-            <HintPath>../Lib/System.ComponentModel.Annotations.dll</HintPath>
-        </Reference>
+        <PackageReference Include="HarmonyX" Version="2.10.0" />
+        <PackageReference Include="OWML" Version="2.3.3" />
+        <PackageReference Include="OuterWildsGameLibs" Version="1.1.12.168" />
+        <Reference Include="../Lib/System.ComponentModel.Annotations.dll" />
     </ItemGroup>
     <ItemGroup>
         <None Include="../Lib/System.ComponentModel.Annotations.dll">
-            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
         <None Include="default-config.json">
-            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
         <None Include="manifest.json">
-            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
         <None Include="AssetBundle\**">
-            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
     </ItemGroup>
     <ItemGroup>
-        <Content Include="NewHorizons.csproj.user"/>
-    </ItemGroup>
-    <ItemGroup>
-        <Compile Update="Properties\Settings.Designer.cs">
-            <DesignTimeSharedInput>True</DesignTimeSharedInput>
-            <AutoGen>True</AutoGen>
-            <DependentUpon>Settings.settings</DependentUpon>
-        </Compile>
-    </ItemGroup>
-    <ItemGroup>
-        <None Update="Properties\Settings.settings">
-            <Generator>SettingsSingleFileGenerator</Generator>
-            <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-        </None>
+        <Content Include="NewHorizons.csproj.user" />
     </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/NewHorizons/NewHorizons.csproj.user b/NewHorizons/NewHorizons.csproj.user
index 9aeb566d..ad382158 100644
--- a/NewHorizons/NewHorizons.csproj.user
+++ b/NewHorizons/NewHorizons.csproj.user
@@ -1,8 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectView>ProjectFiles</ProjectView>
-    <OutputPath>$(AppData)\OuterWildsModManager\OWML\Mods\xen.NewHorizons</OutputPath>
-    <OuterWildsModsDirectory>$(AppData)\OuterWildsModManager\OWML\Mods</OuterWildsModsDirectory>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
+<Project>
+    <PropertyGroup>
+        <OutputPath>$(AppData)\OuterWildsModManager\OWML\Mods\xen.NewHorizons</OutputPath>
+    </PropertyGroup>
+</Project>
diff --git a/SchemaExporter/SchemaExporter.csproj b/SchemaExporter/SchemaExporter.csproj
index 6c156b5f..c55b8e38 100644
--- a/SchemaExporter/SchemaExporter.csproj
+++ b/SchemaExporter/SchemaExporter.csproj
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>net48</TargetFramework>
@@ -9,25 +8,22 @@
         <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
         <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
     </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-        <DebugType>portable</DebugType>
-    </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
         <DebugType>none</DebugType>
     </PropertyGroup>
     <ItemGroup>
         <None Include="System.Runtime.Serialization.dll">
-            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
         <None Include="UnityEngine.CoreModule.dll">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1"/>
-        <PackageReference Include="NJsonSchema" Version="10.7.1"/>
-        <PackageReference Include="OuterWildsGameLibs" Version="1.1.12.168" IncludeAssets="compile"/>
-        <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0"/>
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="NJsonSchema" Version="10.7.1" />
+        <PackageReference Include="OuterWildsGameLibs" Version="1.1.12.168" IncludeAssets="compile" />
+        <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     </ItemGroup>
     <ItemGroup>
-        <ProjectReference Include="..\NewHorizons\NewHorizons.csproj"/>
+        <ProjectReference Include="..\NewHorizons\NewHorizons.csproj" />
     </ItemGroup>
 </Project>