Skip to content

Commit d9a0f70

Browse files
dependabot[bot]dalyIsaac
dependabot[bot]
and
dalyIsaac
authored
Bump csharpier from 0.30.6 to 1.0.1 (#1119)
* Bump csharpier from 0.30.6 to 1.0.1 Bumps [csharpier](https://github.com/belav/csharpier) from 0.30.6 to 1.0.1. - [Release notes](https://github.com/belav/csharpier/releases) - [Changelog](https://github.com/belav/csharpier/blob/main/CHANGELOG.md) - [Commits](belav/csharpier@0.30.6...1.0.1) --- updated-dependencies: - dependency-name: csharpier dependency-version: 1.0.1 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Skip a release if the PR has the label * Upgrade dotnet tool * Formatting * Switch to the 'skip release' label --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Isaac Daly <[email protected]>
1 parent e36fd5e commit d9a0f70

File tree

52 files changed

+1393
-1349
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1393
-1349
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,18 @@
44
"tools": {
55
"xamlstyler.console": {
66
"version": "3.2501.8",
7-
"commands": [
8-
"xstyler"
9-
],
7+
"commands": ["xstyler"],
108
"rollForward": false
119
},
1210
"csharpier": {
13-
"version": "0.30.6",
14-
"commands": [
15-
"dotnet-csharpier"
16-
],
11+
"version": "1.0.1",
12+
"commands": ["csharpier"],
1713
"rollForward": false
1814
},
1915
"docfx": {
2016
"version": "2.78.3",
21-
"commands": [
22-
"docfx"
23-
],
17+
"commands": ["docfx"],
2418
"rollForward": false
2519
}
2620
}
27-
}
21+
}

‎.github/workflows/commit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
7070
- name: Check C# formatting
7171
run: |
72-
dotnet tool run dotnet-csharpier . --check
72+
dotnet tool run csharpier check .
7373
7474
- name: Check XAML formatting
7575
run: |

‎.github/workflows/release.yml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,50 @@ on:
1717
- "global.json"
1818

1919
jobs:
20+
check-skip-label:
21+
runs-on: ubuntu-latest
22+
outputs:
23+
should-skip: ${{ steps.check-labels.outputs.should-skip }}
24+
steps:
25+
- name: Check for 'skip release' label
26+
id: check-labels
27+
shell: pwsh
28+
env:
29+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
30+
run: |
31+
# Get commit SHA
32+
$commitSha = "${{ github.sha }}"
33+
34+
# Check if this commit is part of a PR
35+
Write-Host "Checking if commit $commitSha is part of a PR in $env:GITHUB_REPOSITORY"
36+
37+
$repoName = "$env:GITHUB_REPOSITORY"
38+
$query = "repo:$repoName sha:$commitSha is:pr"
39+
40+
Write-Host "Running query: $query"
41+
$prs = gh api -X GET search/issues -f q="$query" --jq '.items[] | {number: .number, labels: [.labels[].name]}'
42+
Write-Host "PRs found: $prs"
43+
44+
# Initialize skip flag
45+
$shouldSkip = $false
46+
47+
if ($prs) {
48+
$prsArray = $prs | ConvertFrom-Json
49+
foreach ($pr in $prsArray) {
50+
if ($pr.labels -contains "skip release") {
51+
Write-Host "Found PR #$($pr.number) with skip release label"
52+
$shouldSkip = $true
53+
break
54+
}
55+
}
56+
}
57+
58+
"should-skip=$shouldSkip" >> $env:GITHUB_OUTPUT
59+
Write-Host "Should skip: $shouldSkip"
60+
2061
create-release:
62+
needs: check-skip-label
63+
if: ${{ needs.check-skip-label.outputs.should-skip != 'true' }}
2164
runs-on: ubuntu-latest
2265
concurrency: ci-create-release-${{ github.ref }}
2366

@@ -61,7 +104,9 @@ jobs:
61104
release:
62105
runs-on: windows-latest
63106
needs:
107+
- check-skip-label
64108
- create-release
109+
if: ${{ needs.check-skip-label.outputs.should-skip != 'true' }}
65110
env:
66111
# We install the packages to the D:\ drive to avoid the slow IO on the C:\ drive.
67112
# Based on https://github.com/actions/setup-dotnet/issues/260#issuecomment-1790162905

