From c42d8e14e06537e14d227f14597a414aa5cbc7bf Mon Sep 17 00:00:00 2001 From: WhiteBlackGoose Date: Sun, 10 Oct 2021 15:31:34 +0300 Subject: [PATCH 1/2] License header moved to .editorconfig --- .editorconfig | 6 +++++- Silk.NET.sln | 23 ++++++++++++++--------- Silk.NET.sln.DotSettings | 3 --- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.editorconfig b/.editorconfig index e0db7becdf..be264ea9ed 100644 --- a/.editorconfig +++ b/.editorconfig @@ -73,4 +73,8 @@ silk_touch_compact_file_format = true [*.{appxmanifest,asax,ascx,aspx,build,config,cs,cshtml,csproj,dbml,discomap,dtd,fs,fsi,fsscript,fsx,htm,html,jsproj,lsproj,master,ml,mli,njsproj,nuspec,proj,props,razor,resw,resx,skin,StyleCop,targets,tasks,vb,vbproj,xaml,xamlx,xml,xoml,xsd}] indent_style = space indent_size = 4 -tab_width = 4 \ No newline at end of file +tab_width = 4 + +# License header + warning generated if missing +file_header_template=Licensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the MIT license. +dotnet_diagnostic.IDE0073.severity = warning \ No newline at end of file diff --git a/Silk.NET.sln b/Silk.NET.sln index 8113b8c9e5..df98f4549b 100644 --- a/Silk.NET.sln +++ b/Silk.NET.sln @@ -271,9 +271,9 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.NUKE", "build\nuke\Silk.NET.NUKE.csproj", "{B9A8D738-FE7D-4860-A446-4A03E3DDEB74}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft", "Microsoft", "{F2CF5D32-4B41-425E-B229-8FFC48F88063}" -ProjectSection(SolutionItems) = preProject - src\Microsoft\dxva.h = src\Microsoft\dxva.h -EndProjectSection + ProjectSection(SolutionItems) = preProject + src\Microsoft\dxva.h = src\Microsoft\dxva.h + EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.Direct3D11", "src\Microsoft\Silk.NET.Direct3D11\Silk.NET.Direct3D11.csproj", "{F3B7A9D6-5B15-45E8-925B-20B5BBD33428}" EndProject @@ -453,17 +453,22 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.OpenXR.Extensions. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.OpenXR.Extensions.LIV", "src\OpenXR\Extensions\Silk.NET.OpenXR.Extensions.LIV\Silk.NET.OpenXR.Extensions.LIV.csproj", "{0D1E5AD9-E329-4B84-A5FE-FC1EE33BF038}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TriangleNET6", "src\Lab\Experiments\TriangleNET6\TriangleNET6.csproj", "{477046D2-AF81-4E2B-83BD-20176A971FDD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TriangleNET6", "src\Lab\Experiments\TriangleNET6\TriangleNET6.csproj", "{477046D2-AF81-4E2B-83BD-20176A971FDD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.OpenCL.Extensions.POCL", "src\OpenCL\Extensions\Silk.NET.OpenCL.Extensions.POCL\Silk.NET.OpenCL.Extensions.POCL.csproj", "{8881342D-6247-4826-9963-87D4B029ECB6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.OpenCL.Extensions.POCL", "src\OpenCL\Extensions\Silk.NET.OpenCL.Extensions.POCL\Silk.NET.OpenCL.Extensions.POCL.csproj", "{8881342D-6247-4826-9963-87D4B029ECB6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.OpenAL.Tests", "src\OpenAL\Silk.NET.OpenAL.Tests\Silk.NET.OpenAL.Tests.csproj", "{514DED00-4DA3-46D1-B2E8-10CE826CD52D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.OpenAL.Tests", "src\OpenAL\Silk.NET.OpenAL.Tests\Silk.NET.OpenAL.Tests.csproj", "{514DED00-4DA3-46D1-B2E8-10CE826CD52D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OpenGL Demos", "OpenGL Demos", "{2F547104-C74A-4A84-8980-D1B973CC40C1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.DXVA", "src\Microsoft\Silk.NET.DXVA\Silk.NET.DXVA.csproj", "{28D863B1-B60C-4C08-8661-EB820A5B78D2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.DXVA", "src\Microsoft\Silk.NET.DXVA\Silk.NET.DXVA.csproj", "{28D863B1-B60C-4C08-8661-EB820A5B78D2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Core.Win32Extras", "src\Core\Silk.NET.Core.Win32Extras\Silk.NET.Core.Win32Extras.csproj", "{3E30D674-9282-4297-AD1F-9B233A166308}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.Core.Win32Extras", "src\Core\Silk.NET.Core.Win32Extras\Silk.NET.Core.Win32Extras.csproj", "{3E30D674-9282-4297-AD1F-9B233A166308}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Properties", "Solution Properties", "{C8C9952A-EF5C-406F-9AC6-131C132A7443}" + ProjectSection(SolutionItems) = preProject + .editorconfig = .editorconfig + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -2923,6 +2928,7 @@ Global {2C22A70C-12B3-4BCF-A273-1B0A1BD432BE} = {39B598E9-44BA-4A61-A1BB-7C543734DBA6} {1431D746-63CC-4498-BCD4-7A68E225ACF1} = {39B598E9-44BA-4A61-A1BB-7C543734DBA6} {C7E1C064-DF0A-4809-A3E7-3A20E8995DE1} = {39B598E9-44BA-4A61-A1BB-7C543734DBA6} + {58E7EE89-B67C-482D-9605-04B3BCC5CFBB} = {2F547104-C74A-4A84-8980-D1B973CC40C1} {D16B9145-C5CB-4E2A-A325-07E9FC89F3EA} = {39B598E9-44BA-4A61-A1BB-7C543734DBA6} {4001CDD7-6F73-4C18-966C-27E3BB1208F2} = {39B598E9-44BA-4A61-A1BB-7C543734DBA6} {1C687F7A-54A8-4BC8-82FB-0424AEA537FB} = {39B598E9-44BA-4A61-A1BB-7C543734DBA6} @@ -2987,7 +2993,6 @@ Global {8881342D-6247-4826-9963-87D4B029ECB6} = {757F2B10-B69D-4C19-BFE0-D99070A00AD9} {514DED00-4DA3-46D1-B2E8-10CE826CD52D} = {081E7761-B200-4DBF-8950-941464DECACE} {2F547104-C74A-4A84-8980-D1B973CC40C1} = {6842A2C6-5C7B-42DD-9825-0EDE91BFEBF7} - {58E7EE89-B67C-482D-9605-04B3BCC5CFBB} = {2F547104-C74A-4A84-8980-D1B973CC40C1} {28D863B1-B60C-4C08-8661-EB820A5B78D2} = {F2CF5D32-4B41-425E-B229-8FFC48F88063} {3E30D674-9282-4297-AD1F-9B233A166308} = {0651C5EF-50AA-4598-8D9C-8F210ADD8490} EndGlobalSection diff --git a/Silk.NET.sln.DotSettings b/Silk.NET.sln.DotSettings index 996b6b15db..7e543f9188 100644 --- a/Silk.NET.sln.DotSettings +++ b/Silk.NET.sln.DotSettings @@ -11,9 +11,6 @@ Required DoNotTouch DoNotTouch - Licensed to the .NET Foundation under one or more agreements. -The .NET Foundation licenses this file to you under the MIT license. - API CL EGL From 0aa20bde3a9ed482e2eb8389260b266a2e054d8a Mon Sep 17 00:00:00 2001 From: WhiteBlackGoose Date: Sun, 10 Oct 2021 15:36:46 +0300 Subject: [PATCH 2/2] sln file reverted --- Silk.NET.sln | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/Silk.NET.sln b/Silk.NET.sln index df98f4549b..8113b8c9e5 100644 --- a/Silk.NET.sln +++ b/Silk.NET.sln @@ -271,9 +271,9 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.NUKE", "build\nuke\Silk.NET.NUKE.csproj", "{B9A8D738-FE7D-4860-A446-4A03E3DDEB74}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft", "Microsoft", "{F2CF5D32-4B41-425E-B229-8FFC48F88063}" - ProjectSection(SolutionItems) = preProject - src\Microsoft\dxva.h = src\Microsoft\dxva.h - EndProjectSection +ProjectSection(SolutionItems) = preProject + src\Microsoft\dxva.h = src\Microsoft\dxva.h +EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.Direct3D11", "src\Microsoft\Silk.NET.Direct3D11\Silk.NET.Direct3D11.csproj", "{F3B7A9D6-5B15-45E8-925B-20B5BBD33428}" EndProject @@ -453,22 +453,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.OpenXR.Extensions. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.OpenXR.Extensions.LIV", "src\OpenXR\Extensions\Silk.NET.OpenXR.Extensions.LIV\Silk.NET.OpenXR.Extensions.LIV.csproj", "{0D1E5AD9-E329-4B84-A5FE-FC1EE33BF038}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TriangleNET6", "src\Lab\Experiments\TriangleNET6\TriangleNET6.csproj", "{477046D2-AF81-4E2B-83BD-20176A971FDD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TriangleNET6", "src\Lab\Experiments\TriangleNET6\TriangleNET6.csproj", "{477046D2-AF81-4E2B-83BD-20176A971FDD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.OpenCL.Extensions.POCL", "src\OpenCL\Extensions\Silk.NET.OpenCL.Extensions.POCL\Silk.NET.OpenCL.Extensions.POCL.csproj", "{8881342D-6247-4826-9963-87D4B029ECB6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.OpenCL.Extensions.POCL", "src\OpenCL\Extensions\Silk.NET.OpenCL.Extensions.POCL\Silk.NET.OpenCL.Extensions.POCL.csproj", "{8881342D-6247-4826-9963-87D4B029ECB6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.OpenAL.Tests", "src\OpenAL\Silk.NET.OpenAL.Tests\Silk.NET.OpenAL.Tests.csproj", "{514DED00-4DA3-46D1-B2E8-10CE826CD52D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.OpenAL.Tests", "src\OpenAL\Silk.NET.OpenAL.Tests\Silk.NET.OpenAL.Tests.csproj", "{514DED00-4DA3-46D1-B2E8-10CE826CD52D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OpenGL Demos", "OpenGL Demos", "{2F547104-C74A-4A84-8980-D1B973CC40C1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.DXVA", "src\Microsoft\Silk.NET.DXVA\Silk.NET.DXVA.csproj", "{28D863B1-B60C-4C08-8661-EB820A5B78D2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.DXVA", "src\Microsoft\Silk.NET.DXVA\Silk.NET.DXVA.csproj", "{28D863B1-B60C-4C08-8661-EB820A5B78D2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.Core.Win32Extras", "src\Core\Silk.NET.Core.Win32Extras\Silk.NET.Core.Win32Extras.csproj", "{3E30D674-9282-4297-AD1F-9B233A166308}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Properties", "Solution Properties", "{C8C9952A-EF5C-406F-9AC6-131C132A7443}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - EndProjectSection +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Core.Win32Extras", "src\Core\Silk.NET.Core.Win32Extras\Silk.NET.Core.Win32Extras.csproj", "{3E30D674-9282-4297-AD1F-9B233A166308}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -2928,7 +2923,6 @@ Global {2C22A70C-12B3-4BCF-A273-1B0A1BD432BE} = {39B598E9-44BA-4A61-A1BB-7C543734DBA6} {1431D746-63CC-4498-BCD4-7A68E225ACF1} = {39B598E9-44BA-4A61-A1BB-7C543734DBA6} {C7E1C064-DF0A-4809-A3E7-3A20E8995DE1} = {39B598E9-44BA-4A61-A1BB-7C543734DBA6} - {58E7EE89-B67C-482D-9605-04B3BCC5CFBB} = {2F547104-C74A-4A84-8980-D1B973CC40C1} {D16B9145-C5CB-4E2A-A325-07E9FC89F3EA} = {39B598E9-44BA-4A61-A1BB-7C543734DBA6} {4001CDD7-6F73-4C18-966C-27E3BB1208F2} = {39B598E9-44BA-4A61-A1BB-7C543734DBA6} {1C687F7A-54A8-4BC8-82FB-0424AEA537FB} = {39B598E9-44BA-4A61-A1BB-7C543734DBA6} @@ -2993,6 +2987,7 @@ Global {8881342D-6247-4826-9963-87D4B029ECB6} = {757F2B10-B69D-4C19-BFE0-D99070A00AD9} {514DED00-4DA3-46D1-B2E8-10CE826CD52D} = {081E7761-B200-4DBF-8950-941464DECACE} {2F547104-C74A-4A84-8980-D1B973CC40C1} = {6842A2C6-5C7B-42DD-9825-0EDE91BFEBF7} + {58E7EE89-B67C-482D-9605-04B3BCC5CFBB} = {2F547104-C74A-4A84-8980-D1B973CC40C1} {28D863B1-B60C-4C08-8661-EB820A5B78D2} = {F2CF5D32-4B41-425E-B229-8FFC48F88063} {3E30D674-9282-4297-AD1F-9B233A166308} = {0651C5EF-50AA-4598-8D9C-8F210ADD8490} EndGlobalSection