Permalink
Browse files

Merge branch 'release/1.10'

# Conflicts:
#	CHANGELOG
#	HearthCap/Version.txt
#	appveyor.yml
  • Loading branch information...
2 parents 50ef7ff + fb97ecb commit 7124dc424f81a870baeea448e54742c994de3b4d @remcoros remcoros committed Aug 30, 2015
Showing with 14 additions and 8 deletions.
  1. +8 −1 CHANGELOG
  2. +3 −4 HearthCap/App.Release.config
  3. +2 −2 HearthCap/Features/AutoUpdate/UpdateViewModel.cs
  4. +1 −1 HearthCap/HearthCap.csproj
View
@@ -5,7 +5,14 @@ Legend:
v 1.11 (unreleased)
-v 1.10
+
+v 1.10.17
+ - fix the zip filename
+
+v 1.10.16
+ - fix the auto update url
+
+v 1.10.15
+ Support new game modes (mission / tavern brawl)
+ Compatible hook engine with latest HearthStone version
+ Add an option to not attach to HearthStone on startup
@@ -2,10 +2,9 @@
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<appSettings>
- <add
- key="updatebaseurl"
- value="http://hearthstonetracker.com/install"
- xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
+ <add key="updatebaseurl"
+ xdt:Transform="Remove"
+ xdt:Locator="Match(key)"/>
<add key="webapi_providers"
xdt:Transform="Remove"
xdt:Locator="Match(key)" />
@@ -39,8 +39,8 @@ public class UpdateViewModel : Screen
private Version _currentVersion;
- private readonly string _updateBaseUrl = "http://hearthstonetracker.com/install";
- private readonly string _updateXmlUrl = "http://hearthstonetracker.com/install/update.xml";
+ private readonly string _updateBaseUrl = "http://hearthstonetracker.com/install/latest/package";
+ private readonly string _updateXmlUrl = "http://hearthstonetracker.com/install/latest/package/update.xml";
private string _error;
@@ -1082,7 +1082,7 @@
<Output PropertyName="TheApplicationVersion" TaskParameter="OutputVersion" />
</FormatVersion>
-->
- <Zip Files="@(ZipFiles)" WorkingDirectory="$(TargetDir)" ZipFileName="$(SolutionDir)\package\packages\HearthstoneTracker-$(VersionMajor).$(VersionMinor).$(VersionBuild)-$(Configuration).zip" ZipLevel="9" />
+ <Zip Files="@(ZipFiles)" WorkingDirectory="$(TargetDir)" ZipFileName="$(SolutionDir)\package\packages\HearthstoneTracker-$(VersionMajor).$(VersionMinor).$(VersionBuild).$(VersionRevision)-$(Configuration).zip" ZipLevel="9" />
<XmlUpdate XPath="item/title" XmlFileName="update.xml" Value="Version $(VersionMajor).$(VersionMinor).$(VersionBuild).$(VersionRevision)" />
<XmlUpdate XPath="item/version" XmlFileName="update.xml" Value="$(VersionMajor).$(VersionMinor).$(VersionBuild).$(VersionRevision)" />
<XmlUpdate XPath="item/updater" XmlFileName="update.xml" Value="$(GitHubUrl)v$(VersionMajor).$(VersionMinor).$(VersionBuild).$(VersionRevision)/HearthCap.Updater.exe" />

0 comments on commit 7124dc4

Please sign in to comment.