Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/copilot-instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ The MaterialDesignInXamlToolkit is a **theme library** for WPF applications that
### Build and Test
```powershell
# Restore dependencies
dotnet restore MaterialDesignToolkit.Full.sln
dotnet restore MaterialDesignToolkit.Full.slnx

# Build (requires Windows)
dotnet build MaterialDesignToolkit.Full.sln --configuration Release --no-restore -p:Platform="Any CPU" -p:TreatWarningsAsErrors=True
dotnet build MaterialDesignToolkit.Full.slnx --configuration Release --no-restore -p:Platform="Any CPU" -p:TreatWarningsAsErrors=True

# Run tests
dotnet test MaterialDesignToolkit.Full.sln --configuration Release --no-build
dotnet test MaterialDesignToolkit.Full.slnx --configuration Release --no-build

# Build NuGet packages
.\build\BuildNugets.ps1 -MDIXVersion "x.x.x" -MDIXColorsVersion "x.x.x" -MDIXMahAppsVersion "x.x.x"
Expand Down
117 changes: 59 additions & 58 deletions .github/workflows/build_artifacts.yml
Original file line number Diff line number Diff line change
@@ -1,73 +1,74 @@
name: Build Artifacts

on:
workflow_call:
inputs:
build-configuration:
default: "Release"
required: false
type: string
mdix-version:
required: true
type: string
mdix-colors-version:
required: true
type: string
mdix-mahapps-version:
required: true
type: string
workflow_call:
inputs:
build-configuration:
default: "Release"
required: false
type: string
mdix-version:
required: true
type: string
mdix-colors-version:
required: true
type: string
mdix-mahapps-version:
required: true
type: string

jobs:
build:
name: Build and Test
runs-on: windows-latest
build:
name: Build and Test
runs-on: windows-latest

env:
solution: MaterialDesignToolkit.Full.sln
env:
solution: MaterialDesignToolkit.Full.slnx

steps:
- uses: actions/checkout@v5
steps:
- uses: actions/checkout@v5

- name: Setup .NET
uses: actions/setup-dotnet@v5
with:
dotnet-version: |
8.x
9.x
- name: Setup .NET
uses: actions/setup-dotnet@v5
with:
dotnet-version: |
8.x
9.x
10.x

- name: Restore dependencies
run: dotnet restore ${{ env.solution }}
- name: Restore dependencies
run: dotnet restore ${{ env.solution }}

- name: Build
run: dotnet build ${{ env.solution }} --configuration ${{ inputs.build-configuration }} --no-restore -p:Platform="Any CPU" -p:TreatWarningsAsErrors=True
env:
MDIXVersion: ${{ inputs.mdix-version }}
MDIXColorsVersion: ${{ inputs.mdix-colors-version }}
MDIXMahAppsVersion: ${{ inputs.mdix-mahapps-version }}
- name: Build
run: dotnet build ${{ env.solution }} --configuration ${{ inputs.build-configuration }} --no-restore -p:Platform="Any CPU" -p:TreatWarningsAsErrors=True
env:
MDIXVersion: ${{ inputs.mdix-version }}
MDIXColorsVersion: ${{ inputs.mdix-colors-version }}
MDIXMahAppsVersion: ${{ inputs.mdix-mahapps-version }}

- name: Test
timeout-minutes: 20
run: dotnet test ${{ env.solution }} --configuration ${{ inputs.build-configuration }} --no-build --blame-crash --logger GitHubActions
- name: Test
timeout-minutes: 20
run: dotnet test ${{ env.solution }} --configuration ${{ inputs.build-configuration }} --no-build --blame-crash --logger GitHubActions

- name: Upload Screenshots
if: ${{ always() }}
uses: actions/upload-artifact@v5
with:
name: Screenshots-${{ github.run_number }}
path: ${{ github.workspace }}\tests\MaterialDesignThemes.UITests\bin\${{ inputs.build-configuration }}\net9.0-windows\Screenshots
if-no-files-found: ignore
- name: Upload Screenshots
if: ${{ always() }}
uses: actions/upload-artifact@v5
with:
name: Screenshots-${{ github.run_number }}
path: ${{ github.workspace }}\tests\MaterialDesignThemes.UITests\bin\${{ inputs.build-configuration }}\net9.0-windows\Screenshots
if-no-files-found: ignore

- name: Build NuGets
run: .\build\BuildNugets.ps1 -MDIXVersion ${{ inputs.mdix-version }} -MDIXColorsVersion ${{ inputs.mdix-colors-version }} -MDIXMahAppsVersion ${{ inputs.mdix-mahapps-version }}
- name: Build NuGets
run: .\build\BuildNugets.ps1 -MDIXVersion ${{ inputs.mdix-version }} -MDIXColorsVersion ${{ inputs.mdix-colors-version }} -MDIXMahAppsVersion ${{ inputs.mdix-mahapps-version }}

- name: Upload NuGets
uses: actions/upload-artifact@v5
with:
name: NuGets
path: "*.nupkg"
- name: Upload NuGets
uses: actions/upload-artifact@v5
with:
name: NuGets
path: "*.nupkg"

- name: Upload Demo App
uses: actions/upload-artifact@v5
with:
name: DemoApp
path: "src/MainDemo.Wpf/bin/${{ env.buildConfiguration }}"
- name: Upload Demo App
uses: actions/upload-artifact@v5
with:
name: DemoApp
path: "src/MainDemo.Wpf/bin/${{ env.buildConfiguration }}"
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
type: string

env:
solution: MaterialDesignToolkit.Full.sln
solution: MaterialDesignToolkit.Full.slnx
GITHUB_TOKEN: ${{ secrets.SA_PAT }}

defaults:
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Copyright>Copyright © 2022</Copyright>
<Company>Mulholland Software/James Willock</Company>

<LangVersion>13.0</LangVersion>
<LangVersion>14.0</LangVersion>
<ErrorReport>prompt</ErrorReport>

<SignAssembly>true</SignAssembly>
Expand Down
4 changes: 1 addition & 3 deletions Directory.packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
<PackageVersion Include="Humanizer" Version="2.14.1" />
<PackageVersion Include="MahApps.Metro" Version="2.4.10" />
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.8.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
Expand All @@ -29,15 +30,12 @@
<PackageVersion Include="ShowMeTheXAML.AvalonEdit" Version="2.0.0" />
<PackageVersion Include="ShowMeTheXAML.MSBuild" Version="2.0.0" />
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
<PackageVersion Include="System.Private.Uri" Version="4.3.2" />
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageVersion Include="TUnit" Version="0.25.21" />
<PackageVersion Include="VirtualizingWrapPanel" Version="1.5.8" />
<PackageVersion Include="XAMLTest" Version="1.3.0-ci616" />
<PackageVersion Include="System.Memory" Version="4.6.3" />
<PackageVersion Include="System.ValueTuple" Version="4.6.1" />
<PackageVersion Include="Polyfill" Version="8.8.1" />
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
</ItemGroup>
</Project>
Loading
Loading