yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge release/10.0.0 into v10/dev

Browse Source 
commit ff6d064b29
Author: Paul Johnson <pmj@umbraco.com>
Date:   Mon May 23 08:43:52 2022 +0100

    Allow for slow integration test runs

commit e6320a12ba
Author: Andy Butland <abutland73@gmail.com>
Date:   Sat May 21 08:10:52 2022 +0200

    Fixed null check in external login.

    (cherry picked from commit 9981907532)

commit 0f6630861e
Author: Paul Johnson <pmj@umbraco.com>
Date:   Mon May 23 07:25:04 2022 +0100

    static assets nupkg fixes (#12440)

    * Remove duplicate jsonschema build

    * Don't attempt to --no-build for dotnet pack (fixes static assets)

    * Bump version to 10.0.0-rc3

    * Improve restoreKeys

    * update Umbraco.GitVersioning.Extensions to 0.1.1

    (cherry picked from commit 0ef34ab9c5)

    * tag e2e container with current commit

    * cache cypress binaries

# Conflicts:
#	version.json
This commit is contained in:
Paul Johnson
2022-05-23 08:56:50 +01:00
parent bf8f0e8e05
commit e366fe8806
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -59,7 +59,6 @@
<Target Name="JsonSchemaBuild">
<Exec Command="dotnet run -c Release --project $(JsonSchemaProjectPath) -o $(ProjectDir)appsettings-schema.json" />
<Exec Command="dotnet run -c Release --project $(JsonSchemaProjectPath) -o &quot;$(ProjectDir)appsettings-schema.json&quot;" />
</Target>