Skip to content

Commit d3ea38f

Browse files
ravibpatelravibpatel
committed
Now it is possible to run AutoUpdater without XML url but it requires handling ParseUpdateInfoEvent in that case.
Added more space for Remind Later button when current locale is Spanish. This closes #432 and closes #708.
1 parent 7fef4e1 commit d3ea38f

File tree

7 files changed

+286
-271
lines changed

7 files changed

+286
-271
lines changed

‎AutoUpdater.NET/AutoUpdater.NET.csproj‎

Lines changed: 242 additions & 242 deletions
Large diffs are not rendered by default.

‎AutoUpdater.NET/AutoUpdater.cs‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -405,25 +405,32 @@ private static object CheckUpdate(Assembly mainAssembly)
405405

406406
PersistenceProvider ??= new RegistryPersistenceProvider(registryLocation);
407407

408-
BaseUri = new Uri(AppCastURL);
409-
410408
UpdateInfoEventArgs args;
411-
using (MyWebClient client = GetWebClient(BaseUri, BasicAuthXML))
409+
string xml = null;
410+
411+
if (AppCastURL != null)
412412
{
413-
string xml = client.DownloadString(BaseUri);
413+
BaseUri = new Uri(AppCastURL);
414+
using MyWebClient client = GetWebClient(BaseUri, BasicAuthXML);
415+
xml = client.DownloadString(BaseUri);
416+
}
414417

415-
if (ParseUpdateInfoEvent == null)
416-
{
417-
var xmlSerializer = new XmlSerializer(typeof(UpdateInfoEventArgs));
418-
var xmlTextReader = new XmlTextReader(new StringReader(xml)) { XmlResolver = null };
419-
args = (UpdateInfoEventArgs)xmlSerializer.Deserialize(xmlTextReader);
420-
}
421-
else
418+
if (ParseUpdateInfoEvent == null)
419+
{
420+
if (string.IsNullOrEmpty(xml))
422421
{
423-
var parseArgs = new ParseUpdateInfoEventArgs(xml);
424-
ParseUpdateInfoEvent(parseArgs);
425-
args = parseArgs.UpdateInfo;
422+
throw new Exception("It is required to handle ParseUpdateInfoEvent when XML url is not specified.");
426423
}
424+
425+
var xmlSerializer = new XmlSerializer(typeof(UpdateInfoEventArgs));
426+
var xmlTextReader = new XmlTextReader(new StringReader(xml)) { XmlResolver = null };
427+
args = (UpdateInfoEventArgs)xmlSerializer.Deserialize(xmlTextReader);
428+
}
429+
else
430+
{
431+
var parseArgs = new ParseUpdateInfoEventArgs(xml);
432+
ParseUpdateInfoEvent(parseArgs);
433+
args = parseArgs.UpdateInfo;
427434
}
428435

429436
if (string.IsNullOrEmpty(args?.CurrentVersion) || string.IsNullOrEmpty(args.DownloadURL))

‎AutoUpdater.NET/UpdateForm.es.resx‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,15 @@
133133
<value>Notas de la versión :</value>
134134
</data>
135135
<data name="buttonUpdate.Text" xml:space="preserve">
136-
<value>actualizar</value>
136+
<value>Actualizar</value>
137137
</data>
138-
<data name="buttonRemindLater.Text" xml:space="preserve">
138+
<data name="buttonRemindLater.Location" type="System.Drawing.Point, System.Drawing">
139+
<value>300, 573</value>
140+
</data>
141+
<data name="buttonRemindLater.Size" type="System.Drawing.Size, System.Drawing">
142+
<value>175, 28</value>
143+
</data>
144+
<data name="buttonRemindLater.Text" xml:space="preserve">
139145
<value>Recuérdame más tarde</value>
140146
</data>
141147
<data name="buttonSkip.Text" xml:space="preserve">

