Merge pull request #39 from TheJoeFin/dev

v 1.9

Author: TheJoeFin

.github/workflows/build.yml

@@ -0,0 +1,38 @@
+name: Build
+
+on:
+  # push:
+  #   branches:
+  #     - main
+  #     - dev
+  # pull_request:
+  #   branches:
+  #     - main
+  #     - dev
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v6
+
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v5
+      with:
+        dotnet-version: '9.0.x'
+
+    - name: Setup MSBuild
+      uses: microsoft/setup-msbuild@v2
+
+    - name: Restore
+      run: msbuild "Simple QR Code Maker.sln" /t:Restore /p:Configuration=Release /p:Platform=x64
+
+    - name: Build
+      run: msbuild "Simple QR Code Maker.sln" /p:Configuration=Release /p:Platform=x64

Simple QR Code Maker.Core/Simple QR Code Maker.Core.csproj

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <RootNamespace>Simple_QR_Code_Maker.Core</RootNamespace>
-    <Platforms>x86;x64;arm64;AnyCPU</Platforms>
+    <Platforms>x64;arm64</Platforms>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
@@ -11,6 +11,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="9.0.4" />
+    <PackageReference Include="System.Text.Json" Version="10.0.0" />
   </ItemGroup>
 </Project>

Simple QR Code Maker.sln

@@ -0,0 +1,17 @@
+<Solution>
+  <Configurations>
+    <Platform Name="arm64" />
+    <Platform Name="x64" />
+  </Configurations>
+  <Project Path="Simple QR Code Maker.Core/Simple QR Code Maker.Core.csproj">
+    <Platform Solution="*|arm64" Project="arm64" />
+    <Platform Solution="*|x64" Project="x64" />
+    <Platform Solution="*|x86" Project="x86" />
+  </Project>
+  <Project Path="Simple QR Code Maker/Simple QR Code Maker.csproj">
+    <Platform Solution="*|arm64" Project="arm64" />
+    <Platform Solution="*|x64" Project="x64" />
+    <Platform Solution="*|x86" Project="x86" />
+    <Deploy />
+  </Project>
+</Solution>

Simple QR Code Maker.slnx

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<StackPanel
+    x:Class="Simple_QR_Code_Maker.Controls.IconAndTextContent"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Simple_QR_Code_Maker.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    DataContext="{Binding}"
+    Orientation="Horizontal"
+    Spacing="6"
+    mc:Ignorable="d">
+    <Viewbox Height="14">
+        <SymbolIcon Symbol="{x:Bind Icon}" />
+    </Viewbox>
+    <TextBlock Text="{x:Bind ContentText}" />
+</StackPanel>

Simple QR Code Maker/Controls/IconAndTextContent.xaml

@@ -0,0 +1,26 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+
+namespace Simple_QR_Code_Maker.Controls;
+
+public sealed partial class IconAndTextContent : StackPanel
+{
+    public IconAndTextContent()
+    {
+        InitializeComponent();
+    }
+
+    public Symbol Icon
+    { get => (Symbol)GetValue(IconProperty); set => SetValue(IconProperty, value);
+    }
+
+    public static readonly DependencyProperty IconProperty =
+        DependencyProperty.Register(nameof(Icon), typeof(Symbol), typeof(IconAndTextContent), new PropertyMetadata(Symbol.Placeholder));
+
+    public string ContentText
+    { get => (string)GetValue(ContentTextProperty); set => SetValue(ContentTextProperty, value);
+    }
+
+    public static readonly DependencyProperty ContentTextProperty =
+        DependencyProperty.Register(nameof(ContentText), typeof(string), typeof(IconAndTextContent), new PropertyMetadata(string.Empty));
+}