Merge branch 'master' into improve-tests

sillsdev · Dec 3, 2024 · 269b695 · 269b695
2 parents 2e5e58c + 7004a47
commit 269b695
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/SIL.Core.Desktop.Tests/Progress/Commands/CommandTests.cs b/SIL.Core.Desktop.Tests/Progress/Commands/CommandTests.cs
@@ -53,7 +53,7 @@ public void CommandCallsInitializeCallback()
 		public void CommandCallsFinalize()
 		{
 			TestCommand cmd = new TestCommand();
-			cmd.Finish += new EventHandler(OnFinish);
+			cmd.Finish += OnFinish;
 			cmd.BeginInvoke();
 			WaitOnBool(ref _onFinishCalled);
 		}

diff --git a/SIL.Windows.Forms/SIL.Windows.Forms.csproj b/SIL.Windows.Forms/SIL.Windows.Forms.csproj
@@ -20,7 +20,6 @@
     <PackageReference Include="Mono.Unix" Version="7.1.0-final.1.21458.1" />
     <PackageReference Include="TagLibSharp" Version="2.3.0" />
     <PackageReference Include="GitVersion.MsBuild" Version="5.11.1" PrivateAssets="all" />
-    <PackageReference Include="SIL.BuildTasks" Version="2.5.0" PrivateAssets="All" />
     <PackageReference Include="SIL.ReleaseTasks" Version="2.5.0" PrivateAssets="All" />
     <PackageReference Include="System.Resources.Extensions" Version="6.0.0" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />

diff --git a/build/Palaso.proj b/build/Palaso.proj
@@ -49,7 +49,7 @@
 		<Message Text="RestartBuild=$(RestartBuild)" />
 		<!-- first remove any existing packages - if they were installed with appended version numbers nuget refuses to install it again, messing up things -->
 		<RemoveDir Directories="@(PackageDirs)" />
-		<Exec Command='$(NuGetCommand) install SIL.BuildTasks -excludeVersion -version 2.3.1 -solutionDirectory "$(RootDir)"' />
+		<Exec Command='$(NuGetCommand) install SIL.BuildTasks -excludeVersion -version 2.5.0 -solutionDirectory "$(RootDir)"' />
 		<!-- Install NUnit.Console which has the required extensions as dependencies -->
 		<Exec Command='$(NuGetCommand) install NUnit.Console -excludeVersion -version 3.11.1 -solutionDirectory "$(RootDir)"' />
 	</Target>