Skip to content

Commit

Permalink
Merge pull request #4 from hlaueriksson/net9.0
Browse files Browse the repository at this point in the history
Bump
  • Loading branch information
hlaueriksson authored Dec 17, 2024
2 parents fd72e25 + 5ff0c6d commit 723649e
Show file tree
Hide file tree
Showing 27 changed files with 41 additions and 47 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions src/Community.PowerToys.Run.Plugin.Templates.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@
<PackageType>Template</PackageType>
<PackageVersion>0.2.0</PackageVersion>
<PackageReleaseNotes>
- Fix: Build fails from command line
- New: dotnet new ptrun-scripts
- Change target framework to net8.0-windows10.0.22621.0
- Bump Community.PowerToys.Run.Plugin.Dependencies to 0.86.0
- Change target framework to net9.0-windows10.0.22621.0
- Bump Community.PowerToys.Run.Plugin.Dependencies to 0.87.0
</PackageReleaseNotes>
<PackageId>Community.PowerToys.Run.Plugin.Templates</PackageId>
<PackageProjectUrl>https://github.com/hlaueriksson/Community.PowerToys.Run.Plugin.Templates</PackageProjectUrl>
Expand Down
4 changes: 2 additions & 2 deletions src/templates/project/Namespace.Plugin1.csproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
<TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
<UseWPF>true</UseWPF>
<Platforms>x64;ARM64</Platforms>
<PlatformTarget>$(Platform)</PlatformTarget>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Community.PowerToys.Run.Plugin.Dependencies" Version="0.86.0" />
<PackageReference Include="Community.PowerToys.Run.Plugin.Dependencies" Version="0.87.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/templates/project/plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"IsGlobal": false,
"Name": "Plugin1",
"Author": "hlaueriksson",
"Version": "0.86.0",
"Version": "0.87.0",
"Language": "csharp",
"Website": "https://github.com/hlaueriksson/Namespace.Plugin1",
"ExecuteFileName": "Namespace.Plugin1.dll",
Expand Down
2 changes: 1 addition & 1 deletion src/templates/scripts/deploy.ps1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<#PSScriptInfo
.VERSION 0.86.0
.VERSION 0.87.0
.GUID 2d1e62b4-4b98-4fad-98b2-2cc1db4694b8
.AUTHOR Henrik Lau Eriksson
.COMPANYNAME
Expand Down
2 changes: 1 addition & 1 deletion src/templates/scripts/pack.ps1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<#PSScriptInfo
.VERSION 0.86.0
.VERSION 0.87.0
.GUID 58d7b8e8-fa18-485d-baaf-4c413181280b
.AUTHOR Henrik Lau Eriksson
.COMPANYNAME
Expand Down
2 changes: 1 addition & 1 deletion src/templates/scripts/releasenotes.ps1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<#PSScriptInfo
.VERSION 0.86.0
.VERSION 0.87.0
.GUID d790e6d3-96c9-447b-9863-941da73870ea
.AUTHOR Henrik Lau Eriksson
.COMPANYNAME
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
<TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
<Platforms>x64;ARM64</Platforms>
<PlatformTarget>$(Platform)</PlatformTarget>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.5.0" />
<PackageReference Include="MSTest.TestFramework" Version="3.5.0" />
<PackageReference Include="System.IO.Abstractions" Version="17.2.3" />
<PackageReference Include="MSTest" Version="3.6.3" />
<PackageReference Include="System.IO.Abstractions" Version="21.0.29" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
<TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
<UseWPF>true</UseWPF>
<Platforms>x64;ARM64</Platforms>
<PlatformTarget>$(Platform)</PlatformTarget>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Community.PowerToys.Run.Plugin.Dependencies" Version="0.86.0" />
<PackageReference Include="Community.PowerToys.Run.Plugin.Dependencies" Version="0.87.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"IsGlobal": false,
"Name": "Plugin1",
"Author": "hlaueriksson",
"Version": "0.86.0",
"Version": "0.87.0",
"Language": "csharp",
"Website": "https://github.com/hlaueriksson/Community.PowerToys.Run.Plugin.Plugin1",
"ExecuteFileName": "Community.PowerToys.Run.Plugin.Plugin1.dll",
Expand Down
28 changes: 14 additions & 14 deletions tests/Community.PowerToys.Run.Plugin.Templates.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.12.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="NUnit" Version="4.2.2" />
<PackageReference Include="FluentAssertions" Version="7.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="NUnit" Version="4.3.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Verify.NUnit" Version="28.3.1" />
<PackageReference Include="Verify.NUnit" Version="28.6.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\src\Community.PowerToys.Run.Plugin.Templates.csproj" />
</ItemGroup>

