From 31c41e3e143757afacfb78d1f1c59377bce86719 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 14 Mar 2017 20:23:07 +0900 Subject: [PATCH 1/6] Don't overwrite newer config files (doesn't seem to fix anything buut..). --- osu.Desktop.Deploy/osu.Desktop.Deploy.csproj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj b/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj index 6bed6bb049..7a3719a25b 100644 --- a/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj +++ b/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj @@ -104,7 +104,9 @@ osu.licenseheader - + + PreserveNewest + From c192de9ebd0a9ab4ed617e102d36abf2b194ed22 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 14 Mar 2017 20:23:18 +0900 Subject: [PATCH 2/6] Give deploy uploads more time before dying. --- osu.Desktop.Deploy/Program.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/osu.Desktop.Deploy/Program.cs b/osu.Desktop.Deploy/Program.cs index 7141b6d52f..d3166a4fdc 100644 --- a/osu.Desktop.Deploy/Program.cs +++ b/osu.Desktop.Deploy/Program.cs @@ -198,7 +198,7 @@ namespace osu.Desktop.Deploy write($"- Creating release {version}...", ConsoleColor.Yellow); var req = new JsonWebRequest($"{GitHubApiEndpoint}") { - Method = HttpMethod.POST + Method = HttpMethod.POST, }; req.AddRaw(JsonConvert.SerializeObject(new GitHubRelease { @@ -215,6 +215,7 @@ namespace osu.Desktop.Deploy var upload = new WebRequest(assetUploadUrl, Path.GetFileName(a)) { Method = HttpMethod.POST, + Timeout = 240000, ContentType = "application/octet-stream", }; From 1699c9fb1d763259290f18de8363a60529bae727 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 14 Mar 2017 20:23:37 +0900 Subject: [PATCH 3/6] Don't download executables when pulling down existing assets. --- osu.Desktop.Deploy/Program.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/osu.Desktop.Deploy/Program.cs b/osu.Desktop.Deploy/Program.cs index d3166a4fdc..e47c6b3a01 100644 --- a/osu.Desktop.Deploy/Program.cs +++ b/osu.Desktop.Deploy/Program.cs @@ -283,6 +283,8 @@ namespace osu.Desktop.Deploy foreach (var a in assets) { + if (a.Name.EndsWith(".exe")) continue; + write($"- Downloading {a.Name}...", ConsoleColor.Yellow); new FileWebRequest(Path.Combine(ReleasesFolder, a.Name), $"{GitHubApiEndpoint}/assets/{a.Id}").AuthenticatedBlockingPerform(); } From 864a97fa45a9968c1ddf9405f853092b92f843eb Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 14 Mar 2017 20:23:53 +0900 Subject: [PATCH 4/6] Output StandardError when an error occurs with a command line invocation. --- osu.Desktop.Deploy/Program.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/osu.Desktop.Deploy/Program.cs b/osu.Desktop.Deploy/Program.cs index e47c6b3a01..f14506ce72 100644 --- a/osu.Desktop.Deploy/Program.cs +++ b/osu.Desktop.Deploy/Program.cs @@ -340,6 +340,7 @@ namespace osu.Desktop.Deploy WorkingDirectory = solutionPath, CreateNoWindow = true, RedirectStandardOutput = true, + RedirectStandardError = true, UseShellExecute = false, WindowStyle = ProcessWindowStyle.Hidden }; @@ -348,6 +349,7 @@ namespace osu.Desktop.Deploy if (p == null) return false; string output = p.StandardOutput.ReadToEnd(); + output += p.StandardError.ReadToEnd(); if (p.ExitCode == 0) return true; From 10ab015501a067e2b84c8979e789f736d76883d2 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 14 Mar 2017 20:23:58 +0900 Subject: [PATCH 5/6] Fix typo. --- osu.Desktop.Deploy/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Desktop.Deploy/Program.cs b/osu.Desktop.Deploy/Program.cs index f14506ce72..00ec215e8a 100644 --- a/osu.Desktop.Deploy/Program.cs +++ b/osu.Desktop.Deploy/Program.cs @@ -262,7 +262,7 @@ namespace osu.Desktop.Deploy if (!File.Exists(Path.Combine(ReleasesFolder, nupkgDistroFilename(lastRelease.Name)))) { - write("Last verion's package not found locally.", ConsoleColor.Red); + write("Last version's package not found locally.", ConsoleColor.Red); requireDownload = true; } else From b5a8ef07fe4da5ba5b33b2ac40c00086edcff409 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 14 Mar 2017 22:39:57 +0900 Subject: [PATCH 6/6] Update framework. --- osu-framework | 2 +- osu.Game/Graphics/UserInterface/OsuDropDownMenu.cs | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/osu-framework b/osu-framework index 4834d27107..8c79c94aa7 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 4834d27107198b9dc2f0e073be484cf0b92e0416 +Subproject commit 8c79c94aa71711cf9c8bb169f684df2e35596f9d diff --git a/osu.Game/Graphics/UserInterface/OsuDropDownMenu.cs b/osu.Game/Graphics/UserInterface/OsuDropDownMenu.cs index b9ebcff65a..786636ce1a 100644 --- a/osu.Game/Graphics/UserInterface/OsuDropDownMenu.cs +++ b/osu.Game/Graphics/UserInterface/OsuDropDownMenu.cs @@ -1,8 +1,6 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System.Collections.Generic; -using System.Linq; using osu.Framework.Graphics.Transforms; using osu.Framework.Graphics.UserInterface; using OpenTK; @@ -15,9 +13,6 @@ namespace osu.Game.Graphics.UserInterface { protected override DropDownHeader CreateHeader() => new OsuDropDownHeader(); - protected override IEnumerable> GetDropDownItems(IEnumerable> values) - => values.Select(v => new OsuDropDownMenuItem(v.Key, v.Value)); - public OsuDropDownMenu() { ContentContainer.CornerRadius = 4; @@ -38,5 +33,7 @@ namespace osu.Game.Graphics.UserInterface { ContentContainer.ResizeTo(State == DropDownMenuState.Opened ? new Vector2(1, ContentHeight) : new Vector2(1, 0), 300, EasingTypes.OutQuint); } + + protected override DropDownMenuItem CreateDropDownItem(string key, U value) => new OsuDropDownMenuItem(key, value); } } \ No newline at end of file