yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,605 Commits 4 Branches 7 Tags
a64c58d68e78ebe8b62ea110461a3a35053c504f
Commit Graph

1495 Commits

Author SHA1 Message Date
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
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
Warren Buckley
c6c924179b Update build/templates/UmbracoProject/.gitignore 
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
 2021-09-08 19:55:56 +01:00
Bjarke Berg
995595cce1 Merge remote-tracking branch 'origin/v9/dev' into v9/bugfix/fix_issues_when_changing_umbraco_path 2021-09-08 18:17:39 +02:00
Elitsa Marinovska
6c56c298d6 Merge branch 'v9/dev' into v9/bugfix/fix_issues_when_changing_umbraco_path 2021-09-08 08:17:59 +02:00
Warren Buckley
b673ad2b94 Same gitignore as Umbraco Cloud team are using 2021-09-07 16:17:45 +01:00
Warren Buckley
a2a88e5851 Adds the default from dotnet new gitignore 2021-09-07 16:15:39 +01:00
Bjarke Berg
981982d87c Fixes https://github.com/umbraco/Umbraco-CMS/issues/10641 and a couple of other issues with the Umbraco Package dotnet new template. 
- Fixed issues with invalid namespace, when using characters like "-"
- Fixed issues with invalid characters in MSBuilder property names, like "."
 2021-09-07 10:58:33 +02:00
Bjarke Berg
eca26cd827 Bump version to next rc 2021-09-01 10:57:33 +02:00
Bjarke Berg
2876d0b179 Handle the msbuild copy in two steps, so we can override the wwwroot/umbraco folder from outside, using the following in the project csproj. 
<PropertyGroup>
        <UmbracoWwwrootName>my-secret-loginpanel</UmbracoWwwrootName>
    </PropertyGroup>

    it will now copy to wwwroot/my-secret-loginpanel instead of wwwroot/umbraco
 2021-09-01 10:57:21 +02:00
Nikolaj Geisle
7de1e1b187 Merge pull request #10941 from umbraco/v9/feature/improved-project-template 
New project - simplify includes/excludes
 2021-08-31 10:01:28 +02:00
Bjarke Berg
56d8e0e684 Merge remote-tracking branch 'origin/v8/8.16' into v9/dev 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	build/NuSpecs/UmbracoCms.nuspec
#	build/build.ps1
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Diagnostics/MiniDump.cs
#	src/Umbraco.Core/Sync/DatabaseServerMessenger.cs
#	src/Umbraco.Infrastructure/Persistence/LocalDb.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyHandler.cs
#	src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
 2021-08-26 12:13:04 +02:00
Paul Johnson
1e0d82ceee More consistent globs 2021-08-24 20:35:14 +01:00
Paul Johnson
64f4d0ec93 also ignore wwwroot/media 2021-08-24 16:58:05 +01:00
Paul Johnson
fe7067e056 New project - simplify includes/excludes 2021-08-24 16:49:58 +01:00
Chad Currie
8b685a0a2c Update Serilog.Enrichers.Process to 2.0.2 as it fixes a leak 
(cherry picked from commit dcc533fd8d)
 2021-08-23 15:18:03 +02:00
Chad Currie
dcc533fd8d Update Serilog.Enrichers.Process to 2.0.2 as it fixes a leak 2021-08-23 14:47:50 +02:00