Uniformize version numbers and assembly attributes, add missing file …

…descriptions
BepInEx · Nov 21, 2020 · a2bfb4f · a2bfb4f
1 parent a095ecc
commit a2bfb4f
Show file tree

Hide file tree

Showing 24 changed files with 91 additions and 194 deletions.
diff --git a/BepInEx.Debug.sln b/BepInEx.Debug.sln
@@ -23,7 +23,20 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MirrorInternalLogs", "src\M
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CtorShotgun", "src\CtorShotgun\CtorShotgun.csproj", "{B168EEDB-82B6-445B-AD19-96214B0D6537}"
 EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Common", "src\Common\Common.shproj", "{DC4E3630-F21D-479F-9071-9FF62BCC7BB7}"
+EndProject
 Global
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		src\Common\Common.projitems*{241492bb-4f96-4286-b787-04b68bd44ddb}*SharedItemsImports = 4
+		src\Common\Common.projitems*{29571930-f2e9-45dc-bb65-5b60c2b16850}*SharedItemsImports = 4
+		src\Common\Common.projitems*{6081c5ae-ab5a-456b-a29f-3eef9ad9eedf}*SharedItemsImports = 4
+		src\Common\Common.projitems*{679f65cb-10e1-4858-84d5-78d7a993facd}*SharedItemsImports = 4
+		src\Common\Common.projitems*{967c527c-1a7e-4c83-9427-e92a6092f59e}*SharedItemsImports = 4
+		src\Common\Common.projitems*{a909ba1c-4c18-49cf-a4e8-60584b7f2200}*SharedItemsImports = 4
+		src\Common\Common.projitems*{b168eedb-82b6-445b-ad19-96214b0d6537}*SharedItemsImports = 4
+		src\Common\Common.projitems*{dc4e3630-f21d-479f-9071-9ff62bcc7bb7}*SharedItemsImports = 13
+		src\Common\Common.projitems*{e643a810-00a8-4b6f-83fc-b8631257eb43}*SharedItemsImports = 4
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64

