From 25e4aa14d865cdf9f3616cfb0fd981aaaf0e3535 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Fri, 9 Aug 2019 17:47:53 -0400
Subject: remove legacy AssemblyInfo and GlobalAssemblyInfo files, use
 consistent assembly names

---
 src/SMAPI/Program.cs                 | 3 +++
 src/SMAPI/Properties/AssemblyInfo.cs | 7 -------
 src/SMAPI/SMAPI.csproj               | 8 ++------
 3 files changed, 5 insertions(+), 13 deletions(-)
 delete mode 100644 src/SMAPI/Properties/AssemblyInfo.cs

(limited to 'src/SMAPI')

diff --git a/src/SMAPI/Program.cs b/src/SMAPI/Program.cs
index 6c94a2af..2d143439 100644
--- a/src/SMAPI/Program.cs
+++ b/src/SMAPI/Program.cs
@@ -3,12 +3,15 @@ using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Threading;
 #if SMAPI_FOR_WINDOWS
 #endif
 using StardewModdingAPI.Framework;
 using StardewModdingAPI.Toolkit.Utilities;
 
+[assembly: InternalsVisibleTo("SMAPI.Tests")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] // Moq for unit testing
 namespace StardewModdingAPI
 {
     /// <summary>The main entry point for SMAPI, responsible for hooking into and launching the game.</summary>
diff --git a/src/SMAPI/Properties/AssemblyInfo.cs b/src/SMAPI/Properties/AssemblyInfo.cs
deleted file mode 100644
index 03843ea8..00000000
--- a/src/SMAPI/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-[assembly: AssemblyTitle("SMAPI")]
-[assembly: AssemblyDescription("A modding API for Stardew Valley.")]
-[assembly: InternalsVisibleTo("StardewModdingAPI.Tests")]
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] // Moq for unit testing
diff --git a/src/SMAPI/SMAPI.csproj b/src/SMAPI/SMAPI.csproj
index 0157e66a..f41ede29 100644
--- a/src/SMAPI/SMAPI.csproj
+++ b/src/SMAPI/SMAPI.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <RootNamespace>StardewModdingAPI</RootNamespace>
     <AssemblyName>StardewModdingAPI</AssemblyName>
+    <RootNamespace>StardewModdingAPI</RootNamespace>
+    <Description>The modding API for Stardew Valley.</Description>
     <TargetFramework>net45</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <LangVersion>latest</LangVersion>
     <PlatformTarget>x86</PlatformTarget>
     <OutputType>Exe</OutputType>
@@ -91,10 +91,6 @@
     <ProjectReference Include="..\SMAPI.Toolkit\SMAPI.Toolkit.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="..\..\build\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <Content Include="SMAPI.config.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-- 
cgit