diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index fa4087e..f6624b9 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -17,11 +17,11 @@ jobs: - name: Install dependencies run: dotnet restore - name: Build - run: dotnet build --configuration Development --no-restore + run: dotnet build --no-restore - name: Test run: dotnet test --no-restore --verbosity normal - name: Upload Artifact uses: actions/upload-artifact@v2 with: name: Rush (dev build) - path: osu.Game.Rulesets.Rush/bin/Development/netstandard2.1/osu.Game.Rulesets.Rush-dev.dll + path: osu.Game.Rulesets.Rush/bin/Debug/netstandard2.1/osu.Game.Rulesets.Rush.dll diff --git a/.vscode/launch.json b/.vscode/launch.json index 7ea3a1a..d9bcc85 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -25,17 +25,5 @@ "preLaunchTask": "Build tests (Release)", "console": "internalConsole" }, - { - "name": "Rush for osu! (Tests, Development)", - "type": "coreclr", - "request": "launch", - "program": "dotnet", - "args": [ - "${workspaceRoot}/osu.Game.Rulesets.Rush.Tests/bin/Development/net5.0/osu.Game.Rulesets.Rush.Tests.dll" - ], - "cwd": "${workspaceRoot}", - "preLaunchTask": "Build tests (Development)", - "console": "internalConsole" - }, ] } diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 02c6bb5..2f65aad 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -30,21 +30,6 @@ "group": "build", "problemMatcher": "$msCompile" }, - { - "label": "Build tests (Development)", - "type": "shell", - "command": "dotnet", - "args": [ - "build", - "osu.Game.Rulesets.Rush.Tests", - "/p:Configuration=Development", - "/p:GenerateFullPaths=true", - "/m", - "/verbosity:m" - ], - "group": "build", - "problemMatcher": "$msCompile" - }, // Test Tasks { "label": "Run tests (Debug)", diff --git a/osu.Game.Rulesets.Rush.sln b/osu.Game.Rulesets.Rush.sln index 00d1665..8879dda 100644 --- a/osu.Game.Rulesets.Rush.sln +++ b/osu.Game.Rulesets.Rush.sln @@ -11,21 +11,16 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU - Development|Any CPU = Development|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Debug|Any CPU.Build.0 = Debug|Any CPU {5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Release|Any CPU.ActiveCfg = Release|Any CPU {5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Release|Any CPU.Build.0 = Release|Any CPU - {5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Development|Any CPU.ActiveCfg = Development|Any CPU - {5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Development|Any CPU.Build.0 = Development|Any CPU {B4577C85-CB83-462A-BCE3-22FFEB16311D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B4577C85-CB83-462A-BCE3-22FFEB16311D}.Debug|Any CPU.Build.0 = Debug|Any CPU {B4577C85-CB83-462A-BCE3-22FFEB16311D}.Release|Any CPU.ActiveCfg = Release|Any CPU {B4577C85-CB83-462A-BCE3-22FFEB16311D}.Release|Any CPU.Build.0 = Release|Any CPU - {B4577C85-CB83-462A-BCE3-22FFEB16311D}.Development|Any CPU.ActiveCfg = Development|Any CPU - {B4577C85-CB83-462A-BCE3-22FFEB16311D}.Development|Any CPU.Build.0 = Development|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/osu.Game.Rulesets.Rush/RushRuleset.cs b/osu.Game.Rulesets.Rush/RushRuleset.cs index bda5108..9cc6e99 100644 --- a/osu.Game.Rulesets.Rush/RushRuleset.cs +++ b/osu.Game.Rulesets.Rush/RushRuleset.cs @@ -3,6 +3,8 @@ using System; using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Sprites; @@ -30,11 +32,12 @@ public class RushRuleset : Ruleset { public const string SHORT_NAME = "rush"; - private static readonly Lazy is_development_build = new Lazy(() => typeof(RushRuleset).Assembly.GetName().Name.EndsWith("-dev")); + private static readonly Lazy is_development_build + = new Lazy(() => typeof(RushRuleset).Assembly.GetCustomAttributes(false).OfType().Any(da => da.IsJITTrackingEnabled)); public static bool IsDevelopmentBuild => is_development_build.Value; - public override string ShortName => !IsDevelopmentBuild ? SHORT_NAME : $"{SHORT_NAME}-dev"; + public override string ShortName => SHORT_NAME; public override string Description => !IsDevelopmentBuild ? "Rush!" : "Rush! (dev build)"; diff --git a/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj b/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj index 9a00ab7..73859ab 100644 --- a/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj +++ b/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj @@ -1,38 +1,19 @@  - - Debug;Release;Development - netstandard2.1 - Library - AnyCPU - osu.Game.Rulesets.Rush - - - true - - - - - osu.Game.Rulesets.Rush + rush for osu! - - - - - osu.Game.Rulesets.Rush-dev + osu.Game.Rulesets.Rush + netstandard2.1 + Library + AnyCPU + osu.Game.Rulesets.Rush + + rush for osu! (development build) - - - - - - - $(AssemblyName).$([System.String]::Copy(%(Identity)).Replace($([System.IO.Path]::DirectorySeparatorChar.ToString()), '.')) - - - - - + + + + + + +