yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,242 Commits 4 Branches 7 Tags
156fe5976cfc19f79508d7bcfd09d53c40c8eac1
Commit Graph

1524 Commits

Author SHA1 Message Date
Sebastiaan Janssen
48dbe959f6 Merge pull request #12249 from umbraco/v9/feature/merge-v9-contrib 2022-04-14 11:44:24 +02:00
Sebastiaan Janssen
4e71d6f2f6 Merge branch 'v9/dev' into v9/contrib 
# Conflicts:
#	src/Umbraco.Infrastructure/HostedServices/RecurringHostedServiceBase.cs
 2022-04-12 13:41:34 +02:00
Ronald Barendse
20666218d2 Move templates to root 2022-04-12 11:00:59 +02:00
Corné Hoskam
b594936463 Update UmbracoProject.csproj (#12164) 
* Update UmbracoProject.csproj

Changing the comment would make the intent of the comment more clear, as you cannot use InMemoryAuto on compiled Razor views, but you're still allowed to keep it as false if you're using a different ModelsBuilder mode.

* Update UmbracoProject.csproj

Hoping this kicks off the PR checks...
 2022-03-28 07:32:23 +10:00
Ronald Barendse
c511f19cc8 Merge branch 'v9/feature/move-templates-to-root' into v9/feature/projecttemplate-cleanup 2022-03-24 13:57:38 +01:00
Ronald Barendse
f5d0abc28b Move templates to root 2022-03-24 13:48:43 +01:00
Mole
c1552cf7fc Bump versions 2022-03-23 11:36:34 +01:00
vsilvar
3c40c20d27 Made sure Umbraco files aren't included twice 
This fixes CS8785 RazorSourceGenerator failures due to repeated files in .Net 6
 2022-03-09 17:10:53 +01:00
Ronald Barendse
8d82f86c29 Re-use DefaultItemExcludes from StaticAssets 2022-03-09 15:40:24 +01:00
Ronald Barendse
ee3f7520b3 Conditionally update Umbraco version in templates 2022-02-24 11:41:31 +01:00
Ronald Barendse
5a3578eca9 Fix updating default Umbraco version in templates 2022-02-24 11:37:22 +01:00
Bjarke Berg
366d7c0fce Update docfx dependency (#12046) 
* Update docfx

* temp commit to test out azure pipeline

* Rollback temp fix
 2022-02-24 11:30:20 +01:00
Ronald Barendse
05d606d6a7 Fix artifact build and ensure the version of future templates are also updated 2022-02-24 10:42:59 +01:00
Ronald Barendse
4c037774de Move templates to root 2022-02-23 22:45:35 +01:00
Sebastiaan Janssen
ab870347ed Merge branch 'v9/dev' into v9/contrib 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/pages/login.less
 2022-02-21 10:06:08 +01:00
Jeavon
8b6c844a55 Exclude the Umbraco Log files from UmbracoProject template gitignore 2022-02-16 07:57:06 +10:00
Paul Johnson
cf410ab91e Attempt to make app local icu setup less problematic. (#11961) 
* Attempt to make app local icu setup less problematic.

Prevents issues for windows build agent -> linux app server.

On Windows version is split at first '.' e.g. 68.2.0.9 ->  icuuc68.dll
https://github.com/dotnet/runtime/blob/205f70e/src/libraries/System.Private.CoreLib/src/System/Globalization/GlobalizationMode.Windows.cs

On Linux we are looking for libicuuc.so.68.2.0.9
https://github.com/dotnet/runtime/blob/205f70e/src/libraries/System.Private.CoreLib/src/System/Globalization/GlobalizationMode.Unix.cs

On macos we don't have a native library in a shiny nuget package so hope
folks are building on their macs or setting the rid until we have a
better solution.

* Combine elements
 2022-02-10 12:03:35 +00:00
Bjarke Berg
158f4d29f6 Bump version to 9.4.0-rc 2022-02-04 13:02:19 +01:00
Mole
3ade2b6de3 Add RC to version 2022-01-26 08:43:43 +01:00
Bjarke Berg
b7d8b7923d Merge remote-tracking branch 'origin/v9/9.2' into v9/dev 
# Conflicts:
#	build/templates/UmbracoPackage/.template.config/template.json
#	build/templates/UmbracoProject/.template.config/template.json
#	src/Directory.Build.props
#	src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
 2022-01-23 13:34:39 +01:00
Mole
bbfa975096 Bump versions to non-rc 2022-01-03 15:36:52 +01:00
Mole
a69499a136 Bump versions 2021-12-16 09:10:55 +01:00
Mole
cd022af2d7 Merge pull request #11759 from PerplexDaniel/bugfix/11758_umbraco-cshtml-compilation 
Ensure Umbraco Razor files are compiled into <project>.Views.dll
 2021-12-14 15:47:37 +01:00
Daniël Knippers
95efeeabcf Ensure Umbraco Razor files are compiled into <project>.Views.dll 
It worked properly if the Umbraco files are on disk before a build
but when the files are not there yet or a dotnet clean is done first the
files are not compiled. This is often the case on build servers that start
with a clean working directory for each build.

Using this target we simply ensure the files are included as "Content"
which Razor will scan for .cshtml files in their "ResolveRazorGenerateInputs"
target.
 2021-12-14 12:25:25 +01:00
Bjarke Berg
579613c83c Revert version 2021-11-22 17:45:49 +01:00
Paul Johnson
b58a0cf0a5 Ensure Umbraco static assets included when publish --no-build (#11665) 
* Ensure Umbraco static assets included when publish --no-build

Closes #11662

* Bump version to 9.1.1
 2021-11-22 09:30:54 +01:00
Nikolaj Geisle
32d8e0bb96 v9: Fix tests on Linux (#11586) 
* downgraded cypress, updated package

* Fixed language test

* Fix language test

* Fixed routing tests to wait for popup

* Publish test artifacts

* Added better element to wait on

* Fix routing tests for linux

* Fix language tests on linux

* Stablize tabs tests

* Implement waiting for inner tree like in content tests

* Assert that we are in settings section so we dont click an element that doesnt exist

* Fixed rollback by not doing cy.reload()

* Fix language test with correct wait

* Stabilize dataTypes by moving API Call, and stabilize systemInformation.ts test by waiting for success notification

* Fix dataTypes, tabs and template tests

* Update node to newer version in package-lock.json and fix template test

* Implemented cy.wait to test if it is because we are too fast

* Added comments

* Bigger wait

* Try another wait instead of magic numbers

Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
 2021-11-15 14:20:10 +01:00
Patrick de Mooij
baaed139c3 Updated version to 9.1.0 2021-11-12 14:55:12 +01:00
Bjarke Berg
fa96ba1e82 Bump version to 9.2.0-rc 2021-11-04 12:36:10 +01:00
Bjarke Berg
a64c58d68e Merge branch 'v9/9.1' into v9/dev 2021-11-04 12:34:21 +01:00
Nikolaj Geisle
fca16859fd v9: 11419 Remove Azure gallery from build.ps1 (#11540) 
* Fix build.ps1 & change order of itemgroup in csproj

* Fix merge conflict

* Update package version

Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2021-11-04 11:05:39 +01:00
Bjarke Berg
7ffa46d4f2 Use specific version of docfx 2021-11-04 07:55:51 +01:00
Bjarke Berg
b4d00cc695 Bump version to 9.1.0-rc 2021-11-03 15:05:12 +01:00
Bjarke Berg
be65f12ed7 Updated nuget dependencies 2021-11-03 14:29:59 +01:00
Bjarke Berg
109487f117 Merge pull request #11568 from umbraco/v9/feature/merge_v8_03-11-2021 
V9: Merge v8: 03-11-2021
 2021-11-03 12:56:23 +01:00
Bjarke Berg
c3ebbe23fd Merge remote-tracking branch 'origin/v8/dev' into v9/feature/merge_v8_03-11-2021 
# Conflicts:
#	src/Umbraco.Core/Configuration/GlobalSettings.cs
#	src/Umbraco.Core/Configuration/IGlobalSettings.cs
#	src/Umbraco.Core/Constants-AppSettings.cs
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/Editors/ContentTypeController.cs
#	src/Umbraco.Web/HealthCheck/Checks/Security/BaseHttpHeaderCheck.cs
#	tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configurations/LanguageXmlTests.cs
 2021-11-03 08:44:12 +01:00
Bjarke Berg
0c3c88609e New projects starts with history cleanup enabled by default 2021-11-02 10:19:41 +01:00
Paul Johnson
b375d28bdb Use powershell / bash tasks instead of npm for acceptance tests 2021-10-26 14:08:11 +01:00
Paul Johnson
7a929765cd Fix build required before initial publish 2021-10-21 02:05:08 +01:00
Paul Johnson
7020793235 Restore BelleBuild target (for back-office assets) and use npm ci (#11364) 
Co-authored-by: Ronald Barendse <ronald@barend.se>
 2021-10-19 10:15:07 +01:00
Paul Johnson
00133e880d Move test projects from src/ to tests/ (#11357) 
* Update gitignore

* Move csproj

* Update project references

* Update solutions

* Update build scripts

* Tests used to share editorconfig with projects in src

* Fix broken tests.

* Stop copying around .editorconfig

merged root one with linting

* csharp_style_expression_bodied -> suggestion

* Move StyleCop rulesets to matching directories and update shared build properties

* Remove legacy build files, update NuGet.cofig and solution files

* Restore myget source

* Clean up .gitignore

* Update .gitignore

* Move new test classes to tests after merge

* Gitignore + nuget config

* Move new test

Co-authored-by: Ronald Barendse <ronald@barend.se>
 2021-10-18 08:14:04 +01:00
Bjarke Berg
9d4a0573d0 Merge remote-tracking branch 'origin/v9/9.0' into v9/dev 
# Conflicts:
#	build/templates/UmbracoPackage/.template.config/template.json
#	build/templates/UmbracoProject/.template.config/template.json
#	src/Directory.Build.props
#	src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
 2021-10-07 07:16:32 +02:00
Bjarke Berg
e786491a0c Added CopyRazorGenerateFilesToPublishDirectory to the template (#11301) 2021-10-06 14:38:50 +02:00
Mole
83e79f9bfa Merge pull request #11276 from umbraco/v9/bugfix/force_icu_on_windows_in_template 
Force ICU usage on windows.
 2021-10-06 10:28:00 +02:00
Blake Irwin
1bd827cbba Execute CopyUmbracoAssets @ BeforeBuild to prevent Rebuild failures 2021-10-06 10:25:05 +02:00
Bjarke Berg
931e91760d Force ICU usage on windows. 2021-10-05 12:34:39 +02:00
Bjarke Berg
5300d74cda Bump version to 9.0.1 2021-10-04 11:15:28 +02:00
Bjarke Berg
82959816d8 Bump to 9.1.0 2021-10-01 09:17:45 +02:00
Paul Johnson
9c0de1970b Merge pull request #11216 from OzoneNZ/v9/bugfix/static-assets-copy 
Copy static assets during BeforeBuild target to fix Visual Studio "rebuild" failures
 2021-09-30 07:20:43 +01:00
Paul Johnson
bceebea158 V9 Move sln files to root (#11212) 
* Move sln files to root

* Fix tests

* Misc cleanup - remove unused helper

* Document the esoteric nature of UmbracoWebApplicationFactory

* Avoid unnecessary change to TestHelper WorkingDirectory
 2021-09-29 11:51:28 +01:00