From 1ce247cc021f2bbe23d8d0494bd62abe70b50f93 Mon Sep 17 00:00:00 2001 From: Giuseppe Lippolis Date: Mon, 14 Nov 2022 11:30:43 +0100 Subject: [PATCH 1/4] fix: Ensure Dev*,Microcom and Build Task are builds before Controls when build solution in IDE --- Avalonia.sln | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Avalonia.sln b/Avalonia.sln index e2f04ddc35..687dd86e81 100644 --- a/Avalonia.sln +++ b/Avalonia.sln @@ -12,6 +12,11 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Direct2D1", "src\Windows\Avalonia.Direct2D1\Avalonia.Direct2D1.csproj", "{3E908F67-5543-4879-A1DC-08EACE79B3CD}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Controls", "src\Avalonia.Controls\Avalonia.Controls.csproj", "{D2221C82-4A25-4583-9B43-D791E3F6820C}" + ProjectSection(ProjectDependencies) = postProject + {1BBFAD42-B99E-47E0-B00A-A4BC6B6BB4BB} = {1BBFAD42-B99E-47E0-B00A-A4BC6B6BB4BB} + {BF28998D-072C-439A-AFBB-2FE5021241E0} = {BF28998D-072C-439A-AFBB-2FE5021241E0} + {FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE} = {FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE} + EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Themes.Simple", "src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj", "{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}" EndProject From 6176b634f860f35767c7174e5746504c6d9ef406 Mon Sep 17 00:00:00 2001 From: Giuseppe Lippolis Date: Tue, 15 Nov 2022 18:40:22 +0100 Subject: [PATCH 2/4] Revert "fix: Ensure Dev*,Microcom and Build Task are builds before Controls when build solution in IDE" This reverts commit 1ce247cc021f2bbe23d8d0494bd62abe70b50f93. --- Avalonia.sln | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Avalonia.sln b/Avalonia.sln index 687dd86e81..e2f04ddc35 100644 --- a/Avalonia.sln +++ b/Avalonia.sln @@ -12,11 +12,6 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Direct2D1", "src\Windows\Avalonia.Direct2D1\Avalonia.Direct2D1.csproj", "{3E908F67-5543-4879-A1DC-08EACE79B3CD}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Controls", "src\Avalonia.Controls\Avalonia.Controls.csproj", "{D2221C82-4A25-4583-9B43-D791E3F6820C}" - ProjectSection(ProjectDependencies) = postProject - {1BBFAD42-B99E-47E0-B00A-A4BC6B6BB4BB} = {1BBFAD42-B99E-47E0-B00A-A4BC6B6BB4BB} - {BF28998D-072C-439A-AFBB-2FE5021241E0} = {BF28998D-072C-439A-AFBB-2FE5021241E0} - {FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE} = {FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE} - EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Themes.Simple", "src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj", "{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}" EndProject From 84ca1673c9956f2dd6d6f4c375144d2b1d696490 Mon Sep 17 00:00:00 2001 From: Giuseppe Lippolis Date: Tue, 15 Nov 2022 18:46:03 +0100 Subject: [PATCH 3/4] fix: Ensure Dev*,Microcom and Build Task are builds before Controls when build solution in IDE --- src/Avalonia.Base/Avalonia.Base.csproj | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj index bdb5882ef2..7463871083 100644 --- a/src/Avalonia.Base/Avalonia.Base.csproj +++ b/src/Avalonia.Base/Avalonia.Base.csproj @@ -45,6 +45,14 @@ + + + + false + true + TargetFramework + + From e74feb80966af1be3b14b4674c87831efb6d1062 Mon Sep 17 00:00:00 2001 From: Giuseppe Lippolis Date: Wed, 16 Nov 2022 11:58:19 +0100 Subject: [PATCH 4/4] fix: build --- src/Avalonia.Base/Avalonia.Base.csproj | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj index 7463871083..d8fcce803f 100644 --- a/src/Avalonia.Base/Avalonia.Base.csproj +++ b/src/Avalonia.Base/Avalonia.Base.csproj @@ -47,11 +47,10 @@ - - false - true - TargetFramework - +