Skip to content

Commit 2c33091

Browse files
author
Chris Lovett
committed
Upgrade dependencies and remove duplicate base.OnLayout
1 parent 850ff8b commit 2c33091

7 files changed

Lines changed: 31 additions & 32 deletions

File tree

‎src/Application/Application.csproj‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<HintPath>..\packages\Microsoft.Win32.Registry.6.0.0-preview.5.21301.5\lib\net461\Microsoft.Win32.Registry.dll</HintPath>
8585
</Reference>
8686
<Reference Include="SgmlReaderDll, Version=1.8.24.0, Culture=neutral, PublicKeyToken=ab3ea86545595e2b, processorArchitecture=MSIL">
87-
<HintPath>..\packages\Microsoft.Xml.SgmlReader.1.8.24\lib\net47\SgmlReaderDll.dll</HintPath>
87+
<HintPath>..\packages\Microsoft.Xml.SgmlReader.1.8.25\lib\net47\SgmlReaderDll.dll</HintPath>
8888
</Reference>
8989
<Reference Include="SimpleGoogleAnalytics, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ab3ea86545595e2b, processorArchitecture=MSIL">
9090
<HintPath>..\packages\SimpleGoogleAnalytics.1.0.1\lib\netstandard2.0\SimpleGoogleAnalytics.dll</HintPath>
@@ -102,11 +102,13 @@
102102
</Reference>
103103
<Reference Include="System.Windows.Forms" />
104104
<Reference Include="System.Xml" />
105-
<Reference Include="XmlDiffPatch, Version=1.0.2.0, Culture=neutral, PublicKeyToken=ab3ea86545595e2b, processorArchitecture=MSIL">
106-
<HintPath>..\packages\LovettSoftware.XmlDiff.1.0.2\lib\net47\XmlDiffPatch.dll</HintPath>
105+
<Reference Include="XmlDiffPatch, Version=1.0.3.0, Culture=neutral, PublicKeyToken=ab3ea86545595e2b, processorArchitecture=MSIL">
106+
<HintPath>..\packages\LovettSoftware.XmlDiff.1.0.3\lib\net47\XmlDiffPatch.dll</HintPath>
107+
<Private>True</Private>
107108
</Reference>
108-
<Reference Include="XmlDiffPatch.View, Version=1.0.2.0, Culture=neutral, PublicKeyToken=ab3ea86545595e2b, processorArchitecture=MSIL">
109-
<HintPath>..\packages\LovettSoftware.XmlDiff.1.0.2\lib\net47\XmlDiffPatch.View.dll</HintPath>
109+
<Reference Include="XmlDiffPatch.View, Version=1.0.3.0, Culture=neutral, PublicKeyToken=ab3ea86545595e2b, processorArchitecture=MSIL">
110+
<HintPath>..\packages\LovettSoftware.XmlDiff.1.0.3\lib\net47\XmlDiffPatch.View.dll</HintPath>
111+
<Private>True</Private>
110112
</Reference>
111113
</ItemGroup>
112114
<ItemGroup>
@@ -369,17 +371,17 @@
369371
<CoreBuildDependsOn>$(CoreBuildDependsOn);SyncVersionsTarget</CoreBuildDependsOn>
370372
</PropertyGroup>
371373
<ItemGroup>
372-
<Content Include="$(MSBuildThisFileDirectory)\..\packages\Microsoft.Web.WebView2.1.0.961.33\runtimes\win-x86\native\WebView2Loader.dll">
374+
<Content Include="$(MSBuildThisFileDirectory)\..\packages\Microsoft.Web.WebView2.1.0.1020.30\runtimes\win-x86\native\WebView2Loader.dll">
373375
<Link>runtimes\win-x86\native\%(Filename)%(Extension)</Link>
374376
<PublishState>Included</PublishState>
375377
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
376378
</Content>
377-
<Content Include="$(MSBuildThisFileDirectory)\..\packages\Microsoft.Web.WebView2.1.0.961.33\runtimes\win-x64\native\WebView2Loader.dll">
379+
<Content Include="$(MSBuildThisFileDirectory)\..\packages\Microsoft.Web.WebView2.1.0.1020.30\runtimes\win-x64\native\WebView2Loader.dll">
378380
<Link>runtimes\win-x64\native\%(Filename)%(Extension)</Link>
379381
<PublishState>Included</PublishState>
380382
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
381383
</Content>
382-
<Content Include="$(MSBuildThisFileDirectory)\..\packages\Microsoft.Web.WebView2.1.0.961.33\runtimes\win-arm64\native\WebView2Loader.dll">
384+
<Content Include="$(MSBuildThisFileDirectory)\..\packages\Microsoft.Web.WebView2.1.0.1020.30\runtimes\win-arm64\native\WebView2Loader.dll">
383385
<Link>runtimes\win-arm64\native\%(Filename)%(Extension)</Link>
384386
<PublishState>Included</PublishState>
385387
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

