From f9827d85017410d74ab29a54cb21dd1ec219fb4c Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Mon, 8 Nov 2021 19:59:43 +0000 Subject: [PATCH 01/14] update harfbuzz # Conflicts: # build/HarfBuzzSharp.props --- build/HarfBuzzSharp.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/HarfBuzzSharp.props b/build/HarfBuzzSharp.props index 13419eb173..16aab3911e 100644 --- a/build/HarfBuzzSharp.props +++ b/build/HarfBuzzSharp.props @@ -1,6 +1,6 @@  - - + + From 07135d556ab982431ef40a042d074e531717b9bb Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Mon, 8 Nov 2021 19:46:48 +0000 Subject: [PATCH 02/14] latest skia preview # Conflicts: # build/SkiaSharp.props --- build/SkiaSharp.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/SkiaSharp.props b/build/SkiaSharp.props index f2e7df36cd..97b29a192d 100644 --- a/build/SkiaSharp.props +++ b/build/SkiaSharp.props @@ -1,6 +1,6 @@  - - + + From b4d10d5ed9e38ec3522dad2b6b97b96398794aac Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 9 Nov 2021 16:46:08 +0000 Subject: [PATCH 03/14] dotnet 6 compatibility. --- azure-pipelines.yml | 12 ++++++------ build/MicroCom.targets | 2 +- global.json | 3 --- src/tools/MicroComGenerator/MicroComGenerator.csproj | 2 +- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bc8d065137..9939302cef 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -9,9 +9,9 @@ jobs: version: 3.1.414 - task: UseDotNet@2 - displayName: 'Use .NET Core SDK 5.0.402' + displayName: 'Use .NET Core SDK 6.0.101' inputs: - version: 5.0.402 + version: 6.0.101 - task: CmdLine@2 displayName: 'Run Build' @@ -40,9 +40,9 @@ jobs: version: 3.1.414 - task: UseDotNet@2 - displayName: 'Use .NET Core SDK 5.0.402' + displayName: 'Use .NET Core SDK 6.0.101' inputs: - version: 5.0.402 + version: 6.0.101 - task: CmdLine@2 displayName: 'Install Mono 5.18' @@ -110,9 +110,9 @@ jobs: version: 3.1.414 - task: UseDotNet@2 - displayName: 'Use .NET Core SDK 5.0.402' + displayName: 'Use .NET Core SDK 6.0.101' inputs: - version: 5.0.402 + version: 6.0.101 - task: CmdLine@2 displayName: 'Install Nuke' diff --git a/build/MicroCom.targets b/build/MicroCom.targets index 49d2cdce72..1ed388f689 100644 --- a/build/MicroCom.targets +++ b/build/MicroCom.targets @@ -15,7 +15,7 @@ Inputs="@(AvnComIdl);$(MSBuildThisFileDirectory)../src/tools/MicroComGenerator/**/*.cs" Outputs="%(AvnComIdl.OutputFile)"> - diff --git a/global.json b/global.json index 9f83c1ea1e..ad41e7fea1 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,4 @@ { - "sdk": { - "version": "5.0.402" - }, "msbuild-sdks": { "Microsoft.Build.Traversal": "1.0.43", "MSBuild.Sdk.Extras": "2.0.54", diff --git a/src/tools/MicroComGenerator/MicroComGenerator.csproj b/src/tools/MicroComGenerator/MicroComGenerator.csproj index 5ae431b4b9..f2ed8b0185 100644 --- a/src/tools/MicroComGenerator/MicroComGenerator.csproj +++ b/src/tools/MicroComGenerator/MicroComGenerator.csproj @@ -1,7 +1,7 @@ Exe - netcoreapp3.1 + net6.0 From 92239a1fc222b251198735e830e0dd1b3303d86c Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 9 Nov 2021 16:55:45 +0000 Subject: [PATCH 04/14] allow building on .net 6 machines. --- nukebuild/_build.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nukebuild/_build.csproj b/nukebuild/_build.csproj index e08ffd0413..ec2f917018 100644 --- a/nukebuild/_build.csproj +++ b/nukebuild/_build.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net6.0 false False From e1cc426066f2fc8fe1c97619cd52771135e31606 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 9 Nov 2021 16:57:53 +0000 Subject: [PATCH 05/14] correct dotnet version. --- azure-pipelines.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9939302cef..84582fc2c1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -9,9 +9,9 @@ jobs: version: 3.1.414 - task: UseDotNet@2 - displayName: 'Use .NET Core SDK 6.0.101' + displayName: 'Use .NET Core SDK 6.0.100' inputs: - version: 6.0.101 + version: 6.0.100 - task: CmdLine@2 displayName: 'Run Build' @@ -40,9 +40,9 @@ jobs: version: 3.1.414 - task: UseDotNet@2 - displayName: 'Use .NET Core SDK 6.0.101' + displayName: 'Use .NET Core SDK 6.0.100' inputs: - version: 6.0.101 + version: 6.0.100 - task: CmdLine@2 displayName: 'Install Mono 5.18' @@ -110,9 +110,9 @@ jobs: version: 3.1.414 - task: UseDotNet@2 - displayName: 'Use .NET Core SDK 6.0.101' + displayName: 'Use .NET Core SDK 6.0.100' inputs: - version: 6.0.101 + version: 6.0.100 - task: CmdLine@2 displayName: 'Install Nuke' From ae5ce83fd5202400baa783833a822c51f48510b7 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 9 Nov 2021 17:20:22 +0000 Subject: [PATCH 06/14] Revert "allow building on .net 6 machines." This reverts commit 92239a1fc222b251198735e830e0dd1b3303d86c. --- nukebuild/_build.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nukebuild/_build.csproj b/nukebuild/_build.csproj index ec2f917018..e08ffd0413 100644 --- a/nukebuild/_build.csproj +++ b/nukebuild/_build.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + netcoreapp3.1 false False From 8a46ee060b960258faaac1fb4947773a2ccdf9a2 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 9 Nov 2021 17:21:24 +0000 Subject: [PATCH 07/14] dont upgrade microcom. --- build/MicroCom.targets | 2 +- src/tools/MicroComGenerator/MicroComGenerator.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/MicroCom.targets b/build/MicroCom.targets index 1ed388f689..49d2cdce72 100644 --- a/build/MicroCom.targets +++ b/build/MicroCom.targets @@ -15,7 +15,7 @@ Inputs="@(AvnComIdl);$(MSBuildThisFileDirectory)../src/tools/MicroComGenerator/**/*.cs" Outputs="%(AvnComIdl.OutputFile)"> - diff --git a/src/tools/MicroComGenerator/MicroComGenerator.csproj b/src/tools/MicroComGenerator/MicroComGenerator.csproj index f2ed8b0185..5ae431b4b9 100644 --- a/src/tools/MicroComGenerator/MicroComGenerator.csproj +++ b/src/tools/MicroComGenerator/MicroComGenerator.csproj @@ -1,7 +1,7 @@ Exe - net6.0 + netcoreapp3.1 From 64c44c6fd1678c5ad7cb93be3bba02583d8ef5dd Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 9 Nov 2021 18:12:23 +0000 Subject: [PATCH 08/14] fix sdk. --- global.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/global.json b/global.json index ad41e7fea1..e3e652761c 100644 --- a/global.json +++ b/global.json @@ -1,4 +1,7 @@ { + "sdk": { + "version": "6.0.100" + }, "msbuild-sdks": { "Microsoft.Build.Traversal": "1.0.43", "MSBuild.Sdk.Extras": "2.0.54", From 087f59712599349f345abc900a797d8d4e3bfcc5 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 9 Nov 2021 18:25:55 +0000 Subject: [PATCH 09/14] workaround dotnet sdk bug --- azure-pipelines.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 84582fc2c1..5f74f564f8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,3 +1,6 @@ +variables: + MSBuildEnableWorkloadResolver: 'false' + jobs: - job: Linux pool: From d4ce30decd9c384a9ba6c1255ca30766918fbf7e Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 9 Nov 2021 18:29:31 +0000 Subject: [PATCH 10/14] micro com net6 with build script on netcoreapp3.1 --- azure-pipelines.yml | 3 --- build/MicroCom.targets | 2 +- nukebuild/_build.csproj | 7 +++---- src/tools/MicroComGenerator/MicroComGenerator.csproj | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5f74f564f8..84582fc2c1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,6 +1,3 @@ -variables: - MSBuildEnableWorkloadResolver: 'false' - jobs: - job: Linux pool: diff --git a/build/MicroCom.targets b/build/MicroCom.targets index 49d2cdce72..1ed388f689 100644 --- a/build/MicroCom.targets +++ b/build/MicroCom.targets @@ -15,7 +15,7 @@ Inputs="@(AvnComIdl);$(MSBuildThisFileDirectory)../src/tools/MicroComGenerator/**/*.cs" Outputs="%(AvnComIdl.OutputFile)"> - diff --git a/nukebuild/_build.csproj b/nukebuild/_build.csproj index e08ffd0413..3cc9c44e4a 100644 --- a/nukebuild/_build.csproj +++ b/nukebuild/_build.csproj @@ -36,10 +36,9 @@ - - - - + + + diff --git a/src/tools/MicroComGenerator/MicroComGenerator.csproj b/src/tools/MicroComGenerator/MicroComGenerator.csproj index 5ae431b4b9..f2ed8b0185 100644 --- a/src/tools/MicroComGenerator/MicroComGenerator.csproj +++ b/src/tools/MicroComGenerator/MicroComGenerator.csproj @@ -1,7 +1,7 @@ Exe - netcoreapp3.1 + net6.0 From 1df32a964521cf0b9f7d73853d3fedcae81d14fa Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 9 Nov 2021 18:30:38 +0000 Subject: [PATCH 11/14] use multitargetting. --- nukebuild/_build.csproj | 9 +++++---- src/tools/MicroComGenerator/MicroComGenerator.csproj | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/nukebuild/_build.csproj b/nukebuild/_build.csproj index 3cc9c44e4a..ec2f917018 100644 --- a/nukebuild/_build.csproj +++ b/nukebuild/_build.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net6.0 false False @@ -36,9 +36,10 @@ - - - + + + + diff --git a/src/tools/MicroComGenerator/MicroComGenerator.csproj b/src/tools/MicroComGenerator/MicroComGenerator.csproj index f2ed8b0185..eab14760a4 100644 --- a/src/tools/MicroComGenerator/MicroComGenerator.csproj +++ b/src/tools/MicroComGenerator/MicroComGenerator.csproj @@ -1,7 +1,7 @@ Exe - net6.0 + net6.0;netcoreapp3.1 From aba3280277fba4682cf068158a4ee6af30e7ede3 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 9 Nov 2021 18:40:01 +0000 Subject: [PATCH 12/14] fix net6.0 build --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 84582fc2c1..3b957a0b84 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -56,7 +56,7 @@ jobs: inputs: script: | export PATH="`pwd`/sdk:$PATH" - cd src/tools/MicroComGenerator; dotnet run -i ../../Avalonia.Native/avn.idl --cpp ../../../native/Avalonia.Native/inc/avalonia-native.h + cd src/tools/MicroComGenerator; dotnet run -f net6.0 -i ../../Avalonia.Native/avn.idl --cpp ../../../native/Avalonia.Native/inc/avalonia-native.h - task: Xcode@5 inputs: From e5a9776fc88ff07c6c70acead1c73aa14a5b0190 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 9 Nov 2021 19:01:42 +0000 Subject: [PATCH 13/14] fix nuke build. --- nukebuild/_build.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nukebuild/_build.csproj b/nukebuild/_build.csproj index ec2f917018..e08ffd0413 100644 --- a/nukebuild/_build.csproj +++ b/nukebuild/_build.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + netcoreapp3.1 false False From e6669ab022ffa5c24e5083ea0a5d8b2b65d85cee Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 9 Nov 2021 19:13:00 +0000 Subject: [PATCH 14/14] net 6 sdk bug workaround. --- azure-pipelines.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3b957a0b84..9fa79ec5ba 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,3 +1,6 @@ +variables: + MSBuildEnableWorkloadResolver: 'false' + jobs: - job: Linux pool: