From 14efee7ed8568d60953bd6dab3a6a2f20a2d86c9 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 13 Sep 2017 21:02:07 +0900 Subject: [PATCH 1/3] Update deploy dependency paths Forgot about these. Should probably make them automatically handle version changes at some point... --- osu.Desktop.Deploy/Program.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Desktop.Deploy/Program.cs b/osu.Desktop.Deploy/Program.cs index 644987ce5a..929483b428 100644 --- a/osu.Desktop.Deploy/Program.cs +++ b/osu.Desktop.Deploy/Program.cs @@ -17,8 +17,8 @@ namespace osu.Desktop.Deploy { internal static class Program { - private const string nuget_path = @"packages\NuGet.CommandLine.4.1.0\tools\NuGet.exe"; - private const string squirrel_path = @"packages\squirrel.windows.1.7.5\tools\Squirrel.exe"; + private const string nuget_path = @"packages\NuGet.CommandLine.4.3.0\tools\NuGet.exe"; + private const string squirrel_path = @"packages\squirrel.windows.1.7.8\tools\Squirrel.exe"; private const string msbuild_path = @"C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe"; public static string StagingFolder = ConfigurationManager.AppSettings["StagingFolder"]; From 160f48bf8587f0a38b15d92fb5187edb84bbb11d Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 14 Sep 2017 17:50:50 +0900 Subject: [PATCH 2/3] Make VisualTests target 64 bit where possible --- osu.Desktop/osu.Desktop.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj index 5eebad47ef..bb9852681c 100644 --- a/osu.Desktop/osu.Desktop.csproj +++ b/osu.Desktop/osu.Desktop.csproj @@ -104,6 +104,7 @@ prompt AllRules.ruleset --tests + false From db6437eea9fc1a79e7655cd7cc098cd8383f2b07 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 14 Sep 2017 17:58:42 +0900 Subject: [PATCH 3/3] Remove very old defined constants --- osu.Desktop/osu.Desktop.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj index bb9852681c..ef57265a06 100644 --- a/osu.Desktop/osu.Desktop.csproj +++ b/osu.Desktop/osu.Desktop.csproj @@ -69,7 +69,8 @@ none true bin\Release\ - CuttingEdge NoUpdate + + prompt 4 true