diff --git a/.github/workflows/SvnDist.yml b/.github/workflows/SvnDist.yml index fb3ded4e4..1a37e12f2 100644 --- a/.github/workflows/SvnDist.yml +++ b/.github/workflows/SvnDist.yml @@ -14,16 +14,16 @@ jobs: steps: - name: Git Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: '8' - name: Cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | imports/downloads @@ -37,7 +37,7 @@ jobs: run: ${{env.nant}} -f:tools/buildbot.build "-D:CCNetNumericLabel=${{ github.run_number }}" "-D:CCNetProject=SlikSvn" -D:svnDist=true -D:gitBuild=true buildbot-build package-svndist - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: svndist-files path: | diff --git a/imports/scripts/download.build b/imports/scripts/download.build index d3df0db92..6406c9ceb 100644 --- a/imports/scripts/download.build +++ b/imports/scripts/download.build @@ -1,9 +1,9 @@ - + - + @@ -64,7 +64,7 @@ @@ -127,11 +127,6 @@ todir="${gettextToolsDir}" encoding="utf-8" /> - + /> diff --git a/imports/svn-dist/Wix/P_ARM64.wxs b/imports/svn-dist/Wix/P_ARM64.wxs index b4fb1012b..990fc2f66 100644 --- a/imports/svn-dist/Wix/P_ARM64.wxs +++ b/imports/svn-dist/Wix/P_ARM64.wxs @@ -105,7 +105,7 @@ - + @@ -116,7 +116,7 @@ - + diff --git a/imports/svn-dist/Wix/P_Win32.wxs b/imports/svn-dist/Wix/P_Win32.wxs index 97ba2ef4f..0e2789000 100644 --- a/imports/svn-dist/Wix/P_Win32.wxs +++ b/imports/svn-dist/Wix/P_Win32.wxs @@ -105,7 +105,7 @@ - + @@ -116,7 +116,7 @@ - + diff --git a/imports/svn-dist/Wix/P_X64.wxs b/imports/svn-dist/Wix/P_X64.wxs index 30c488cda..140fa0be6 100644 --- a/imports/svn-dist/Wix/P_X64.wxs +++ b/imports/svn-dist/Wix/P_X64.wxs @@ -105,7 +105,7 @@ - + @@ -116,7 +116,7 @@ - + diff --git a/imports/svn-dist/Wix/SlikSvn.wixproj b/imports/svn-dist/Wix/SlikSvn.wixproj index bf4eb3020..0db6d6a79 100644 --- a/imports/svn-dist/Wix/SlikSvn.wixproj +++ b/imports/svn-dist/Wix/SlikSvn.wixproj @@ -1,4 +1,4 @@ - + 38BD67A1-0135-414F-82ED-3BF0F30C87AA @@ -60,7 +60,7 @@ Slik-Subversion-$(SvnFullVersion)-ARM64 - + @@ -68,7 +68,4 @@ SharpSvn-Licenses-v4.wxs - - - \ No newline at end of file