<ItemGroup>
<Compile Remove="IntegrationTests.ptrun_proj\**" />
<Compile Remove="IntegrationTests.ptrun_scripts\**" />
<Compile Remove="IntegrationTests.ptrun_sln\**" />
<Compile Remove="VerifyTests.ptrun_proj\**" />
<Compile Remove="VerifyTests.ptrun_scripts\**" />
<Compile Remove="VerifyTests.ptrun_sln\**" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Remove="IntegrationTests.ptrun_proj\**" />
<EmbeddedResource Remove="IntegrationTests.ptrun_scripts\**" />
<EmbeddedResource Remove="IntegrationTests.ptrun_sln\**" />
<EmbeddedResource Remove="VerifyTests.ptrun_proj\**" />
<EmbeddedResource Remove="VerifyTests.ptrun_scripts\**" />
<EmbeddedResource Remove="VerifyTests.ptrun_sln\**" />
</ItemGroup>

<ItemGroup>
<None Remove="IntegrationTests.ptrun_proj\**" />
<None Remove="IntegrationTests.ptrun_scripts\**" />
<None Remove="IntegrationTests.ptrun_sln\**" />
<None Remove="VerifyTests.ptrun_proj\**" />
<None Remove="VerifyTests.ptrun_scripts\**" />
<None Remove="VerifyTests.ptrun_sln\**" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
<TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
<UseWPF>true</UseWPF>
<Platforms>x64;ARM64</Platforms>
<PlatformTarget>$(Platform)</PlatformTarget>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Community.PowerToys.Run.Plugin.Dependencies" Version="0.86.0" />
<PackageReference Include="Community.PowerToys.Run.Plugin.Dependencies" Version="0.87.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"IsGlobal": false,
"Name": "MyProject",
"Author": "hlaueriksson",
"Version": "0.86.0",
"Version": "0.87.0",
"Language": "csharp",
"Website": "https://github.com/hlaueriksson/MyProject",
"ExecuteFileName": "MyProject.dll",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<#PSScriptInfo
.VERSION 0.86.0
.VERSION 0.87.0
.GUID 2d1e62b4-4b98-4fad-98b2-2cc1db4694b8
.AUTHOR Henrik Lau Eriksson
.COMPANYNAME
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<#PSScriptInfo
.VERSION 0.86.0
.VERSION 0.87.0
.GUID 58d7b8e8-fa18-485d-baaf-4c413181280b
.AUTHOR Henrik Lau Eriksson
.COMPANYNAME
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<#PSScriptInfo
.VERSION 0.86.0
.VERSION 0.87.0
.GUID d790e6d3-96c9-447b-9863-941da73870ea
.AUTHOR Henrik Lau Eriksson
.COMPANYNAME
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
<TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
<Platforms>x64;ARM64</Platforms>
<PlatformTarget>$(Platform)</PlatformTarget>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.5.0" />
<PackageReference Include="MSTest.TestFramework" Version="3.5.0" />
<PackageReference Include="System.IO.Abstractions" Version="17.2.3" />
<PackageReference Include="MSTest" Version="3.6.3" />
<PackageReference Include="System.IO.Abstractions" Version="21.0.29" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
<TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
<UseWPF>true</UseWPF>
<Platforms>x64;ARM64</Platforms>
<PlatformTarget>$(Platform)</PlatformTarget>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Community.PowerToys.Run.Plugin.Dependencies" Version="0.86.0" />
<PackageReference Include="Community.PowerToys.Run.Plugin.Dependencies" Version="0.87.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"IsGlobal": false,
"Name": "MySolution",
"Author": "hlaueriksson",
"Version": "0.86.0",
"Version": "0.87.0",
"Language": "csharp",
"Website": "https://github.com/hlaueriksson/Community.PowerToys.Run.Plugin.MySolution",
"ExecuteFileName": "Community.PowerToys.Run.Plugin.MySolution.dll",
Expand Down

0 comments on commit 723649e

Please sign in to comment.