diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 369dd46cdc..c6db01ab9d 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -89,7 +89,7 @@ Instead you can use object orientation, or simply placing repeated code in a fun ### No magic numbers or strings This means stuff like having a "mode" variable for an object set to "1" or "2" with no clear indicator of what that means. Make these #defines with a name that more clearly states what it's for. This is clearer and enhances readability of your code! Get used to doing it! -### Do not commit modifications to Version.cs +### Do not commit modifications to the version numbers in AssemblyInfo.global.cs This file will be updated by maintainers when they deem it prudent to release a new version. For reference here is the version format we use 3.\.\.\ The criteria for changing a version number is as follows - Major: A breaking change to the DMAPI diff --git a/AssemblyInfo.global.cs b/AssemblyInfo.global.cs new file mode 100644 index 0000000000..6b2553d945 --- /dev/null +++ b/AssemblyInfo.global.cs @@ -0,0 +1,10 @@ +using System.Reflection; +using System.Runtime.CompilerServices; + +//You cannot one definition the version number +//Believe me, I've tried, the compiler hates it so much +[assembly: AssemblyVersion("3.2.0.0")] +[assembly: AssemblyFileVersion("3.2.0.0")] +[assembly: AssemblyInformationalVersion("3.2.0.0")] + +[assembly: InternalsVisibleTo("TGServiceTests")] diff --git a/TGCommandLine/Properties/AssemblyInfo.cs b/TGCommandLine/Properties/AssemblyInfo.cs index 27af13774e..7017cbba7f 100644 --- a/TGCommandLine/Properties/AssemblyInfo.cs +++ b/TGCommandLine/Properties/AssemblyInfo.cs @@ -15,6 +15,3 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("9ad1f086-a83e-4d14-a844-58a9471106b6")] - -//allow the unit tester to peek inside us -[assembly: InternalsVisibleTo("TGServiceTests", AllInternalsVisible = true)] diff --git a/TGCommandLine/TGCommandLine.csproj b/TGCommandLine/TGCommandLine.csproj index 0c299ad037..b228dbaccc 100644 --- a/TGCommandLine/TGCommandLine.csproj +++ b/TGCommandLine/TGCommandLine.csproj @@ -40,6 +40,9 @@ MinimumRecommendedRules.ruleset true + + false + @@ -53,7 +56,7 @@ - + diff --git a/TGControlPanel/TGControlPanel.csproj b/TGControlPanel/TGControlPanel.csproj index d1b390395f..3a18cd4fed 100644 --- a/TGControlPanel/TGControlPanel.csproj +++ b/TGControlPanel/TGControlPanel.csproj @@ -39,6 +39,9 @@ MinimumRecommendedRules.ruleset true + + false + @@ -89,7 +92,7 @@ Form - + Form diff --git a/TGDreamDaemonBridge/TGDreamDaemonBridge.csproj b/TGDreamDaemonBridge/TGDreamDaemonBridge.csproj index 99acc47c27..0cb0c67596 100644 --- a/TGDreamDaemonBridge/TGDreamDaemonBridge.csproj +++ b/TGDreamDaemonBridge/TGDreamDaemonBridge.csproj @@ -34,9 +34,12 @@ prompt MinimumRecommendedRules.ruleset + + false + - + diff --git a/TGInstallerWrapper/TGInstallerWrapper.csproj b/TGInstallerWrapper/TGInstallerWrapper.csproj index ffee3114b1..d84f79b22a 100644 --- a/TGInstallerWrapper/TGInstallerWrapper.csproj +++ b/TGInstallerWrapper/TGInstallerWrapper.csproj @@ -42,6 +42,9 @@ MinimumRecommendedRules.ruleset true + + false + ..\packages\Costura.Fody.1.6.2\lib\dotnet\Costura.dll @@ -66,7 +69,7 @@ True Resources.resx - + Main.cs diff --git a/TGServerService/Properties/AssemblyInfo.cs b/TGServerService/Properties/AssemblyInfo.cs index 6df01aa814..e9ebd6fc8c 100644 --- a/TGServerService/Properties/AssemblyInfo.cs +++ b/TGServerService/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following @@ -15,6 +14,3 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("f32eda25-0855-411c-af5e-f0d042917e2d")] - -//allow the unit tester to peek inside us -[assembly: InternalsVisibleTo("TGServiceTests", AllInternalsVisible = true)] diff --git a/TGServerService/TGServerService.csproj b/TGServerService/TGServerService.csproj index 375c542010..8f4b5939f6 100644 --- a/TGServerService/TGServerService.csproj +++ b/TGServerService/TGServerService.csproj @@ -41,14 +41,17 @@ MinimumRecommendedRules.ruleset true + + false + - + ..\packages\Discord.Net.Core.1.0.2\lib\net45\Discord.Net.Core.dll - + ..\packages\Discord.Net.Rest.1.0.2\lib\net45\Discord.Net.Rest.dll - + ..\packages\Discord.Net.WebSocket.1.0.2\lib\net45\Discord.Net.WebSocket.dll @@ -125,7 +128,7 @@ - + diff --git a/TGServiceInstaller/TGServiceInstaller.wixproj b/TGServiceInstaller/TGServiceInstaller.wixproj index dbe628e0fd..47751a1102 100644 --- a/TGServiceInstaller/TGServiceInstaller.wixproj +++ b/TGServiceInstaller/TGServiceInstaller.wixproj @@ -70,6 +70,12 @@ + + + + + powershell -Command $(SolutionDir)/Tools/SignMSI.ps1 +