diff --git a/Difficalcy.Catch.Tests/Difficalcy.Catch.Tests.csproj b/Difficalcy.Catch.Tests/Difficalcy.Catch.Tests.csproj index dd95367..627422c 100644 --- a/Difficalcy.Catch.Tests/Difficalcy.Catch.Tests.csproj +++ b/Difficalcy.Catch.Tests/Difficalcy.Catch.Tests.csproj @@ -8,13 +8,13 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Difficalcy.Mania.Tests/Difficalcy.Mania.Tests.csproj b/Difficalcy.Mania.Tests/Difficalcy.Mania.Tests.csproj index 00ac3e0..b1dd8f1 100644 --- a/Difficalcy.Mania.Tests/Difficalcy.Mania.Tests.csproj +++ b/Difficalcy.Mania.Tests/Difficalcy.Mania.Tests.csproj @@ -8,13 +8,13 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Difficalcy.Osu.Tests/Difficalcy.Osu.Tests.csproj b/Difficalcy.Osu.Tests/Difficalcy.Osu.Tests.csproj index 7015ece..c38abb4 100644 --- a/Difficalcy.Osu.Tests/Difficalcy.Osu.Tests.csproj +++ b/Difficalcy.Osu.Tests/Difficalcy.Osu.Tests.csproj @@ -8,13 +8,13 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Difficalcy.Taiko.Tests/Difficalcy.Taiko.Tests.csproj b/Difficalcy.Taiko.Tests/Difficalcy.Taiko.Tests.csproj index b64b853..df1d06e 100644 --- a/Difficalcy.Taiko.Tests/Difficalcy.Taiko.Tests.csproj +++ b/Difficalcy.Taiko.Tests/Difficalcy.Taiko.Tests.csproj @@ -8,13 +8,13 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Difficalcy.Tests/Difficalcy.Tests.csproj b/Difficalcy.Tests/Difficalcy.Tests.csproj index a15ebdb..ea8dbc5 100644 --- a/Difficalcy.Tests/Difficalcy.Tests.csproj +++ b/Difficalcy.Tests/Difficalcy.Tests.csproj @@ -8,8 +8,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Difficalcy/Difficalcy.csproj b/Difficalcy/Difficalcy.csproj index 30582b5..a1e3fc6 100644 --- a/Difficalcy/Difficalcy.csproj +++ b/Difficalcy/Difficalcy.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/Makefile b/Makefile index 684a6af..4e6e565 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ -COMPOSE_TOOLING_RUN = docker compose -f docker-compose.tooling.yml run --rm --build tooling -COMPOSE_E2E = docker compose -f docker-compose.yml -f docker-compose.override.e2e.yml +COMPOSE_TOOLING_RUN = docker compose -f compose.tooling.yaml run --rm --build tooling +COMPOSE_E2E = docker compose -f compose.yaml -f compose.override.e2e.yaml COMPOSE_E2E_RUN = $(COMPOSE_E2E) run --rm --build e2e-test-runner -COMPOSE_APP_DEV = docker compose -f docker-compose.yml -f docker-compose.override.yml -COMPOSE_RUN_DOCS = docker compose -f docker-compose.yml -f docker-compose.override.yml run docs -COMPOSE_PUBLISH = docker compose -f docker-compose.yml -f docker-compose.override.publish.yml +COMPOSE_APP_DEV = docker compose -f compose.yaml -f compose.override.yaml +COMPOSE_RUN_DOCS = docker compose -f compose.yaml -f compose.override.yaml run docs +COMPOSE_PUBLISH = docker compose -f compose.yaml -f compose.override.publish.yaml help: ## Show this help @fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##//' diff --git a/docker-compose.override.e2e.yml b/compose.override.e2e.yaml similarity index 100% rename from docker-compose.override.e2e.yml rename to compose.override.e2e.yaml diff --git a/docker-compose.override.publish.yml b/compose.override.publish.yaml similarity index 100% rename from docker-compose.override.publish.yml rename to compose.override.publish.yaml diff --git a/docker-compose.override.yml b/compose.override.yaml similarity index 100% rename from docker-compose.override.yml rename to compose.override.yaml diff --git a/docker-compose.tooling.yml b/compose.tooling.yaml similarity index 100% rename from docker-compose.tooling.yml rename to compose.tooling.yaml diff --git a/docker-compose.yml b/compose.yaml similarity index 100% rename from docker-compose.yml rename to compose.yaml