From 9d4d5f0385cd901a55c27766c56d5fdbe303794f Mon Sep 17 00:00:00 2001 From: Filip W Date: Sat, 18 Jul 2020 21:03:28 +0200 Subject: [PATCH 1/5] use Mono 6.10.0.105 during build time --- azure-pipelines.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 758663bf03..3405336a87 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -47,7 +47,7 @@ jobs: vmImage: "macOS-10.15" dependsOn: GitVersion variables: - MONO_VERSION: 6.8.0 + MONO_VERSION: 6.10.0 steps: - template: ./.pipelines/init.yml parameters: @@ -79,7 +79,7 @@ jobs: vmImage: "Ubuntu-18.04" dependsOn: GitVersion variables: - MONO_VERSION: 6.8.0 + MONO_VERSION: 6.10.0 steps: - template: ./.pipelines/init.yml parameters: @@ -90,7 +90,7 @@ jobs: - script: | sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF sudo apt install apt-transport-https ca-certificates - echo "deb https://download.mono-project.com/repo/ubuntu stable-xenial/snapshots/$MONO_VERSION.105 main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list + echo "deb https://download.mono-project.com/repo/ubuntu stable-bionic/snapshots/$MONO_VERSION.105 main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list sudo apt update sudo apt install mono-devel sudo apt install msbuild From 80bb3959b56431136158ef9dd11a35f29bdaa60e Mon Sep 17 00:00:00 2001 From: filipw Date: Sat, 18 Jul 2020 21:38:02 +0200 Subject: [PATCH 2/5] msbuild 16.6 --- build/Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Packages.props b/build/Packages.props index a22c435e43..5fe2f54e6c 100644 --- a/build/Packages.props +++ b/build/Packages.props @@ -3,7 +3,7 @@ xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - 16.5.0 + 16.6.0 5.2.0 3.8.0-1.20357.3 2.4.0 From f4909e6c73413824b7f703f1caa7ffe54e20bc78 Mon Sep 17 00:00:00 2001 From: filipw Date: Sat, 18 Jul 2020 21:48:33 +0200 Subject: [PATCH 3/5] msbuild 16.6 --- tools/packages.config | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/packages.config b/tools/packages.config index fc509ac78f..30d0e4bd03 100644 --- a/tools/packages.config +++ b/tools/packages.config @@ -1,11 +1,11 @@ - - - - - + + + + + From 0c34fa9a336244ed9cbb6aa73b8cd860fe30e8da Mon Sep 17 00:00:00 2001 From: Filip W Date: Sun, 19 Jul 2020 13:38:18 +0200 Subject: [PATCH 4/5] added Microsoft.Managed.Before.targets and Microsoft.Managed.After.targets --- build.cake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.cake b/build.cake index db260ab62b..de3595c90f 100644 --- a/build.cake +++ b/build.cake @@ -225,7 +225,9 @@ Task("CreateMSBuildFolder") "Microsoft.CSharp.Mono.targets", "Microsoft.CSharp.targets", "Microsoft.Data.Entity.targets", + "Microsoft.Managed.After.targets "Microsoft.Managed.targets", + "Microsoft.Managed.Before.targets", "Microsoft.NET.props", "Microsoft.NETFramework.CurrentVersion.props", "Microsoft.NETFramework.CurrentVersion.targets", From 9eaa0f6ed2ddd5920d5caab2a5bcfad2c0211b24 Mon Sep 17 00:00:00 2001 From: Filip W Date: Sun, 19 Jul 2020 13:42:23 +0200 Subject: [PATCH 5/5] typo --- build.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.cake b/build.cake index de3595c90f..6cdadd45e4 100644 --- a/build.cake +++ b/build.cake @@ -225,7 +225,7 @@ Task("CreateMSBuildFolder") "Microsoft.CSharp.Mono.targets", "Microsoft.CSharp.targets", "Microsoft.Data.Entity.targets", - "Microsoft.Managed.After.targets + "Microsoft.Managed.After.targets", "Microsoft.Managed.targets", "Microsoft.Managed.Before.targets", "Microsoft.NET.props",