Housekeeping: Update Packages Update Copyright (#318)

* Housekeeping: Update Packages Update Copyright * Update Build
reactiveui · May 1, 2024 · dc71369 · dc71369
1 parent 9d48a7d
commit dc71369
Show file tree

Hide file tree

Showing 14 changed files with 41 additions and 71 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -20,7 +20,7 @@ jobs:
     with:
       configuration: Release
       productNamespacePrefix: "Punchclock"
-      useVisualStudioPreview: true
+      dotNetBuild: true
+      useVisualStudioPreview: false
       useMauiCheckDotNetTool: false
       installWorkflows: false
-      dotNetBuild: true
diff --git a/.github/workflows/ci-buildAndRelease.yml b/.github/workflows/ci-buildAndRelease.yml
@@ -18,7 +18,8 @@ jobs:
     with:
       configuration: Release
       productNamespacePrefix: "Punchclock"
-      useVisualStudioPreview: true
+      dotNetBuild: true
+      useVisualStudioPreview: false
       useMauiCheckDotNetTool: false
     secrets:
       SIGN_CLIENT_USER_ID: ${{ secrets.SIGN_CLIENT_USER_ID }}

diff --git a/src/Directory.build.props b/src/Directory.build.props
@@ -4,7 +4,7 @@
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<PackageProjectUrl>https://github.com/reactiveui/punchclock/</PackageProjectUrl>
 		<Authors>.NET Foundation and Contributors</Authors>
-		<Owners>xpaulbettsx;ghuntley</Owners>
+		<Owners>xanaisbettsx;ghuntley</Owners>
 		<NoWarn>$(NoWarn);VSX1000;SA1010</NoWarn>
 		<Platform>AnyCPU</Platform>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
@@ -33,22 +33,6 @@
 		<IsPackable>false</IsPackable>
 	</PropertyGroup>
 
-	<ItemGroup Condition="$(IsTestProject)">
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-		<PackageReference Include="xunit" Version="2.7.1" />
-		<PackageReference Include="xunit.runner.console" Version="2.7.1" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.8" />
-		<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
-		<PackageReference Include="Xunit.StaFact" Version="1.1.11" />
-		<PackageReference Include="FluentAssertions" Version="6.12.0" />
-		<PackageReference Include="DiffEngine" Version="15.3.0" />
-		<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>
-		</PackageReference>
-	</ItemGroup>
-
 	<ItemGroup Condition="'$(IsTestProject)' != 'true'">
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
 	</ItemGroup>

diff --git a/src/Punchclock.Tests/API/ApiApprovalTests.cs b/src/Punchclock.Tests/API/ApiApprovalTests.cs
@@ -5,7 +5,6 @@
 
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
-using VerifyXunit;
 using Xunit;
 
 namespace Punchclock.APITests;
@@ -14,7 +13,6 @@ namespace Punchclock.APITests;
 /// Tests for handling API approval.
 /// </summary>
 [ExcludeFromCodeCoverage]
-[UsesVerify]
 public class ApiApprovalTests
 {
     /// <summary>

diff --git a/src/Punchclock.Tests/Punchclock.Tests.csproj b/src/Punchclock.Tests/Punchclock.Tests.csproj
@@ -9,7 +9,20 @@
 		<PackageReference Include="DynamicData" Version="8.*" />
 		<PackageReference Include="splat" Version="14.*" />
 		<PackageReference Include="PublicApiGenerator" Version="11.1.0" />
-		<PackageReference Include="Verify.Xunit" Version="22.5.0" />
+		<PackageReference Include="Verify.Xunit" Version="24.1.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+		<PackageReference Include="xunit" Version="2.8.0" />
+		<PackageReference Include="xunit.runner.console" Version="2.8.0" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.8.0" />
+		<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
+		<PackageReference Include="Xunit.StaFact" Version="1.1.11" />
+		<PackageReference Include="FluentAssertions" Version="6.12.0" />
+		<PackageReference Include="DiffEngine" Version="15.3.0" />
+		<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>
+		</PackageReference>
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Punchclock/KeyedOperation.cs b/src/Punchclock/KeyedOperation.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.

diff --git a/src/Punchclock/OperationQueue.cs b/src/Punchclock/OperationQueue.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // 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
     /// <param name="key">Items with the same key will be run in order.</param>
     /// <param name="asyncCalculationFunc">The async method to execute when scheduled.</param>
     /// <returns>The result of the async calculation.</returns>
-    public IObservable<T> EnqueueObservableOperation<T>(int priority, string key, Func<IObservable<T>> asyncCalculationFunc)
-    {
-        return EnqueueObservableOperation(priority, key, Observable.Never<Unit>(), asyncCalculationFunc);
-    }
+    public IObservable<T> EnqueueObservableOperation<T>(int priority, string key, Func<IObservable<T>> asyncCalculationFunc) =>
+        EnqueueObservableOperation(priority, key, Observable.Never<Unit>(), asyncCalculationFunc);
 
     /// <summary>
     /// 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
     /// <param name="priority">Higher priorities run before lower ones.</param>
     /// <param name="asyncCalculationFunc">The async method to execute when scheduled.</param>
     /// <returns>The result of the async calculation.</returns>
-    public IObservable<T> EnqueueObservableOperation<T>(int priority, Func<IObservable<T>> asyncCalculationFunc)
-    {
-        return EnqueueObservableOperation(priority, DefaultKey, Observable.Never<Unit>(), asyncCalculationFunc);
-    }
+    public IObservable<T> EnqueueObservableOperation<T>(int priority, Func<IObservable<T>> asyncCalculationFunc) =>
+        EnqueueObservableOperation(priority, DefaultKey, Observable.Never<Unit>(), asyncCalculationFunc);
 
     /// <summary>
     /// This method pauses the dispatch queue. Inflight operations will not

diff --git a/src/Punchclock/OperationQueueExtensions.cs b/src/Punchclock/OperationQueueExtensions.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.

diff --git a/src/Punchclock/PriorityQueue.cs b/src/Punchclock/PriorityQueue.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
@@ -99,10 +99,7 @@ public T[] DequeueSome(int count)
     /// Removes all the items currently contained within the queue and returns them.
     /// </summary>
     /// <returns>All the items from the queue.</returns>
-    public T[] DequeueAll()
-    {
-        return DequeueSome(Count);
-    }
+    public T[] DequeueAll() => DequeueSome(Count);
 
     /// <summary>
     /// Adds a item in the correct location based on priority to the queue.
@@ -141,10 +138,7 @@ public bool Remove(T item)
         return false;
     }
 
-    private bool IsHigherPriority(int left, int right)
-    {
-        return _items[left].CompareTo(_items[right]) < 0;
-    }
+    private bool IsHigherPriority(int left, int right) => _items[left].CompareTo(_items[right]) < 0;
 
     private void Percolate(int index)
     {
@@ -166,10 +160,7 @@ private void Percolate(int index)
         }
     }
 
