Browse Source

Update x64 pipeline

flabbet 5 years ago
parent
commit
bfd8941d96

+ 2 - 2
Installer/installer-setup-x64-light.iss

@@ -43,8 +43,8 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 6.1; Check: not IsAdminInstallMode
 
 [Files]
-Source: "..\Builds\PixiEditor-{#TargetPlatform}\PixiEditor.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Builds\PixiEditor-{#TargetPlatform}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "..\..\Builds\PixiEditor-{#TargetPlatform}\PixiEditor.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\Builds\PixiEditor-{#TargetPlatform}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]

+ 2 - 2
Installer/installer-setup-x64.iss

@@ -43,8 +43,8 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 6.1; Check: not IsAdminInstallMode
 
 [Files]
-Source: "..\Builds\PixiEditor-{#TargetPlatform}\PixiEditor.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Builds\PixiEditor-{#TargetPlatform}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "..\..\Builds\PixiEditor-{#TargetPlatform}\PixiEditor.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\Builds\PixiEditor-{#TargetPlatform}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]

+ 11 - 3
windows-x64-release.yml

@@ -38,31 +38,36 @@ steps:
     zipAfterPublish: false
 
 - task: DotNetCoreCLI@2
+  displayName: "Publish PixiEditor Self-contained"
   inputs:
     command: 'publish'
     publishWebProjects: false
     projects: '**/PixiEditor.csproj'
-    arguments: '-o "Builds\PixiEditor-x64" --self-contained=true -r "win-x64" -c Release'
+    arguments: '-o "Builds/PixiEditor-x64" --self-contained=true -r "win-x64" -c Release'
     zipAfterPublish: false
 
 - task: CopyFiles@2
+  displayName: "Copy updater to PixiEditor target dir"
   inputs:
     SourceFolder: 'UpdateInstaller'
     Contents: '**'
     TargetFolder: 'Builds/PixiEditor-x64'
 
 - task: PowerShell@2
+  displayName: "Compile installer"
   inputs:
     targetType: 'inline'
     script: '& "$env:userprofile\.nuget\packages\tools.innosetup\6.0.5\tools\ISCC.exe" Installer\installer-setup-x64.iss'
   
 - task: PublishPipelineArtifact@1
+  displayName: "Publish artifact"
   inputs:
-    targetPath: 'Assets/PixiEditor-x64/'
+    targetPath: 'Installer/Assets/PixiEditor-x64/'
     artifact: 'PixiEditor-setup-x64.exe'
     publishLocation: 'pipeline'
 
 - task: DotNetCoreCLI@2
+  displayName: "Publish PixiEditor x64 light"
   inputs:
     command: 'publish'
     publishWebProjects: false
@@ -71,18 +76,21 @@ steps:
     zipAfterPublish: false
 
 - task: CopyFiles@2
+  displayName: "Copy updater to PixiEditor target dir"
   inputs:
     SourceFolder: 'UpdateInstaller'
     Contents: '**'
     TargetFolder: 'Builds/PixiEditor-x64-light'
 
 - task: PowerShell@2
+  displayName: "Compile installer"
   inputs:
     targetType: 'inline'
     script: '& "$env:userprofile\.nuget\packages\tools.innosetup\6.0.5\tools\ISCC.exe" Installer\installer-setup-x64-light.iss'
 
 - task: PublishPipelineArtifact@1
+  displayName: "Publish artifact"
   inputs:
-    targetPath: 'Assets/PixiEditor-x64-light/'
+    targetPath: 'Installer/Assets/PixiEditor-x64-light/'
     artifact: 'PixiEditor-setup-x64-light.exe'
     publishLocation: 'pipeline'