yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
69,277 Commits 4 Branches 7 Tags
3db0ec7efc5b2c2afaf0a2fd533bdd62dec2c6e5
Commit Graph

1710 Commits

Author SHA1 Message Date
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
Bjarke Berg
47c1058195 Merge remote-tracking branch 'origin/v9/dev' into v10/dev 
# Conflicts:
#	src/Umbraco.Infrastructure/HostedServices/ReportSiteTask.cs
 2021-12-15 14:41:49 +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
0b39741309 Bump version 2021-12-07 08:22:29 +01:00
Bjarke Berg
78dc2d5721 Merge remote-tracking branch 'origin/v9/dev' into v10/dev 
# Conflicts:
#	build/azure-pipelines.yml
#	src/Umbraco.Core/Routing/DefaultUrlProvider.cs
#	src/Umbraco.Core/Routing/UrlProviderExtensions.cs
#	src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentRepository.cs
#	src/Umbraco.Infrastructure/Services/Implement/ContentService.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/BTree.ContentDataSerializer.cs
#	src/Umbraco.PublishedCache.NuCache/Persistence/NuCacheContentRepository.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	tests/Umbraco.Tests.AcceptanceTest/package-lock.json
#	tests/Umbraco.Tests.AcceptanceTest/package.json
#	tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs
 2021-11-22 19:43:20 +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
Elitsa Marinovska
61f459670c Update to .NET6 and ASP.NET Core 6 (#11652) 
* Changed targetFramework in nuspec file & project files + updated NuGet dependencies

* Updated .net version in pipelines

* Updated .net version in templates

* Update more dependencies

* Fixed ambiguous call to DistinctBy() - part of Umbraco.Extensions and System.Linq

* Disabling the Razor source generators in .NET 6 due to error: "Cannot find the fallback endpoint specified by route values..."

* Fixed unit tests

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
 2021-11-18 15:35:42 +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
0f3b24496a Restore BelleBuild target (for back-office assets) and use npm ci (#11364) 
Co-authored-by: Ronald Barendse <ronald@barend.se>
 2021-10-19 10:16: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
Blake Irwin
74a232d989 Execute CopyUmbracoAssets @ BeforeBuild to prevent Rebuild failures 2021-09-29 23:44:40 +13:00
Bjarke Berg
22546fd629 bump version to 9.0.0 2021-09-22 21:30:26 +02:00
Bjarke Berg
63807bc65f Bump version to RC4 2021-09-21 10:51:43 +02:00
Warren Buckley
138ef42884 Adds new dotnet new template arg --use-https-redirect (#11115) 2021-09-16 13:39:56 +02:00
Warren Buckley
465d730616 Fixes issue with dotnet new template if you did not specify a connection string it was adding an empty one in appsettings.dev 2021-09-15 11:55:53 +01:00
Andy Butland
b8a135626d Moved NoNodesViewPath destination from template to appSettings.json. 2021-09-15 11:19:12 +02:00
Andy Butland
d52fd92bbd Fixed JSON syntax error 2021-09-15 10:21:32 +02:00
Andy Butland
9a3f77ed83 Added option to set NoNodesViewPath in umbraco template. 2021-09-15 09:45:15 +02:00
Warren Buckley
e7b1f09254 Remove condition around connection string needed to have all unattended arguments in dotnet new template set 
This is for Umbraco cloud team as they want to set a connection string with the dotnet new template but not set the rest of the unattedend arguments
 2021-09-14 10:56:31 +01:00
Paul Johnson
cafbe89f61 Template bugfix for ModelsBuilder, don't attempt to compile ood.flag marker. 2021-09-13 10:56:33 +01:00
Paul Johnson
6dec0f9aba Template bugfix for ModelsBuilder default path in SourceCode mode(s) 2021-09-13 09:25:09 +01:00
Warren Buckley
b8316d151e Commit missing update to ensure gitignore file is packed in Umbraco.Templates 2021-09-09 14:36:34 +01:00
Bjarke Berg
36582f2cd2 Merge pull request #11045 from umbraco/v9/gitignore-in-template 
Ship a gitignore in Umbraco V9 dotnet new template
 2021-09-08 21:19:35 +02:00
Warren Buckley
d797351349 Update build/templates/UmbracoProject/.gitignore 
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
 2021-09-08 20:16:07 +01:00