diff options
| author | verhoek <30193551+verhoek@users.noreply.github.com> | 2018-12-23 22:36:53 +0300 |
|---|---|---|
| committer | verhoek <30193551+verhoek@users.noreply.github.com> | 2018-12-23 22:36:53 +0300 |
| commit | 14133457c6abec2b6004d2c23246b22fe1236c4a (patch) | |
| tree | 26d6de0f427a176c80b0cffbcc9d6bb4ca983fec /BuildTools | |
| parent | ae5d6ffcc7f98ea4cd92320ad71c19c405b63828 (diff) | |
| parent | 898dbf30db012f43ac2a98c5aa5726789d8b7264 (diff) | |
Merge remote-tracking branch 'origin/master' into auto_updater/allow_for_new_key
Diffstat (limited to 'BuildTools')
| -rw-r--r-- | BuildTools/UpdateVersionStamp/Program.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/BuildTools/UpdateVersionStamp/Program.cs b/BuildTools/UpdateVersionStamp/Program.cs index 076d36570..79c03cb58 100644 --- a/BuildTools/UpdateVersionStamp/Program.cs +++ b/BuildTools/UpdateVersionStamp/Program.cs @@ -19,6 +19,9 @@ namespace UpdateVersionStamp FILEMAP.Add("AssemblyInfo.cs", new Regex(@"(\[assembly\: AssemblyVersion\(\""" + versionre + @"""\)\])|(\[assembly\: AssemblyFileVersion\(\""" + versionre + @"\""\)\])|(\[assembly\: AssemblyFileVersionAttribute\(\""" + versionre + @"\""\)\])"));
FILEMAP.Add("UpgradeData.wxi", new Regex(@"\<\?define ProductVersion\=\""" + versionre + @"\"" \?\>"));
FILEMAP.Add("AssemblyRedirects.xml", new Regex(@"newVersion\=\""" + versionre + @"\"""));
+ FILEMAP.Add("index.html", new Regex(@"\?v\=" + versionre));
+ FILEMAP.Add("login.html", new Regex(@"\?v\=" + versionre));
+ FILEMAP.Add("app.js", new Regex(@"\?v\=" + versionre));
}
private class Options
@@ -54,7 +57,8 @@ namespace UpdateVersionStamp Func<string, bool> isFile = (string x) => !x.EndsWith(DIR_SEP);
- var paths = Duplicati.Library.Utility.Utility.EnumerateFileSystemEntries(opt.sourcefolder, filter)
+ var paths = Duplicati.Library.Utility.Utility.EnumerateFileSystemEntries(opt.sourcefolder)
+ .Where(x => Duplicati.Library.Utility.FilterExpression.Matches(filter, x))
.Where(x => isFile(x) && FILEMAP.ContainsKey(Path.GetFileName(x)))
.Select(x =>
{
|