Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Housekeeping resolve minor issues #345

Merged
merged 4 commits into from
Sep 23, 2024
Merged

Housekeeping resolve minor issues #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a1dfdfe
Housekeeping resolve minor issues
ChrisPulman Sep 21, 2024
2e94ded
Update Build
ChrisPulman Sep 21, 2024
31418b6
Remove global
ChrisPulman Sep 21, 2024
a364615
Merge branch 'main' into CP_Housekeeping
ChrisPulman Sep 23, 2024
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
4 changes: 1 addition & 3 deletions .github/workflows/ci-buildAndRelease.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ jobs:
with:
configuration: Release
productNamespacePrefix: "Punchclock"
dotNetBuild: true
useVisualStudioPreview: false
useMauiCheckDotNetTool: false
installWorkflows: false
secrets:
SIGN_CLIENT_USER_ID: ${{ secrets.SIGN_CLIENT_USER_ID }}
SIGN_CLIENT_SECRET: ${{ secrets.SIGN_CLIENT_SECRET }}
Expand Down
Binary file added images/logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion src/Directory.build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<NoWarn>$(NoWarn);VSX1000;SA1010</NoWarn>
<Platform>AnyCPU</Platform>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageIcon>logo.png</PackageIcon>
<Description>Make sure your asynchronous operations show up to work on time</Description>
<PackageReleaseNotes>https://github.com/reactiveui/punchclock/releases</PackageReleaseNotes>
<RepositoryUrl>https://github.com/reactiveui/punchclock</RepositoryUrl>
Expand All @@ -22,7 +23,6 @@
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<!-- Optional: Include PDB in the built .nupkg -->
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<PackageIconUrl>https://raw.githubusercontent.com/reactiveui/styleguide/master/logo_punchclock/main.png?raw=true</PackageIconUrl>

<EnableNETAnalyzers>True</EnableNETAnalyzers>
<AnalysisLevel>latest</AnalysisLevel>
Expand All @@ -38,6 +38,7 @@
</ItemGroup>

<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)..\images\logo.png" Pack="true" PackagePath="\" />
<None Include="$(MSBuildThisFileDirectory)..\LICENSE" Pack="true" PackagePath="LICENSE" />
<None Include="$(MSBuildThisFileDirectory)..\README.md" Pack="true" PackagePath="\" />
</ItemGroup>
Expand Down
5 changes: 2 additions & 3 deletions src/Punchclock.Tests/Punchclock.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net472</TargetFrameworks>
<NoWarn>$(NoWarn);1591;CA1707;SA1633</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="DynamicData" Version="8.*" />
<PackageReference Include="DynamicData" Version="9.0.4" />
<PackageReference Include="splat" Version="15.*" />
<PackageReference Include="PublicApiGenerator" Version="11.1.0" />
<PackageReference Include="Verify.Xunit" Version="26.4.5" />
Expand All @@ -18,7 +18,6 @@
<PackageReference Include="Xunit.StaFact" Version="1.1.11" />
<PackageReference Include="FluentAssertions" Version="6.12.1" />
<PackageReference Include="DiffEngine" Version="15.5.1" />
<PackageReference Include="PublicApiGenerator" Version="11.1.0" />
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
Expand Down
3 changes: 1 addition & 2 deletions src/Punchclock.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
# 17
VisualStudioVersion = 17.3.32922.545
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Punchclock", "Punchclock\Punchclock.csproj", "{D3D5E08E-2DAA-4C14-BDF1-C15BD81247F5}"
Expand All @@ -11,7 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Items", "Items", "{E035091F
analyzers.ruleset = analyzers.ruleset
analyzers.tests.ruleset = analyzers.tests.ruleset
Directory.build.props = Directory.build.props
global.json = global.json
..\README.md = ..\README.md
stylecop.json = stylecop.json
..\version.json = ..\version.json
Expand Down
2 changes: 1 addition & 1 deletion src/Punchclock/Punchclock.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Reactive" Version="6.*" />
<PackageReference Include="System.Reactive" Version="6.0.1" />
</ItemGroup>

</Project>
6 changes: 0 additions & 6 deletions src/global.json
View file
Open in desktop

This file was deleted.

Loading