From d330486b91339f5d0f4a5cacb050eae301313dc4 Mon Sep 17 00:00:00 2001 From: Dylan Perks Date: Fri, 2 Aug 2019 16:12:55 +0100 Subject: [PATCH 1/4] Set up CI with Azure Pipelines [skip ci] --- azure-pipelines.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 azure-pipelines.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 0000000000..ab85acf169 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,14 @@ +trigger: +- master + +pool: + vmImage: 'ubuntu-latest' + +variables: + buildConfiguration: 'Release' + +steps: +- script: dotnet run --configuration $(buildConfiguration) --project src/Core/BuildTools/BuildTools.csproj build/binder_scripts/build.json + displayName: 'Bind' +- script: dotnet build --configuration $(buildConfiguration) + displayName: 'Build' From 533142865d5bb6645c381a4f777e23cd6a864f4d Mon Sep 17 00:00:00 2001 From: Dylan Perks Date: Fri, 2 Aug 2019 16:30:47 +0100 Subject: [PATCH 2/4] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ab85acf169..563fc7194f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,14 +1,22 @@ trigger: - master -pool: - vmImage: 'ubuntu-latest' +pr: +- master + +jobs: +- job: Build + + pool: + vmImage: 'ubuntu-latest' -variables: - buildConfiguration: 'Release' + variables: + buildConfiguration: 'Release' -steps: -- script: dotnet run --configuration $(buildConfiguration) --project src/Core/BuildTools/BuildTools.csproj build/binder_scripts/build.json - displayName: 'Bind' -- script: dotnet build --configuration $(buildConfiguration) - displayName: 'Build' + steps: + - script: dotnet run --configuration $(buildConfiguration) --project src/Core/BuildTools/BuildTools.csproj build/binder_scripts/build.json + displayName: 'Bind' + - script: dotnet pack --configuration $(buildConfiguration) --version-suffix build$(Build.BuildNumber) + displayName: 'Build/Pack' + - publish: build/output_packages + artifact: NuGet Packages From d60d03453b0098587c6f031d79baaff1ff91092e Mon Sep 17 00:00:00 2001 From: Dylan Perks Date: Fri, 2 Aug 2019 17:05:38 +0100 Subject: [PATCH 3/4] Update common.props --- build/props/common.props | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/props/common.props b/build/props/common.props index 0c2b574226..2683ff8a97 100644 --- a/build/props/common.props +++ b/build/props/common.props @@ -3,7 +3,8 @@ https://static.ultz.co.uk/img/SilkDotNet.png MIT - First preview release + $(MSBuildThisFileDirectory)/../output_packages 1.0.0-preview Silk.NET is a high-speed, advanced library, providing bindings to popular low-level APIs such as OpenGL and OpenAL. - \ No newline at end of file + From c0e34f49343cb87840d4db35d41020ee062fc1ad Mon Sep 17 00:00:00 2001 From: DMP9 Date: Sat, 3 Aug 2019 23:16:50 +0100 Subject: [PATCH 4/4] Try and get CI to stop complaining --- src/Windowing/Silk.NET.Windowing.Desktop/GlfwWindow.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Windowing/Silk.NET.Windowing.Desktop/GlfwWindow.cs b/src/Windowing/Silk.NET.Windowing.Desktop/GlfwWindow.cs index 4b833767c5..0811a5850f 100644 --- a/src/Windowing/Silk.NET.Windowing.Desktop/GlfwWindow.cs +++ b/src/Windowing/Silk.NET.Windowing.Desktop/GlfwWindow.cs @@ -420,7 +420,7 @@ public unsafe void Run() } else { // Raise UpdateFrame, but don't await it yet. - var task = Task.Run(RaiseUpdateFrame); + var task = Task.Run((Action)RaiseUpdateFrame); // cast to action, ambiguous call // Loop while we're still updating - the Update thread might be calling the main thread while (!task.IsCompleted)