Merge pull request #1 from hlaueriksson/bump

Bump
hlaueriksson · Jan 6, 2025 · 44d589a · 44d589a
2 parents 3bdc60a + cb34b5d
commit 44d589a
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 29 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Setup dotnet
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
 
     - name: Restore dependencies
       run: dotnet restore

diff --git a/Analyzers.props b/Analyzers.props
@@ -12,11 +12,11 @@
     </AdditionalFiles>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.10.48">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.12.19">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Roslynator.Analyzers" Version="4.12.4">
+    <PackageReference Include="Roslynator.Analyzers" Version="4.12.10">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/...nity.PowerToys.Run.Plugin.Abstractions/Community.PowerToys.Run.Plugin.Abstractions.csproj b/...nity.PowerToys.Run.Plugin.Abstractions/Community.PowerToys.Run.Plugin.Abstractions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <Platforms>x64;ARM64</Platforms>
     <PlatformTarget>$(Platform)</PlatformTarget>
@@ -23,6 +23,7 @@ It contains interfaces and wrappers for static classes from:
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IncludeBuildOutput>false</IncludeBuildOutput>
+    <NoWarn>NU5128;PKV0001</NoWarn>
   </PropertyGroup>
 
   <Import Project="../../Analyzers.props" />
@@ -31,22 +32,23 @@ It contains interfaces and wrappers for static classes from:
     <None Include="..\..\icon.png" Pack="true" PackagePath="\" />
     <None Include="..\..\README.md" Pack="true" PackagePath="\" />
     <None Include="Community.PowerToys.Run.Plugin.Abstractions.props" Pack="true" PackagePath="buildTransitive" />
+    <None Include="Community.PowerToys.Run.Plugin.Abstractions.targets" Pack="true" PackagePath="buildTransitive" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="bin\ARM64\Release\net8.0-windows\Community.PowerToys.Run.Plugin.Abstractions.dll" Pack="true" PackagePath="lib/net8.0-windows7.0/ARM64/" />
-    <None Include="bin\ARM64\Release\net8.0-windows\Community.PowerToys.Run.Plugin.Abstractions.pdb" Pack="true" PackagePath="lib/net8.0-windows7.0/ARM64/" />
-    <None Include="bin\ARM64\Release\net8.0-windows\Community.PowerToys.Run.Plugin.Abstractions.xml" Pack="true" PackagePath="lib/net8.0-windows7.0/ARM64/" />
+    <None Include="bin\ARM64\Release\net9.0-windows\Community.PowerToys.Run.Plugin.Abstractions.dll" Pack="true" PackagePath="runtimes\win-arm64\lib\net9.0" />
+    <None Include="bin\ARM64\Release\net9.0-windows\Community.PowerToys.Run.Plugin.Abstractions.pdb" Pack="true" PackagePath="runtimes\win-arm64\lib\net9.0" />
+    <None Include="bin\ARM64\Release\net9.0-windows\Community.PowerToys.Run.Plugin.Abstractions.xml" Pack="true" PackagePath="runtimes\win-arm64\lib\net9.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="bin\x64\Release\net8.0-windows\Community.PowerToys.Run.Plugin.Abstractions.dll" Pack="true" PackagePath="lib/net8.0-windows7.0/x64/" />
-    <None Include="bin\x64\Release\net8.0-windows\Community.PowerToys.Run.Plugin.Abstractions.pdb" Pack="true" PackagePath="lib/net8.0-windows7.0/x64/" />
-    <None Include="bin\x64\Release\net8.0-windows\Community.PowerToys.Run.Plugin.Abstractions.xml" Pack="true" PackagePath="lib/net8.0-windows7.0/x64/" />
+    <None Include="bin\x64\Release\net9.0-windows\Community.PowerToys.Run.Plugin.Abstractions.dll" Pack="true" PackagePath="runtimes\win-x64\lib\net9.0" />
+    <None Include="bin\x64\Release\net9.0-windows\Community.PowerToys.Run.Plugin.Abstractions.pdb" Pack="true" PackagePath="runtimes\win-x64\lib\net9.0" />
+    <None Include="bin\x64\Release\net9.0-windows\Community.PowerToys.Run.Plugin.Abstractions.xml" Pack="true" PackagePath="runtimes\win-x64\lib\net9.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Community.PowerToys.Run.Plugin.Dependencies" Version="0.83.0" />
+    <PackageReference Include="Community.PowerToys.Run.Plugin.Dependencies" Version="0.87.1" />
   </ItemGroup>
 
 </Project>
diff --git a/...unity.PowerToys.Run.Plugin.Abstractions/Community.PowerToys.Run.Plugin.Abstractions.props b/...unity.PowerToys.Run.Plugin.Abstractions/Community.PowerToys.Run.Plugin.Abstractions.props
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Condition="'$(Platform)' == 'ARM64'">
-    <Reference Include="Community.PowerToys.Run.Plugin.Abstractions.dll" HintPath="$(MSBuildThisFileDirectory)..\lib\net8.0-windows7.0\ARM64\Community.PowerToys.Run.Plugin.Abstractions.dll" />
+    <Reference Include="Community.PowerToys.Run.Plugin.Abstractions.dll" HintPath="$(MSBuildThisFileDirectory)..\runtimes\win-arm64\lib\net9.0\Community.PowerToys.Run.Plugin.Abstractions.dll" />
   </ItemGroup>
