diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8a65d0f..fc9c7c7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,11 +23,5 @@ jobs: # Runs the Fallout build (Compile → Test). Hand-written client (no codegen); # Test skips live DSM integration tests automatically without SYNOLOGY_* env. - # - # GITHUB_PACKAGES_PAT authenticates the Fallout-build package feed (nuget.config) - # so the build/ project can restore Fallout.*. PACKAGES_PAT is a PAT with - # read:packages on the Fallout-build org. - name: Build & test (Fallout) - env: - GITHUB_PACKAGES_PAT: ${{ secrets.PACKAGES_PAT }} run: ./build.sh Test diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1c3e429..de158b2 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -9,8 +9,7 @@ name: publish # # Requires a nuget.org Trusted Publishing policy for this repo + this workflow file # (publish.yml) with Environment=Nuget.org, and the NUGET_USER secret (nuget.org -# profile name). GITHUB_PACKAGES_PAT (from PACKAGES_PAT) only authenticates the -# Fallout-build feed for the build/ project. +# profile name). on: push: branches: [main] @@ -52,11 +51,8 @@ jobs: with: user: ${{ secrets.NUGET_USER }} - # Fallout Pack + Publish. GITHUB_PACKAGES_PAT authenticates the Fallout-build - # feed (build/ project restore); the push uses the short-lived nuget.org key. + # Fallout Pack + Publish; the push uses the short-lived nuget.org key. - name: Publish (Fallout → nuget.org) - env: - GITHUB_PACKAGES_PAT: ${{ secrets.PACKAGES_PAT }} run: | ARGS=(Publish --nuget-api-key "${{ steps.login.outputs.NUGET_API_KEY }}") if [[ -n "${{ steps.ver.outputs.suffix }}" ]]; then diff --git a/README.md b/README.md index 700ab4f..549b940 100644 --- a/README.md +++ b/README.md @@ -46,8 +46,8 @@ flowchart LR ## Build / use Built with [Fallout](https://github.com/Fallout-build/Fallout) (Chris's C#/.NET -build system, a NUKE successor). Requires the .NET 10 SDK and `GITHUB_PACKAGES_PAT` -(a PAT with `read:packages` on the Fallout-build org — restores `Fallout.*`, see `nuget.config`). +build system, a NUKE successor). Requires the .NET 10 SDK; everything, +including `Fallout.*`, restores from nuget.org with no credentials. ```bash ./build.sh # default: Test (Compile + Test); ./build.sh Pack → Chrison.* nupkgs diff --git a/build.ps1 b/build.ps1 index 9338557..c297fae 100755 --- a/build.ps1 +++ b/build.ps1 @@ -1,7 +1,7 @@ #!/usr/bin/env pwsh # SynoSharp build entrypoint (Fallout build). Requires the .NET 10 SDK on PATH -# (see global.json) and, for restoring the Fallout.* build packages, GITHUB_PACKAGES_PAT -# in the environment (a PAT with read:packages on the Fallout-build org; see nuget.config). +# (see global.json). Everything, including the Fallout.* build packages, restores from +# nuget.org with no credentials (see nuget.config). # # ./build.ps1 # default target: Test # ./build.ps1 Pack --version-suffix preview.42 diff --git a/build.sh b/build.sh index bb4c65f..aa93dc1 100755 --- a/build.sh +++ b/build.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # SynoSharp build entrypoint (Fallout build). Requires the .NET 10 SDK on PATH -# (see global.json) and, for restoring the Fallout.* build packages, GITHUB_PACKAGES_PAT -# in the environment (a PAT with read:packages on the Fallout-build org; see nuget.config). +# (see global.json). Everything, including the Fallout.* build packages, restores from +# nuget.org with no credentials (see nuget.config). # # ./build.sh # default target: Test # ./build.sh Pack --version-suffix preview.42 diff --git a/build/_build.csproj b/build/_build.csproj index 273d68c..c3bc20a 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -4,7 +4,8 @@ system, a NUKE successor). Restore/Compile/Test/Pack/Publish targets wrap the native `dotnet` toolchain; run via ./build.sh / ./build.ps1 or directly with `dotnet run` on this project (target as the arg). Fallout packages come - from the Fallout-build edge feed (see ../nuget.config); pinned for repro. --> + from nuget.org (10.4.0 stable; the 2026.1.0-preview edge pin was pulled from + the Fallout-build feed, same move as ProxmoxSharp#25); pinned for repro. --> Exe @@ -20,9 +21,9 @@ - - - + + + diff --git a/nuget.config b/nuget.config index ea0ce39..089d507 100644 --- a/nuget.config +++ b/nuget.config @@ -2,28 +2,13 @@ + - - - - - - - - - - - - -