Florian Küpper
92e8bcd9f7
Fix merge error
2015-12-09 00:24:36 +01:00
Florian Küpper
d796b649fa
Some minor improvements and fixes for bg-music
2015-12-08 10:44:13 +01:00
Florian Küpper
37a9f9c359
Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop
2015-12-07 22:37:55 +01:00
lukeIam
c09d18889a
Fix: build fails because of a link to old vocaluxe.dependencies in Vocaluxe.csproj
2015-12-07 22:09:08 +01:00
lukeIam
6055c1cfb1
Fix: build fails because of a link to themes.ambient in Vocaluxe.csproj
2015-12-07 22:01:11 +01:00
Florian Küpper
31f06034e5
Added removed changelogs again
2015-12-07 21:53:54 +01:00
Florian Küpper
885dff41c8
Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop
2015-12-07 21:50:40 +01:00
lukeIam
27cf45fb07
Add the Ambient theme to git again
2015-12-07 20:52:39 +01:00
lukeIam
ba4111203f
Fix: gitDescribe.ps1 crashed on a lightweight tag
2015-12-07 19:51:15 +01:00
Florian Küpper
f03bb86f30
Some minor code-improvements
2015-12-07 19:23:36 +01:00
Florian Küpper
6e1ae9a17a
Fix merge errors
2015-12-07 19:23:13 +01:00
lukeIam
5f2c341216
Changed a github api query to use credentials (quota problem)
2015-12-06 21:23:11 +01:00
lukeIam
8782ac649e
Merge pull request #170 from Vocaluxe/appveyor
...
Add Appveyor (Windows) Build
2015-12-06 21:00:51 +01:00
lukeIam
0040638d83
Fix: PR could be threatened as special branch
2015-12-06 18:06:13 +01:00
lukeIam
4c16284ce0
Use "PR_[PRNumber]" as version tag for PR builds (using the anonymous to limited)
2015-12-06 18:02:42 +01:00
lukeIam
873619ccf8
Changed options for building Vocaluxe/Vocaluxe
2015-12-06 17:12:25 +01:00
lukeIam
971c57c237
Fixed duet parsing ( closes #159 )
...
Thanks to @derivator and @BenKmann
2015-12-06 14:09:55 +01:00
lukeIam
a50f026f8e
Fix: environment variable scope problem
2015-12-06 14:09:55 +01:00
lukeIam
d1b0431964
Fix: deployment does not work under some circumstances
2015-12-06 14:09:55 +01:00
lukeIam
80516570a6
Add more logging to moveTagForSpecialBranches.ps1 for debugging
2015-12-06 14:09:55 +01:00
lukeIam
f012579dc3
Close song options on click on the song menu
2015-12-06 14:09:55 +01:00
lukeIam
2ab8f4f937
Fixed Playlist buttons (2nd try)
2015-12-06 14:07:54 +01:00
lukeIam
12e43265db
Replaced Move-Tasks with a Copy-Task and a Delete-Task as xbuild does not support Move-Tasks
2015-12-06 13:48:17 +01:00
lukeIam
eae68bb6c3
-Fix: VocaluxeLib not found by PartyModes
2015-12-06 13:48:17 +01:00
lukeIam
2aa9813e5d
Updated WebserverInitalConfig dependencies
2015-12-06 13:48:17 +01:00
lukeIam
095ce5964f
Bundled the two dep of WebserverInitialConfig
2015-12-06 13:48:17 +01:00
lukeIam
8b4ecfce7c
Updated git ignore
2015-12-06 13:48:17 +01:00
lukeIam
0966cb08d0
Made release description consistent
2015-12-06 13:48:17 +01:00
lukeIam
cb51f15fed
Improoved logging
2015-12-06 13:48:17 +01:00
lukeIam
0021b76083
Fixed: variable not correctly escaped
2015-12-06 13:48:17 +01:00
lukeIam
7e8c032618
Fix: crash on nightly tag move
2015-12-06 13:48:17 +01:00
lukeIam
0171b19084
Fixed nightly detection
2015-12-06 13:48:16 +01:00
lukeIam
11dbef6f37
Fixed artifact issue
2015-12-06 13:48:16 +01:00
lukeIam
02a2bc4c5f
Fix github api auth
2015-12-06 13:48:16 +01:00
lukeIam
475a074c9e
Small deployment changes
2015-12-06 13:48:16 +01:00
lukeIam
677a66ac9b
Use the environment variable instead of git describe (if the environment variable exists)
2015-12-06 13:48:16 +01:00
lukeIam
954e5eddef
Authenticate for github api requests as the ip-based limit is very low
2015-12-06 13:48:16 +01:00
lukeIam
76bc9e93cb
Working on release deployment
2015-12-06 13:48:16 +01:00
Florian Küpper
b8bf1b66fc
Changed data-paths to avoid problems on Linux
2015-12-06 13:44:29 +01:00
lukeIam
ced828c401
Appveyor: add prepareDeploy.ps1 and gitDescribe.ps1
...
which is needed to use GitHub API to correctly tag automatic
builds, because git-describe doesn't work on shallow clones
2015-12-06 13:42:29 +01:00
lukeIam
d4eb4f74c3
- Fixed VocluxeTests dependency
...
- VocaluxeLib: direct export to \libs\managed
2015-12-06 13:42:28 +01:00
lukeIam
cc45de1183
Changed wrong toolset in PitchTracker.vcxproj
2015-12-06 13:42:28 +01:00
lukeIam
0cdeb732a9
- Modified PitchTracker projectfile to autodetect the current visual studio version
...
- Changed PitchTracker output paths
2015-12-06 13:42:28 +01:00
lukeIam
95a5543a04
- Changed lib probing paths
...
- Fixed a pdb error
2015-12-06 13:42:28 +01:00
lukeIam
73efe1e4b6
Added a postbuild move task to move managed dlls to to libs\managed folder
2015-12-06 13:42:28 +01:00
lukeIam
e66cb853c5
Updated .gitignore
2015-12-06 13:42:28 +01:00
lukeIam
876d3138e4
Removed unused dependency
2015-12-06 13:42:28 +01:00
lukeIam
8450b46657
Removed duplicate references
2015-12-06 13:42:28 +01:00
lukeIam
6459f0350e
- Moved unmanaged libs to folder libs/unmanaged
...
- Modified loading path
- Updated nuget package versions
- Changed the way managed assemblies are referenced
2015-12-06 13:42:28 +01:00
lukeIam
b302184de3
Disabled nuget.org package source.
...
Cleanup and
Revert "Removed unused ref "System.Transactions" "System.Transactions.Portable""
as "System.Transactions" is needed for the mono sqlite nuget package.
This reverts commit 48d11d026e8aee55b6127c02a96a27c4e26f653b.
# Conflicts:
# Vocaluxe/Vocaluxe.csproj
2015-12-06 13:42:28 +01:00
Florian Küpper