diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f6caa217..00fd44bd 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,10 +1,11 @@ -# Set update schedule for GitHub Actions - version: 2 updates: - - package-ecosystem: "github-actions" directory: "/" schedule: - # Check for updates to GitHub Actions every daily + interval: "daily" + + - package-ecosystem: "nuget" + directory: "/" + schedule: interval: "daily" diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index bdb501b6..135e985e 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -22,34 +22,39 @@ jobs: matrix: configuration: [Release] - runs-on: ubuntu-latest + runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v4.2.2 + + - name: Setup + uses: actions/setup-dotnet@v4.2.0 + with: + dotnet-version: '8.0.x' - name: Build run: | cd v2rayN - dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r linux-x64 --self-contained true -p:PublishReadyToRun=false -p:PublishSingleFile=true -o $OutputPath64 - dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r linux-arm64 --self-contained true -p:PublishReadyToRun=false -p:PublishSingleFile=true -o $OutputPathArm64 - dotnet publish ./AmazTool/AmazTool.csproj -c Release -r linux-x64 --self-contained true -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:PublishTrimmed=true -o $OutputPath64 - dotnet publish ./AmazTool/AmazTool.csproj -c Release -r linux-arm64 --self-contained true -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:PublishTrimmed=true -o $OutputPathArm64 + dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r linux-x64 --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -o $OutputPath64 + dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r linux-arm64 --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -o $OutputPathArm64 + dotnet publish ./AmazTool/AmazTool.csproj -c Release -r linux-x64 --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:PublishTrimmed=true -o $OutputPath64 + dotnet publish ./AmazTool/AmazTool.csproj -c Release -r linux-arm64 --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:PublishTrimmed=true -o $OutputPathArm64 - name: Upload build artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v4.6.0 with: name: v2rayN-linux path: | ${{ github.workspace }}/v2rayN/Release/linux* # release debian package - - name: Package debian + - name: Package debian if: github.event.inputs.release_tag != '' run: | chmod 755 package-debian.sh - ./package-debian.sh $OutputArch $OutputPath64 ${{ github.event.inputs.release_tag }} - ./package-debian.sh $OutputArchArm $OutputPathArm64 ${{ github.event.inputs.release_tag }} + ./package-debian.sh $OutputArch $OutputPath64 ${{ github.event.inputs.release_tag }} + ./package-debian.sh $OutputArchArm $OutputPathArm64 ${{ github.event.inputs.release_tag }} - name: Upload deb to release uses: svenstaro/upload-release-action@v2 @@ -59,12 +64,12 @@ jobs: tag: ${{ github.event.inputs.release_tag }} file_glob: true - - name: Package AppImage + - name: Package AppImage if: github.event.inputs.release_tag != '' run: | chmod 755 package-appimage.sh - ./package-appimage.sh $OutputArch $OutputPath64 ${{ github.event.inputs.release_tag }} - ./package-appimage.sh $OutputArchArm $OutputPathArm64 ${{ github.event.inputs.release_tag }} + ./package-appimage.sh $OutputArch $OutputPath64 ${{ github.event.inputs.release_tag }} + ./package-appimage.sh $OutputArchArm $OutputPathArm64 ${{ github.event.inputs.release_tag }} - name: Upload AppImage to release uses: svenstaro/upload-release-action@v2 @@ -77,7 +82,7 @@ jobs: # release zip archive - name: Package release zip archive if: github.event.inputs.release_tag != '' - run: | + run: | chmod 755 package-release-zip.sh ./package-release-zip.sh $OutputArch $OutputPath64 ./package-release-zip.sh $OutputArchArm $OutputPathArm64 diff --git a/.github/workflows/build-osx.yml b/.github/workflows/build-osx.yml index 6a50d6b4..1a8e5d93 100644 --- a/.github/workflows/build-osx.yml +++ b/.github/workflows/build-osx.yml @@ -22,34 +22,39 @@ jobs: matrix: configuration: [Release] - runs-on: macos-latest + runs-on: macos-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v4.2.2 + + - name: Setup + uses: actions/setup-dotnet@v4.2.0 + with: + dotnet-version: '8.0.x' - name: Build run: | cd v2rayN - dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r osx-x64 --self-contained true -p:PublishReadyToRun=false -p:PublishSingleFile=true -o $OutputPath64 - dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r osx-arm64 --self-contained true -p:PublishReadyToRun=false -p:PublishSingleFile=true -o $OutputPathArm64 - dotnet publish ./AmazTool/AmazTool.csproj -c Release -r osx-x64 --self-contained true -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:PublishTrimmed=true -o $OutputPath64 - dotnet publish ./AmazTool/AmazTool.csproj -c Release -r osx-arm64 --self-contained true -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:PublishTrimmed=true -o $OutputPathArm64 + dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r osx-x64 --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -o $OutputPath64 + dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r osx-arm64 --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -o $OutputPathArm64 + dotnet publish ./AmazTool/AmazTool.csproj -c Release -r osx-x64 --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:PublishTrimmed=true -o $OutputPath64 + dotnet publish ./AmazTool/AmazTool.csproj -c Release -r osx-arm64 --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:PublishTrimmed=true -o $OutputPathArm64 - name: Upload build artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v4.6.0 with: name: v2rayN-macos path: | ${{ github.workspace }}/v2rayN/Release/macos* # release osx package - - name: Package osx + - name: Package osx if: github.event.inputs.release_tag != '' run: | brew install create-dmg chmod 755 package-osx.sh - ./package-osx.sh $OutputArch $OutputPath64 ${{ github.event.inputs.release_tag }} + ./package-osx.sh $OutputArch $OutputPath64 ${{ github.event.inputs.release_tag }} ./package-osx.sh $OutputArchArm $OutputPathArm64 ${{ github.event.inputs.release_tag }} - name: Upload dmg to release @@ -63,7 +68,7 @@ jobs: # release zip archive - name: Package release zip archive if: github.event.inputs.release_tag != '' - run: | + run: | chmod 755 package-release-zip.sh ./package-release-zip.sh $OutputArch $OutputPath64 ./package-release-zip.sh $OutputArchArm $OutputPathArm64 diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index a9a3c9cb..9f8e575d 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -23,39 +23,39 @@ jobs: matrix: configuration: [Release] - runs-on: ubuntu-latest + runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v4.2.2 - name: Setup - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v4.2.0 with: dotnet-version: '8.0.x' - name: Build run: | cd v2rayN - dotnet publish ./v2rayN/v2rayN.csproj -c Release -r win-x64 --self-contained false -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:EnableWindowsTargeting=true -o $OutputPath64 - dotnet publish ./v2rayN/v2rayN.csproj -c Release -r win-arm64 --self-contained false -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:EnableWindowsTargeting=true -o $OutputPathArm64 - dotnet publish ./v2rayN/v2rayN.csproj -c Release -r win-x64 --self-contained true -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:EnableWindowsTargeting=true -o $OutputPath64Sc - dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-x64 --self-contained false -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:EnableWindowsTargeting=true -o $OutputPath64 - dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-arm64 --self-contained false -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:EnableWindowsTargeting=true -o $OutputPathArm64 - dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-x64 --self-contained true -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:PublishTrimmed=true -p:EnableWindowsTargeting=true -o $OutputPath64Sc + dotnet publish ./v2rayN/v2rayN.csproj -c Release -r win-x64 --self-contained=false -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:EnableWindowsTargeting=true -o $OutputPath64 + dotnet publish ./v2rayN/v2rayN.csproj -c Release -r win-arm64 --self-contained=false -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:EnableWindowsTargeting=true -o $OutputPathArm64 + dotnet publish ./v2rayN/v2rayN.csproj -c Release -r win-x64 --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:EnableWindowsTargeting=true -o $OutputPath64Sc + dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-x64 --self-contained=false -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:EnableWindowsTargeting=true -o $OutputPath64 + dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-arm64 --self-contained=false -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:EnableWindowsTargeting=true -o $OutputPathArm64 + dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-x64 --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:PublishTrimmed=true -p:EnableWindowsTargeting=true -o $OutputPath64Sc - name: Upload build artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v4.6.0 with: name: v2rayN-windows path: | - ${{ github.workspace }}/v2rayN/Release/windows* + ${{ github.workspace }}/v2rayN/Release/windows* # release zip archive - name: Package release zip archive if: github.event.inputs.release_tag != '' - run: | + run: | chmod 755 package-release-zip.sh ./package-release-zip.sh $OutputArch $OutputPath64 ./package-release-zip.sh $OutputArchArm $OutputPathArm64 diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 00000000..28874908 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,33 @@ + + + + true + true + false + $(NoWarn);NU1507 + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/v2rayN/AmazTool/AmazTool.csproj b/v2rayN/AmazTool/AmazTool.csproj index 4f2ab677..93b72591 100644 --- a/v2rayN/AmazTool/AmazTool.csproj +++ b/v2rayN/AmazTool/AmazTool.csproj @@ -1,27 +1,27 @@  - - Exe - net8.0 - enable - enable - Copyright © 2017-2025 (GPLv3) - 1.3.1 - - - - - True - True - Resource.resx - - - - - - ResXFileCodeGenerator - Resource.Designer.cs - - + + Exe + net8.0 + enable + enable + Copyright © 2017-2025 (GPLv3) + 1.3.1 + + + + + True + True + Resource.resx + + + + + + ResXFileCodeGenerator + Resource.Designer.cs + + \ No newline at end of file diff --git a/v2rayN/ServiceLib/ServiceLib.csproj b/v2rayN/ServiceLib/ServiceLib.csproj index 507f7cec..0ac841e6 100644 --- a/v2rayN/ServiceLib/ServiceLib.csproj +++ b/v2rayN/ServiceLib/ServiceLib.csproj @@ -1,83 +1,80 @@  - - net8.0 - enable - enable - 7.7.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + net8.0 + enable + enable + 7.7.0 + - - ResUI.resx - True - True - + + + + + + + + + + - - Designer - PublicResXFileCodeGenerator - - - PublicResXFileCodeGenerator - - - Designer - ResUI.Designer.cs - PublicResXFileCodeGenerator - - - Designer - PublicResXFileCodeGenerator - - - Designer - PublicResXFileCodeGenerator - - - Designer - PublicResXFileCodeGenerator - + + + + + + + + + + + + + + + + + + + - + + + ResUI.resx + True + True + + + + + + Designer + PublicResXFileCodeGenerator + + + PublicResXFileCodeGenerator + + + Designer + ResUI.Designer.cs + PublicResXFileCodeGenerator + + + Designer + PublicResXFileCodeGenerator + + + Designer + PublicResXFileCodeGenerator + + + Designer + PublicResXFileCodeGenerator + + + + \ No newline at end of file diff --git a/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj b/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj index 3472aff5..02a8ee7b 100644 --- a/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj +++ b/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj @@ -1,56 +1,52 @@  - - WinExe - net8.0 - enable + + + WinExe + net8.0 + enable enable Assets\v2rayN.ico - true - Copyright © 2017-2025 (GPLv3) - true - v2rayN - + true + Copyright © 2017-2025 (GPLv3) + true + v2rayN + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - Never - - - - - - Always - - - Always - - - - + + + + + + + + + + + + + + + Never + + + + + + Always + + + Always + + + + \ No newline at end of file diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj index 70a239f9..d3a0a123 100644 --- a/v2rayN/v2rayN/v2rayN.csproj +++ b/v2rayN/v2rayN/v2rayN.csproj @@ -5,35 +5,34 @@ WinExe net8.0-windows10.0.17763 enable - true + true app.manifest enable Resources\v2rayN.ico Copyright © 2017-2025 (GPLv3) 7.0 - + - - - - - - - - - - Never - - - - - - - - - - + + + - + + + + Never + + + + + + + + + + + + + \ No newline at end of file