Skip to content

Commit dc71369

Browse files
ChrisPulmanChrisPulman
authored
Housekeeping: Update Packages Update Copyright (#318)
* Housekeeping: Update Packages Update Copyright * Update Build
1 parent 9d48a7d commit dc71369

14 files changed

+41
-71
lines changed

‎.github/workflows/ci-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
with:
2121
configuration: Release
2222
productNamespacePrefix: "Punchclock"
23-
useVisualStudioPreview: true
23+
dotNetBuild: true
24+
useVisualStudioPreview: false
2425
useMauiCheckDotNetTool: false
2526
installWorkflows: false
26-
dotNetBuild: true

‎.github/workflows/ci-buildAndRelease.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ jobs:
1818
with:
1919
configuration: Release
2020
productNamespacePrefix: "Punchclock"
21-
useVisualStudioPreview: true
21+
dotNetBuild: true
22+
useVisualStudioPreview: false
2223
useMauiCheckDotNetTool: false
2324
secrets:
2425
SIGN_CLIENT_USER_ID: ${{ secrets.SIGN_CLIENT_USER_ID }}

‎src/Directory.build.props

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PackageLicenseExpression>MIT</PackageLicenseExpression>
55
<PackageProjectUrl>https://github.com/reactiveui/punchclock/</PackageProjectUrl>
66
<Authors>.NET Foundation and Contributors</Authors>
7-
<Owners>xpaulbettsx;ghuntley</Owners>
7+
<Owners>xanaisbettsx;ghuntley</Owners>
88
<NoWarn>$(NoWarn);VSX1000;SA1010</NoWarn>
99
<Platform>AnyCPU</Platform>
1010
<PackageReadmeFile>README.md</PackageReadmeFile>
@@ -33,22 +33,6 @@
3333
<IsPackable>false</IsPackable>
3434
</PropertyGroup>
3535

36-
<ItemGroup Condition="$(IsTestProject)">
37-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
38-
<PackageReference Include="xunit" Version="2.7.1" />
39-
<PackageReference Include="xunit.runner.console" Version="2.7.1" />
40-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.8" />
41-
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
42-
<PackageReference Include="Xunit.StaFact" Version="1.1.11" />
43-
<PackageReference Include="FluentAssertions" Version="6.12.0" />
44-
<PackageReference Include="DiffEngine" Version="15.3.0" />
45-
<PackageReference Include="PublicApiGenerator" Version="11.1.0" />
46-
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
47-
<PrivateAssets>all</PrivateAssets>
48-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
49-
</PackageReference>
50-
</ItemGroup>
51-
5236
<ItemGroup Condition="'$(IsTestProject)' != 'true'">
5337
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
5438
</ItemGroup>

‎src/Punchclock.Tests/API/ApiApprovalTests.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
using System.Diagnostics.CodeAnalysis;
77
using System.Threading.Tasks;
8-
using VerifyXunit;
98
using Xunit;
109

1110
namespace Punchclock.APITests;
@@ -14,7 +13,6 @@ namespace Punchclock.APITests;
1413
/// Tests for handling API approval.
1514
/// </summary>
1615
[ExcludeFromCodeCoverage]
17-
[UsesVerify]
1816
public class ApiApprovalTests
1917
{
2018
/// <summary>

‎src/Punchclock.Tests/Punchclock.Tests.csproj

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,20 @@
99
<PackageReference Include="DynamicData" Version="8.*" />
1010
<PackageReference Include="splat" Version="14.*" />
1111
<PackageReference Include="PublicApiGenerator" Version="11.1.0" />
12-
<PackageReference Include="Verify.Xunit" Version="22.5.0" />
12+
<PackageReference Include="Verify.Xunit" Version="24.1.0" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
14+
<PackageReference Include="xunit" Version="2.8.0" />
15+
<PackageReference Include="xunit.runner.console" Version="2.8.0" />
16+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.0" />
17+
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
18+
<PackageReference Include="Xunit.StaFact" Version="1.1.11" />
19+
<PackageReference Include="FluentAssertions" Version="6.12.0" />
20+
<PackageReference Include="DiffEngine" Version="15.3.0" />
21+
<PackageReference Include="PublicApiGenerator" Version="11.1.0" />
22+
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
23+
<PrivateAssets>all</PrivateAssets>
24+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
25+
</PackageReference>
1326
</ItemGroup>
1427

1528
<ItemGroup>

‎src/Punchclock/KeyedOperation.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
1+
// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved.
22
// Licensed to the .NET Foundation under one or more agreements.
33
// The .NET Foundation licenses this file to you under the MIT license.
44
// See the LICENSE file in the project root for full license information.

‎src/Punchclock/OperationQueue.cs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
1+
// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved.
22
// Licensed to the .NET Foundation under one or more agreements.
33
// The .NET Foundation licenses this file to you under the MIT license.
44
// See the LICENSE file in the project root for full license information.
@@ -124,10 +124,8 @@ public IObservable<T> EnqueueObservableOperation<T, TDontCare>(int priority, str
124124
/// <param name="key">Items with the same key will be run in order.</param>
125125
/// <param name="asyncCalculationFunc">The async method to execute when scheduled.</param>
126126
/// <returns>The result of the async calculation.</returns>
127-
public IObservable<T> EnqueueObservableOperation<T>(int priority, string key, Func<IObservable<T>> asyncCalculationFunc)
128-
{
129-
return EnqueueObservableOperation(priority, key, Observable.Never<Unit>(), asyncCalculationFunc);
130-
}
127+
public IObservable<T> EnqueueObservableOperation<T>(int priority, string key, Func<IObservable<T>> asyncCalculationFunc) =>
128+
EnqueueObservableOperation(priority, key, Observable.Never<Unit>(), asyncCalculationFunc);
131129

132130
/// <summary>
133131
/// This method enqueues an action to be run at a later time, according
@@ -137,10 +135,8 @@ public IObservable<T> EnqueueObservableOperation<T>(int priority, string key, Fu
137135
/// <param name="priority">Higher priorities run before lower ones.</param>
138136
/// <param name="asyncCalculationFunc">The async method to execute when scheduled.</param>
139137
/// <returns>The result of the async calculation.</returns>
140-
public IObservable<T> EnqueueObservableOperation<T>(int priority, Func<IObservable<T>> asyncCalculationFunc)
141-
{
142-
return EnqueueObservableOperation(priority, DefaultKey, Observable.Never<Unit>(), asyncCalculationFunc);
143-
}
138+
public IObservable<T> EnqueueObservableOperation<T>(int priority, Func<IObservable<T>> asyncCalculationFunc) =>
139+
EnqueueObservableOperation(priority, DefaultKey, Observable.Never<Unit>(), asyncCalculationFunc);
144140

145141
/// <summary>
146142
/// This method pauses the dispatch queue. Inflight operations will not

‎src/Punchclock/OperationQueueExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
1+
// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved.
22
// Licensed to the .NET Foundation under one or more agreements.
33
// The .NET Foundation licenses this file to you under the MIT license.
44
// See the LICENSE file in the project root for full license information.

‎src/Punchclock/PriorityQueue.cs

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
1+
// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved.
22
// Licensed to the .NET Foundation under one or more agreements.
33
// The .NET Foundation licenses this file to you under the MIT license.
44
// See the LICENSE file in the project root for full license information.
@@ -99,10 +99,7 @@ public T[] DequeueSome(int count)
9999
/// Removes all the items currently contained within the queue and returns them.
100100
/// </summary>
101101
/// <returns>All the items from the queue.</returns>
102-
public T[] DequeueAll()
103-
{
104-
return DequeueSome(Count);
105-
}
102+
public T[] DequeueAll() => DequeueSome(Count);
106103

107104
/// <summary>
108105
/// Adds a item in the correct location based on priority to the queue.
@@ -141,10 +138,7 @@ public bool Remove(T item)
141138
return false;
142139
}
143140

144-
private bool IsHigherPriority(int left, int right)
145-
{
146-
return _items[left].CompareTo(_items[right]) < 0;
147-
}
141+
private bool IsHigherPriority(int left, int right) => _items[left].CompareTo(_items[right]) < 0;
148142

149143
private void Percolate(int index)
150144
{
@@ -166,10 +160,7 @@ private void Percolate(int index)
166160
}
167161
}
168162

169-
private void Heapify()
170-
{
171-
Heapify(0);
172-
}
163+
private void Heapify() => Heapify(0);
173164

174165
private void Heapify(int index)
175166
{

‎src/Punchclock/PrioritySemaphoreSubject.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
1+
// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved.
22
// Licensed to the .NET Foundation under one or more agreements.
33
// The .NET Foundation licenses this file to you under the MIT license.
44
// See the LICENSE file in the project root for full license information.
@@ -26,7 +26,7 @@ internal class PrioritySemaphoreSubject<T> : ISubject<T>
2626
/// <param name="sched">The scheduler to use when emitting the items.</param>
2727
public PrioritySemaphoreSubject(int maxCount, IScheduler? sched = null)
2828
{
29-
_inner = sched != null ? (ISubject<T>)new ScheduledSubject<T>(sched) : new Subject<T>();
29+
_inner = sched != null ? new ScheduledSubject<T>(sched) : new Subject<T>();
3030
MaximumCount = maxCount;
3131
}
3232

@@ -100,10 +100,7 @@ public void OnError(Exception error)
100100
}
101101

102102
/// <inheritdoc />
103-
public IDisposable Subscribe(IObserver<T> observer)
104-
{
105-
return _inner.Subscribe(observer);
106-
}
103+
public IDisposable Subscribe(IObserver<T> observer) => _inner.Subscribe(observer);
107104

108105
private void YieldUntilEmptyOrBlocked()
109106
{

0 commit comments

Comments
 (0)