diff --git a/.github/shared.yml b/.github/shared.yml index 5f725af..bc92e24 100644 --- a/.github/shared.yml +++ b/.github/shared.yml @@ -30,7 +30,7 @@ definitions: build: &build name: Build - run: dotnet build --configuration Release --no-restore + run: dotnet publish --configuration Release --no-restore test: &test name: Test @@ -63,18 +63,11 @@ definitions: run: dotnet nuget push 'artifacts/*.nupkg' -k ${{ secrets.GITHUB_TOKEN }} -s csgals --skip-duplicate --no-symbols build-css-package: &build-css-package - name: 'Build CSS Package' + name: 'Build CSS Packages' run: | - src="./src/CSSUniversalMenuAPI/bin/Release/net8.0" - dst="./artifacts/CSSUniversalMenuAPI" - dst_shared="$dst/addons/counterstrikesharp/shared/CSSUniversalMenuAPI" - mkdir -p "$dst_shared" - cp "$src/CSSUniversalMenuAPI.dll" "$dst_shared/" - cp "$src/CSSUniversalMenuAPI.deps.json" "$dst_shared/" - pushd "$dst" - 7z a ../CSSUniversalMenuAPI.zip ./ - popd - rm -rf "$dst" + bash package.sh + + empty: "hi" # fixes the yml parser from messing the last value up diff --git a/.github/workflows/continuous-delivery.yml b/.github/workflows/continuous-delivery.yml index c598844..9985ba7 100644 --- a/.github/workflows/continuous-delivery.yml +++ b/.github/workflows/continuous-delivery.yml @@ -48,7 +48,7 @@ jobs: run: dotnet restore - name: Build - run: dotnet build --configuration Release --no-restore + run: dotnet publish --configuration Release --no-restore - name: Test run: dotnet test --configuration Debug --logger GitHubActions -p:CollectCoverage=true @@ -58,18 +58,11 @@ jobs: run: dotnet pack -p:PackageOutputPath="$(pwd)/artifacts" --configuration Release --no-restore - - name: Build CSS Package + - name: Build CSS Packages run: | - src="./src/CSSUniversalMenuAPI/bin/Release/net8.0" - dst="./artifacts/CSSUniversalMenuAPI" - dst_shared="$dst/addons/counterstrikesharp/shared/CSSUniversalMenuAPI" - mkdir -p "$dst_shared" - cp "$src/CSSUniversalMenuAPI.dll" "$dst_shared/" - cp "$src/CSSUniversalMenuAPI.deps.json" "$dst_shared/" - pushd "$dst" - 7z a ../CSSUniversalMenuAPI.zip ./ - popd - rm -rf "$dst" + bash package.sh + + - name: Upload Artifacts uses: actions/upload-artifact@v4 diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index c71b0b9..706309e 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -46,7 +46,7 @@ jobs: run: dotnet restore - name: Build - run: dotnet build --configuration Release --no-restore + run: dotnet publish --configuration Release --no-restore - name: Test run: dotnet test --configuration Debug --logger GitHubActions -p:CollectCoverage=true @@ -56,18 +56,11 @@ jobs: run: dotnet pack -p:PackageOutputPath="$(pwd)/artifacts" --configuration Release --no-restore - - name: Build CSS Package + - name: Build CSS Packages run: | - src="./src/CSSUniversalMenuAPI/bin/Release/net8.0" - dst="./artifacts/CSSUniversalMenuAPI" - dst_shared="$dst/addons/counterstrikesharp/shared/CSSUniversalMenuAPI" - mkdir -p "$dst_shared" - cp "$src/CSSUniversalMenuAPI.dll" "$dst_shared/" - cp "$src/CSSUniversalMenuAPI.deps.json" "$dst_shared/" - pushd "$dst" - 7z a ../CSSUniversalMenuAPI.zip ./ - popd - rm -rf "$dst" + bash package.sh + + - name: Upload Artifacts uses: actions/upload-artifact@v4 diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml index c6bc4e6..6fdce56 100644 --- a/.github/workflows/deploy-release.yml +++ b/.github/workflows/deploy-release.yml @@ -48,7 +48,7 @@ jobs: run: dotnet restore - name: Build - run: dotnet build --configuration Release --no-restore + run: dotnet publish --configuration Release --no-restore - name: Test run: dotnet test --configuration Debug --logger GitHubActions -p:CollectCoverage=true @@ -58,18 +58,11 @@ jobs: run: dotnet pack -p:PackageOutputPath="$(pwd)/artifacts" --configuration Release --no-restore - - name: Build CSS Package + - name: Build CSS Packages run: | - src="./src/CSSUniversalMenuAPI/bin/Release/net8.0" - dst="./artifacts/CSSUniversalMenuAPI" - dst_shared="$dst/addons/counterstrikesharp/shared/CSSUniversalMenuAPI" - mkdir -p "$dst_shared" - cp "$src/CSSUniversalMenuAPI.dll" "$dst_shared/" - cp "$src/CSSUniversalMenuAPI.deps.json" "$dst_shared/" - pushd "$dst" - 7z a ../CSSUniversalMenuAPI.zip ./ - popd - rm -rf "$dst" + bash package.sh + + - name: Upload Artifacts uses: actions/upload-artifact@v4 diff --git a/CSSUniversalMenuAPI.sln b/CSSUniversalMenuAPI.sln index 8d91411..bfe455b 100644 --- a/CSSUniversalMenuAPI.sln +++ b/CSSUniversalMenuAPI.sln @@ -4,6 +4,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests", "tests\UnitTests\UnitTests.csproj", "{A605AB7A-AD18-4C24-B086-9678F071FE5B}" + ProjectSection(ProjectDependencies) = postProject + {2BB5D58A-F186-4B9C-8FE6-DDA31CC791C7} = {2BB5D58A-F186-4B9C-8FE6-DDA31CC791C7} + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{12ADA386-60DF-4855-A3AD-D76CB1C3770F}" ProjectSection(SolutionItems) = preProject @@ -20,6 +23,20 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSSUniversalMenuAPI", "src\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProofOfConcepts", "tests\ProofOfConcepts\ProofOfConcepts.csproj", "{6BDB6BFA-284D-4C47-9095-4BBE83DB6B8A}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniversalMenu.Compat.MenuManagerApi", "src\UniversalMenu.Compat.MenuManagerApi\UniversalMenu.Compat.MenuManagerApi.csproj", "{44AAF649-62D6-1CD8-3F16-028F4D262BE6}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniversalMenu.Driver.ScreenMenuAPI", "src\UniversalMenu.Driver.ScreenMenuAPI\UniversalMenu.Driver.ScreenMenuAPI.csproj", "{E2FD83DD-D7EA-97CA-B6F4-DE2F92E5A00F}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub Actions", "GitHub Actions", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}" + ProjectSection(SolutionItems) = preProject + .github\continuous-delivery.yml = .github\continuous-delivery.yml + .github\continuous-integration.yml = .github\continuous-integration.yml + .github\dependabot.yml = .github\dependabot.yml + .github\deploy-release.yml = .github\deploy-release.yml + .github\regenerate-actions.sh = .github\regenerate-actions.sh + .github\shared.yml = .github\shared.yml + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -38,10 +55,21 @@ Global {6BDB6BFA-284D-4C47-9095-4BBE83DB6B8A}.Debug|Any CPU.Build.0 = Debug|Any CPU {6BDB6BFA-284D-4C47-9095-4BBE83DB6B8A}.Release|Any CPU.ActiveCfg = Release|Any CPU {6BDB6BFA-284D-4C47-9095-4BBE83DB6B8A}.Release|Any CPU.Build.0 = Release|Any CPU + {44AAF649-62D6-1CD8-3F16-028F4D262BE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {44AAF649-62D6-1CD8-3F16-028F4D262BE6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {44AAF649-62D6-1CD8-3F16-028F4D262BE6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {44AAF649-62D6-1CD8-3F16-028F4D262BE6}.Release|Any CPU.Build.0 = Release|Any CPU + {E2FD83DD-D7EA-97CA-B6F4-DE2F92E5A00F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E2FD83DD-D7EA-97CA-B6F4-DE2F92E5A00F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E2FD83DD-D7EA-97CA-B6F4-DE2F92E5A00F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E2FD83DD-D7EA-97CA-B6F4-DE2F92E5A00F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {12ADA386-60DF-4855-A3AD-D76CB1C3770F} + EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C275584F-B754-4C9D-9361-03D343B72607} EndGlobalSection diff --git a/Directory.Build.props b/Directory.Build.props index 8af0696..59388c7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -31,6 +31,7 @@ Ashleigh Adams UniversalMenuAPI + false