This repository has been archived by the owner on Dec 21, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #9 from StrangeRanger/csharp-gui
Csharp gui
- Loading branch information
Showing
14 changed files
with
289 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,7 +36,7 @@ | |
| # 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 | ||
| name: .NET Core Desktop (CI) | ||
|
|
||
| on: | ||
| push: | ||
|
|
@@ -56,17 +56,24 @@ jobs: | |
| # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on | ||
|
|
||
| env: | ||
| Solution_Name: FAFB-PowerShell-Tool.sln # Replace with your solution name, i.e. MyWpfApp.sln. | ||
| Test_Project_Path: FAFB-PowerShell-Tool-Test.csproj # Replace with the path to your test project, i.e. MyWpfApp.Tests\MyWpfApp.Tests.csproj. | ||
| Wap_Project_Directory: FAFB-PowerShell-Tool # Replace with the Wap project directory relative to the solution, i.e. MyWpfApp.Package. | ||
| Wap_Project_Path: FAFB-PowerShell-Tool\FAFB-PowerShell-Tool.csproj # Replace with the path to your Wap project, i.e. MyWpf.App.Package\MyWpfApp.Package.wapproj. | ||
| App_Packages_Directory: AppPackages | ||
| SigningCertificate: GitHubActionsDemo.pfx | ||
| Solution_Name: FAFB-PowerShell-Tool.sln # Replace with your solution name, i.e. MyWpfApp.sln. | ||
| Test_Project_Path: FAFB-PowerShell-Tool.Test\FAFB-PowerShell-Tool.Test.csproj # Replace with the path to your test project, i.e. MyWpfApp.Tests\MyWpfApp.Tests.csproj. | ||
| Wap_Project_Directory: FAFB-PowerShell-Tool.Package # Replace with the Wap project directory relative to the solution, i.e. MyWpfApp.Package. | ||
| Wap_Project_Path: FAFB-PowerShell-Tool.Package/FAFB-PowerShell-Tool.Package.wapproj # Replace with the path to your Wap project, i.e. MyWpf.App.Package\MyWpfApp.Package.wapproj. | ||
|
|
||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| # NEW: Use Nerdbank.GitVersioning to set version variables: https://github.com/AArnott/nbgv | ||
| - name: Use Nerdbank.GitVersioning to set version variables | ||
| uses: dotnet/nbgv@master | ||
| id: nbgv | ||
|
|
||
| # Install the .NET Core workload | ||
| - name: Install .NET Core (net8) | ||
| uses: actions/setup-dotnet@v3 | ||
|
|
@@ -77,6 +84,13 @@ jobs: | |
| - name: Setup MSBuild.exe | ||
| uses: microsoft/[email protected] | ||
|
|
||
| # NEW: Update the version before build | ||
| - name: Update manifest version | ||
| run: | | ||
| [xml]$manifest = get-content ".\$env:Wap_Project_Directory\Package.appxmanifest" | ||
| $manifest.Package.Identity.Version = "${{ steps.nbgv.outputs.SimpleVersion }}.0" | ||
| $manifest.save(".\$env:Wap_Project_Directory\Package.appxmanifest") | ||
| # Execute all unit tests in the solution | ||
| #- name: Execute unit tests | ||
| # run: dotnet test | ||
|
|
@@ -91,25 +105,34 @@ jobs: | |
| - 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 | ||
| $certificatePath = Join-Path -Path $env:Wap_Project_Directory -ChildPath $env:SigningCertificate | ||
| [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 }} | ||
| #- 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 }} | ||
|
|
||
| # NEW: Build the Windows Application Packaging project | ||
| - name: Build the Windows Application Packaging Project (wapproj) | ||
| run: msbuild $env:Solution_Path /p:Platform=$env:TargetPlatform /p:Configuration=$env:Configuration /p:UapAppxPackageBuildMode=$env:BuildMode /p:AppxBundle=$env:AppxBundle /p:PackageCertificateKeyFile=$env:SigningCertificate /p:PackageCertificatePassword=${{ secrets.Pfx_Key }} | ||
| env: | ||
| Appx_Bundle: Always | ||
| Appx_Bundle_Platforms: x86|x64 | ||
| Appx_Package_Build_Mode: StoreUpload | ||
| Configuration: ${{ matrix.configuration }} | ||
| AppxBundle: Never | ||
| BuildMode: SideloadOnly | ||
| Configuration: Debug | ||
| TargetPlatform: ${{ matrix.targetplatform }} | ||
|
|
||
| # Remove the pfx | ||
| - name: Remove the pfx | ||
| run: Remove-Item -path $env:Wap_Project_Directory\GitHubActionsWorkflow.pfx | ||
| run: Remove-Item -path $env:Wap_Project_Directory\$env:SigningCertificate | ||
|
|
||
| # 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 | ||
| path: ${{ env.Wap_Project_Directory }}\${{ env.App_Packages_Directory }} | ||
82 changes: 82 additions & 0 deletions
82
FAFB-PowerShell-Tool.Package/FAFB-PowerShell-Tool.Package.wapproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' < '15.0'"> | ||
| <VisualStudioVersion>15.0</VisualStudioVersion> | ||
| </PropertyGroup> | ||
| <ItemGroup Label="ProjectConfigurations"> | ||
| <ProjectConfiguration Include="Debug|x86"> | ||
| <Configuration>Debug</Configuration> | ||
| <Platform>x86</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Release|x86"> | ||
| <Configuration>Release</Configuration> | ||
| <Platform>x86</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Debug|x64"> | ||
| <Configuration>Debug</Configuration> | ||
| <Platform>x64</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Release|x64"> | ||
| <Configuration>Release</Configuration> | ||
| <Platform>x64</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Debug|ARM"> | ||
| <Configuration>Debug</Configuration> | ||
| <Platform>ARM</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Release|ARM"> | ||
| <Configuration>Release</Configuration> | ||
| <Platform>ARM</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Debug|ARM64"> | ||
| <Configuration>Debug</Configuration> | ||
| <Platform>ARM64</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Release|ARM64"> | ||
| <Configuration>Release</Configuration> | ||
| <Platform>ARM64</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Debug|AnyCPU"> | ||
| <Configuration>Debug</Configuration> | ||
| <Platform>AnyCPU</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Release|AnyCPU"> | ||
| <Configuration>Release</Configuration> | ||
| <Platform>AnyCPU</Platform> | ||
| </ProjectConfiguration> | ||
| </ItemGroup> | ||
| <PropertyGroup> | ||
| <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath> | ||
| </PropertyGroup> | ||
| <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" /> | ||
| <PropertyGroup> | ||
| <ProjectGuid>3ae0a0e8-4683-4e4a-ba94-ae22f5d0778f</ProjectGuid> | ||
| <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion> | ||
| <TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion> | ||
| <DefaultLanguage>en-US</DefaultLanguage> | ||
| <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled> | ||
| <NoWarn>$(NoWarn);NU1702</NoWarn> | ||
| <EntryPointProjectUniqueName>..\FAFB-PowerShell-Tool\FAFB-PowerShell-Tool.csproj</EntryPointProjectUniqueName> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <AppxManifest Include="Package.appxmanifest"> | ||
| <SubType>Designer</SubType> | ||
| </AppxManifest> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Content Include="Images\SplashScreen.scale-200.png" /> | ||
| <Content Include="Images\LockScreenLogo.scale-200.png" /> | ||
| <Content Include="Images\Square150x150Logo.scale-200.png" /> | ||
| <Content Include="Images\Square44x44Logo.scale-200.png" /> | ||
| <Content Include="Images\Square44x44Logo.targetsize-24_altform-unplated.png" /> | ||
| <Content Include="Images\StoreLogo.png" /> | ||
| <Content Include="Images\Wide310x150Logo.scale-200.png" /> | ||
| </ItemGroup> | ||
| <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" /> | ||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" PrivateAssets="all" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\FAFB-PowerShell-Tool\FAFB-PowerShell-Tool.csproj" /> | ||
| </ItemGroup> | ||
| </Project> |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.23 KB
...werShell-Tool.Package/Images/Square44x44Logo.targetsize-24_altform-unplated.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
|
|
||
| <Package | ||
| xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" | ||
| xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" | ||
| xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" | ||
| IgnorableNamespaces="uap rescap"> | ||
|
|
||
| <Identity | ||
| Name="7346627d-88da-45ee-905a-e72e65d63231" | ||
| Publisher="CN=Hunter Thompson" | ||
| Version="1.0.0.0" /> | ||
|
|
||
| <Properties> | ||
| <DisplayName>FAFB-PowerShell-Tool.Package</DisplayName> | ||
| <PublisherDisplayName>Hunter Thompson</PublisherDisplayName> | ||
| <Logo>Images\StoreLogo.png</Logo> | ||
| </Properties> | ||
|
|
||
| <Dependencies> | ||
| <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" /> | ||
| <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.0" MaxVersionTested="10.0.14393.0" /> | ||
| </Dependencies> | ||
|
|
||
| <Resources> | ||
| <Resource Language="x-generate"/> | ||
| </Resources> | ||
|
|
||
| <Applications> | ||
| <Application Id="App" | ||
| Executable="$targetnametoken$.exe" | ||
| EntryPoint="$targetentrypoint$"> | ||
| <uap:VisualElements | ||
| DisplayName="FAFB-PowerShell-Tool.Package" | ||
| Description="FAFB-PowerShell-Tool.Package" | ||
| BackgroundColor="transparent" | ||
| Square150x150Logo="Images\Square150x150Logo.png" | ||
| Square44x44Logo="Images\Square44x44Logo.png"> | ||
| <uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png" /> | ||
| <uap:SplashScreen Image="Images\SplashScreen.png" /> | ||
| </uap:VisualElements> | ||
| </Application> | ||
| </Applications> | ||
|
|
||
| <Capabilities> | ||
| <Capability Name="internetClient" /> | ||
| <rescap:Capability Name="runFullTrust" /> | ||
| </Capabilities> | ||
| </Package> |
25 changes: 25 additions & 0 deletions
25
FAFB-PowerShell-Tool.Test/FAFB-PowerShell-Tool.Test.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net8.0</TargetFramework> | ||
| <RootNamespace>FAFB_PowerShell_Tool.Test</RootNamespace> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <Nullable>enable</Nullable> | ||
|
|
||
| <IsPackable>false</IsPackable> | ||
| <IsTestProject>true</IsTestProject> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" /> | ||
| <PackageReference Include="NUnit" Version="3.13.3" /> | ||
| <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" /> | ||
| <PackageReference Include="NUnit.Analyzers" Version="3.6.1" /> | ||
| <PackageReference Include="coverlet.collector" Version="6.0.0" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\FAFB-PowerShell-Tool\FAFB-PowerShell-Tool.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| global using NUnit.Framework; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| namespace FAFB_PowerShell_Tool.Test | ||
| { | ||
| public class Tests | ||
| { | ||
| [SetUp] | ||
| public void Setup() | ||
| { | ||
| } | ||
|
|
||
| [Test] | ||
| public void Test1() | ||
| { | ||
| Assert.Pass(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters