Skip to content

Commit 175684b

Browse files
pomianowskipomianowski
committed
Add support for .NET 6
1 parent 1c21398 commit 175684b

File tree

23 files changed

+126
-99
lines changed

23 files changed

+126
-99
lines changed

‎.github/workflows/main.yml renamed to ‎.github/workflows/CI.yml

+21-24
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,26 @@
1+
# Taken from LibreHardwareMonitor https://github.com/LibreHardwareMonitor/LibreHardwareMonitor/blob/master/.github/workflows/main.yml
2+
13
name: CI
4+
25
on:
36
push:
47
branches: [ main ]
5-
pull_request:
6-
branches: [ main ]
78

8-
# Allows you to run this workflow manually from the Actions tab
99
workflow_dispatch:
1010

11-
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1211
jobs:
13-
# This workflow contains a single job called "build"
1412
build:
15-
# The type of runner that the job will run on
16-
runs-on: windows-latest
13+
runs-on: windows-2022
1714
if: contains(github.event.head_commit.message, 'ci skip') == false
1815

19-
# Steps represent a sequence of tasks that will be executed as part of the job
2016
steps:
21-
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
2217
- uses: actions/checkout@v2
18+
- uses: microsoft/[email protected]
19+
with:
20+
msbuild-architecture: x64
2321
- uses: nuget/setup-nuget@v1
24-
- uses: microsoft/[email protected]
25-
26-
# Taken from LibreHardwareMonitor https://github.com/LibreHardwareMonitor/LibreHardwareMonitor/blob/master/.github/workflows/main.yml
22+
with:
23+
nuget-version: 'latest'
2724
- uses: dorny/paths-filter@v2
2825
id: changes
2926
with:
@@ -39,25 +36,25 @@ jobs:
3936
if(!$m.Success -or $m.Groups[4].Success -or $m.Groups[5].Success) { $_; }
4037
else { $_ -replace $m.Value, ("<Version>{0}.{1}.{2}-prerelease${{ github.run_number }}</Version>" -f $m.Groups[1].Value,$m.Groups[2].Value,([convert]::ToInt32($m.Groups[3].Value)+1)); }
4138
} | Set-Content Directory.Build.props
42-
39+
4340
- name: NuGet restore
4441
run: nuget restore DXNET.sln
45-
42+
4643
- name: Build
4744
run: msbuild DXNET.sln -p:Configuration=Release -m
4845

4946
- name: Publish nupkg
5047
uses: actions/upload-artifact@v2
5148
with:
52-
name: nupkg-dxnet
49+
name: DXNET-NUPKG
5350
path: |
5451
Output/Release/DXNET.*.nupkg
55-
56-
- name: Upload update to NuGet
57-
uses: rohith/publish-nuget@v2
58-
with:
59-
PROJECT_FILE_PATH: DXNET/DXNET.csproj
60-
VERSION_FILE_PATH: Directory.Build.props
61-
NUGET_KEY: ${{secrets.NUGET_API_KEY}}
62-
INCLUDE_SYMBOLS: false
63-
TAG_COMMIT: false
52+
53+
# - name: Upload update to NuGet
54+
# uses: rohith/publish-nuget@v2
55+
# with:
56+
# PROJECT_FILE_PATH: DXNET/DXNET.csproj
57+
# VERSION_FILE_PATH: Directory.Build.props
58+
# NUGET_KEY: ${{secrets.NUGET_API_KEY}}
59+
# INCLUDE_SYMBOLS: false
60+
# TAG_COMMIT: false

‎.github/workflows/PR.yml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: PR
2+
3+
on:
4+
pull_request:
5+
branches: [ main ]
6+
7+
workflow_dispatch:
8+
9+
jobs:
10+
build:
11+
runs-on: windows-2022
12+
if: contains(github.event.head_commit.message, 'ci skip') == false
13+
14+
steps:
15+
- uses: actions/checkout@v2
16+
- uses: microsoft/[email protected]
17+
with:
18+
msbuild-architecture: x64
19+
- uses: nuget/setup-nuget@v1
20+
with:
21+
nuget-version: 'latest'
22+
23+
- name: NuGet restore
24+
run: nuget restore DXNET.sln
25+
26+
- name: Build
27+
run: msbuild DXNET.sln -p:Configuration=Release -m

‎DXNET.Tests/DXNET.Tests.csproj

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
11-
<PackageReference Include="NUnit" Version="3.13.1" />
12-
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
13-
<PackageReference Include="coverlet.collector" Version="3.0.2" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
11+
<PackageReference Include="NUnit" Version="3.13.2" />
12+
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
13+
<PackageReference Include="coverlet.collector" Version="3.1.0">
14+
<PrivateAssets>all</PrivateAssets>
15+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16+
</PackageReference>
1417
</ItemGroup>
1518

1619
<ItemGroup>

