From 6797e695f407ffe3e7566248d86afe921563c02b Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Sat, 12 Dec 2020 19:24:24 +0000 Subject: [PATCH 1/7] upgrade osx vm image, to output arm64 apple m1 compatible avalonia.native dylib. --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ac1944b171..fcf5fc8c6a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -27,7 +27,7 @@ jobs: variables: SolutionDir: '$(Build.SourcesDirectory)' pool: - vmImage: 'macOS-10.14' + vmImage: 'macOS-10.15' steps: - task: UseDotNet@2 displayName: 'Use .NET Core SDK 3.1.401' From e907b4f8f8ae2e445bba9c3d881ff7147571867f Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Sat, 12 Dec 2020 19:37:55 +0000 Subject: [PATCH 2/7] use xcode 12. --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index fcf5fc8c6a..197b41d1dc 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -54,7 +54,7 @@ jobs: sdk: 'macosx10.14' configuration: 'Release' xcWorkspacePath: '**/*.xcodeproj/project.xcworkspace' - xcodeVersion: '10' # Options: 8, 9, default, specifyPath + xcodeVersion: '12' # Options: 8, 9, default, specifyPath args: '-derivedDataPath ./' - task: CmdLine@2 From fc6d4953b03232ef3aeea4e23d6e8a123b686d9e Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Sat, 12 Dec 2020 19:43:09 +0000 Subject: [PATCH 3/7] sdk 10.15 --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 197b41d1dc..8a6e5ddb97 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -51,7 +51,7 @@ jobs: inputs: actions: 'build' scheme: '' - sdk: 'macosx10.14' + sdk: 'macosx10.15' configuration: 'Release' xcWorkspacePath: '**/*.xcodeproj/project.xcworkspace' xcodeVersion: '12' # Options: 8, 9, default, specifyPath From 451d07826cf8fb7b0fc864d1281841f08a8e3a5c Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Sat, 12 Dec 2020 19:45:28 +0000 Subject: [PATCH 4/7] dont specify sdk. --- azure-pipelines.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8a6e5ddb97..3c131e8663 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -51,7 +51,6 @@ jobs: inputs: actions: 'build' scheme: '' - sdk: 'macosx10.15' configuration: 'Release' xcWorkspacePath: '**/*.xcodeproj/project.xcworkspace' xcodeVersion: '12' # Options: 8, 9, default, specifyPath From 88fd934fb1ef03f725df3cd9714962ec5318a698 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Sat, 12 Dec 2020 19:48:43 +0000 Subject: [PATCH 5/7] list sdks. --- azure-pipelines.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3c131e8663..2f41af8b89 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -46,7 +46,14 @@ jobs: inputs: script: | cd src/tools/MicroComGenerator; dotnet run -i ../../Avalonia.Native/avn.idl --cpp ../../../native/Avalonia.Native/inc/avalonia-native.h + + - task: CmdLine@2 + displayName: 'List SDKs' + inputs: + script: | + xcodebuild -showsdks + - task: Xcode@5 - task: Xcode@5 inputs: actions: 'build' From 7c2de57d395d459954d1ef3d427e05641dc198a4 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Sat, 12 Dec 2020 19:51:18 +0000 Subject: [PATCH 6/7] 11 sdk --- azure-pipelines.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2f41af8b89..63ba47ec46 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -46,18 +46,11 @@ jobs: inputs: script: | cd src/tools/MicroComGenerator; dotnet run -i ../../Avalonia.Native/avn.idl --cpp ../../../native/Avalonia.Native/inc/avalonia-native.h - - - task: CmdLine@2 - displayName: 'List SDKs' - inputs: - script: | - xcodebuild -showsdks - - task: Xcode@5 - task: Xcode@5 inputs: actions: 'build' - scheme: '' + scheme: 'macosx11.0' configuration: 'Release' xcWorkspacePath: '**/*.xcodeproj/project.xcworkspace' xcodeVersion: '12' # Options: 8, 9, default, specifyPath From 19e1266993df97494f4e4fa7215699ac8db182dd Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Sat, 12 Dec 2020 19:53:46 +0000 Subject: [PATCH 7/7] fix sdk. --- azure-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 63ba47ec46..15392278c9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -50,7 +50,8 @@ jobs: - task: Xcode@5 inputs: actions: 'build' - scheme: 'macosx11.0' + scheme: '' + sdk: 'macosx11.0' configuration: 'Release' xcWorkspacePath: '**/*.xcodeproj/project.xcworkspace' xcodeVersion: '12' # Options: 8, 9, default, specifyPath