‎AutoUpdater.NET/build/Autoupdater.NET.Official.nuspec‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata>
44
<id>Autoupdater.NET.Official</id>
5-
<version>1.9.2.0</version>
5+
<version>1.9.3.0</version>
66
<title>AutoUpdater.NET</title>
77
<authors>rbsoft</authors>
88
<requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -18,22 +18,22 @@
1818
<tags>autoupdate updater c# vb wpf winforms</tags>
1919
<dependencies>
2020
<group targetFramework=".NETFramework4.6.2">
21-
<dependency id="Microsoft.Web.WebView2" version="1.0.2592.51" exclude="Build,Analyzers"/>
21+
<dependency id="Microsoft.Web.WebView2" version="1.0.2739.15" exclude="Build,Analyzers"/>
2222
</group>
2323
<group targetFramework=".NETCoreApp3.1">
24-
<dependency id="Microsoft.Web.WebView2" version="1.0.2592.51" exclude="Build,Analyzers"/>
24+
<dependency id="Microsoft.Web.WebView2" version="1.0.2739.15" exclude="Build,Analyzers"/>
2525
</group>
2626
<group targetFramework="net5.0-windows7.0">
27-
<dependency id="Microsoft.Web.WebView2" version="1.0.2592.51" exclude="Build,Analyzers"/>
27+
<dependency id="Microsoft.Web.WebView2" version="1.0.2739.15" exclude="Build,Analyzers"/>
2828
</group>
2929
<group targetFramework="net6.0-windows7.0">
30-
<dependency id="Microsoft.Web.WebView2" version="1.0.2592.51" exclude="Build,Analyzers"/>
30+
<dependency id="Microsoft.Web.WebView2" version="1.0.2739.15" exclude="Build,Analyzers"/>
3131
</group>
3232
<group targetFramework="net7.0-windows7.0">
33-
<dependency id="Microsoft.Web.WebView2" version="1.0.2592.51" exclude="Build,Analyzers"/>
33+
<dependency id="Microsoft.Web.WebView2" version="1.0.2739.15" exclude="Build,Analyzers"/>
3434
</group>
3535
<group targetFramework="net8.0-windows7.0">
36-
<dependency id="Microsoft.Web.WebView2" version="1.0.2592.51" exclude="Build,Analyzers"/>
36+
<dependency id="Microsoft.Web.WebView2" version="1.0.2739.15" exclude="Build,Analyzers"/>
3737
</group>
3838
</dependencies>
3939
<frameworkReferences>

‎ZipExtractor/FormMain.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ private void FormMain_Shown(object sender, EventArgs e)
100100

101101
_logBuilder.AppendLine("BackgroundWorker started successfully.");
102102

103+
ControlBox = false;
104+
103105
// Ensures that the last character on the extraction path
104106
// is the directory separator char.
105107
// Without this, a malicious zip file could try to traverse outside of the expected

‎ZipExtractor/ZipExtractor.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
<Company>RBSoft</Company>
1010
<Product>ZipExtractor</Product>
1111
<Copyright>Copyright © 2012-2024 RBSoft</Copyright>
12-
<Version>1.5.2.0</Version>
13-
<AssemblyVersion>1.5.2.0</AssemblyVersion>
14-
<FileVersion>1.5.2.0</FileVersion>
15-
<ApplicationVersion>1.5.2.0</ApplicationVersion>
12+
<Version>1.5.3.0</Version>
13+
<AssemblyVersion>1.5.3.0</AssemblyVersion>
14+
<FileVersion>1.5.3.0</FileVersion>
15+
<ApplicationVersion>1.5.3.0</ApplicationVersion>
1616
<ApplicationIcon>ZipExtractor.ico</ApplicationIcon>
1717
<ApplicationManifest>app.manifest</ApplicationManifest>
1818
<SignAssembly>true</SignAssembly>

‎appveyor.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
version: 1.9.2.{build}
1+
version: 1.9.3.{build}
22
environment:
3-
my_version: 1.9.2
3+
my_version: 1.9.3
44
my_secret:
55
secure: vbPRaZLQYpGPr4BrZZ4p6TofpSZMud+FKtlpqjgO8aA=
66
skip_branch_with_pr: true

0 commit comments

Comments
 (0)