‎DXNET/DXNET.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
55
<AssemblyVersion>5.0.0.0</AssemblyVersion>
66
<FileVersion>5.0.0.0</FileVersion>
77
<Version>5.0.0</Version>
@@ -15,7 +15,7 @@
1515
<PackageTags>dxnet directx sharpdx direct3d multimedia 3d net5 core framework</PackageTags>
1616
<PackageLicense>https://raw.githubusercontent.com/lepoco/dxnet/main/LICENSE</PackageLicense>
1717
<Description>Core assembly providing infrastructure for all managed DirectX API.</Description>
18-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
18+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1919
</PropertyGroup>
2020

2121
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -49,5 +49,5 @@
4949
<PackagePath></PackagePath>
5050
</None>
5151
</ItemGroup>
52-
52+
5353
</Project>

‎Modules/DXNET.Animation/DXNET.Animation.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
55
<AssemblyVersion>5.0.0.0</AssemblyVersion>
66
<FileVersion>5.0.0.0</FileVersion>
77
<Version>5.0.0</Version>

‎Modules/DXNET.D3DCompiler/DXNET.D3DCompiler.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
55
<AssemblyVersion>5.0.0.0</AssemblyVersion>
66
<FileVersion>5.0.0.0</FileVersion>
77
<Version>5.0.0</Version>

‎Modules/DXNET.DXGI/DXNET.DXGI.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
55
<AssemblyVersion>5.0.0.0</AssemblyVersion>
66
<FileVersion>5.0.0.0</FileVersion>
77
<Version>5.0.0</Version>

‎Modules/DXNET.Desktop/DXNET.Desktop.csproj

+48-48
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,56 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22

3-
<PropertyGroup>
4-
<TargetFrameworks>net5.0-windows;netcoreapp3.1;net48;net46</TargetFrameworks>
5-
<AssemblyVersion>5.0.0.0</AssemblyVersion>
6-
<FileVersion>5.0.0.0</FileVersion>
7-
<Version>5.0.0</Version>
8-
<Copyright>Copyright 2014-2019 Alexandre Mutel | 2021 DXNET Contributors</Copyright>
9-
<Company>DXNET Contributors</Company>
10-
<Authors>DXNET Contributors</Authors>
11-
<PackageIcon>dxnet-desktop.png</PackageIcon>
12-
<PackageIconUrl />
13-
<PackageProjectUrl>https://github.com/lepoco/dxnet</PackageProjectUrl>
14-
<RepositoryUrl>https://github.com/lepoco/dxnet</RepositoryUrl>
15-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
16-
<PackageTags>dxnet directx sharpdx direct3d multimedia 3d net5 core framework</PackageTags>
17-
<PackageLicense>https://raw.githubusercontent.com/lepoco/dxnet/main/LICENSE</PackageLicense>
18-
<Description>Assembly providing APIs related to Desktop platform.</Description>
19-
<PackageLicenseFile>LICENSE</PackageLicenseFile>
20-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
21-
<UseWindowsForms>true</UseWindowsForms>
22-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFrameworks>net6.0-windows;net5.0-windows;netcoreapp3.1;net48;net46</TargetFrameworks>
5+
<AssemblyVersion>5.0.0.0</AssemblyVersion>
6+
<FileVersion>5.0.0.0</FileVersion>
7+
<Version>5.0.0</Version>
8+
<Copyright>Copyright 2014-2019 Alexandre Mutel | 2021 DXNET Contributors</Copyright>
9+
<Company>DXNET Contributors</Company>
10+
<Authors>DXNET Contributors</Authors>
11+
<PackageIcon>dxnet-desktop.png</PackageIcon>
12+
<PackageIconUrl />
13+
<PackageProjectUrl>https://github.com/lepoco/dxnet</PackageProjectUrl>
14+
<RepositoryUrl>https://github.com/lepoco/dxnet</RepositoryUrl>
15+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
16+
<PackageTags>dxnet directx sharpdx direct3d multimedia 3d net5 core framework</PackageTags>
17+
<PackageLicense>https://raw.githubusercontent.com/lepoco/dxnet/main/LICENSE</PackageLicense>
18+
<Description>Assembly providing APIs related to Desktop platform.</Description>
19+
<PackageLicenseFile>LICENSE</PackageLicenseFile>
20+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
21+
<UseWindowsForms>true</UseWindowsForms>
22+
</PropertyGroup>
2323

24-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
25-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
26-
<OutputPath>..\..\Output\Debug</OutputPath>
27-
</PropertyGroup>
24+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
25+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
26+
<OutputPath>..\..\Output\Debug</OutputPath>
27+
</PropertyGroup>
2828

29-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
30-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
31-
<OutputPath>..\..\Output\Release</OutputPath>
32-
</PropertyGroup>
29+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
30+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
31+
<OutputPath>..\..\Output\Release</OutputPath>
32+
</PropertyGroup>
3333