‎Directory.Packages.props‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
<Project>
2-
<PropertyGroup>
3-
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4-
</PropertyGroup>
5-
<ItemGroup>
6-
<PackageVersion Include="Corvus.Json.ExtendedTypes" Version="4.2.4" />
7-
<PackageVersion Include="Corvus.Json.SourceGenerator" Version="4.2.4" />
8-
<PackageVersion Include="DotNext" Version="5.18.0" />
9-
<PackageVersion Include="Microsoft.CodeAnalysis.Scripting" Version="4.12.0" />
10-
<PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.1" />
11-
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.183" />
12-
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.250108002" />
13-
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
14-
<PackageVersion Include="Octokit" Version="14.0.0" />
15-
<PackageVersion Include="Serilog" Version="4.2.0" />
16-
<PackageVersion Include="Serilog.Sinks.Async" Version="2.1.0" />
17-
<PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
18-
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
19-
<PackageVersion Include="System.Drawing.Common" Version="9.0.1" />
20-
<PackageVersion Include="Yaml2JsonNode" Version="2.2.0" />
21-
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
22-
</ItemGroup>
23-
<!-- Test dependencies -->
24-
<ItemGroup>
25-
<PackageVersion Include="AutoFixture" Version="4.18.1" />
26-
<PackageVersion Include="AutoFixture.AutoNSubstitute" Version="4.18.1" />
27-
<PackageVersion Include="AutoFixture.Xunit2" Version="4.18.1" />
28-
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
29-
<PackageVersion Include="FluentAssertions" Version="8.0.1" />
30-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
31-
<PackageVersion Include="NSubstitute" Version="5.3.0" />
32-
<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
33-
<PackageVersion Include="xunit" Version="2.9.3" />
34-
<PackageVersion Include="xunit.analyzers" Version="1.20.0" />
35-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
36-
</ItemGroup>
37-
</Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<PackageVersion Include="Corvus.Json.ExtendedTypes" Version="4.2.4" />
7+
<PackageVersion Include="Corvus.Json.SourceGenerator" Version="4.2.4" />
8+
<PackageVersion Include="DotNext" Version="5.18.0" />
9+
<PackageVersion Include="Microsoft.CodeAnalysis.Scripting" Version="4.12.0" />
10+
<PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.1" />
11+
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.183" />
12+
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.250108002" />
13+
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
14+
<PackageVersion Include="Octokit" Version="14.0.0" />
15+
<PackageVersion Include="Serilog" Version="4.2.0" />
16+
<PackageVersion Include="Serilog.Sinks.Async" Version="2.1.0" />
17+
<PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
18+
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
19+
<PackageVersion Include="System.Drawing.Common" Version="9.0.1" />
20+
<PackageVersion Include="Yaml2JsonNode" Version="2.2.0" />
21+
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
22+
</ItemGroup>
23+
<!-- Test dependencies -->
24+
<ItemGroup>
25+
<PackageVersion Include="AutoFixture" Version="4.18.1" />
26+
<PackageVersion Include="AutoFixture.AutoNSubstitute" Version="4.18.1" />
27+
<PackageVersion Include="AutoFixture.Xunit2" Version="4.18.1" />
28+
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
29+
<PackageVersion Include="FluentAssertions" Version="8.0.1" />
30+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
31+
<PackageVersion Include="NSubstitute" Version="5.3.0" />
32+
<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
33+
<PackageVersion Include="xunit" Version="2.9.3" />
34+
<PackageVersion Include="xunit.analyzers" Version="1.20.0" />
35+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
36+
</ItemGroup>
37+
</Project>

‎docs/contribute/environment-setup.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ cd Whim
2626
dotnet tool restore
2727

