Skip to content

Commit a041dfb

Browse files
committed
Merge branch 'develop/3.0' of https://github.com/dotnet/Silk.NET into feature/windowing-3.0
2 parents d86a14c + de89670 commit a041dfb

File tree

5 files changed

+20
-32
lines changed

5 files changed

+20
-32
lines changed

Silk.NET.sln

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SDL", "SDL", "{49D426BF-A00
8888
EndProject
8989
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SilkTouch", "SilkTouch", "{AB25C482-DA9D-4335-8E26-2F29C3700152}"
9090
EndProject
91-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Windowing.Common", "sources\Windowing\Common\Silk.NET.Windowing.Common.csproj", "{75CD2208-F000-4839-B492-50C38C63AEB9}"
91+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Windowing", "Windowing", "{AE84F4C8-6102-4A72-86EF-0C9345AA27A9}"
9292
EndProject
93-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Windowing", "Windowing", "{2FA536C6-E68A-44AB-BCAD-DA1442F66F04}"
93+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Windowing.Common", "sources\Windowing\Common\Silk.NET.Windowing.Common.csproj", "{D1542DA9-7C7D-417C-8B63-791570D4C4A0}"
9494
EndProject
95-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Windowing", "sources\Windowing\Windowing\Silk.NET.Windowing.csproj", "{B3A917B0-027F-4438-99C5-40C31CF3D01C}"
96-
EndProject
97-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{CFA6E293-8A63-4164-BF5C-4610A0B3372E}"
98-
EndProject
99-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Core.Analyzers", "sources\Core\Analyzers\Silk.NET.Core.Analyzers.csproj", "{3664126F-5535-4071-8F71-F019C6B19FA9}"
95+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Windowing", "sources\Windowing\Windowing\Silk.NET.Windowing.csproj", "{6B3A9BCC-8EBF-4132-B306-8E275D05CB52}"
10096
EndProject
10197
Global
10298
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -148,18 +144,14 @@ Global
148144
{D2B9C43F-A80D-4C9A-9643-BC1AC1B4E807}.Debug|Any CPU.Build.0 = Debug|Any CPU
149145
{D2B9C43F-A80D-4C9A-9643-BC1AC1B4E807}.Release|Any CPU.ActiveCfg = Release|Any CPU
150146
{D2B9C43F-A80D-4C9A-9643-BC1AC1B4E807}.Release|Any CPU.Build.0 = Release|Any CPU
151-
{75CD2208-F000-4839-B492-50C38C63AEB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
152-
{75CD2208-F000-4839-B492-50C38C63AEB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
153-
{75CD2208-F000-4839-B492-50C38C63AEB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
154-
{75CD2208-F000-4839-B492-50C38C63AEB9}.Release|Any CPU.Build.0 = Release|Any CPU
155-
{B3A917B0-027F-4438-99C5-40C31CF3D01C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
156-
{B3A917B0-027F-4438-99C5-40C31CF3D01C}.Debug|Any CPU.Build.0 = Debug|Any CPU
157-
{B3A917B0-027F-4438-99C5-40C31CF3D01C}.Release|Any CPU.ActiveCfg = Release|Any CPU
158-
{B3A917B0-027F-4438-99C5-40C31CF3D01C}.Release|Any CPU.Build.0 = Release|Any CPU
159-
{3664126F-5535-4071-8F71-F019C6B19FA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
160-
{3664126F-5535-4071-8F71-F019C6B19FA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
161-
{3664126F-5535-4071-8F71-F019C6B19FA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
162-
{3664126F-5535-4071-8F71-F019C6B19FA9}.Release|Any CPU.Build.0 = Release|Any CPU
147+
{D1542DA9-7C7D-417C-8B63-791570D4C4A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
148+
{D1542DA9-7C7D-417C-8B63-791570D4C4A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
149+
{D1542DA9-7C7D-417C-8B63-791570D4C4A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
150+
{D1542DA9-7C7D-417C-8B63-791570D4C4A0}.Release|Any CPU.Build.0 = Release|Any CPU
151+
{6B3A9BCC-8EBF-4132-B306-8E275D05CB52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
152+
{6B3A9BCC-8EBF-4132-B306-8E275D05CB52}.Debug|Any CPU.Build.0 = Debug|Any CPU
153+
{6B3A9BCC-8EBF-4132-B306-8E275D05CB52}.Release|Any CPU.ActiveCfg = Release|Any CPU
154+
{6B3A9BCC-8EBF-4132-B306-8E275D05CB52}.Release|Any CPU.Build.0 = Release|Any CPU
163155
EndGlobalSection
164156
GlobalSection(SolutionProperties) = preSolution
165157
HideSolutionNode = FALSE
@@ -186,9 +178,9 @@ Global
186178
{01683C11-4721-43AB-B53C-15EBE935B48F} = {FCD75AA5-1536-433E-BA9B-3D698C2255EB}
187179
{D2B9C43F-A80D-4C9A-9643-BC1AC1B4E807} = {49D426BF-A009-43D5-A9E2-EFAAAA7196FC}
188180
{600D712C-4ABF-44C4-96C3-B1DEE1F38298} = {AB25C482-DA9D-4335-8E26-2F29C3700152}
189-
{2FA536C6-E68A-44AB-BCAD-DA1442F66F04} = {DD29EA8F-B1A6-45AA-8D2E-B38DA56D9EF6}
190-
{B3A917B0-027F-4438-99C5-40C31CF3D01C} = {2FA536C6-E68A-44AB-BCAD-DA1442F66F04}
191-
{75CD2208-F000-4839-B492-50C38C63AEB9} = {2FA536C6-E68A-44AB-BCAD-DA1442F66F04}
181+
{AE84F4C8-6102-4A72-86EF-0C9345AA27A9} = {DD29EA8F-B1A6-45AA-8D2E-B38DA56D9EF6}
182+
{D1542DA9-7C7D-417C-8B63-791570D4C4A0} = {AE84F4C8-6102-4A72-86EF-0C9345AA27A9}
183+
{6B3A9BCC-8EBF-4132-B306-8E275D05CB52} = {AE84F4C8-6102-4A72-86EF-0C9345AA27A9}
192184
EndGlobalSection
193185
GlobalSection(ExtensibilityGlobals) = postSolution
194186
SolutionGuid = {78D2CF6A-60A1-43E3-837B-00B73C9DA384}

sources/Core/Core/Silk.NET.Core.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
// <auto-generated/>
1+
// <auto-generated/>
22
global using static Silk.NET.Core.DSL;
3-
global using Silk.NET.Core;
3+
global using Silk.NET.Core;

sources/Core/Core/Silk.NET.Core.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
<PackageReference Include="InlineIL.Fody" Version="1.8.0" PrivateAssets="all" />
1919
</ItemGroup>
2020

21-
<ItemGroup>
22-
<Folder Include="Core\" />
23-
</ItemGroup>
24-
2521
<!-- Dogfooding -->
2622
<Import Project="Silk.NET.Core.targets" />
2723

tests/Maths/Maths/Silk.NET.Maths.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
15-
<PackageReference Include="xunit" Version="2.8.1" />
16-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
15+
<PackageReference Include="xunit" Version="2.9.0" />
16+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
1717
<PrivateAssets>all</PrivateAssets>
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1919
</PackageReference>

tests/SilkTouch/SilkTouch/Silk.NET.SilkTouch.UnitTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<PackageReference Include="Silk.NET.BuildTools" Version="2.21.0" />
1616
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
1717
<PackageReference Include="Verify.DiffPlex" Version="3.0.0" />
18-
<PackageReference Include="Verify.NUnit" Version="25.0.1" />
18+
<PackageReference Include="Verify.NUnit" Version="25.3.2" />
1919
<None Include="**/*.received.*" />
2020
<None Include="**/*.verified.*" />
2121
</ItemGroup>

0 commit comments

Comments
 (0)