‎src/Application/FormMain.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,6 @@ protected override void OnLayout(LayoutEventArgs levent)
609609
//this.taskList.Location = new Point(0, top + this.xmlTreeView1.Height + this.resizer.Height);
610610
this.tabControlLists.Size = new Size(w, this.tabControlLists.Height);
611611
this.tabControlLists.Location = new Point(0, top + this.tabControlViews.Height + this.resizer.Height);
612-
base.OnLayout(levent);
613612
}
614613

615614

‎src/Application/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<packages>
33
<package id="LovettSoftware.XmlDiff" version="1.0.3" targetFramework="net472" />
44
<package id="Microsoft.Win32.Registry" version="6.0.0-preview.5.21301.5" targetFramework="net472" />
5-
<package id="Microsoft.Xml.SgmlReader" version="1.8.24" targetFramework="net472" />
5+
<package id="Microsoft.Xml.SgmlReader" version="1.8.25" targetFramework="net472" />
66
<package id="SimpleGoogleAnalytics" version="1.0.1" targetFramework="net472" />
77
<package id="System.Security.AccessControl" version="6.0.0-preview.5.21301.5" targetFramework="net472" />
88
<package id="System.Security.Principal.Windows" version="6.0.0-preview.5.21301.5" targetFramework="net472" />

‎src/Model/Settings.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -563,10 +563,11 @@ public PersistentFileNames(string startupPath)
563563