diff --git a/src/Common/AssemblyInfo.cs b/src/Common/AssemblyInfo.cs
@@ -0,0 +1,13 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+using Common;
+
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("https://github.com/BepInEx/BepInEx.Debug")]
+[assembly: AssemblyCopyright("Copyright ©  2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: ComVisible(false)]
+
+[assembly: AssemblyVersion(Metadata.Version)]
diff --git a/src/Common/Common.projitems b/src/Common/Common.projitems
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>dc4e3630-f21d-479f-9071-9ff62bcc7bb7</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>Common</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)AssemblyInfo.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Metadata.cs" />
+  </ItemGroup>
+</Project>
diff --git a/src/Common/Common.shproj b/src/Common/Common.shproj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>dc4e3630-f21d-479f-9071-9ff62bcc7bb7</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="Common.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
diff --git a/src/Common/Metadata.cs b/src/Common/Metadata.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Common
+{
+    internal static class Metadata
+    {
+        public const string Version = "7.0";
+    }
+}
diff --git a/src/ConstructorProfiler/ConstructorProfiler.cs b/src/ConstructorProfiler/ConstructorProfiler.cs
@@ -7,12 +7,16 @@
 using System.Diagnostics;
 using HarmonyLib;
 using System.IO;
+using Common;
 
 namespace ConstructorProfiler
 {
-    [BepInPlugin("keelhauled.constructorprofiler", "Constructor Profiler", "1.0.0")]
+    [BepInPlugin(GUID, "Constructor Profiler", Version)]
     public class ConstructorProfiler : BaseUnityPlugin
     {
+        public const string GUID = "keelhauled.constructorprofiler";
+        public const string Version = Metadata.Version;
+
         private static string[] AssFilter = new[] { "Assembly-CSharp", "UnityEngine" };
         private static Dictionary<string, StackData> CallCounter = new Dictionary<string, StackData>();
         private Harmony harmony = new Harmony(nameof(ConstructorProfiler));

diff --git a/src/ConstructorProfiler/ConstructorProfiler.csproj b/src/ConstructorProfiler/ConstructorProfiler.csproj
@@ -59,5 +59,6 @@
   <ItemGroup>
     <Analyzer Include="..\..\packages\Microsoft.Unity.Analyzers.1.8.2\analyzers\dotnet\cs\Microsoft.Unity.Analyzers.dll" />
   </ItemGroup>
+  <Import Project="..\Common\Common.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/src/ConstructorProfiler/Properties/AssemblyInfo.cs b/src/ConstructorProfiler/Properties/AssemblyInfo.cs
@@ -1,36 +1,7 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
 [assembly: AssemblyTitle("ConstructorProfiler")]
 [assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("ConstructorProfiler")]
-[assembly: AssemblyCopyright("Copyright ©  2020")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("241492bb-4f96-4286-b787-04b68bd44ddb")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/CtorShotgun/CtorShotgun.csproj b/src/CtorShotgun/CtorShotgun.csproj
@@ -63,6 +63,7 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <Import Project="..\Common\Common.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\packages\BepInEx.Core.5.3.0.3\build\BepInEx.Core.targets" Condition="Exists('..\..\packages\BepInEx.Core.5.3.0.3\build\BepInEx.Core.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

diff --git a/src/CtorShotgun/Properties/AssemblyInfo.cs b/src/CtorShotgun/Properties/AssemblyInfo.cs
@@ -1,36 +1,7 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
 [assembly: AssemblyTitle("CtorShotgun")]
 [assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("CtorShotgun")]
-[assembly: AssemblyCopyright("Copyright ©  2020")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("b168eedb-82b6-445b-ad19-96214b0d6537")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: Guid("b168eedb-82b6-445b-ad19-96214b0d6537")]
diff --git a/src/DemystifyExceptions/DemystifyExceptions.csproj b/src/DemystifyExceptions/DemystifyExceptions.csproj
@@ -77,5 +77,6 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <Import Project="..\Common\Common.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/src/DemystifyExceptions/Properties/AssemblyInfo.cs b/src/DemystifyExceptions/Properties/AssemblyInfo.cs
@@ -1,34 +1,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
 [assembly: AssemblyTitle("DemystifyExceptions")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyDescription("Turns exceptions into a more readable format, especially useful for async and enumerators")]
 [assembly: AssemblyProduct("DemystifyExceptions")]
-[assembly: AssemblyCopyright("Copyright ©  2019")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("679f65cb-10e1-4858-84d5-78d7a993facd")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0")]
diff --git a/src/MirrorInternalLogs/MirrorInternalLogs.csproj b/src/MirrorInternalLogs/MirrorInternalLogs.csproj
@@ -86,6 +86,7 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <Import Project="..\Common\Common.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\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.

diff --git a/src/MirrorInternalLogs/Properties/AssemblyInfo.cs b/src/MirrorInternalLogs/Properties/AssemblyInfo.cs
@@ -1,35 +1,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
 [assembly: AssemblyTitle("MirrorInternalLogs")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyDescription("Capture and mirror Unity internal debug logs into unity_log.txt")]
 [assembly: AssemblyProduct("MirrorInternalLogs")]
-[assembly: AssemblyCopyright("Copyright ©  2020")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("29571930-F2E9-45DC-BB65-5B60C2B16850")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.0.0")]
-[assembly: AssemblyFileVersion("1.3.0.0")]
diff --git a/src/ScriptEngine/Properties/AssemblyInfo.cs b/src/ScriptEngine/Properties/AssemblyInfo.cs
@@ -1,36 +1,7 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
 [assembly: AssemblyTitle("ScriptEngine")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyDescription(@"Loads and reloads BepInEx plugins from the BepInEx\scripts folder")]
 [assembly: AssemblyProduct("ScriptEngine")]
-[assembly: AssemblyCopyright("Copyright ©  2019")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("967c527c-1a7e-4c83-9427-e92a6092f59e")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion(ScriptEngine.ScriptEngine.Version)]
diff --git a/src/ScriptEngine/ScriptEngine.cs b/src/ScriptEngine/ScriptEngine.cs
@@ -10,6 +10,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Text;
+using Common;
 using UnityEngine;
 
 namespace ScriptEngine
@@ -18,7 +19,7 @@ namespace ScriptEngine
     public class ScriptEngine : BaseUnityPlugin
     {
         public const string GUID = "com.bepis.bepinex.scriptengine";
-        public const string Version = "1.0.1";
+        public const string Version = Metadata.Version;
 
         public string ScriptDirectory => Path.Combine(Paths.BepInExRootPath, "scripts");
 

diff --git a/src/ScriptEngine/ScriptEngine.csproj b/src/ScriptEngine/ScriptEngine.csproj
@@ -72,5 +72,6 @@
   <ItemGroup>
     <Analyzer Include="..\..\packages\Microsoft.Unity.Analyzers.1.8.2\analyzers\dotnet\cs\Microsoft.Unity.Analyzers.dll" />
   </ItemGroup>
+  <Import Project="..\Common\Common.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/src/SimpleProfiler/MonoProfilerController/MonoProfilerController.cs b/src/SimpleProfiler/MonoProfilerController/MonoProfilerController.cs
@@ -2,14 +2,16 @@
 using System.IO;
 using BepInEx;
 using BepInEx.Configuration;
+using Common;
 using UnityEngine;
 
 namespace MonoProfiler
 {
-    [BepInPlugin("MonoProfiler", "MonoProfiler Controller", Version)]
+    [BepInPlugin(GUID, "MonoProfiler Controller", Version)]
     public class MonoProfilerController : BaseUnityPlugin
     {
-        public const string Version = "1.1";
+        public const string GUID = "MonoProfiler";
+        public const string Version = Metadata.Version;
 
         private ConfigEntry<bool> _uniqueNames;
         private ConfigEntry<KeyboardShortcut> _key;
@@ -32,7 +34,7 @@ private void Update()
             if (_key.Value.IsDown())
             {
                 var dumpFile = MonoProfilerPatcher.RunProfilerDump();
-                if(_uniqueNames.Value)
+                if (_uniqueNames.Value)
                     dumpFile.MoveTo(Path.Combine(dumpFile.DirectoryName, $"{Path.GetFileNameWithoutExtension(dumpFile.Name)}_{DateTime.Now:yyyy-MM-dd_HH-mm-ss}{dumpFile.Extension}"));
                 Logger.LogMessage("Saved profiler dump to " + dumpFile.FullName);
             }

diff --git a/src/SimpleProfiler/MonoProfilerController/MonoProfilerController.csproj b/src/SimpleProfiler/MonoProfilerController/MonoProfilerController.csproj
@@ -58,5 +58,6 @@
   <ItemGroup>
     <Analyzer Include="..\..\..\packages\Microsoft.Unity.Analyzers.1.8.2\analyzers\dotnet\cs\Microsoft.Unity.Analyzers.dll" />
   </ItemGroup>
+  <Import Project="..\..\Common\Common.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/src/SimpleProfiler/MonoProfilerController/Properties/AssemblyInfo.cs b/src/SimpleProfiler/MonoProfilerController/Properties/AssemblyInfo.cs
@@ -1,14 +1,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
-using MonoProfiler;
 
 [assembly: AssemblyTitle("MonoProfilerController")]
 [assembly: AssemblyDescription("BepInEx plugin that allows more control over MonoProfiler")]
-[assembly: AssemblyCompany("https://github.com/BepInEx/BepInEx.Debug")]
 [assembly: AssemblyProduct("MonoProfilerController")]
-[assembly: AssemblyCopyright("Copyright ©  2020")]
-
-[assembly: ComVisible(false)]
-[assembly: Guid("e643a810-00a8-4b6f-83fc-b8631257eb43")]
-
-[assembly: AssemblyVersion(MonoProfilerController.Version)]
+[assembly: Guid("e643a810-00a8-4b6f-83fc-b8631257eb43")]