mirror of https://github.com/lidarr/Lidarr
Win x86 Builds
This commit is contained in:
parent
eb97568b3a
commit
bcfa856842
|
@ -184,7 +184,11 @@ stages:
|
||||||
- bash: ./build.sh --packages
|
- bash: ./build.sh --packages
|
||||||
displayName: Create Packages
|
displayName: Create Packages
|
||||||
- bash: |
|
- bash: |
|
||||||
setup/inno/ISCC.exe setup/lidarr.iss //DFramework=netcoreapp3.1
|
setup/inno/ISCC.exe setup/lidarr.iss //DFramework=netcoreapp3.1 //DRuntime=win-x86
|
||||||
|
cp setup/output/Lidarr.*windows.netcoreapp3.1.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Lidarr.${BUILDNAME}.windows-core-x86-installer.exe
|
||||||
|
displayName: Create .NET Core Windows installer
|
||||||
|
- bash: |
|
||||||
|
setup/inno/ISCC.exe setup/lidarr.iss //DFramework=netcoreapp3.1 //DRuntime=win-x64
|
||||||
cp setup/output/Lidarr.*windows.netcoreapp3.1.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Lidarr.${BUILDNAME}.windows-core-x64-installer.exe
|
cp setup/output/Lidarr.*windows.netcoreapp3.1.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Lidarr.${BUILDNAME}.windows-core-x64-installer.exe
|
||||||
displayName: Create .NET Core Windows installer
|
displayName: Create .NET Core Windows installer
|
||||||
- publish: $(Build.ArtifactStagingDirectory)
|
- publish: $(Build.ArtifactStagingDirectory)
|
||||||
|
@ -228,7 +232,14 @@ stages:
|
||||||
archiveFile: '$(Build.ArtifactStagingDirectory)/Lidarr.$(buildName).windows-core-x64.zip'
|
archiveFile: '$(Build.ArtifactStagingDirectory)/Lidarr.$(buildName).windows-core-x64.zip'
|
||||||
archiveType: 'zip'
|
archiveType: 'zip'
|
||||||
includeRootFolder: false
|
includeRootFolder: false
|
||||||
rootFolderOrFile: $(artifactsFolder)/windows/netcoreapp3.1
|
rootFolderOrFile: $(artifactsFolder)/win-x64/netcoreapp3.1
|
||||||
|
- task: ArchiveFiles@2
|
||||||
|
displayName: Create Windows x86 Core zip
|
||||||
|
inputs:
|
||||||
|
archiveFile: '$(Build.ArtifactStagingDirectory)/Lidarr.$(buildName).windows-core-x86.zip'
|
||||||
|
archiveType: 'zip'
|
||||||
|
includeRootFolder: false
|
||||||
|
rootFolderOrFile: $(artifactsFolder)/win-x86/netcoreapp3.1
|
||||||
- task: ArchiveFiles@2
|
- task: ArchiveFiles@2
|
||||||
displayName: Create MacOS Core app
|
displayName: Create MacOS Core app
|
||||||
inputs:
|
inputs:
|
||||||
|
|
17
build.sh
17
build.sh
|
@ -185,12 +185,13 @@ PackageMacOSApp()
|
||||||
PackageWindows()
|
PackageWindows()
|
||||||
{
|
{
|
||||||
local framework="$1"
|
local framework="$1"
|
||||||
|
local runtime="$2"
|
||||||
|
|
||||||
ProgressStart "Creating Windows Package for $framework"
|
ProgressStart "Creating Windows Package for $framework"
|
||||||
|
|
||||||
local folder=$artifactsFolder/windows/$framework/Lidarr
|
local folder=$artifactsFolder/$runtime/$framework/Lidarr
|
||||||
|
|
||||||
PackageFiles "$folder" "$framework" "win-x64"
|
PackageFiles "$folder" "$framework" "$runtime"
|
||||||
|
|
||||||
echo "Removing Lidarr.Mono"
|
echo "Removing Lidarr.Mono"
|
||||||
rm -f $folder/Lidarr.Mono.*
|
rm -f $folder/Lidarr.Mono.*
|
||||||
|
@ -216,7 +217,7 @@ Package()
|
||||||
PackageLinux "$framework" "$runtime"
|
PackageLinux "$framework" "$runtime"
|
||||||
;;
|
;;
|
||||||
win)
|
win)
|
||||||
PackageWindows "$framework"
|
PackageWindows "$framework" "$runtime"
|
||||||
;;
|
;;
|
||||||
osx)
|
osx)
|
||||||
PackageMacOS "$framework"
|
PackageMacOS "$framework"
|
||||||
|
@ -234,14 +235,6 @@ PackageTests()
|
||||||
|
|
||||||
rm -f $testPackageFolder/$framework/$runtime/*.log.config
|
rm -f $testPackageFolder/$framework/$runtime/*.log.config
|
||||||
|
|
||||||
# geckodriver.exe isn't copied by dotnet publish
|
|
||||||
if [ "$runtime" = "win-x64" ];
|
|
||||||
then
|
|
||||||
curl -Lso gecko.zip "https://github.com/mozilla/geckodriver/releases/download/v0.26.0/geckodriver-v0.26.0-win64.zip"
|
|
||||||
unzip -o gecko.zip
|
|
||||||
cp geckodriver.exe "$testPackageFolder/$framework/win-x64/publish"
|
|
||||||
fi
|
|
||||||
|
|
||||||
ProgressEnd 'Creating Test Package'
|
ProgressEnd 'Creating Test Package'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -320,6 +313,7 @@ then
|
||||||
if [[ -z "$RID" || -z "$FRAMEWORK" ]];
|
if [[ -z "$RID" || -z "$FRAMEWORK" ]];
|
||||||
then
|
then
|
||||||
PackageTests "netcoreapp3.1" "win-x64"
|
PackageTests "netcoreapp3.1" "win-x64"
|
||||||
|
PackageTests "netcoreapp3.1" "win-x86"
|
||||||
PackageTests "netcoreapp3.1" "linux-x64"
|
PackageTests "netcoreapp3.1" "linux-x64"
|
||||||
PackageTests "netcoreapp3.1" "linux-musl-x64"
|
PackageTests "netcoreapp3.1" "linux-musl-x64"
|
||||||
PackageTests "netcoreapp3.1" "osx-x64"
|
PackageTests "netcoreapp3.1" "osx-x64"
|
||||||
|
@ -352,6 +346,7 @@ then
|
||||||
if [[ -z "$RID" || -z "$FRAMEWORK" ]];
|
if [[ -z "$RID" || -z "$FRAMEWORK" ]];
|
||||||
then
|
then
|
||||||
Package "netcoreapp3.1" "win-x64"
|
Package "netcoreapp3.1" "win-x64"
|
||||||
|
Package "netcoreapp3.1" "win-x86"
|
||||||
Package "netcoreapp3.1" "linux-x64"
|
Package "netcoreapp3.1" "linux-x64"
|
||||||
Package "netcoreapp3.1" "linux-musl-x64"
|
Package "netcoreapp3.1" "linux-musl-x64"
|
||||||
Package "netcoreapp3.1" "linux-arm64"
|
Package "netcoreapp3.1" "linux-arm64"
|
||||||
|
|
|
@ -48,8 +48,8 @@ Name: "startupShortcut"; Description: "Create shortcut in Startup folder (Starts
|
||||||
Name: "none"; Description: "Do not start automatically"; GroupDescription: "Start automatically"; Flags: exclusive unchecked
|
Name: "none"; Description: "Do not start automatically"; GroupDescription: "Start automatically"; Flags: exclusive unchecked
|
||||||
|
|
||||||
[Files]
|
[Files]
|
||||||
Source: "..\_artifacts\windows\{#Framework}\Lidarr\Lidarr.exe"; DestDir: "{app}"; Flags: ignoreversion
|
Source: "..\_artifacts\{#Runtime}\{#Framework}\Lidarr\Lidarr.exe"; DestDir: "{app}"; Flags: ignoreversion
|
||||||
Source: "..\_artifacts\windows\{#Framework}\Lidarr\*"; Excludes: "Lidarr.Update"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
|
Source: "..\_artifacts\{#Runtime}\{#Framework}\Lidarr\*"; Excludes: "Lidarr.Update"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
|
||||||
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
|
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
|
||||||
|
|
||||||
[Icons]
|
[Icons]
|
||||||
|
|
|
@ -5,8 +5,8 @@
|
||||||
|
|
||||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||||
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
|
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
|
||||||
<RuntimeIdentifiers>win-x64;osx-x64;linux-x64;linux-musl-x64;linux-arm;linux-arm64;linux-musl-arm64</RuntimeIdentifiers>
|
<RuntimeIdentifiers>win-x64;win-x86;osx-x64;linux-x64;linux-musl-x64;linux-arm;linux-arm64;linux-musl-arm64</RuntimeIdentifiers>
|
||||||
<ExcludedRuntimeFrameworkPairs>win-x64:net462;osx-x64:net462;linux-arm:net462;linux-arm64:net462;linux-musl-x64:net462;linux-musl-arm64:net462</ExcludedRuntimeFrameworkPairs>
|
<ExcludedRuntimeFrameworkPairs>win-x64:net462;win-x86:net462;osx-x64:net462;linux-arm:net462;linux-arm64:net462;linux-musl-x64:net462;linux-musl-arm64:net462</ExcludedRuntimeFrameworkPairs>
|
||||||
|
|
||||||
<LidarrRootDir>$(MSBuildThisFileDirectory)..\</LidarrRootDir>
|
<LidarrRootDir>$(MSBuildThisFileDirectory)..\</LidarrRootDir>
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<OutputType>WinExe</OutputType>
|
<OutputType>WinExe</OutputType>
|
||||||
<TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
|
<TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
|
||||||
<NeutralLanguage>en</NeutralLanguage>
|
<NeutralLanguage>en</NeutralLanguage>
|
||||||
<RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
|
<RuntimeIdentifiers>win-x64;win-x86</RuntimeIdentifiers>
|
||||||
<UseWindowsForms>true</UseWindowsForms>
|
<UseWindowsForms>true</UseWindowsForms>
|
||||||
<ApplicationIcon>..\NzbDrone.Host\NzbDrone.ico</ApplicationIcon>
|
<ApplicationIcon>..\NzbDrone.Host\NzbDrone.ico</ApplicationIcon>
|
||||||
<ApplicationManifest>app.manifest</ApplicationManifest>
|
<ApplicationManifest>app.manifest</ApplicationManifest>
|
||||||
|
|
Binary file not shown.
Loading…
Reference in New Issue