-    private void Heapify()
-    {
-        Heapify(0);
-    }
+    private void Heapify() => Heapify(0);
 
     private void Heapify(int index)
     {

diff --git a/src/Punchclock/PrioritySemaphoreSubject.cs b/src/Punchclock/PrioritySemaphoreSubject.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
@@ -26,7 +26,7 @@ internal class PrioritySemaphoreSubject<T> : ISubject<T>
     /// <param name="sched">The scheduler to use when emitting the items.</param>
     public PrioritySemaphoreSubject(int maxCount, IScheduler? sched = null)
     {
-        _inner = sched != null ? (ISubject<T>)new ScheduledSubject<T>(sched) : new Subject<T>();
+        _inner = sched != null ? new ScheduledSubject<T>(sched) : new Subject<T>();
         MaximumCount = maxCount;
     }
 
@@ -100,10 +100,7 @@ public void OnError(Exception error)
     }
 
     /// <inheritdoc />
-    public IDisposable Subscribe(IObserver<T> observer)
-    {
-        return _inner.Subscribe(observer);
-    }
+    public IDisposable Subscribe(IObserver<T> observer) => _inner.Subscribe(observer);
 
     private void YieldUntilEmptyOrBlocked()
     {

diff --git a/src/Punchclock/ScheduledSubject.cs b/src/Punchclock/ScheduledSubject.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
@@ -43,22 +43,13 @@ public ScheduledSubject(IScheduler scheduler, IObserver<T>? defaultObserver = nu
     }
 
     /// <inheritdoc />
-    public void OnCompleted()
-    {
-        _subject.OnCompleted();
-    }
+    public void OnCompleted() => _subject.OnCompleted();
 
     /// <inheritdoc />
-    public void OnError(Exception error)
-    {
-        _subject.OnError(error);
-    }
+    public void OnError(Exception error) => _subject.OnError(error);
 
     /// <inheritdoc />
-    public void OnNext(T value)
-    {
-        _subject.OnNext(value);
-    }
+    public void OnNext(T value) => _subject.OnNext(value);
 
     /// <inheritdoc />
     public IDisposable Subscribe(IObserver<T>? observer)

diff --git a/src/global.json b/src/global.json
@@ -2,8 +2,5 @@
     "sdk": {
         "version": "8.0.10",
         "rollForward": "latestMinor"
-    },
-    "msbuild-sdks": {
-        "MSBuild.Sdk.Extras": "3.0.44"
     }
 }
diff --git a/src/stylecop.json b/src/stylecop.json
@@ -13,7 +13,7 @@
             "documentPrivateFields": false,
             "documentationCulture": "en-US",
             "companyName": ".NET Foundation and Contributors",
-            "copyrightText": "Copyright (c) 2021 {companyName}. All rights reserved.\nLicensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the {licenseName} license.\nSee the {licenseFile} file in the project root for full license information.",
+            "copyrightText": "Copyright (c) 2024 {companyName}. All rights reserved.\nLicensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the {licenseName} license.\nSee the {licenseFile} file in the project root for full license information.",
             "variables": {
                 "licenseName": "MIT",
                 "licenseFile": "LICENSE"

diff --git a/version.json b/version.json
@@ -2,8 +2,10 @@
   "version": "3.4",
   "publicReleaseRefSpec": [
     "^refs/heads/main$", // we release out of master
+    "^refs/heads/preview/.*", // we release previews
+    "^refs/heads/rel/\\d+\\.\\d+\\.\\d+" // we also release branches starting with rel/N.N.N
   ],
-  "nugetPackageVersion":{
+  "nugetPackageVersion": {
     "semVer": 2
   },
   "cloudBuild": {