Build improvements, dynamic Windows SDK resolution, bugfixes (#661)

* Build improvements & dynamic Windows SDK resolution (backport from 3.0) * Changes to some code formatting * Fix build errors * Fix build error * Enhanced typedef-powered renaming * Fix #652 * Marshal generic pointers in COM vtable wrapper functions * String generation improvements (fixes #630) * Sanity check, remove JetBrains.Annotations
dotnet · Nov 5, 2021 · 9fe05af · 9fe05af
1 parent c21404c
commit 9fe05af
Show file tree

Hide file tree

Showing 875 changed files with 111,848 additions and 66,583 deletions.
diff --git a/Silk.NET.sln b/Silk.NET.sln
@@ -465,6 +465,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.DXVA", "src\Micros
 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}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.OpenXR.Extensions.ALMALENCE", "src\OpenXR\Extensions\Silk.NET.OpenXR.Extensions.ALMALENCE\Silk.NET.OpenXR.Extensions.ALMALENCE.csproj", "{606214B8-07FC-436F-9523-02AF32E1AB1E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.OpenXR.Extensions.HTCX", "src\OpenXR\Extensions\Silk.NET.OpenXR.Extensions.HTCX\Silk.NET.OpenXR.Extensions.HTCX.csproj", "{782B6A7E-9F04-429A-9DCD-D7273AA3882E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -2766,6 +2770,30 @@ Global
 		{3E30D674-9282-4297-AD1F-9B233A166308}.Release|x64.Build.0 = Release|Any CPU
 		{3E30D674-9282-4297-AD1F-9B233A166308}.Release|x86.ActiveCfg = Release|Any CPU
 		{3E30D674-9282-4297-AD1F-9B233A166308}.Release|x86.Build.0 = Release|Any CPU
+		{606214B8-07FC-436F-9523-02AF32E1AB1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{606214B8-07FC-436F-9523-02AF32E1AB1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{606214B8-07FC-436F-9523-02AF32E1AB1E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{606214B8-07FC-436F-9523-02AF32E1AB1E}.Debug|x64.Build.0 = Debug|Any CPU
+		{606214B8-07FC-436F-9523-02AF32E1AB1E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{606214B8-07FC-436F-9523-02AF32E1AB1E}.Debug|x86.Build.0 = Debug|Any CPU
+		{606214B8-07FC-436F-9523-02AF32E1AB1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{606214B8-07FC-436F-9523-02AF32E1AB1E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{606214B8-07FC-436F-9523-02AF32E1AB1E}.Release|x64.ActiveCfg = Release|Any CPU
+		{606214B8-07FC-436F-9523-02AF32E1AB1E}.Release|x64.Build.0 = Release|Any CPU
+		{606214B8-07FC-436F-9523-02AF32E1AB1E}.Release|x86.ActiveCfg = Release|Any CPU
+		{606214B8-07FC-436F-9523-02AF32E1AB1E}.Release|x86.Build.0 = Release|Any CPU
+		{782B6A7E-9F04-429A-9DCD-D7273AA3882E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{782B6A7E-9F04-429A-9DCD-D7273AA3882E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{782B6A7E-9F04-429A-9DCD-D7273AA3882E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{782B6A7E-9F04-429A-9DCD-D7273AA3882E}.Debug|x64.Build.0 = Debug|Any CPU
+		{782B6A7E-9F04-429A-9DCD-D7273AA3882E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{782B6A7E-9F04-429A-9DCD-D7273AA3882E}.Debug|x86.Build.0 = Debug|Any CPU
+		{782B6A7E-9F04-429A-9DCD-D7273AA3882E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{782B6A7E-9F04-429A-9DCD-D7273AA3882E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{782B6A7E-9F04-429A-9DCD-D7273AA3882E}.Release|x64.ActiveCfg = Release|Any CPU
+		{782B6A7E-9F04-429A-9DCD-D7273AA3882E}.Release|x64.Build.0 = Release|Any CPU
+		{782B6A7E-9F04-429A-9DCD-D7273AA3882E}.Release|x86.ActiveCfg = Release|Any CPU
+		{782B6A7E-9F04-429A-9DCD-D7273AA3882E}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2990,6 +3018,8 @@ Global
 		{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}
+		{606214B8-07FC-436F-9523-02AF32E1AB1E} = {90471225-AC23-424E-B62E-F6EC4C6ECAC0}
+		{782B6A7E-9F04-429A-9DCD-D7273AA3882E} = {90471225-AC23-424E-B62E-F6EC4C6ECAC0}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {F5273D7F-3334-48DF-94E3-41AE6816CD4D}

diff --git a/build/cache/assimp.json.gz b/build/cache/assimp.json.gz
diff --git a/build/cache/cl.json.gz b/build/cache/cl.json.gz
diff --git a/build/cache/core.json.gz b/build/cache/core.json.gz
diff --git a/build/cache/d3d11.json.gz b/build/cache/d3d11.json.gz
diff --git a/build/cache/d3d12.json.gz b/build/cache/d3d12.json.gz
diff --git a/build/cache/d3d9.json.gz b/build/cache/d3d9.json.gz
diff --git a/build/cache/d3dcompiler.json.gz b/build/cache/d3dcompiler.json.gz
diff --git a/build/cache/dxc.json.gz b/build/cache/dxc.json.gz
diff --git a/build/cache/dxgi.json.gz b/build/cache/dxgi.json.gz
diff --git a/build/cache/dxva.json.gz b/build/cache/dxva.json.gz
diff --git a/build/cache/gl.json.gz b/build/cache/gl.json.gz
diff --git a/build/cache/glcore.json.gz b/build/cache/glcore.json.gz
diff --git a/build/cache/gles2.json.gz b/build/cache/gles2.json.gz
diff --git a/build/cache/openxr.json.gz b/build/cache/openxr.json.gz
diff --git a/build/cache/sdl.json.gz b/build/cache/sdl.json.gz
diff --git a/build/cache/vulkan.json.gz b/build/cache/vulkan.json.gz
diff --git a/build/cache/vulkan_video.json.gz b/build/cache/vulkan_video.json.gz
diff --git a/build/cache/win32extras.json.gz b/build/cache/win32extras.json.gz
diff --git a/build/cache/xaudio.json.gz b/build/cache/xaudio.json.gz
diff --git a/build/cache/xinput.json.gz b/build/cache/xinput.json.gz
diff --git a/build/nuke/Build.cs b/build/nuke/Build.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
-using JetBrains.Annotations;
+
 using Nuke.Common;
 using Nuke.Common.Execution;
 using Nuke.Common.IO;
@@ -92,7 +92,7 @@ bool HasDesktopMsBuild
 
     [Solution] readonly Solution Solution;
 
-    [CanBeNull] Dictionary<string, (Solution Solution, bool UseDesktopMSBuild)> SolutionsValue;
+    Dictionary<string, (Solution Solution, bool UseDesktopMSBuild)>? SolutionsValue;
 
     Dictionary<string, (Solution Solution, bool UseDesktopMSBuild)> Solutions
         => SolutionsValue ??= Projects.ProcessSolution(Solution, FeatureSets, HasDesktopMsBuild);
@@ -157,7 +157,7 @@ bool HasDesktopMsBuild
                             "extension) to the AllowedExclusions array in the NUKE Build.cs file."
                         );
 
-                        missedOut.Add(file);
+                        missedOut.Add(Path.GetRelativePath(RootDirectory, file));
                     }
                 }
 
@@ -180,6 +180,7 @@ bool HasDesktopMsBuild
         (
             () =>
             {
+                var outputs = Enumerable.Empty<Output>();
                 if (!HasProcessedSolutions)
                 {
                     var slnDir = Path.Combine(Solution.Directory!, "build", "sln");
@@ -202,21 +203,27 @@ bool HasDesktopMsBuild
                     Logger.Info($"Cleaning feature set \"{key}\" ({sln})");
                     if (useDesktopMsBuild)
                     {
-                        MSBuild
+                        outputs = outputs.Concat
                         (
-                            s => s.SetTargets("Clean")
-                                .SetMaxCpuCount(Environment.ProcessorCount)
-                                .SetProperties(ProcessedMsbuildProperties)
-                                .SetTargetPath(sln)
+                            MSBuild
+                            (
+                                s => s.SetTargets("Clean")
+                                    .SetMaxCpuCount(Environment.ProcessorCount)
+                                    .SetProperties(ProcessedMsbuildProperties)
+                                    .SetTargetPath(sln)
+                            )
                         );
                     }
                     else
                     {
-                        DotNetClean
+                        outputs = outputs.Concat
                         (
-                            s => s.SetProject(sln)
-                                .SetConfiguration(Configuration)
-                                .SetProperties(ProcessedMsbuildProperties)
+                            DotNetClean
+                            (
+                                s => s.SetProject(sln)
+                                    .SetConfiguration(Configuration)
+                                    .SetProperties(ProcessedMsbuildProperties)
+                            )
                         );
                     }
                 }
@@ -228,12 +235,21 @@ bool HasDesktopMsBuild
 
                 Directory.CreateDirectory(RootDirectory / "build" / "output_packages");
 
-                var silkDroid = SourceDirectory / "Windowing" / "Android" / "SilkDroid";
-                using var process = RuntimeInformation.IsOSPlatform(OSPlatform.Linux)
-                    ? StartProcess("bash", "-c \"./gradlew clean\"", silkDroid)
-                    : StartProcess("cmd", "/c \".\\gradlew clean\"", silkDroid);
-                process.AssertZeroExitCode();
-                return process.Output;
+                if (FeatureSets.Any(x => x.Equals("native", StringComparison.OrdinalIgnoreCase)))
+                {
+                    var silkDroid = SourceDirectory / "Windowing" / "Android" / "SilkDroid";
+                    using var process = RuntimeInformation.IsOSPlatform(OSPlatform.Linux)
+                        ? StartProcess("bash", "-c \"./gradlew clean\"", silkDroid)
+                        : StartProcess("cmd", "/c \".\\gradlew clean\"", silkDroid);
+                    process.AssertZeroExitCode();
+                    outputs = outputs.Concat(process.Output);
+                }
+                else
+                {
+                    Logger.Warn("Skipping gradlew clean as the \"native\" feature-set has not been specified.");
+                }
+
+                return outputs;
             }
         );
 
@@ -300,7 +316,7 @@ bool HasDesktopMsBuild
                             s => s
                                 .SetProjectFile(sln)
                                 .SetConfiguration(Configuration)
-                                .SetNoRestore(true)
+                                .EnableNoRestore()
                                 .SetProperties(ProcessedMsbuildProperties)
                         );
                     }
@@ -357,6 +373,12 @@ bool HasDesktopMsBuild
         (
             () =>
             {
+                if (!FeatureSets.Any(x => x.Equals("native", StringComparison.OrdinalIgnoreCase)))
+                {
+                    Logger.Warn("Skipping gradlew build as the \"native\" feature-set has not been specified.");
+                    return Enumerable.Empty<Output>();
+                }
+                
                 var sdl = RootDirectory / "build" / "submodules" / "SDL";
                 var silkDroid = SourceDirectory / "Windowing" / "Android" / "SilkDroid";
                 var xcopy = new (string, string)[]
@@ -425,7 +447,7 @@ bool HasDesktopMsBuild
                             s => s
                                 .SetProject(sln)
                                 .SetConfiguration(Configuration)
-                                .SetNoRestore(true)
+                                .EnableNoRestore()
                                 .SetProperties(ProcessedMsbuildProperties)
                         );
                     }
@@ -448,21 +470,25 @@ bool HasDesktopMsBuild
     static IEnumerable<string> Packages => Directory.GetFiles(PackageDirectory, "*.nupkg")
         .Where(x => Path.GetFileName(x).StartsWith("Silk.NET") || Path.GetFileName(x).StartsWith("Ultz.Native"));
 
-    async Task PushPackages()
+    async Task<IEnumerable<Output>> PushPackages()
     {
+        var outputs = Enumerable.Empty<Output>();
         const int rateLimit = 300;
         if (!string.IsNullOrWhiteSpace(SignUsername) && !string.IsNullOrWhiteSpace(SignPassword))
         {
             var basePath = RootDirectory / "build" / "codesigning";
             var execPath = basePath / "tool" / (OperatingSystem.IsWindows() ? "SignClient.exe" : "SignClient");
             if (!File.Exists(execPath))
             {
-                DotNetToolInstall(s => s.SetToolInstallationPath(basePath / "tool").SetPackageName("SignClient"));
+                outputs = outputs.Concat
+                (
+                    DotNetToolInstall(s => s.SetToolInstallationPath(basePath / "tool").SetPackageName("SignClient"))
+                );
             }
 
             foreach (var pkg in Packages)
             {
-                StartProcess
+                var proc = StartProcess
                 (
                     execPath,
                     "sign " +
@@ -475,7 +501,10 @@ async Task PushPackages()
                     "--name \"Silk.NET\" " +
                     "--description \"Silk.NET\" " +
                     "--descriptionUrl \"https://github.com/dotnet/Silk.NET\""
-                ).AssertZeroExitCode();
+                );
+
+                proc.AssertZeroExitCode();
+                outputs = outputs.Concat(proc.Output);
             }
         }
 
@@ -484,11 +513,6 @@ async Task PushPackages()
             .Select(x => x.Select(v => v.Value).ToList())
             .ToList();
         var first = true;
-        var pushed = 0;
-        var feed = NuGetInterface.OpenNuGetFeed(NugetFeed, NugetUsername, NugetPassword);
-        var uploadResource = await NuGetInterface.GetUploadResourceAsync(feed);
-        var symbolsResource = await NuGetInterface.GetSymbolsUploadResourceAsync(feed);
-        var exceptions = new List<Exception>();
         Logger.Info($"Searching for packages in \"{RootDirectory / "build" / "output_packages"}\"...");
         foreach (var files in allFiles)
         {
@@ -501,33 +525,33 @@ async Task PushPackages()
                 await Task.Delay(TimeSpan.FromHours(1));
             }
 
-            foreach (var file in files)
+            var srcSettings = new DotNetNuGetAddSourceSettings().SetName("Silk-PushPackages").SetSource(NugetFeed);
+            if (NugetUsername is not null || NugetPassword is not null)
             {
-                try
-                {
-                    await NuGetInterface.UploadPackageAsync
-                        (uploadResource, NugetNoServiceEndpoint, file, NugetApiKey, symbolsResource);
-                    pushed++;
-                }
-                catch (Exception ex)
+                if (NugetUsername is null || NugetPassword is null)
                 {
-                    if (file.Contains(".Native.")) // native packages have their own update cycle
-                    {
-                        Logger.Warn(ex);
-                    }
-                    else
-                    {
-                        exceptions.Add(new Exception($"Failed to push package \"{file}\"", ex));
-                    }
+                    ControlFlow.Fail
+                    (
+                        "Both \"NugetUsername\" and \"NugetPassword\" must be specified if either are used."
+                    );
                 }
+
+                srcSettings = srcSettings.SetUsername(NugetUsername).SetPassword(NugetPassword);
             }
-        }
+
+            outputs = outputs.Concat(DotNetNuGetAddSource(srcSettings));
 
-        Logger.Success($"Successfully pushed {pushed} packages.");
+            foreach (var pushSettings in files.Select(file => new DotNetNuGetPushSettings()
+                .SetNoServiceEndpoint(NugetNoServiceEndpoint)
+                .EnableSkipDuplicate()
+                .SetTargetPath(file)))
+            {
+                outputs = outputs.Concat(DotNetNuGetPush(pushSettings));
+            }
 
-        if (exceptions.Count > 0)
-        {
-            throw new AggregateException(exceptions);
+            outputs = outputs.Concat(DotNet($"dotnet nuget remove source \"Silk-PushPackages\""));
         }
+
+        return outputs;
     }
 }
diff --git a/build/nuke/Projects.cs b/build/nuke/Projects.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using JetBrains.Annotations;
+
 using Nuke.Common;
 using Nuke.Common.IO;
 using Nuke.Common.ProjectModel;
@@ -65,7 +65,11 @@ bool hasDesktopMsBuild
             }
 
             var sln = ParseSolution(originalSolutionPath);
-            featureSetSpecificSolutions[featureSet.Name] = (sln, featureSet.RequiresDesktopMsBuild);
+            if (featureSetUsed)
+            {
+                featureSetSpecificSolutions[featureSet.Name] = (sln, featureSet.RequiresDesktopMsBuild);
+            }
+
             foreach (var removal in rm)
             {
                 sln.RemoveProject(sln.GetProject(removal));

diff --git a/build/submodules/Vulkan-Headers b/build/submodules/Vulkan-Headers