diff --git a/.codecov.yml b/.codecov.yml index 121c30599b..fd5716426b 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -9,7 +9,7 @@ coverage: if_ci_failed: failure patch: default: - target: 100% + target: 100 only_pulls: true changes: default: 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..1285d90759 --- /dev/null +++ b/AssemblyInfo.global.cs @@ -0,0 +1,15 @@ +using System.Reflection; +using System.Runtime.CompilerServices; + +#if !DEBUG && !NO_STRONG_NAME +[assembly: InternalsVisibleTo("TGServiceTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f10487511f8056df7ead40f8f3bb0a7a4890d1bafdbf3d2cc0092655849223733672039671c3855e653c950b68b6a9dd04fbe0784f0c6e213c66be8afa4cc37afad52a05744c1305bf1d1c7c2702b4f64036c5b96045a7ccdc421847eec17203ad8188b5a34a5d5cd3c845a071ebf72fff1236410cce8d51616a49f6e53ba0b9")] +[assembly: AssemblyKeyName("TGStationServer3")] +#else +[assembly: InternalsVisibleTo("TGServiceTests")] +#endif + +//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")] diff --git a/TGCommandLine/Properties/AssemblyInfo.cs b/TGCommandLine/Properties/AssemblyInfo.cs index 322a46bb38..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, PublicKeyToken=<1521fb3fe76ed910>", AllInternalsVisible = true)] diff --git a/TGCommandLine/TGCommandLine.csproj b/TGCommandLine/TGCommandLine.csproj index 415cb7db44..b228dbaccc 100644 --- a/TGCommandLine/TGCommandLine.csproj +++ b/TGCommandLine/TGCommandLine.csproj @@ -41,10 +41,7 @@ true - true - - - ..\TGStationServer3.pfx + false @@ -59,12 +56,11 @@ - + - diff --git a/TGControlPanel/TGControlPanel.csproj b/TGControlPanel/TGControlPanel.csproj index cc3254c1bb..3a18cd4fed 100644 --- a/TGControlPanel/TGControlPanel.csproj +++ b/TGControlPanel/TGControlPanel.csproj @@ -40,10 +40,7 @@ true - true - - - ..\TGStationServer3.pfx + false @@ -95,7 +92,7 @@ Form - + Form @@ -115,7 +112,6 @@ SettingsSingleFileGenerator Settings.Designer.cs - diff --git a/TGDreamDaemonBridge/TGDreamDaemonBridge.csproj b/TGDreamDaemonBridge/TGDreamDaemonBridge.csproj index 4c25253e64..799714d21a 100644 --- a/TGDreamDaemonBridge/TGDreamDaemonBridge.csproj +++ b/TGDreamDaemonBridge/TGDreamDaemonBridge.csproj @@ -27,7 +27,7 @@ bin\x86\Release\ - TRACE + TRACE;NO_STRONG_NAME true pdbonly x86 @@ -35,14 +35,11 @@ MinimumRecommendedRules.ruleset - true - - - ..\TGStationServer3.pfx + false - + @@ -57,7 +54,6 @@ - diff --git a/TGInstallerWrapper/TGInstallerWrapper.csproj b/TGInstallerWrapper/TGInstallerWrapper.csproj index ca314a4891..d84f79b22a 100644 --- a/TGInstallerWrapper/TGInstallerWrapper.csproj +++ b/TGInstallerWrapper/TGInstallerWrapper.csproj @@ -43,10 +43,7 @@ true - true - - - ..\TGStationServer3.pfx + false @@ -72,7 +69,7 @@ True Resources.resx - + Main.cs @@ -86,7 +83,6 @@ - diff --git a/TGServerService/Properties/AssemblyInfo.cs b/TGServerService/Properties/AssemblyInfo.cs index da48afa5bb..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, PublicKeyToken=<1521fb3fe76ed910>", AllInternalsVisible = true)] diff --git a/TGServerService/TGServerService.csproj b/TGServerService/TGServerService.csproj index eeabedd68f..70fba689ec 100644 --- a/TGServerService/TGServerService.csproj +++ b/TGServerService/TGServerService.csproj @@ -31,7 +31,7 @@ bin\Release\ - TRACE + TRACE;NO_STRONG_NAME bin\x86\Release\TGServerService.xml true true @@ -42,10 +42,7 @@ true - true - - - ..\TGStationServer3.pfx + false @@ -131,7 +128,7 @@ - + @@ -144,7 +141,6 @@ SettingsSingleFileGenerator Settings.Designer.cs - diff --git a/TGServiceInterface/TGServiceInterface.csproj b/TGServiceInterface/TGServiceInterface.csproj index 78858a76d8..2432434246 100644 --- a/TGServiceInterface/TGServiceInterface.csproj +++ b/TGServiceInterface/TGServiceInterface.csproj @@ -37,10 +37,7 @@ false - true - - - ..\TGStationServer3.pfx + false @@ -68,7 +65,7 @@ - + @@ -77,7 +74,6 @@ - \ No newline at end of file diff --git a/TGServiceTests/Properties/AssemblyInfo.cs b/TGServiceTests/Properties/AssemblyInfo.cs index 56c3be7ba4..4bde2505b7 100644 --- a/TGServiceTests/Properties/AssemblyInfo.cs +++ b/TGServiceTests/Properties/AssemblyInfo.cs @@ -7,4 +7,3 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] [assembly: Guid("fb693ffb-17e3-4e84-8cbf-6ffa9c8fd971")] - diff --git a/TGServiceTests/TGServiceTests.csproj b/TGServiceTests/TGServiceTests.csproj index 1a31210837..eb363ef2f3 100644 --- a/TGServiceTests/TGServiceTests.csproj +++ b/TGServiceTests/TGServiceTests.csproj @@ -38,10 +38,7 @@ 4 - true - - - ..\TGStationServer3.pfx + false @@ -76,11 +73,10 @@ - + - diff --git a/TGStationServer3.sln b/TGStationServer3.sln index b39a6dd329..60dab517a9 100644 --- a/TGStationServer3.sln +++ b/TGStationServer3.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26430.6 +VisualStudioVersion = 15.0.26730.16 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TGServerService", "TGServerService\TGServerService.csproj", "{F32EDA25-0855-411C-AF5E-F0D042917E2D}" EndProject @@ -19,9 +19,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .gitignore = .gitignore .travis.yml = .travis.yml appveyor.yml = appveyor.yml + AssemblyInfo.global.cs = AssemblyInfo.global.cs README.md = README.md tgs.ico = tgs.ico - Version.cs = Version.cs EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TGInstallerWrapper", "TGInstallerWrapper\TGInstallerWrapper.csproj", "{8956D4C3-BFB9-448E-BF5F-EE7E6F9996F9}" @@ -116,10 +116,12 @@ Global {AC4E7E8B-F83A-481C-A8B0-8FA4E8AE59AB}.Debug|Any CPU.Build.0 = Debug|Any CPU {AC4E7E8B-F83A-481C-A8B0-8FA4E8AE59AB}.Release|Any CPU.ActiveCfg = Release|Any CPU {AC4E7E8B-F83A-481C-A8B0-8FA4E8AE59AB}.Release|Any CPU.Build.0 = Release|Any CPU - {154435F6-0890-42D4-9AEC-B743D4FBC1CB}.Debug|Any CPU.ActiveCfg = Debug|x86 + {154435F6-0890-42D4-9AEC-B743D4FBC1CB}.Debug|Any CPU.ActiveCfg = Release|x86 + {154435F6-0890-42D4-9AEC-B743D4FBC1CB}.Debug|Any CPU.Build.0 = Release|x86 {154435F6-0890-42D4-9AEC-B743D4FBC1CB}.Release|Any CPU.ActiveCfg = Release|x86 {154435F6-0890-42D4-9AEC-B743D4FBC1CB}.Release|Any CPU.Build.0 = Release|x86 {8956D4C3-BFB9-448E-BF5F-EE7E6F9996F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8956D4C3-BFB9-448E-BF5F-EE7E6F9996F9}.Debug|Any CPU.Build.0 = Debug|Any CPU {8956D4C3-BFB9-448E-BF5F-EE7E6F9996F9}.Release|Any CPU.ActiveCfg = Release|Any CPU {8956D4C3-BFB9-448E-BF5F-EE7E6F9996F9}.Release|Any CPU.Build.0 = Release|Any CPU {9A01EF03-8EAE-45CB-8B87-4A17BD904557}.Debug|Any CPU.ActiveCfg = Debug|x86 diff --git a/Tools/DecryptSigningKey.ps1 b/Tools/DecryptSigningKey.ps1 index 0854dee4cb..c702383cf5 100644 --- a/Tools/DecryptSigningKey.ps1 +++ b/Tools/DecryptSigningKey.ps1 @@ -53,4 +53,4 @@ $base64string = Decrypt-String $encrypted $Env:snk_passphrase "SNK-Encrypt" "IV- $rawstring = [System.Convert]::FromBase64String($base64string) [IO.File]::WriteAllBytes("$bf/TGStationServer3.snk", $rawstring) -Add-Content "$bf/Version.cs" "[assembly: AssemblyKeyFile(`"TGStationServer3.snk`")]" \ No newline at end of file +Add-Content "$bf/AssemblyInfo.global.cs" "[assembly: AssemblyKeyFile(`"TGStationServer3.snk`")]" \ No newline at end of file diff --git a/TGStationServer3.pfx b/Tools/TGStationServer3.pfx similarity index 100% rename from TGStationServer3.pfx rename to Tools/TGStationServer3.pfx diff --git a/Version.cs b/Version.cs deleted file mode 100644 index 7f9a690cb5..0000000000 --- a/Version.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Reflection; - -// 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.*")] - -//It's impossible to make these a define, don't say I didn't warn you -[assembly: AssemblyVersion("3.2.0.0")] -[assembly: AssemblyFileVersion("3.2.0.0")] -[assembly: AssemblyInformationalVersion("3.2.0.0")]