564564
public string GetPersistentFileName(Uri uri)
565565
{
566-
if (!uri.IsAbsoluteUri) return uri.OriginalString;
567-
string result = uri.OriginalString;
566+
string result = null;
568567
try
569568
{
569+
if (!uri.IsAbsoluteUri) return uri.OriginalString;
570+
result = uri.OriginalString;
570571
int len = 0;
571572
string path = uri.AbsolutePath;
572573
if (uri.IsFile && !File.Exists(uri.LocalPath)) // sanity check!

‎src/Model/Updater.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ UpdateStatus ProcessUpdate(XmlDocument doc)
295295
Trace.WriteLine(ex.Message);
296296
}
297297
}
298-
bool newVersion = false;
298+
299299
foreach (XmlElement e in doc.SelectNodes("updates/version"))
300300
{
301301
string n = e.GetAttribute("number");

‎src/XmlNotepad/XmlNotepad.csproj‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -237,20 +237,17 @@
237237
</ItemGroup>
238238
<ItemGroup>
239239
<Reference Include="Accessibility" />
240-
<Reference Include="Microsoft.Web.WebView2.Core, Version=1.0.961.33, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
241-
<HintPath>..\packages\Microsoft.Web.WebView2.1.0.961.33\lib\net45\Microsoft.Web.WebView2.Core.dll</HintPath>
240+
<Reference Include="Microsoft.Web.WebView2.Core, Version=1.0.1020.30, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
241+
<HintPath>..\packages\Microsoft.Web.WebView2.1.0.1020.30\lib\net45\Microsoft.Web.WebView2.Core.dll</HintPath>
242242
</Reference>
243-
<Reference Include="Microsoft.Web.WebView2.WinForms, Version=1.0.961.33, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
244-
<HintPath>..\packages\Microsoft.Web.WebView2.1.0.961.33\lib\net45\Microsoft.Web.WebView2.WinForms.dll</HintPath>
243+
<Reference Include="Microsoft.Web.WebView2.WinForms, Version=1.0.1020.30, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
244+
<HintPath>..\packages\Microsoft.Web.WebView2.1.0.1020.30\lib\net45\Microsoft.Web.WebView2.WinForms.dll</HintPath>
245245
</Reference>
246-
<Reference Include="Microsoft.Web.WebView2.Wpf, Version=1.0.961.33, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
247-
<HintPath>..\packages\Microsoft.Web.WebView2.1.0.961.33\lib\net45\Microsoft.Web.WebView2.Wpf.dll</HintPath>
246+
<Reference Include="Microsoft.Web.WebView2.Wpf, Version=1.0.1020.30, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
247+
<HintPath>..\packages\Microsoft.Web.WebView2.1.0.1020.30\lib\net45\Microsoft.Web.WebView2.Wpf.dll</HintPath>
248248
</Reference>
249-
<Reference Include="SgmlReader, Version=1.8.19.0, Culture=neutral, PublicKeyToken=ab3ea86545595e2b, processorArchitecture=MSIL">
250-
<HintPath>..\packages\Microsoft.Xml.SgmlReader.1.8.19\lib\net47\SgmlReader.exe</HintPath>
251-
</Reference>
252-
<Reference Include="SgmlReaderDll, Version=1.8.19.0, Culture=neutral, PublicKeyToken=ab3ea86545595e2b, processorArchitecture=MSIL">
253-
<HintPath>..\packages\Microsoft.Xml.SgmlReader.1.8.19\lib\net47\SgmlReaderDll.dll</HintPath>
249+
<Reference Include="SgmlReaderDll, Version=1.8.24.0, Culture=neutral, PublicKeyToken=ab3ea86545595e2b, processorArchitecture=MSIL">
250+
<HintPath>..\packages\Microsoft.Xml.SgmlReader.1.8.25\lib\net47\SgmlReaderDll.dll</HintPath>
254251
</Reference>
255252
<Reference Include="System" />
256253
<Reference Include="System.Data" />
@@ -259,11 +256,11 @@
259256
<Reference Include="System.Windows.Forms" />
260257
<Reference Include="System.Xml" />
261258
<Reference Include="System.Xml.Linq" />
262-
<Reference Include="XmlDiffPatch, Version=1.0.2.0, Culture=neutral, PublicKeyToken=ab3ea86545595e2b, processorArchitecture=MSIL">
263-
<HintPath>..\packages\LovettSoftware.XmlDiff.1.0.2\lib\net47\XmlDiffPatch.dll</HintPath>
259+
<Reference Include="XmlDiffPatch, Version=1.0.3.0, Culture=neutral, PublicKeyToken=ab3ea86545595e2b, processorArchitecture=MSIL">
260+
<HintPath>..\packages\LovettSoftware.XmlDiff.1.0.3\lib\net47\XmlDiffPatch.dll</HintPath>
264261
</Reference>
265-
<Reference Include="XmlDiffPatch.View, Version=1.0.2.0, Culture=neutral, PublicKeyToken=ab3ea86545595e2b, processorArchitecture=MSIL">
266-
<HintPath>..\packages\LovettSoftware.XmlDiff.1.0.2\lib\net47\XmlDiffPatch.View.dll</HintPath>
262+
<Reference Include="XmlDiffPatch.View, Version=1.0.3.0, Culture=neutral, PublicKeyToken=ab3ea86545595e2b, processorArchitecture=MSIL">
263+
<HintPath>..\packages\LovettSoftware.XmlDiff.1.0.3\lib\net47\XmlDiffPatch.View.dll</HintPath>
267264
</Reference>
268265
</ItemGroup>
269266
<ItemGroup>
@@ -321,8 +318,8 @@
321318
</PropertyGroup>
322319
<Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.NetAnalyzers.5.0.3\build\Microsoft.CodeAnalysis.NetAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.NetAnalyzers.5.0.3\build\Microsoft.CodeAnalysis.NetAnalyzers.props'))" />
323320
<Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.NetAnalyzers.5.0.3\build\Microsoft.CodeAnalysis.NetAnalyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.NetAnalyzers.5.0.3\build\Microsoft.CodeAnalysis.NetAnalyzers.targets'))" />
324-
<Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.961.33\build\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.961.33\build\Microsoft.Web.WebView2.targets'))" />
321+
<Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.1020.30\build\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.1020.30\build\Microsoft.Web.WebView2.targets'))" />
325322
</Target>
326323
<Import Project="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.5.0.3\build\Microsoft.CodeAnalysis.NetAnalyzers.targets" Condition="Exists('..\packages\Microsoft.CodeAnalysis.NetAnalyzers.5.0.3\build\Microsoft.CodeAnalysis.NetAnalyzers.targets')" />
327-
<Import Project="..\packages\Microsoft.Web.WebView2.1.0.961.33\build\Microsoft.Web.WebView2.targets" Condition="Exists('..\packages\Microsoft.Web.WebView2.1.0.961.33\build\Microsoft.Web.WebView2.targets')" />
324+
<Import Project="..\packages\Microsoft.Web.WebView2.1.0.1020.30\build\Microsoft.Web.WebView2.targets" Condition="Exists('..\packages\Microsoft.Web.WebView2.1.0.1020.30\build\Microsoft.Web.WebView2.targets')" />
328325
</Project>

‎src/XmlNotepad/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="LovettSoftware.XmlDiff" version="1.0.2" targetFramework="net472" />
3+
<package id="LovettSoftware.XmlDiff" version="1.0.3" targetFramework="net472" />
44
<package id="Microsoft.CodeAnalysis.NetAnalyzers" version="5.0.3" targetFramework="net472" developmentDependency="true" />
5-
<package id="Microsoft.Web.WebView2" version="1.0.961.33" targetFramework="net472" />
5+
<package id="Microsoft.Web.WebView2" version="1.0.1020.30" targetFramework="net472" />
66
<package id="Microsoft.Xml.SgmlReader" version="1.8.25" targetFramework="net472" />
77
</packages>

0 commit comments

Comments
 (0)