lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11,500 Commits 94 Branches 33 Tags
ca86ec98316f6fa3a3b561cf83eae98b14988dae
Commit Graph

28 Commits

Author SHA1 Message Date
Matteo Piovanelli
ca86ec9831 merge 1.10.x into dev 2021-02-19 10:31:26 +01:00
Aaron Amm
608df75429 Upgrade to net 461 (#8296) 
* Add New-TargetFramework PowerShell script to set .NET Framework

* Update all projects in the solution to .NET 4.6.1 that supports .NET Standard 2.0
 2019-12-19 12:26:54 -08:00
Lombiq
aced5c3e72 Merge branch '1.10.x' into dev 
# Conflicts:
#	README.md
#	src/Orchard.Specs/Boolean.feature
#	src/Orchard.Specs/Boolean.feature.cs
#	src/Orchard.Specs/DateTime.feature
#	src/Orchard.Specs/DateTime.feature.cs
#	src/Orchard.Specs/Enumeration.feature
#	src/Orchard.Specs/Enumeration.feature.cs
#	src/Orchard.Specs/Hosting/Orchard.Web/Web.config
#	src/Orchard.Specs/Input.feature
#	src/Orchard.Specs/Link.feature
#	src/Orchard.Specs/Link.feature.cs
#	src/Orchard.Specs/Numeric.feature
#	src/Orchard.Specs/Numeric.feature.cs
#	src/Orchard.Specs/Text.feature
#	src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
#	src/Orchard.Web/Core/Contents/Views/Parts.Contents.Clone.SummaryAdmin.cshtml
#	src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs
#	src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml
#	src/Orchard.Web/Core/Orchard.Core.csproj
#	src/Orchard.Web/Core/Web.config
#	src/Orchard.Web/Core/packages.config
#	src/Orchard.Web/Modules/Lucene/packages.config
#	src/Orchard.Web/Modules/Markdown/packages.config
#	src/Orchard.Web/Modules/Orchard.Alias/packages.config
#	src/Orchard.Web/Modules/Orchard.ArchiveLater/packages.config
#	src/Orchard.Web/Modules/Orchard.Autoroute/Handlers/AutoroutePartHandler.cs
#	src/Orchard.Web/Modules/Orchard.Autoroute/packages.config
#	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj
#	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config
#	src/Orchard.Web/Modules/Orchard.Blogs/packages.config
#	src/Orchard.Web/Modules/Orchard.Comments/packages.config
#	src/Orchard.Web/Modules/Orchard.ContentPermissions/packages.config
#	src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt
#	src/Orchard.Web/Modules/Orchard.ContentPicker/packages.config
#	src/Orchard.Web/Modules/Orchard.ContentTypes/packages.config
#	src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt
#	src/Orchard.Web/Modules/Orchard.CustomForms/Orchard.CustomForms.csproj
#	src/Orchard.Web/Modules/Orchard.CustomForms/Web.config
#	src/Orchard.Web/Modules/Orchard.CustomForms/packages.config
#	src/Orchard.Web/Modules/Orchard.Dashboards/Orchard.Dashboards.csproj
#	src/Orchard.Web/Modules/Orchard.Dashboards/Web.config
#	src/Orchard.Web/Modules/Orchard.Dashboards/packages.config
#	src/Orchard.Web/Modules/Orchard.DesignerTools/packages.config
#	src/Orchard.Web/Modules/Orchard.Fields/Module.txt
#	src/Orchard.Web/Modules/Orchard.Fields/packages.config
#	src/Orchard.Web/Modules/Orchard.Forms/Module.txt
#	src/Orchard.Web/Modules/Orchard.ImageEditor/packages.config
#	src/Orchard.Web/Modules/Orchard.ImportExport/packages.config
#	src/Orchard.Web/Modules/Orchard.Indexing/packages.config
#	src/Orchard.Web/Modules/Orchard.Layouts/packages.config
#	src/Orchard.Web/Modules/Orchard.Lists/packages.config
#	src/Orchard.Web/Modules/Orchard.Localization/Module.txt
#	src/Orchard.Web/Modules/Orchard.Localization/Views/Parts/Localization.ContentTranslations.SummaryAdmin.cshtml
#	src/Orchard.Web/Modules/Orchard.Localization/packages.config
#	src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
#	src/Orchard.Web/Modules/Orchard.Media/Web.config
#	src/Orchard.Web/Modules/Orchard.Media/packages.config
#	src/Orchard.Web/Modules/Orchard.MediaPicker/Orchard.MediaPicker.csproj
#	src/Orchard.Web/Modules/Orchard.MediaPicker/Web.config
#	src/Orchard.Web/Modules/Orchard.MediaPicker/packages.config
#	src/Orchard.Web/Modules/Orchard.MediaProcessing/packages.config
#	src/Orchard.Web/Modules/Orchard.Modules/packages.config
#	src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config
#	src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj
#	src/Orchard.Web/Modules/Orchard.OutputCache/packages.config
#	src/Orchard.Web/Modules/Orchard.Packaging/packages.config
#	src/Orchard.Web/Modules/Orchard.Projections/Module.txt
#	src/Orchard.Web/Modules/Orchard.Projections/packages.config
#	src/Orchard.Web/Modules/Orchard.PublishLater/packages.config
#	src/Orchard.Web/Modules/Orchard.Recipes/packages.config
#	src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj
#	src/Orchard.Web/Modules/Orchard.Resources/Web.config
#	src/Orchard.Web/Modules/Orchard.Resources/packages.config
#	src/Orchard.Web/Modules/Orchard.Roles/packages.config
#	src/Orchard.Web/Modules/Orchard.Rules/Orchard.Rules.csproj
#	src/Orchard.Web/Modules/Orchard.Rules/Web.config
#	src/Orchard.Web/Modules/Orchard.Rules/packages.config
#	src/Orchard.Web/Modules/Orchard.Scripting.CSharp/packages.config
#	src/Orchard.Web/Modules/Orchard.Search/packages.config
#	src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/packages.config
#	src/Orchard.Web/Modules/Orchard.Setup/packages.config
#	src/Orchard.Web/Modules/Orchard.Tags/packages.config
#	src/Orchard.Web/Modules/Orchard.TaskLease/Module.txt
#	src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj
#	src/Orchard.Web/Modules/Orchard.Templates/packages.config
#	src/Orchard.Web/Modules/Orchard.Themes/packages.config
#	src/Orchard.Web/Modules/Orchard.Tokens/Module.txt
#	src/Orchard.Web/Modules/Orchard.Tokens/packages.config
#	src/Orchard.Web/Modules/Orchard.Users/packages.config
#	src/Orchard.Web/Modules/Orchard.Warmup/packages.config
#	src/Orchard.Web/Modules/Orchard.Widgets/packages.config
#	src/Orchard.Web/Modules/Orchard.Workflows/packages.config
#	src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj
#	src/Orchard.Web/Modules/Orchard.jQuery/Web.config
#	src/Orchard.Web/Modules/Orchard.jQuery/packages.config
#	src/Orchard.Web/Modules/TinyMce/TinyMce.csproj
#	src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml
#	src/Orchard.Web/Modules/TinyMce/packages.config
#	src/Orchard.Web/Themes/Themes.csproj
#	src/Orchard.Web/Themes/Web.config
#	src/Orchard.Web/Themes/packages.config
#	src/Orchard.Web/Web.config
#	src/Orchard.Web/packages.config
#	src/Orchard/ContentManagement/DefaultContentManager.cs
#	src/Orchard/Orchard.Framework.csproj
#	src/Tools/MSBuild.Orchard.Tasks/TypeScriptFiles.cs
 2019-02-20 20:05:18 +01:00
Benedek Farkas
be802146bc Dynamic C# Compilation, Static and Dynamic Razor Compilation with Roslyn (1.10.x) (#7713) 2018-09-19 13:45:23 +02:00
Lombiq
5a6b56cc72 Merge branch '1.10.x' into dev 
# Conflicts:
#	src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj
#	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
#	src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj
#	src/Orchard.Web/packages.config
 2017-12-22 21:05:17 +01:00
Benedek Farkas
ed0c60c5fd 5408: Dropping static view compilation temporarily to be able support Dynamic Compilation with Roslyn (#7892) 2017-12-21 12:49:53 -08:00
Benedek Farkas
7599a25594 Merge branch '1.10.x' into dev 
# Conflicts:
#	src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj
#	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
#	src/Orchard.Core.Tests/Orchard.Core.Tests.csproj
#	src/Orchard.Profile/Orchard.Profile.csproj
#	src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj
#	src/Orchard.Tests/Orchard.Framework.Tests.csproj
#	src/Orchard.Web/Core/Navigation/Migrations.cs
#	src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/FolderController.cs
#	src/Orchard.Web/Modules/Orchard.MediaLibrary/Services/XmlRpcHandler.cs
#	src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj
#	src/Orchard.Web/Orchard.Web.csproj
#	src/Orchard.Web/Web.config
#	src/Orchard.Web/packages.config
#	src/Orchard/Mvc/MvcModule.cs
#	src/Orchard/Orchard.Framework.csproj
 2017-11-10 00:54:02 +01:00
Benedek Farkas
2904d35d91 Enabling C# 6 for Dynamic Compilation and Razor IntelliSense 
Fixes #5408
 2017-11-09 12:04:12 -08:00
Sebastien Ros
eee341696d Merge branch '1.10.2' into dev 
# Conflicts:
#	src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj
#	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
#	src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs
#	src/Orchard.Web/Modules/Orchard.Users/Views/Items/Content-User.Edit.cshtml
#	src/Orchard/Mvc/Routes/StandardExtensionRouteProvider.cs
 2017-04-03 11:54:43 -07:00
Benedek Farkas
185ad6b1eb Adding LangVersion 5 setting to each csproj's Debug and Release target (#7641) 
Fixes #7639
 2017-04-03 10:38:41 -07:00
Daniel Stolt
e4a012a4fb Removed TypeScript build tasks from Orchard.proj. 
Reasons:
- The world is standardizing more and more on using Node.js with Gulp/Grunt for this kind of thing.
- It's becoming more and more adopted also in the Orchard community, along with increased use in core modules.
- This MSBuild target was added to ensure command-line build support, but Node.js with Gulp/Grunt is arguably even more command-line friendly.
- All the compiled JavaScript output is already added to source control anyway, so it's not needed to do TypeScript compilation to build or package Orchard.
- The MSBuild target only applies to TypeScript, and not to LESS, so it's not a complete solution anyway.
- Build servers now have full support for executing Gulp/Grunt tasks. VSTS Build has it, TeamCity has it, etc. No need to do this on the MSBuild level.
 2016-02-14 19:04:27 +01:00
Daniel Stolt
dec68d454c Updated code base to target .NET Framework 4.5.2. Fixes #5700. 2016-01-14 01:06:32 +01:00
Lombiq
e92c1f6356 Normalizing some more line endings 2015-12-13 22:26:26 +01:00
Bertrand Le Roy
39b4009e40 Enable TypeScript files to be built with a simple "build typescript" and without taking a dependency on Node.js 2015-03-20 20:14:37 -07:00
Sebastien Ros
221197f314 Upgrading to .NET Framework 4.5.1 2014-08-13 14:07:45 -07:00
Erik Oppedijk
8e84bd57e7 Upgrade projects and web.config to 4.5 FW 2013-08-23 15:16:14 +02:00
Sebastien Ros
4bd3157fe9 #17793: Removing Orchard.Web.cspoj from msdeploy 
Work Items: 17793

--HG--
branch : 1.x
 2011-05-09 14:13:05 -07:00
Renaud Paquay
cb8b5f3812 Delete 'Trust Level="Medium"' element for package 
--HG--
branch : dev
 2010-12-06 22:03:10 -08:00
Renaud Paquay
26a0ff06a9 Validate modules/themes project files during build 
We check for a few things:
- MVC2/3 tooling guid
- "None Include" elements (these often happen for .cshtml files)
- Output Path not set to "bin\"
- FxCop ruleset not set to Orchard ruleset (disabled for now)

Work Items: 16821

--HG--
branch : dev
 2010-11-24 11:52:15 -08:00
Dave Reed
e869a4f467 Fixing some basic fx cop warnings 
--HG--
branch : dev
 2010-11-12 12:47:06 -08:00
Dave Reed
ca74da5ea5 Setting code analysis ruleset to paired down Security rules. 
--HG--
branch : dev
 2010-11-10 16:16:54 -08:00
Renaud Paquay
b4da079a66 Add target to msbuild file to set a version# in module.txt files 
--HG--
branch : dev
 2010-07-19 13:38:35 -07:00
Renaud Paquay
510621f1bc Update MsDeploy package to include module binaries 
--HG--
branch : dev
 2010-07-16 18:17:34 -07:00
Renaud
ef34e58ed5 A few more changes related to .NET 4.0 port 
--HG--
branch : dev
 2010-05-22 16:48:08 -07:00
Renaud Paquay
1af2d3717c Move project to .net 4.0 
Also cleanup assemblyinfo files

--HG--
branch : net40
 2010-05-21 22:23:26 -07:00
Renaud Paquay
030c93be8e Convert solution/projects to dev10 and target .net 40 
--HG--
branch : net40
 2010-05-06 10:28:29 -07:00
Anthony Steele
4b96ede0be Removed unneeded project references and using statements 2010-04-07 21:40:16 +01:00
Louis DeJardin
17d063fa21 Post-processing the compiled web project 
Custom msbuild task performs heavy lifting over csproj xml
Project references are changed to file references, additional content files are added, and code files are copied over

--HG--
branch : dev
 2010-02-08 01:09:38 -08:00