diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml new file mode 100644 index 000000000..e718dd9be --- /dev/null +++ b/.github/workflows/dotnet-desktop.yml @@ -0,0 +1,115 @@ +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. + +# This workflow will build, test, sign and package a WPF or Windows Forms desktop application +# built on .NET Core. +# To learn how to migrate your existing application to .NET Core, +# refer to https://docs.microsoft.com/en-us/dotnet/desktop-wpf/migration/convert-project-from-net-framework +# +# To configure this workflow: +# +# 1. Configure environment variables +# GitHub sets default environment variables for every workflow run. +# Replace the variables relative to your project in the "env" section below. +# +# 2. Signing +# Generate a signing certificate in the Windows Application +# Packaging Project or add an existing signing certificate to the project. +# Next, use PowerShell to encode the .pfx file using Base64 encoding +# by running the following Powershell script to generate the output string: +# +# $pfx_cert = Get-Content '.\SigningCertificate.pfx' -Encoding Byte +# [System.Convert]::ToBase64String($pfx_cert) | Out-File 'SigningCertificate_Encoded.txt' +# +# Open the output file, SigningCertificate_Encoded.txt, and copy the +# string inside. Then, add the string to the repo as a GitHub secret +# and name it "Base64_Encoded_Pfx." +# For more information on how to configure your signing certificate for +# this workflow, refer to https://github.com/microsoft/github-actions-for-desktop-apps#signing +# +# Finally, add the signing certificate password to the repo as a secret and name it "Pfx_Key". +# See "Build the Windows Application Packaging project" below to see how the secret is used. +# +# For more information on GitHub Actions, refer to https://github.com/features/actions +# For a complete CI/CD sample to get started with GitHub Action workflows for Desktop Applications, +# refer to https://github.com/microsoft/github-actions-for-desktop-apps + +name: .NET Core Desktop + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + + build: + + strategy: + matrix: + configuration: [Debug, Release] + + runs-on: windows-latest # For a list of available runner types, refer to + # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on + + env: + Solution_Name: your-solution-name # Replace with your solution name, i.e. MyWpfApp.sln. + Test_Project_Path: your-test-project-path # Replace with the path to your test project, i.e. MyWpfApp.Tests\MyWpfApp.Tests.csproj. + Wap_Project_Directory: your-wap-project-directory-name # Replace with the Wap project directory relative to the solution, i.e. MyWpfApp.Package. + Wap_Project_Path: your-wap-project-path # Replace with the path to your Wap project, i.e. MyWpf.App.Package\MyWpfApp.Package.wapproj. + + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + # Install the .NET Core workload + - name: Install .NET Core + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 8.0.x + + # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild + - name: Setup MSBuild.exe + uses: microsoft/setup-msbuild@v2 + + # Execute all unit tests in the solution + - name: Execute unit tests + run: dotnet test + + # Restore the application to populate the obj folder with RuntimeIdentifiers + - name: Restore the application + run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration + env: + Configuration: ${{ matrix.configuration }} + + # Decode the base 64 encoded pfx and save the Signing_Certificate + - name: Decode the pfx + run: | + $pfx_cert_byte = [System.Convert]::FromBase64String("${{ secrets.Base64_Encoded_Pfx }}") + $certificatePath = Join-Path -Path $env:Wap_Project_Directory -ChildPath GitHubActionsWorkflow.pfx + [IO.File]::WriteAllBytes("$certificatePath", $pfx_cert_byte) + + # Create the app package by building and packaging the Windows Application Packaging project + - name: Create the app package + run: msbuild $env:Wap_Project_Path /p:Configuration=$env:Configuration /p:UapAppxPackageBuildMode=$env:Appx_Package_Build_Mode /p:AppxBundle=$env:Appx_Bundle /p:PackageCertificateKeyFile=GitHubActionsWorkflow.pfx /p:PackageCertificatePassword=${{ secrets.Pfx_Key }} + env: + Appx_Bundle: Always + Appx_Bundle_Platforms: x86|x64 + Appx_Package_Build_Mode: StoreUpload + Configuration: ${{ matrix.configuration }} + + # Remove the pfx + - name: Remove the pfx + run: Remove-Item -path $env:Wap_Project_Directory\GitHubActionsWorkflow.pfx + + # Upload the MSIX package: https://github.com/marketplace/actions/upload-a-build-artifact + - name: Upload build artifacts + uses: actions/upload-artifact@v3 + with: + name: MSIX Package + path: ${{ env.Wap_Project_Directory }}\AppPackages diff --git a/.idea/.idea.Vanara/.idea/projectSettingsUpdater.xml b/.idea/.idea.Vanara/.idea/projectSettingsUpdater.xml new file mode 100644 index 000000000..86cc6c63e --- /dev/null +++ b/.idea/.idea.Vanara/.idea/projectSettingsUpdater.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/.idea.Vanara/.idea/workspace.xml b/.idea/.idea.Vanara/.idea/workspace.xml new file mode 100644 index 000000000..1ac928b92 --- /dev/null +++ b/.idea/.idea.Vanara/.idea/workspace.xml @@ -0,0 +1,4 @@ + + + {} + \ No newline at end of file diff --git a/WinUI.Extensions/IconExtension.cs b/WinUI.Extensions/IconExtension.cs new file mode 100644 index 000000000..4d50a44f6 --- /dev/null +++ b/WinUI.Extensions/IconExtension.cs @@ -0,0 +1,46 @@ +/* + * + * + * Reference GitHub URL "tajbender.Vanara\Windows.Forms\Extensions\IconExtension.cs" + * + * + */ + +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Vanara.PInvoke; + +namespace Vanara.WinUI.Extensions; + +/// Used to determine the size of the icon returned by various shell methods. +public enum IconSize +{ + /// + /// The image size is normally 32x32 pixels. However, if the Use large icons option is selected from the Effects section of the Appearance tab in + /// Display Properties, the image is 48x48 pixels. + /// + Large = Shell32.SHIL.SHIL_LARGE, + /// The image is the Shell standard small icon size of 16x16, but the size can be customized by the user. + Small = Shell32.SHIL.SHIL_SMALL, + /// The image is the Shell standard extra-large icon size. This is typically 48x48, but the size can be customized by the user. + ExtraLarge = Shell32.SHIL.SHIL_EXTRALARGE, + /// Windows Vista and later. The image is normally 256x256 pixels. + Jumbo = Shell32.SHIL.SHIL_JUMBO +} + +/// Extension methods for . +/// This class replaces "Vanara.Windows.Forms.Extensions.IconExtension" for WinUI. +/// +public static class IconExtension +{ + //public static async Task GetWinUi3BitmapSourceFromIcon(Icon bitmapIcon) + //{ + // ArgumentNullException.ThrowIfNull(bitmapIcon); + + // return await GetWinUi3BitmapSourceFromGdiBitmap(bitmapIcon.ToBitmap()); + //} +} diff --git a/WinUI.Extensions/Vanara.WinUI.Extensions.csproj b/WinUI.Extensions/Vanara.WinUI.Extensions.csproj index 93a0ccf76..45d653641 100644 --- a/WinUI.Extensions/Vanara.WinUI.Extensions.csproj +++ b/WinUI.Extensions/Vanara.WinUI.Extensions.csproj @@ -3,7 +3,7 @@ Extension methods and conversions from Vanara P/Invoke types and methods to UWP and WinUI types and methods. $(AssemblyName) - net45;net48;net6.0;net7.0;net8.0-windows;netcoreapp3.1 + net6.0;net7.0;net8.0-windows;netcoreapp3.1 true true Vanara.WinUI.Extensions @@ -16,6 +16,7 @@ SystemFoundationExtensions pkgreadme.md + Vanara.WinUI.Extensions @@ -26,6 +27,7 @@ SystemFoundationExtensions + \ No newline at end of file