-  <ItemGroup Condition="'$(Platform)' == 'x64'">
-    <Reference Include="Community.PowerToys.Run.Plugin.Abstractions.dll" HintPath="$(MSBuildThisFileDirectory)..\lib\net8.0-windows7.0\x64\Community.PowerToys.Run.Plugin.Abstractions.dll" />
+  <ItemGroup Condition="'$(Platform)' == 'x64' or '$(Platform)' == 'AnyCPU'">
+    <Reference Include="Community.PowerToys.Run.Plugin.Abstractions.dll" HintPath="$(MSBuildThisFileDirectory)..\runtimes\win-x64\lib\net9.0\Community.PowerToys.Run.Plugin.Abstractions.dll" />
   </ItemGroup>
 </Project>
diff --git a/...ity.PowerToys.Run.Plugin.Abstractions/Community.PowerToys.Run.Plugin.Abstractions.targets b/...ity.PowerToys.Run.Plugin.Abstractions/Community.PowerToys.Run.Plugin.Abstractions.targets
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Libs Include="$(MSBuildThisFileDirectory)..\runtimes\win-arm64\lib\net9.0\*.*" Condition="'$(Platform)' == 'ARM64'" />
+    <Libs Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\lib\net9.0\*.*" Condition="'$(Platform)' == 'x64' or '$(Platform)' == 'AnyCPU'" />
+    <ContentWithTargetPath Include="@(Libs)">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <TargetPath>%(Filename)%(Extension)</TargetPath>
+    </ContentWithTargetPath>
+  </ItemGroup>
+</Project>
diff --git a/...ys.Run.Plugin.Abstractions.Tests/Community.PowerToys.Run.Plugin.Abstractions.Tests.csproj b/...ys.Run.Plugin.Abstractions.Tests/Community.PowerToys.Run.Plugin.Abstractions.Tests.csproj
@@ -1,28 +1,27 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
     <Platforms>x64;ARM64</Platforms>
     <PlatformTarget>$(Platform)</PlatformTarget>
     <IsPackable>false</IsPackable>
+    <NoWarn>NU1903</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.10.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.10.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="NLog" Version="5.0.4" />
-    <PackageReference Include="NSubstitute" Version="5.1.0" />
-    <PackageReference Include="NUnit" Version="4.1.0" />
+    <PackageReference Include="FluentAssertions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="NSubstitute" Version="5.3.0" />
+    <PackageReference Include="NUnit" Version="4.3.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.IO.Abstractions" Version="17.2.3" />
-    <PackageReference Include="Verify.NUnit" Version="26.2.0" />
+    <PackageReference Include="System.Management" Version="9.0.0" />
+    <PackageReference Include="Verify.NUnit" Version="28.7.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...rToys.Run.Plugin.Abstractions.Tests/VerifyTests.Verify_Infrastructure_Helper.verified.txt b/...rToys.Run.Plugin.Abstractions.Tests/VerifyTests.Verify_Infrastructure_Helper.verified.txt
@@ -9,6 +9,7 @@ using System.IO.Abstractions;
 using System.Reflection;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+
 using Wox.Plugin.Logger;
 
 namespace Wox.Infrastructure
@@ -70,8 +71,8 @@ namespace Wox.Infrastructure
                 }
                 else
                 {
-                    var time1 = FileInfo.FromFileName(bundledDataPath).LastWriteTimeUtc;
-                    var time2 = FileInfo.FromFileName(dataPath).LastWriteTimeUtc;
+                    var time1 = FileInfo.New(bundledDataPath).LastWriteTimeUtc;
+                    var time2 = FileInfo.New(dataPath).LastWriteTimeUtc;
                     if (time1 != time2)
                     {
                         File.Copy(bundledDataPath, dataPath, true);

diff --git a/...s.Run.Plugin.Abstractions.Tests/VerifyTests.Verify_Plugin_DefaultBrowserInfo.verified.txt b/...s.Run.Plugin.Abstractions.Tests/VerifyTests.Verify_Plugin_DefaultBrowserInfo.verified.txt
@@ -4,6 +4,8 @@
 
 using System;
 using System.Text;
+using System.Threading;
+
 using Wox.Plugin.Common.Win32;
 using Wox.Plugin.Logger;
 
@@ -14,7 +16,7 @@ namespace Wox.Plugin.Common
     /// </summary>
     public static class DefaultBrowserInfo
     {
-        private static readonly object _updateLock = new object();
+        private static readonly Lock _updateLock = new Lock();
 
         /// <summary>Gets the path to the MS Edge browser executable.</summary>
         public static string MSEdgePath => System.IO.Path.Combine(

diff --git a/...munity.PowerToys.Run.Plugin.Abstractions.Tests/VerifyTests.Verify_Plugin_Log.verified.txt b/...munity.PowerToys.Run.Plugin.Abstractions.Tests/VerifyTests.Verify_Plugin_Log.verified.txt
@@ -7,6 +7,7 @@ using System.Globalization;
 using System.IO.Abstractions;
 using System.Runtime.CompilerServices;
 using System.Text;
+
 using NLog;
 using NLog.Config;
 using NLog.Targets;