2828
# Run the formatters
29-
dotnet tool run dotnet-csharpier .
29+
dotnet tool run csharpier format .
3030
dotnet tool run xstyler --recursive --d . --config ./.xamlstylerrc
3131
```

‎src/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
https://github.com/dotnet/roslyn/issues/41640 -->
66
<NoWarn>EnableGenerateDocumentationFile</NoWarn>
77
</PropertyGroup>
8-
</Project>
8+
</Project>

‎src/Whim.Bar.Tests/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
<GenerateDocumentationFile>true</GenerateDocumentationFile>
44
<NoWarn>$(NoWarn);CS1591</NoWarn>
55
</PropertyGroup>
6-
</Project>
6+
</Project>

‎src/Whim.Bar.Tests/Whim.Bar.Tests.csproj‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<AnalysisModeDesign>All</AnalysisModeDesign>
4-
<AnalysisModeDocumentation>All</AnalysisModeDocumentation>
5-
<AnalysisModeGlobalization>None</AnalysisModeGlobalization>
6-
<AnalysisModeInteroperability>All</AnalysisModeInteroperability>
7-
<AnalysisModeMaintainability>All</AnalysisModeMaintainability>
8-
<AnalysisModeNaming>All</AnalysisModeNaming>
9-
<AnalysisModePerformance>All</AnalysisModePerformance>
10-
<AnalysisModeReliability>All</AnalysisModeReliability>
11-
<AnalysisModeSecurity>All</AnalysisModeSecurity>
12-
<AnalysisModeSingleFile>All</AnalysisModeSingleFile>
13-
<AnalysisModeStyle>All</AnalysisModeStyle>
14-
<AnalysisModeUsage>All</AnalysisModeUsage>
15-
<Authors>Isaac Daly</Authors>
16-
<BuildInParallel>true</BuildInParallel>
17-
<Description>An extensible window manager for Windows.</Description>
18-
<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
19-
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
20-
<GenerateLibraryLayout>true</GenerateLibraryLayout>
21-
<ImplicitUsings>enable</ImplicitUsings>
22-
<Nullable>enable</Nullable>
23-
<Platforms>x64;arm64;Any CPU</Platforms>
24-
<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
25-
<Version>0.7.0</Version>
26-
</PropertyGroup>
27-
<ItemGroup>
28-
<PackageReference Include="AutoFixture" />
29-
<PackageReference Include="AutoFixture.AutoNSubstitute" />
30-
<PackageReference Include="AutoFixture.Xunit2" />
31-
<PackageReference Include="coverlet.collector">
32-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
33-
<PrivateAssets>all</PrivateAssets>
34-
</PackageReference>
35-
<PackageReference Include="FluentAssertions" />
36-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
37-
<PackageReference Include="NSubstitute" />
38-
<PackageReference Include="NSubstitute.Analyzers.CSharp">
39-
<PrivateAssets>all</PrivateAssets>
40-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
41-
</PackageReference>
42-
<PackageReference Include="xunit" />
43-
<PackageReference Include="xunit.runner.visualstudio">
44-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
45-
<PrivateAssets>all</PrivateAssets>
46-
</PackageReference>
47-
</ItemGroup>
48-
<ItemGroup>
49-
<ProjectReference Include="..\Whim.Bar\Whim.Bar.csproj" />
50-
<ProjectReference Include="..\Whim.TestUtils\Whim.TestUtils.csproj" />
51-
</ItemGroup>
52-
</Project>
2+
<PropertyGroup>
3+
<AnalysisModeDesign>All</AnalysisModeDesign>
4+
<AnalysisModeDocumentation>All</AnalysisModeDocumentation>
5+
<AnalysisModeGlobalization>None</AnalysisModeGlobalization>
6+
<AnalysisModeInteroperability>All</AnalysisModeInteroperability>
7+
<AnalysisModeMaintainability>All</AnalysisModeMaintainability>
8+
<AnalysisModeNaming>All</AnalysisModeNaming>
9+
<AnalysisModePerformance>All</AnalysisModePerformance>
10+
<AnalysisModeReliability>All</AnalysisModeReliability>
11+
<AnalysisModeSecurity>All</AnalysisModeSecurity>
12+
<AnalysisModeSingleFile>All</AnalysisModeSingleFile>
13+
<AnalysisModeStyle>All</AnalysisModeStyle>
14+
<AnalysisModeUsage>All</AnalysisModeUsage>
15+
<Authors>Isaac Daly</Authors>
16+
<BuildInParallel>true</BuildInParallel>
17+
<Description>An extensible window manager for Windows.</Description>
18+
<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
19+
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
20+
<GenerateLibraryLayout>true</GenerateLibraryLayout>
21+
<ImplicitUsings>enable</ImplicitUsings>
22+
<Nullable>enable</Nullable>
23+
<Platforms>x64;arm64;Any CPU</Platforms>
24+
<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
25+
<Version>0.7.0</Version>
26+
</PropertyGroup>
27+
<ItemGroup>
28+
<PackageReference Include="AutoFixture" />
29+
<PackageReference Include="AutoFixture.AutoNSubstitute" />
30+
<PackageReference Include="AutoFixture.Xunit2" />
31+
<PackageReference Include="coverlet.collector">
32+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
33+
<PrivateAssets>all</PrivateAssets>
34+
</PackageReference>
35+
<PackageReference Include="FluentAssertions" />
36+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
37+
<PackageReference Include="NSubstitute" />
38+
<PackageReference Include="NSubstitute.Analyzers.CSharp">
39+
<PrivateAssets>all</PrivateAssets>
40+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
41+
</PackageReference>
42+
<PackageReference Include="xunit" />
43+
<PackageReference Include="xunit.runner.visualstudio">
44+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
45+
<PrivateAssets>all</PrivateAssets>
46+
</PackageReference>
47+
</ItemGroup>
48+
<ItemGroup>
49+
<ProjectReference Include="..\Whim.Bar\Whim.Bar.csproj" />
50+
<ProjectReference Include="..\Whim.TestUtils\Whim.TestUtils.csproj" />
51+
</ItemGroup>
52+
</Project>

‎src/Whim.Bar/DropDown.xaml.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ namespace Whim.Bar;
1111
/// This is used instead of a <see cref="ComboBox"/> because the <see cref="ComboBox"/>
1212
/// doesn't easily support variable-width buttons, or have data binding.
1313
/// </summary>
14-
1514
public sealed partial class DropDown : UserControl
1615
{
1716
/// <summary>

0 commit comments

Comments
 (0)