Skip to content

Commit d6f80d4

Browse files
manuelblmanuelbl
committed
More upgrades
1 parent 885d235 commit d6f80d4

10 files changed

Lines changed: 157 additions & 108 deletions

File tree

‎Demo-SkiaSharp/Demo-SkiaSharp.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Net.Codecrete.QrCodeGenerator" Version="2.*" />
21-
<PackageReference Include="SkiaSharp" Version="2.*" />
22-
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.*" />
20+
<PackageReference Include="Net.Codecrete.QrCodeGenerator" Version="3.*" />
21+
<PackageReference Include="SkiaSharp" Version="3.*" />
22+
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="3.*" />
2323
</ItemGroup>
2424

2525
</Project>

‎Demo-System-Drawing/Demo-System-Drawing.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Net.Codecrete.QrCodeGenerator" Version="2.*" />
20+
<PackageReference Include="Net.Codecrete.QrCodeGenerator" Version="3.*" />
2121
<PackageReference Include="System.Drawing.Common" Version="5.*" />
2222
</ItemGroup>
2323

‎Demo-VCard/VCardDemo.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<ItemGroup>
99
<PackageReference Include="MixERP.Net.VCards" Version="1.0.7" />
10-
<PackageReference Include="Net.Codecrete.QrCodeGenerator" Version="2.*" />
10+
<PackageReference Include="Net.Codecrete.QrCodeGenerator" Version="3.*" />
1111
</ItemGroup>
1212

1313
</Project>

‎Demo-WinForms/Demo-WinForms.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Net.Codecrete.QrCodeGenerator" Version="2.*" />
11+
<PackageReference Include="Net.Codecrete.QrCodeGenerator" Version="3.*" />
1212
</ItemGroup>
1313

1414
</Project>

‎Demo-WinForms/Form1.Designer.cs‎

Lines changed: 78 additions & 89 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Demo-WinForms/Form1.resx‎

Lines changed: 61 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,64 @@
1-
<root>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
262
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
363
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
464
<xsd:element name="root" msdata:IsDataSet="true">

‎Demo-WinUI/Demo-WinUI/Demo-WinUI.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
4-
<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
4+
<TargetFramework>net10.0-windows10.0.19041.0</TargetFramework>
55
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
66
<RootNamespace>Net.Codecrete.QrCodeGenerator.Demo</RootNamespace>
77
<ApplicationManifest>app.manifest</ApplicationManifest>
@@ -33,15 +33,15 @@
3333
</ItemGroup>
3434

3535
<ItemGroup>
36-
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
37-
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.3.0" />
38-
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106">
36+
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
37+
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.4.0" />
38+
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.275">
3939
<PrivateAssets>all</PrivateAssets>
4040
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4141
</PackageReference>
42-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
43-
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
44-
<PackageReference Include="Net.Codecrete.QrCodeGenerator" Version="2.1.0" />
42+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="2.0.1" />
43+
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.28000.1839" />
44+
<PackageReference Include="Net.Codecrete.QrCodeGenerator" Version="3.0.0" />
4545
<Manifest Include="$(ApplicationManifest)" />
4646
</ItemGroup>
4747

‎Demo-WinUI/Demo-WinUI/MainViewModel.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@ public partial class MainViewModel : ObservableObject
2323
/// QR code text
2424
/// </summary>
2525
[ObservableProperty]
26-
string text = "Hello, world!";
26+
public partial string Text { get; set; } = "Hello, world!";
2727

2828
/// <summary>
2929
/// QR code error correction level
3030
/// </summary>
3131
[ObservableProperty]
32-
QrCode.Ecc errorCorrection = QrCode.Ecc.Medium;
32+
public partial QrCode.Ecc ErrorCorrection { get; set; } = QrCode.Ecc.Medium;
3333

3434
/// <summary>
3535
/// Width of border around QR code (in QR code pixels)
3636
/// </summary>
3737
[ObservableProperty]
38-
int borderWidth = 3;
38+
public partial int BorderWidth { get; set; } = 3;
3939

4040
private readonly Tuple<string, QrCode.Ecc>[] errorCorrectionLevels_ =
4141
{

‎Demo-WindowsPresentationFoundation/Demo-WindowsPresentationFoundation.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Net.Codecrete.QrCodeGenerator" Version="2.*" />
13+
<PackageReference Include="Net.Codecrete.QrCodeGenerator" Version="3.*" />
1414
</ItemGroup>
1515

1616
</Project>

‎Demo-WindowsPresentationFoundation/MainWindow.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace Net.Codecrete.QrCodeGenerator.Demo
1818
public partial class MainWindow : Window
1919
{
2020
private string _text = "QR code text";
21-
private int _borderWidth = 3;
21+
private int _borderWidth = 4;
2222
private QrCode.Ecc _errorCorrection = QrCode.Ecc.Medium;
2323
private readonly Tuple<string, QrCode.Ecc>[] _errorCorrectionLevels =
2424
{

0 commit comments

Comments
 (0)