From 2e500456eb786e64616ad85067a92b4138b84db5 Mon Sep 17 00:00:00 2001 From: Rustam Sayfutdinov Date: Wed, 3 Feb 2021 22:44:14 +0300 Subject: [PATCH] Remove Avalonia.ReactiveUI.Events --- Avalonia.sln | 2 - nukebuild/Build.cs | 37 ------------------- nukebuild/_build.csproj | 1 - .../Avalonia.ReactiveUI.Events.csproj | 13 ------- 4 files changed, 53 deletions(-) delete mode 100644 src/Avalonia.ReactiveUI.Events/Avalonia.ReactiveUI.Events.csproj diff --git a/Avalonia.sln b/Avalonia.sln index 75f1dd8407..6c3c3a92b9 100644 --- a/Avalonia.sln +++ b/Avalonia.sln @@ -222,8 +222,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Headless.Vnc", "sr EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Markup.Xaml.Loader", "src\Markup\Avalonia.Markup.Xaml.Loader\Avalonia.Markup.Xaml.Loader.csproj", "{909A8CBD-7D0E-42FD-B841-022AD8925820}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.ReactiveUI.Events", "src\Avalonia.ReactiveUI.Events\Avalonia.ReactiveUI.Events.csproj", "{28F18757-C3E6-4BBE-A37D-11BA2AB9177C}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sandbox", "samples\Sandbox\Sandbox.csproj", "{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MicroComGenerator", "src\tools\MicroComGenerator\MicroComGenerator.csproj", "{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}" diff --git a/nukebuild/Build.cs b/nukebuild/Build.cs index 8e331edab4..7262a11423 100644 --- a/nukebuild/Build.cs +++ b/nukebuild/Build.cs @@ -16,7 +16,6 @@ using Nuke.Common.Tools.MSBuild; using Nuke.Common.Tools.Npm; using Nuke.Common.Utilities; using Nuke.Common.Utilities.Collections; -using Pharmacist.Core; using static Nuke.Common.EnvironmentInfo; using static Nuke.Common.IO.FileSystemTasks; using static Nuke.Common.IO.PathConstruction; @@ -167,44 +166,8 @@ partial class Build : NukeBuild .AddProperty("PackageVersion", Parameters.Version) .SetConfiguration(Parameters.Configuration) ); - - await CompileReactiveEvents(); }); - async Task CompileReactiveEvents() - { - var avaloniaBuildOutput = Path.Combine(RootDirectory, "packages", "Avalonia", "bin", Parameters.Configuration); - var avaloniaAssemblies = GlobFiles(avaloniaBuildOutput, "**/Avalonia*.dll") - .Where(file => !file.Contains("Avalonia.Build.Tasks") && - !file.Contains("Avalonia.Remote.Protocol")); - - var eventsDirectory = GlobDirectories($"{RootDirectory}/src/**/Avalonia.ReactiveUI.Events").First(); - var eventsBuildFile = Path.Combine(eventsDirectory, "Events_Avalonia.cs"); - if (File.Exists(eventsBuildFile)) - File.Delete(eventsBuildFile); - - using (var stream = File.Create(eventsBuildFile)) - using (var writer = new StreamWriter(stream)) - { - await ObservablesForEventGenerator.ExtractEventsFromAssemblies( - writer, avaloniaAssemblies, new string[0], "netstandard2.0" - ); - } - - var eventsProject = Path.Combine(eventsDirectory, "Avalonia.ReactiveUI.Events.csproj"); - if (Parameters.IsRunningOnWindows) - MsBuildCommon(eventsProject, c => c - .SetProcessArgumentConfigurator(a => a.Add("/r")) - .AddTargets("Build") - ); - else - DotNetBuild(c => c - .SetProjectFile(eventsProject) - .AddProperty("PackageVersion", Parameters.Version) - .SetConfiguration(Parameters.Configuration) - ); - } - void RunCoreTest(string projectName) { Information($"Running tests from {projectName}"); diff --git a/nukebuild/_build.csproj b/nukebuild/_build.csproj index b0380cc92b..e08ffd0413 100644 --- a/nukebuild/_build.csproj +++ b/nukebuild/_build.csproj @@ -17,7 +17,6 @@ - diff --git a/src/Avalonia.ReactiveUI.Events/Avalonia.ReactiveUI.Events.csproj b/src/Avalonia.ReactiveUI.Events/Avalonia.ReactiveUI.Events.csproj deleted file mode 100644 index 7f58e455f9..0000000000 --- a/src/Avalonia.ReactiveUI.Events/Avalonia.ReactiveUI.Events.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - netstandard2.0 - Avalonia.ReactiveUI.Events - false - - - - - - - -