From 007fe8d8944f9cbc4e545554d1bbc7abc265b39f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Wed, 11 Mar 2020 11:18:53 +0100 Subject: [PATCH 1/4] 7434 do not use umb outline for select (#7788) --- src/Umbraco.Web.UI.Client/src/less/forms.less | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/forms.less b/src/Umbraco.Web.UI.Client/src/less/forms.less index 0600c9aab6..ffc0626981 100644 --- a/src/Umbraco.Web.UI.Client/src/less/forms.less +++ b/src/Umbraco.Web.UI.Client/src/less/forms.less @@ -297,7 +297,6 @@ select[size] { } // Focus for select, file, radio, and checkbox -select, input[type="file"], input[type="radio"], input[type="checkbox"] { From f4861f68027e7fdb1c66d5e14c26cdeafe0c6568 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Thu, 12 Mar 2020 17:17:17 +0100 Subject: [PATCH 2/4] Fix the build for people on VS version 16.4.5+ --- build/build-bootstrap.ps1 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build/build-bootstrap.ps1 b/build/build-bootstrap.ps1 index 71a25bfd7e..4da0e0fa2a 100644 --- a/build/build-bootstrap.ps1 +++ b/build/build-bootstrap.ps1 @@ -64,6 +64,11 @@ $params = "-OutputDirectory", $scriptTemp, "-Verbosity", "quiet", "-PreRelease" &$nuget install Umbraco.Build @params if (-not $?) { throw "Failed to download Umbraco.Build." } + + # dependency is necessary since upgrading to VS 16.4.5 + $params = "-OutputDirectory", $scriptTemp, "-Verbosity", "quiet", "-Version", "4.7.0" + &$nuget install NuGet.Versioning @params + if (-not $?) { throw "Failed to download NuGet.Versioning." } } # ensure we have the build system From 4c134f9701ac47c71b2fbd25e712cf1ea3b78fb4 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Fri, 13 Mar 2020 09:47:05 +0100 Subject: [PATCH 3/4] Revert "Fix the build for people on VS version 16.4.5+" This has been properly fixed in Umbraco.Build 0.2.14 instead This reverts commit f4861f68027e7fdb1c66d5e14c26cdeafe0c6568. --- build/build-bootstrap.ps1 | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build/build-bootstrap.ps1 b/build/build-bootstrap.ps1 index 4da0e0fa2a..71a25bfd7e 100644 --- a/build/build-bootstrap.ps1 +++ b/build/build-bootstrap.ps1 @@ -64,11 +64,6 @@ $params = "-OutputDirectory", $scriptTemp, "-Verbosity", "quiet", "-PreRelease" &$nuget install Umbraco.Build @params if (-not $?) { throw "Failed to download Umbraco.Build." } - - # dependency is necessary since upgrading to VS 16.4.5 - $params = "-OutputDirectory", $scriptTemp, "-Verbosity", "quiet", "-Version", "4.7.0" - &$nuget install NuGet.Versioning @params - if (-not $?) { throw "Failed to download NuGet.Versioning." } } # ensure we have the build system From ead3de05e46aa759ff8054a428de18723b3c2bc3 Mon Sep 17 00:00:00 2001 From: Jeffrey Schoemaker Date: Fri, 13 Mar 2020 13:30:54 +0100 Subject: [PATCH 4/4] =?UTF-8?q?Added=20the=20correct=20sources=20to=20the?= =?UTF-8?q?=20buildscripts.=20If=20you=20have=20inte=E2=80=A6=20(#7089)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/build-bootstrap.ps1 | 4 +++- build/build.ps1 | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/build/build-bootstrap.ps1 b/build/build-bootstrap.ps1 index 71a25bfd7e..82c789ff22 100644 --- a/build/build-bootstrap.ps1 +++ b/build/build-bootstrap.ps1 @@ -22,6 +22,8 @@ # get NuGet $cache = 4 $nuget = "$scriptTemp\nuget.exe" + # ensure the correct NuGet-source is used. This one is used by Umbraco + $nugetsourceUmbraco = "https://www.myget.org/F/umbracocore/api/v3/index.json" if (-not $local) { $source = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" @@ -61,7 +63,7 @@ # get the build system if (-not $local) { - $params = "-OutputDirectory", $scriptTemp, "-Verbosity", "quiet", "-PreRelease" + $params = "-OutputDirectory", $scriptTemp, "-Verbosity", "quiet", "-PreRelease", "-Source", $nugetsourceUmbraco &$nuget install Umbraco.Build @params if (-not $?) { throw "Failed to download Umbraco.Build." } } diff --git a/build/build.ps1 b/build/build.ps1 index ea07e4516f..6e124d1508 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -375,11 +375,14 @@ }) + $nugetsourceUmbraco = "https://api.nuget.org/v3/index.json" + $ubuild.DefineMethod("RestoreNuGet", { Write-Host "Restore NuGet" Write-Host "Logging to $($this.BuildTemp)\nuget.restore.log" - &$this.BuildEnv.NuGet restore "$($this.SolutionRoot)\src\Umbraco.sln" > "$($this.BuildTemp)\nuget.restore.log" + $params = "-Source", $nugetsourceUmbraco + &$this.BuildEnv.NuGet restore "$($this.SolutionRoot)\src\Umbraco.sln" > "$($this.BuildTemp)\nuget.restore.log" @params if (-not $?) { throw "Failed to restore NuGet packages." } })