34-
<ItemGroup>
35-
<None Include="..\..\LICENSE">
36-
<Pack>True</Pack>
37-
<PackagePath></PackagePath>
38-
</None>
39-
<None Include="..\..\Resources\dxnet-desktop.png">
40-
<Pack>True</Pack>
41-
<PackagePath></PackagePath>
42-
</None>
43-
</ItemGroup>
44-
45-
<ItemGroup>
46-
<ProjectReference Include="..\..\DXNET\DXNET.csproj" />
47-
</ItemGroup>
34+
<ItemGroup>
35+
<None Include="..\..\LICENSE">
36+
<Pack>True</Pack>
37+
<PackagePath></PackagePath>
38+
</None>
39+
<None Include="..\..\Resources\dxnet-desktop.png">
40+
<Pack>True</Pack>
41+
<PackagePath></PackagePath>
42+
</None>
43+
</ItemGroup>
4844

49-
<ItemGroup>
50-
<Compile Update="RenderControl.cs">
51-
<SubType>UserControl</SubType>
52-
</Compile>
53-
<Compile Update="RenderForm.cs" />
54-
</ItemGroup>
45+
<ItemGroup>
46+
<ProjectReference Include="..\..\DXNET\DXNET.csproj" />
47+
</ItemGroup>
48+
49+
<ItemGroup>
50+
<Compile Update="RenderControl.cs">
51+
<SubType>UserControl</SubType>
52+
</Compile>
53+
<Compile Update="RenderForm.cs" />
54+
</ItemGroup>
5555

5656
</Project>

‎Modules/DXNET.Direct2D1/DXNET.Direct2D1.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
55
<AssemblyVersion>5.0.0.0</AssemblyVersion>
66
<FileVersion>5.0.0.0</FileVersion>
77
<Version>5.0.0</Version>

‎Modules/DXNET.Direct3D10/DXNET.Direct3D10.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
55
<AssemblyVersion>5.0.0.0</AssemblyVersion>
66
<FileVersion>5.0.0.0</FileVersion>
77
<Version>5.0.0</Version>

‎Modules/DXNET.Direct3D11.Effects/DXNET.Direct3D11.Effects.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
55
<AssemblyVersion>5.0.0.0</AssemblyVersion>
66
<FileVersion>5.0.0.0</FileVersion>
77
<Version>5.0.0</Version>

‎Modules/DXNET.Direct3D11/DXNET.Direct3D11.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
55
<AssemblyVersion>5.0.0.0</AssemblyVersion>
66
<FileVersion>5.0.0.0</FileVersion>
77
<Version>5.0.0</Version>

‎Modules/DXNET.Direct3D12/DXNET.Direct3D12.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
55
<AssemblyVersion>5.0.0.0</AssemblyVersion>
66
<FileVersion>5.0.0.0</FileVersion>
77
<Version>5.0.0</Version>

‎Modules/DXNET.Direct3D9/DXNET.Direct3D9.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
55
<AssemblyVersion>5.0.0.0</AssemblyVersion>
66
<FileVersion>5.0.0.0</FileVersion>
77
<Version>5.0.0</Version>

‎Modules/DXNET.DirectComposition/DXNET.DirectComposition.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
55
<AssemblyVersion>5.0.0.0</AssemblyVersion>
66
<FileVersion>5.0.0.0</FileVersion>
77
<Version>5.0.0</Version>

‎Modules/DXNET.DirectInput/DXNET.DirectInput.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
55
<AssemblyVersion>5.0.0.0</AssemblyVersion>
66
<FileVersion>5.0.0.0</FileVersion>
77
<Version>5.0.0</Version>

‎Modules/DXNET.DirectManipulation/DXNET.DirectManipulation.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
55
<AssemblyVersion>5.0.0.0</AssemblyVersion>
66
<FileVersion>5.0.0.0</FileVersion>
77
<Version>5.0.0</Version>

‎Modules/DXNET.DirectSound/DXNET.DirectSound.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
55
<AssemblyVersion>5.0.0.0</AssemblyVersion>
66
<FileVersion>5.0.0.0</FileVersion>
77
<Version>5.0.0</Version>

‎Modules/DXNET.Mathematics/DXNET.Mathematics.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
55
<AssemblyVersion>5.0.0.0</AssemblyVersion>
66
<FileVersion>5.0.0.0</FileVersion>
77
<Version>5.0.0</Version>

‎Modules/DXNET.MediaFoundation/DXNET.MediaFoundation.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netstandard2.1;net48;net46</TargetFrameworks>
55
<AssemblyVersion>5.0.0.0</AssemblyVersion>
66
<FileVersion>5.0.0.0</FileVersion>
77
<Version>5.0.0</Version>

0 commit comments

Comments
 (0)