Fix dev dir in installer and add to CI

MinecraftZenova · Jun 30, 2020 · 75ba9b1 · 75ba9b1
1 parent 9e435fd
commit 75ba9b1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,8 +10,8 @@
 *.userosscache
 *.sln.docstates
 ZenovaAPI.dll
-ZenovaAPI.lib
 ZenovaLoader
+dev/
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs

diff --git a/ZenovaLauncher/Properties/AssemblyInfo.cs b/ZenovaLauncher/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.7")]
-[assembly: AssemblyFileVersion("1.0.1.7")]
+[assembly: AssemblyVersion("1.0.1.8")]
+[assembly: AssemblyFileVersion("1.0.1.8")]
diff --git a/ZenovaLauncher/SetupZenovaLauncher.iss b/ZenovaLauncher/SetupZenovaLauncher.iss
@@ -43,7 +43,6 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 [Files]
 Source: "ZenovaLoader"; DestDir: "{app}"; Flags: ignoreversion
 Source: "ZenovaAPI.dll"; DestDir: "{code:GetDataDir}"; Flags: ignoreversion
-Source: "ZenovaAPI.lib"; DestDir: "{code:GetDataDir}"; Flags: ignoreversion
 Source: "bin\Release\ZenovaLauncher.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "bin\Release\ZenovaBackend.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "bin\Release\ControlzEx.dll"; DestDir: "{app}"; Flags: ignoreversion
@@ -58,7 +57,7 @@ Source: "bin\Release\Octokit.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "bin\Release\System.ValueTuple.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "bin\Release\System.Windows.Interactivity.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "bin\Release\Windows.Internal.Security.Authentication.Web.winmd"; DestDir: "{app}"; Flags: ignoreversion
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+Source: "dev\*"; DestDir: "{code:GetDataDir}\dev"; Flags: ignoreversion recursesubdirs
 
 [Dirs]
 Name: "{code:GetDataDir}\versions"

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -26,9 +26,15 @@ steps:
     connection: 'GitHub - TrinityDevelopers'
     userRepository: 'MinecraftZenova/ZenovaAPI'
     defaultVersionType: 'latest'
-    itemPattern: 'ZenovaAPI.*'
+    itemPattern: 'ZenovaAPI*'
     downloadPath: 'ZenovaLauncher/'
 
+- task: ExtractFiles@1
+  inputs:
+    archiveFilePatterns: 'ZenovaLauncher/ZenovaAPI-dev.zip'
+    destinationFolder: 'ZenovaLauncher/dev'
+    cleanDestinationFolder: true
+
 - task: DownloadGitHubRelease@0
   inputs:
     connection: 'GitHub - TrinityDevelopers'