diff --git a/Build.bat b/Build.bat deleted file mode 100644 index d8639c15d..000000000 --- a/Build.bat +++ /dev/null @@ -1,37 +0,0 @@ - -rmdir /s /q build.windows -rmdir /s /q build.mono -rmdir /s /q Output -cd src -Msbuild Jackett.sln /t:Clean,Build /p:Configuration=Release /verbosity:minimal -cd .. - -xcopy src\Jackett.Console\bin\Release build.windows\ /e /y -copy /Y src\Jackett.Service\bin\Release\JackettService.exe build.windows\JackettService.exe -copy /Y src\Jackett.Service\bin\Release\JackettService.exe.config build.windows\JackettService.exe.config -copy /Y src\Jackett.Tray\bin\Release\JackettTray.exe build.windows\JackettTray.exe -copy /Y src\Jackett.Tray\bin\Release\JackettTray.exe.config build.windows\JackettTray.exe.config -copy /Y src\Jackett.Updater\bin\Release\JackettUpdater.exe build.windows\JackettUpdater.exe -copy /Y src\Jackett.Updater\bin\Release\JackettUpdater.exe.config build.windows\JackettUpdater.exe.config -copy /Y LICENSE build.windows\LICENSE -copy /Y README.md build.windows\README.md - - -cd src -Msbuild Jackett.sln /t:Clean -call "C:\Program Files (x86)\Mono\bin\xbuild.bat" Jackett.sln /t:Build /p:Configuration=Release /verbosity:minimal -cd .. - -xcopy src\Jackett.Console\bin\Release build.mono\ /e /y -copy /Y src\Jackett.Service\bin\Release\JackettService.exe build.mono\JackettService.exe -copy /Y src\Jackett.Service\bin\Release\JackettService.exe.config build.mono\JackettService.exe.config -copy /Y src\Jackett.Tray\bin\Release\JackettTray.exe build.mono\JackettTray.exe -copy /Y src\Jackett.Tray\bin\Release\JackettTray.exe.config build.mono\JackettTray.exe.config -copy /Y src\Jackett.Updater\bin\Release\JackettUpdater.exe build.mono\JackettUpdater.exe -copy /Y src\Jackett.Updater\bin\Release\JackettUpdater.exe.config build.mono\JackettUpdater.exe.config -copy /Y LICENSE build.mono\LICENSE -copy /Y README.md build.mono\README.md -copy /Y Upstart.config build.mono\Upstart.config - -iscc Installer.iss - diff --git a/appveyor.yml b/appveyor.yml index c11497e88..6e4ae00b1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,6 +11,14 @@ assembly_info: assembly_version: '{version}' assembly_file_version: '{version}' assembly_informational_version: '{version}' +dotnet_csproj: + patch: true + file: '**\*.csproj' + version: '{version}' + package_version: '{version}' + assembly_version: '{version}' + file_version: '{version}' + informational_version: '{version}' install: - cmd: choco install InnoSetup before_build: diff --git a/src/Jackett.Common/Jacket.Common.csproj b/src/Jackett.Common/Jackett.Common.csproj similarity index 98% rename from src/Jackett.Common/Jacket.Common.csproj rename to src/Jackett.Common/Jackett.Common.csproj index e472550e6..e519b5c1a 100644 --- a/src/Jackett.Common/Jacket.Common.csproj +++ b/src/Jackett.Common/Jackett.Common.csproj @@ -2,6 +2,7 @@ netstandard2.0;net452 + 0.0.0 diff --git a/src/Jackett.Console/Jackett.Console.csproj b/src/Jackett.Console/Jackett.Console.csproj index 77e3948c0..e18259432 100644 --- a/src/Jackett.Console/Jackett.Console.csproj +++ b/src/Jackett.Console/Jackett.Console.csproj @@ -74,9 +74,9 @@ {74420a79-cc16-442c-8b1e-7c1b913844f0} CurlSharp - + {6B854A1B-9A90-49C0-BC37-9A35C75BCA73} - Jacket.Common + Jackett.Common {e636d5f8-68b4-4903-b4ed-ccfd9c9e899f} diff --git a/src/Jackett.Service/Jackett.Service.csproj b/src/Jackett.Service/Jackett.Service.csproj index db8095b41..4258d52a3 100644 --- a/src/Jackett.Service/Jackett.Service.csproj +++ b/src/Jackett.Service/Jackett.Service.csproj @@ -79,9 +79,9 @@ {74420a79-cc16-442c-8b1e-7c1b913844f0} CurlSharp - + {6B854A1B-9A90-49C0-BC37-9A35C75BCA73} - Jacket.Common + Jackett.Common {e636d5f8-68b4-4903-b4ed-ccfd9c9e899f} diff --git a/src/Jackett.Tray/Jackett.Tray.csproj b/src/Jackett.Tray/Jackett.Tray.csproj index be783facf..757352967 100644 --- a/src/Jackett.Tray/Jackett.Tray.csproj +++ b/src/Jackett.Tray/Jackett.Tray.csproj @@ -99,9 +99,9 @@ - + {6B854A1B-9A90-49C0-BC37-9A35C75BCA73} - Jacket.Common + Jackett.Common {e636d5f8-68b4-4903-b4ed-ccfd9c9e899f} diff --git a/src/Jackett.Updater/Jackett.Updater.csproj b/src/Jackett.Updater/Jackett.Updater.csproj index 39f371ee0..4fc5e1e69 100644 --- a/src/Jackett.Updater/Jackett.Updater.csproj +++ b/src/Jackett.Updater/Jackett.Updater.csproj @@ -67,9 +67,9 @@ - + {6B854A1B-9A90-49C0-BC37-9A35C75BCA73} - Jacket.Common + Jackett.Common {bf611f7b-4658-4cb8-aa9e-0736fadaa3ba} diff --git a/src/Jackett.sln b/src/Jackett.sln index 3f345befd..b69ec1915 100644 --- a/src/Jackett.sln +++ b/src/Jackett.sln @@ -8,7 +8,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CurlSharp", "CurlSharp\Curl EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BE7B0C8A-6144-47CD-821E-B09BA1B7BADE}" ProjectSection(SolutionItems) = preProject - ..\Build.bat = ..\Build.bat + ..\appveyor.yml = ..\appveyor.yml ..\Installer.iss = ..\Installer.iss ..\LICENSE = ..\LICENSE ..\README.md = ..\README.md @@ -30,7 +30,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DateTimeRoutines", "DateTim EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{2FA9B879-5882-4B39-8D34-9EBCB82B4F2B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Jacket.Common", "Jackett.Common\Jacket.Common.csproj", "{6B854A1B-9A90-49C0-BC37-9A35C75BCA73}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Jackett.Common", "Jackett.Common\Jackett.Common.csproj", "{6B854A1B-9A90-49C0-BC37-9A35C75BCA73}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NET", ".NET", "{FF8B9A1B-AE7E-4F14-9C37-DA861D034738}" EndProject diff --git a/src/Jackett/Jackett.csproj b/src/Jackett/Jackett.csproj index 22beaf62b..3638f3e6f 100644 --- a/src/Jackett/Jackett.csproj +++ b/src/Jackett/Jackett.csproj @@ -286,9 +286,9 @@ - + {6b854a1b-9a90-49c0-bc37-9a35c75bca73} - Jacket.Common + Jackett.Common