dschick/git_brcal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added Webview2.loader dll, updated Nuget, bumped version to 1.6.4

Browse Source
This commit is contained in:
Daniel Schick 2025-05-21 11:31:57 +02:00
parent 4718dfb219
commit 2576665c8d
3 changed files with 47 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/BreCalClient/BreCalClient.csproj
View File

@ -8,8 +8,8 @@
<SignAssembly>True</SignAssembly> <SignAssembly>True</SignAssembly>
<StartupObject>BreCalClient.App</StartupObject> <StartupObject>BreCalClient.App</StartupObject>
<AssemblyOriginatorKeyFile>..\..\misc\brecal.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>..\..\misc\brecal.snk</AssemblyOriginatorKeyFile>
<AssemblyVersion>1.6.3.0</AssemblyVersion> <AssemblyVersion>1.6.4.0</AssemblyVersion>
<FileVersion>1.6.3.0</FileVersion> <FileVersion>1.6.4.0</FileVersion>
<Title>Bremen calling client</Title> <Title>Bremen calling client</Title>
<Description>A Windows WPF client for the Bremen calling API.</Description> <Description>A Windows WPF client for the Bremen calling API.</Description>
<ApplicationIcon>containership.ico</ApplicationIcon> <ApplicationIcon>containership.ico</ApplicationIcon>
@ -118,13 +118,13 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Extended.Wpf.Toolkit" Version="4.6.1" /> <PackageReference Include="Extended.Wpf.Toolkit" Version="4.7.25104.5739" />
<PackageReference Include="JsonSubTypes" Version="2.0.1" /> <PackageReference Include="JsonSubTypes" Version="2.0.1" />
<PackageReference Include="log4net" Version="2.0.17" /> <PackageReference Include="log4net" Version="3.1.0" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3179.45" /> <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3240.44" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Polly" Version="8.4.1" /> <PackageReference Include="Polly" Version="8.5.2" />
<PackageReference Include="RestSharp" Version="112.0.0" /> <PackageReference Include="RestSharp" Version="112.1.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

12
src/BreCalClient/ShipcallControl.xaml.cs
View File

@ -565,9 +565,15 @@ namespace BreCalClient
buttonPanel.Children.Add(popOutButton); buttonPanel.Children.Add(popOutButton);
placeHolderMap.Children.Add(_webView); placeHolderMap.Children.Add(_webView);
try
_webView.EnsureCoreWebView2Async(null); {
_webView.Source = new Uri(trenzUri); _webView.EnsureCoreWebView2Async(null);
_webView.Source = new Uri(trenzUri);
}
catch(Exception ex)
{
MessageBox.Show($"WebView2 initialization failed: {ex.Message}");
}
}); });
} }

36
src/Setup/Setup.vdproj
View File

@ -39,6 +39,12 @@
} }
"Entry" "Entry"
{ {
"MsmKey" = "8:_E125FEFD1B0A4E82A92EB7C037145E1F"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED" "MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_CD20A468610C42B89F66B4D3367A5A6A" "OwnerKey" = "8:_CD20A468610C42B89F66B4D3367A5A6A"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
@ -158,7 +164,7 @@
{ {
"AssemblyRegister" = "3:1" "AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE" "AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:Xceed.Wpf.AvalonDock.resources, Version=4.6.0.0, Culture=de, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL" "AssemblyAsmDisplayName" = "8:Xceed.Wpf.AvalonDock.resources, Version=4.7.0.0, Culture=de, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL"
"ScatterAssemblies" "ScatterAssemblies"
{ {
"_1E7663DCE02A4D848349229A724E961A" "_1E7663DCE02A4D848349229A724E961A"
@ -236,6 +242,26 @@
"IsDependency" = "11:FALSE" "IsDependency" = "11:FALSE"
"IsolateTo" = "8:" "IsolateTo" = "8:"
} }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E125FEFD1B0A4E82A92EB7C037145E1F"
{
"SourcePath" = "8:..\\BreCalClient\\bin\\Release\\net6.0-windows\\runtimes\\win-x64\\native\\WebView2Loader.dll"
"TargetName" = "8:WebView2Loader.dll"
"Tag" = "8:"
"Folder" = "8:_7C8F7547CED64B3CAE7D0296A8BCE23F"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
} }
"FileType" "FileType"
{ {
@ -303,15 +329,15 @@
{ {
"Name" = "8:Microsoft Visual Studio" "Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Bremen calling" "ProductName" = "8:Bremen calling"
"ProductCode" = "8:{B09BDAFF-76AE-4703-ABE6-15A75F244A9C}" "ProductCode" = "8:{F6083A70-E7F6-4EB1-8448-2FF6D1245944}"
"PackageCode" = "8:{BD2F0DA7-41AC-49F0-A3DA-C68588D935F0}" "PackageCode" = "8:{9A84EABA-1517-486A-B9BF-3854DD357267}"
"UpgradeCode" = "8:{1C7FA3E4-BAB9-4911-9348-73094357FC7C}" "UpgradeCode" = "8:{1C7FA3E4-BAB9-4911-9348-73094357FC7C}"
"AspNetVersion" = "8:" "AspNetVersion" = "8:"
"RestartWWWService" = "11:FALSE" "RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE" "InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.6.3" "ProductVersion" = "8:1.6.4"
"Manufacturer" = "8:Informatikbüro Daniel Schick" "Manufacturer" = "8:Informatikbüro Daniel Schick"
"ARPHELPTELEPHONE" = "8:+49 (0) 421 - 38 48 27" "ARPHELPTELEPHONE" = "8:+49 (0) 421 - 38 48 27"
"ARPHELPLINK" = "8:https://www.bsmd.de/" "ARPHELPLINK" = "8:https://www.bsmd.de/"
@ -853,7 +879,7 @@
{ {
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3E48B6E716164CC1826E094025517B3F" "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3E48B6E716164CC1826E094025517B3F"
{ {
"SourcePath" = "8:..\\BreCalClient\\obj\\Debug\\net6.0-windows\\apphost.exe" "SourcePath" = "8:..\\BreCalClient\\obj\\Release\\net6.0-windows\\apphost.exe"
"TargetName" = "8:" "TargetName" = "8:"
"Tag" = "8:" "Tag" = "8:"
"Folder" = "8:_7C8F7547CED64B3CAE7D0296A8BCE23F" "Folder" = "8:_7C8F7547CED64B3CAE7D0296A8BCE23F"