Skip to content

Commit ac9b125

Browse files
committed
fix: Nuget targeting
1 parent 213d8f5 commit ac9b125

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

.github/workflows/nuget.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ on:
22
push:
33
tags:
44
- "[0-9]+.[0-9]+.[0-9]+"
5+
name: Nuget
56
jobs:
67
release:
78
name: "Release on Nuget"
8-
runs-on: ubuntu-latest
9+
runs-on: windows-latest
910
steps:
1011
- name: "Checkout"
1112
uses: actions/checkout@v5

Nickvision.Desktop.Tests/Nickvision.Desktop.Tests.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
<ItemGroup>
2222
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
2323
<PackageReference Include="MSTest" Version="3.11.0"/>
24-
<PackageReference Include="MSTest.TestAdapter" Version="3.11.0"/>
25-
<PackageReference Include="MSTest.TestFramework" Version="3.11.0"/>
2624
</ItemGroup>
2725

2826
<ItemGroup>

Nickvision.Desktop/Nickvision.Desktop.csproj

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework Condition="$([MSBuild]::IsOSPlatform('Windows'))">net9.0-windows10.0.22621.0</TargetFramework>
5-
<TargetFramework Condition="!$([MSBuild]::IsOSPlatform('Windows'))">net9.0</TargetFramework>
4+
<TargetFrameworks>net9.0;net9.0-windows10.0.22621.0</TargetFrameworks>
65
<LangVersion>latest</LangVersion>
76
<ImplicitUsings>disable</ImplicitUsings>
87
<Nullable>enable</Nullable>
@@ -24,12 +23,18 @@
2423

2524
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
2625
<DefineConstants>OS_WINDOWS</DefineConstants>
26+
<TargetFrameworks>net9.0-windows10.0.22621.0</TargetFrameworks>
27+
<EnableWindowsTargeting>true</EnableWindowsTargeting>
2728
</PropertyGroup>
2829
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Linux'))">
2930
<DefineConstants>OS_LINUX</DefineConstants>
31+
<TargetFrameworks>net9.0</TargetFrameworks>
32+
<EnableWindowsTargeting>false</EnableWindowsTargeting>
3033
</PropertyGroup>
3134
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('OSX'))">
3235
<DefineConstants>OS_MAC</DefineConstants>
36+
<TargetFrameworks>net9.0</TargetFrameworks>
37+
<EnableWindowsTargeting>false</EnableWindowsTargeting>
3338
</PropertyGroup>
3439

3540
<ItemGroup>
@@ -48,7 +53,7 @@
4853
<ItemGroup>
4954
<None Include="..\resources\icon.png">
5055
<Pack>True</Pack>
51-
<PackagePath></PackagePath>
56+
<PackagePath/>
5257
<Link>icon.png</Link>
5358
</None>
5459
</ItemGroup>

0 commit comments

Comments
 (0)