From 512445793e02f49557ebef1c45df577136d079a5 Mon Sep 17 00:00:00 2001 From: Oliver Booth Date: Wed, 5 Apr 2023 11:21:58 +0100 Subject: [PATCH] build: move meta tools to subdir --- .github/workflows/nightly.yml | 2 +- .github/workflows/prerelease.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/source_validator.yml | 2 +- X10D.sln | 8 ++++++-- .../SourceValidator}/Program.cs | 0 .../SourceValidator/SourceValidator.csproj | 2 +- .../UpmPackageGenerator}/Program.cs | 0 .../UpmPackageGenerator/UpmPackageGenerator.csproj | 0 9 files changed, 11 insertions(+), 7 deletions(-) rename {X10D.SourceValidator => tools/SourceValidator}/Program.cs (100%) rename X10D.SourceValidator/X10D.SourceValidator.csproj => tools/SourceValidator/SourceValidator.csproj (88%) rename {X10D.UpmPackageGenerator => tools/UpmPackageGenerator}/Program.cs (100%) rename X10D.UpmPackageGenerator/X10D.UpmPackageGenerator.csproj => tools/UpmPackageGenerator/UpmPackageGenerator.csproj (100%) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 16f1c90..22d4a81 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -56,7 +56,7 @@ jobs: - name: Build package.json run: | - dotnet run --project ./X10D.UpmPackageGenerator/X10D.UpmPackageGenerator.csproj "./X10D/bin/Debug/netstandard2.1/X10D.dll" + dotnet run --project ./tools/UpmPackageGenerator/UpmPackageGenerator.csproj "./X10D/bin/Debug/netstandard2.1/X10D.dll" cp package.json upm/package.json - name: Copy built artifacts to upm diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index f66cfa7..7b9940b 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -62,7 +62,7 @@ jobs: - name: Build package.json run: | - dotnet run --project ./X10D.UpmPackageGenerator/X10D.UpmPackageGenerator.csproj "./X10D/bin/Release/netstandard2.1/X10D.dll" + dotnet run --project ./tools/UpmPackageGenerator/UpmPackageGenerator.csproj "./X10D/bin/Release/netstandard2.1/X10D.dll" cp package.json upm/package.json - name: Copy built artifacts to upm diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 49fbc0d..0bdbb14 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -62,7 +62,7 @@ jobs: - name: Build package.json run: | - dotnet run --project ./X10D.UpmPackageGenerator/X10D.UpmPackageGenerator.csproj "./X10D/bin/Release/netstandard2.1/X10D.dll" + dotnet run --project ./tools/UpmPackageGenerator/UpmPackageGenerator.csproj "./X10D/bin/Release/netstandard2.1/X10D.dll" cp package.json upm/package.json - name: Copy built artifacts to upm diff --git a/.github/workflows/source_validator.yml b/.github/workflows/source_validator.yml index cefdd50..a0a21a8 100644 --- a/.github/workflows/source_validator.yml +++ b/.github/workflows/source_validator.yml @@ -32,4 +32,4 @@ jobs: run: dotnet build -c Debug - name: Run Source Validation - run: dotnet run --project X10D.SourceValidator ./X10D/src ./X10D.Unity/src + run: dotnet run --project ./tools/SourceValidator/SourceValidator.csproj ./X10D/src ./X10D.Unity/src diff --git a/X10D.sln b/X10D.sln index dcd6a5a..6f8cb0c 100644 --- a/X10D.sln +++ b/X10D.sln @@ -18,7 +18,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution branding_Icon.png = branding_Icon.png EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "X10D.SourceValidator", "X10D.SourceValidator\X10D.SourceValidator.csproj", "{84750149-9068-4780-AFDE-CDA1AC57007D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceValidator", "tools\SourceValidator\SourceValidator.csproj", "{84750149-9068-4780-AFDE-CDA1AC57007D}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "X10D.Unity", "X10D.Unity\X10D.Unity.csproj", "{7EAB3F09-A9FD-4334-B4DB-0394DD0C6568}" EndProject @@ -41,7 +41,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Workflows", "Workflows", "{ .github\workflows\unity.yml = .github\workflows\unity.yml EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "X10D.UpmPackageGenerator", "X10D.UpmPackageGenerator\X10D.UpmPackageGenerator.csproj", "{CCBF047D-1B01-45EC-8D89-B00B4AC482CA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UpmPackageGenerator", "tools\UpmPackageGenerator\UpmPackageGenerator.csproj", "{CCBF047D-1B01-45EC-8D89-B00B4AC482CA}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{4B8969E6-27D2-4357-964E-9979FF7CC805}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -89,5 +91,7 @@ Global SolutionGuid = {6F733785-8837-410C-BD91-C4AD1F0A6914} EndGlobalSection GlobalSection(NestedProjects) = preSolution + {84750149-9068-4780-AFDE-CDA1AC57007D} = {4B8969E6-27D2-4357-964E-9979FF7CC805} + {CCBF047D-1B01-45EC-8D89-B00B4AC482CA} = {4B8969E6-27D2-4357-964E-9979FF7CC805} EndGlobalSection EndGlobal diff --git a/X10D.SourceValidator/Program.cs b/tools/SourceValidator/Program.cs similarity index 100% rename from X10D.SourceValidator/Program.cs rename to tools/SourceValidator/Program.cs diff --git a/X10D.SourceValidator/X10D.SourceValidator.csproj b/tools/SourceValidator/SourceValidator.csproj similarity index 88% rename from X10D.SourceValidator/X10D.SourceValidator.csproj rename to tools/SourceValidator/SourceValidator.csproj index 97f0be0..1d72f7d 100644 --- a/X10D.SourceValidator/X10D.SourceValidator.csproj +++ b/tools/SourceValidator/SourceValidator.csproj @@ -11,7 +11,7 @@ - + diff --git a/X10D.UpmPackageGenerator/Program.cs b/tools/UpmPackageGenerator/Program.cs similarity index 100% rename from X10D.UpmPackageGenerator/Program.cs rename to tools/UpmPackageGenerator/Program.cs diff --git a/X10D.UpmPackageGenerator/X10D.UpmPackageGenerator.csproj b/tools/UpmPackageGenerator/UpmPackageGenerator.csproj similarity index 100% rename from X10D.UpmPackageGenerator/X10D.UpmPackageGenerator.csproj rename to tools/UpmPackageGenerator/UpmPackageGenerator.csproj