Releasing beta1

Author: sebastienros

.travis.yml

@@ -25,4 +25,12 @@ script:
         docker login -u="$DOCKER_USER" -p="$DOCKER_PASS";
         docker push orchardproject/orchardcore-cms-linux;
     fi;
+  - if [[ "$TRAVIS_BRANCH" == "dev" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$TRAVIS_PULL_REQUEST" == "false" ]]; then
+        cd $TRAVIS_BUILD_DIR/src/OrchardCore.Cms.Web;
+        dotnet publish -c Release -o $TRAVIS_BUILD_DIR/.build/release;
+        cd $TRAVIS_BUILD_DIR;
+        docker build -t orchardproject/orchardcore-cms-linux:dev .;
+        docker login -u="$DOCKER_USER" -p="$DOCKER_PASS";
+        docker push orchardproject/orchardcore-cms-linux;
+    fi;
   - if test "$TRAVIS_OS_NAME" == "linux"; then dotnet test -c Release ./test/OrchardCore.Tests/OrchardCore.Tests.csproj; fi

.vscode/launch.json

@@ -6,9 +6,12 @@
 			"type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "Web App: Dotnet Build Debug",
-			"program": "${workspaceRoot}/src/OrchardCore.Cms.Web/bin/Debug/netcoreapp1.1/OrchardCore.Cms.Web.dll",
+			"program": "${workspaceRoot}/src/OrchardCore.Cms.Web/bin/Debug/netcoreapp2.0/OrchardCore.Cms.Web.dll",
 			"args": [],
 			"cwd": "${workspaceRoot}/src/OrchardCore.Cms.Web",
+			"env": {				
+				"ASPNETCORE_ENVIRONMENT": "Development"
+			},
 			"stopAtEntry": false
 		},
 		{
@@ -17,9 +20,12 @@
 			"request": "launch",
 			"internalConsoleOptions": "openOnSessionStart",
 			"preLaunchTask": "Web App: Dotnet Build Debug",
-			"program": "${workspaceRoot}/src/OrchardCore.Cms.Web/bin/Debug/netcoreapp1.1/OrchardCore.Cms.Web.dll",
+			"program": "${workspaceRoot}/src/OrchardCore.Cms.Web/bin/Debug/netcoreapp2.0/OrchardCore.Cms.Web.dll",
 			"args": [],
 			"cwd": "${workspaceRoot}/src/OrchardCore.Cms.Web",
+			"env": {				
+				"ASPNETCORE_ENVIRONMENT": "Development"
+			},
 			"stopAtEntry": false,
 			"launchBrowser": {
 				"enabled": true,
@@ -41,7 +47,7 @@
 			"type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "Web App: Dotnet Build Release/admin",
-			"program": "${workspaceRoot}/src/OrchardCore.Cms.Web/bin/Release/netcoreapp1.1/OrchardCore.Cms.Web.dll",
+			"program": "${workspaceRoot}/src/OrchardCore.Cms.Web/bin/Release/netcoreapp2.0/OrchardCore.Cms.Web.dll",
 			"args": [],
 			"cwd": "${workspaceRoot}/src/OrchardCore.Cms.Web",
 			"stopAtEntry": false,

.vscode/tasks.json

@@ -15,21 +15,6 @@
 			"taskName": "Dotnet Restore Force",
 			"args": [ "dotnet restore --no-cache" ]
 		},
-		{
-			"taskName": "Solution: Dotnet Build Debug",
-			"args": [ "dotnet build src/**/project.json -c Debug" ],
-			"problemMatcher": "$msCompile"
-		},
-		{
-			"taskName": "Solution: Dotnet Rebuild Debug",
-			"args": [ "dotnet build src/**/project.json --no-incremental -c Debug" ],
-			"problemMatcher": "$msCompile"
-		},
-		{
-			"taskName": "Solution: Dotnet Build Release",
-			"args": [ "dotnet build src/**/project.json -c Release" ],
-			"problemMatcher": "$msCompile"
-		},
 		{
 			"taskName": "Web App: Dotnet Build Debug",
 			"args": [ "dotnet build ${workspaceRoot}/src/OrchardCore.Cms.Web -c Debug" ],

Dockerfile

@@ -2,10 +2,11 @@
 # A prerequisite is a published application in the .build/release  
 
 FROM microsoft/dotnet:2.0-runtime 
-WORKDIR /app
 
+EXPOSE 80
+ENV ASPNETCORE_URLS http://+:80
+
+WORKDIR /app
 COPY .build/release .
 
-ENV ASPNETCORE_URLS http://+:80
-ENTRYPOINT ["dotnet", "OrchardCore.Cms.Web.dll"]
-EXPOSE 80
+ENTRYPOINT ["dotnet", "OrchardCore.Cms.Web.dll"]

LICENSE.txt renamed to LICENSE

@@ -2,26 +2,34 @@
 
 Orchard Core is a re-implementation of [Orchard CMS](https://github.com/OrchardCMS/Orchard) in [ASP.NET Core](http://www.asp.net/vnext). You can check out the [Orchard Core presentation from the last Orchard Harvest](https://www.youtube.com/watch?v=TK6a_HfD0O8) to get an introductory overview of its features and goals.
 
-[![Join the chat at https://gitter.im/OrchardCMS/Orchard2](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/OrchardCMS/Orchard2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Join the chat at https://gitter.im/OrchardCMS/OrchardCore](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/OrchardCMS/OrchardCore?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![BSD-3-Clause License](https://img.shields.io/badge/license-BSD--3--Clause-blue.svg)](LICENSE.txt)
 [![Documentation](https://readthedocs.org/projects/orchardcore/badge/)](https://orchardcore.readthedocs.io/en/latest/)
 
 
-
 ## Build Status
 
-[![Build Status](https://img.shields.io/travis/OrchardCMS/OrchardCore.svg?label=travis-ci&branch=master&style=flat-square)](https://travis-ci.org/OrchardCMS/OrchardCore/branches)
+Stable (master): 
+
+[![Build Status](https://api.travis-ci.org/OrchardCMS/OrchardCore.svg?branch=master)](https://travis-ci.org/OrchardCMS/OrchardCore/branches)
 [![Build status](https://img.shields.io/appveyor/ci/alexbocharov/orchard2/master.svg?label=appveyor&style=flat-square)](https://ci.appveyor.com/project/alexbocharov/orchard2/branch/master)
+[![NuGet](https://img.shields.io/nuget/v/OrchardCore.Application.Cms.Targets.svg)](https://www.nuget.org/packages/OrchardCore.Application.Cms.Targets)
+
+Nightly (dev): 
+
+[![Build Status](https://api.travis-ci.org/OrchardCMS/OrchardCore.svg?branch=dev)](https://travis-ci.org/OrchardCMS/OrchardCore/branches)
+[![Build status](https://img.shields.io/appveyor/ci/alexbocharov/orchard2/dev.svg?label=appveyor&style=flat-square)](https://ci.appveyor.com/project/alexbocharov/orchard2/branch/dev)
+[![MyGet](https://img.shields.io/myget/orchardcore-preview/vpre/OrchardCore.Application.Cms.Targets.svg)](https://myget.org/feed/orchardcore-preview/package/nuget/OrchardCore.Application.Cms.Targets)
 
 ## Orchard CMS
 
 Orchard is a free, [open source](https://github.com/OrchardCMS/Orchard), community-focused Content Management System built on the ASP.NET MVC platform.
 
 ## Status
 
-### Alpha
+### Beta
 
-The software is complete enough for internal testing. This is typically done by people other than the software engineers who wrote it, but still within the same organization or community that developed the software. 
+The software is complete enough for external testing -- that is, by groups outside the organization or community that developed the software. Beta software is usually feature complete, but may have known limitations or bugs. Betas are either closed (private) and limited to a specific set of users, or they can be open to the general public.
 
 Here is a more detailed [roadmap](https://github.com/OrchardCMS/OrchardCore/wiki/Roadmap).
 
@@ -32,9 +40,7 @@ Here is a more detailed [roadmap](https://github.com/OrchardCMS/OrchardCore/wiki
 ### Command line
 
 - Install the latest versions (current) for both Runtime and SDK of .NET Core from this page https://www.microsoft.com/net/download/core
-- Call `dotnet restore`.
-- Call `dotnet build`.
-- Next navigate to `D:\OrchardCore\src\OrchardCore.Cms.Web` or wherever your respective folder is on the command line in Administrator mode.
+- Navigate to `D:\OrchardCore\src\OrchardCore.Cms.Web` or wherever your respective folder is on the command line in Administrator mode.
 - Call `dotnet run`.
 - Then open the `http://localhost:5000` URL in your browser.
 
@@ -44,6 +50,12 @@ Here is a more detailed [roadmap](https://github.com/OrchardCMS/OrchardCore/wiki
 - Open `OrchardCore.sln` and wait for Visual Studio to restore all Nuget packages
 - Ensure `OrchardCore.Cms.Web` is the startup project and run it
 
+### Docker
+
+- Run `docker run --name orchardcms orchardproject/orchardcore-cms-linux:latest`
+
+Docker images and parameters can be found at https://hub.docker.com/u/orchardproject/
+
 ### Contributing
 
 We currently follow the these [engineering guidelines](https://github.com/OrchardCMS/OrchardCore/wiki/Engineering-Guidelines).

README.md

@@ -8,6 +8,11 @@ environment:
       secure: 2a9QfyDw5J1NDZD80kMwhQ==
     DOCKER_PASS:
       secure: aLjaywnziVFcRa3uZ8iMteFDjA1wp0fSaPMaBE55LO4=
+    MYGET_API_KEY:
+        secure: 8Fp2ETunhU6PvhlotuQXTZ7WkG1FikJ3BM7YLAZyfmbpy00knABu5yL7MhJ9uNcl
+    NUGET_API_KEY:
+        secure: bR0JuO8NuLOxL18tQ7ZtQXOHNHjqCJXlkUOzEyNQniptTszwYcwufYhKTyoybqei
+
 # Install scripts. (runs after repo cloning)
 install:
   # Download .NET Core 2.0 SDK and add to PATH
@@ -21,15 +26,16 @@ install:
   # Get the latest stable version of Node.js or io.js
   - ps: Install-Product node $env:nodejs_version
   - ps: $env:BuildNumber= $env:APPVEYOR_BUILD_NUMBER
+  - ps: $IsMasterBranch = ($env:APPVEYOR_REPO_BRANCH -eq "master" -And -not $env:APPVEYOR_PULL_REQUEST_NUMBER)
+  - ps: $IsDevBranch = ($env:APPVEYOR_REPO_BRANCH -eq "dev" -And -not $env:APPVEYOR_PULL_REQUEST_NUMBER)
 init:
   - git config --global core.autocrlf true
 build_script:
   - dotnet --version
-  - dotnet restore
-  - dotnet pack -c Release
+  - ps: if (($IsMasterBranch -eq $true) -or ($IsDevBranch -eq $true)) { dotnet pack -c Release }
 
   - ps: |
-      if ($env:APPVEYOR_REPO_BRANCH -eq "master" -And -not $env:APPVEYOR_PULL_REQUEST_NUMBER)
+      if ($IsMasterBranch -eq $true)
       {
         cd $env:APPVEYOR_BUILD_FOLDER\src\OrchardCore.Cms.Web
         dotnet publish -c Release -o $env:APPVEYOR_BUILD_FOLDER\.build\release
@@ -39,18 +45,24 @@ build_script:
         docker push orchardproject/orchardcore-cms-windows
       }
 
+      if ($IsDevBranch -eq $true)
+      {
+        cd $env:APPVEYOR_BUILD_FOLDER\src\OrchardCore.Cms.Web
+        dotnet publish -c Release -o $env:APPVEYOR_BUILD_FOLDER\.build\release
+        cd $env:APPVEYOR_BUILD_FOLDER
+        docker build -t orchardproject/orchardcore-cms-windows:dev .
+        docker login -u="$env:DOCKER_USER" -p="$env:DOCKER_PASS"
+        docker push orchardproject/orchardcore-cms-windows
+      }
+
 test_script:
   - dotnet test -c Release .\test\OrchardCore.Tests\OrchardCore.Tests.csproj
 clone_depth: 1
 test: on
+
 artifacts:
 - path: 'src\**\*.nupkg'
-deploy:
-  on:
-    branch: master
-  provider: NuGet
-  server: https://www.myget.org/F/orchardcore-preview/api/v2/package
-  api_key:
-    secure: 8Fp2ETunhU6PvhlotuQXTZ7WkG1FikJ3BM7YLAZyfmbpy00knABu5yL7MhJ9uNcl
-  skip_symbols: true
-  artifact: /.*\.nupkg/
+
+deploy_script:
+- ps:  if ($IsMasterBranch -eq $true) { foreach ($artifactName in $artifacts.keys) { nuget push $artifacts[$artifactName].path $env:NUGET_API_KEY -Source https://www.nuget.org/api/v2/package } }
+- ps:  if ($IsDevBranch -eq $true) { foreach ($artifactName in $artifacts.keys) { nuget push $artifacts[$artifactName].path $env:MYGET_API_KEY -Source https://www.myget.org/F/orchardcore-preview/api/v2/package } }

appveyor.yml

@@ -7,7 +7,10 @@ repo_url: https://github.com/OrchardCMS/OrchardCore
 
 # Options
 docs_dir: src
-extra_css: []
+
+extra_css: 
+- docs/css/extra.css
+
 extra_javascript:
 - docs/js/extra.js
 
@@ -30,13 +33,15 @@ pages:
         - Content Fields: OrchardCore.Modules/OrchardCore.ContentFields/README.md
         - Content Preview: OrchardCore.Modules/OrchardCore.ContentPreview/README.md
         - Content Types: OrchardCore.Modules/OrchardCore.ContentTypes/README.md
+        - Lists: OrchardCore.Modules/OrchardCore.Lists/README.md
         - Markdown: OrchardCore.Modules/OrchardCore.Markdown/README.md
         - Media: OrchardCore.Modules/OrchardCore.Media/README.md
         - Menu: OrchardCore.Modules/OrchardCore.Menu/README.md
         - Navigation: OrchardCore.Modules/OrchardCore.Navigation/README.md
         - Indexing: OrchardCore.Modules/OrchardCore.Indexing/README.md
         - Lucene: OrchardCore.Modules/OrchardCore.Lucene/README.md
         - Queries: OrchardCore.Modules/OrchardCore.Queries/README.md
+        - Templates: OrchardCore.Modules/OrchardCore.Templates/README.md
         - Liquid: OrchardCore.Modules/OrchardCore.Liquid/README.md
         - Custom Settings: OrchardCore.Modules/OrchardCore.CustomSettings/README.md
     - Core Modules: