Releasing beta2

Author: sebastienros

.editorconfig

@@ -34,7 +34,7 @@ dotnet_style_qualification_for_event                       = false : suggestion
 
 # Use language keywords instead of framework type names for type references
 dotnet_style_predefined_type_for_locals_parameters_members = true : suggestion
-dotnet_style_predefined_type_for_member_access             = true : suggestion
+dotnet_style_predefined_type_for_member_access             = false : suggestion
 
 # Suggest more modern language features when available
 csharp_style_pattern_matching_over_is_with_cast_check = true : none

.gitignore

@@ -184,6 +184,9 @@ nuget.exe
 !lib/*/*.*
 
 #exclude node modules
-node_modules/*
+node_modules/
 
-wwwroot
+wwwroot
+!src/OrchardCore.Modules/**/wwwroot
+!src/OrchardCore.Themes/**/wwwroot
+.template.config/

.travis.yml

@@ -4,7 +4,7 @@ services:
   - docker
 dist: trusty
 mono: none
-dotnet: 2.0.0
+# dotnet: 2.1.300
 env:
   global:
     - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
@@ -14,14 +14,16 @@ os:
   - osx
 osx_image: xcode8.3
 script:
-  - if test "$TRAVIS_OS_NAME" == "linux"; then dotnet restore; fi
-  - if test "$TRAVIS_OS_NAME" == "osx"; then dotnet restore --disable-parallel; fi
+  - curl https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.sh | bash /dev/stdin --version 2.1.301
+  - if test "$TRAVIS_OS_NAME" == "linux"; then export PATH="/home/travis/.dotnet":"$PATH"; fi
+  - if test "$TRAVIS_OS_NAME" == "osx"; then export PATH="/Users/travis/.dotnet":"$PATH"; fi
+  - dotnet --info
   - dotnet build -c Release
   - if [[ "$TRAVIS_BRANCH" == "master" ]] && [[ "$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:latest -t orchardproject/orchardcore-cms-linux:1.0.0-beta1 .;
+        docker build -t orchardproject/orchardcore-cms-linux:latest -t orchardproject/orchardcore-cms-linux:1.0.0-beta2 .;
         docker login -u="$DOCKER_USER" -p="$DOCKER_PASS";
         docker push orchardproject/orchardcore-cms-linux;
     fi;

.vscode/launch.json

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

.vscode/settings.json

@@ -1,3 +1,4 @@
 // Place your settings in this file to overwrite default and user settings.
 {
+    "omnisharp.projectLoadTimeout": 600
 }

Contributors.md

@@ -18,3 +18,5 @@ their names indented and be marked with a '-'
 * Lombiq (@LombiqTechnologies)
   - Benedek Farkas
   - Zoltán Lehóczky (@Piedone)
+
+* Antoine Griffard (@agriffard)

Dockerfile

@@ -1,7 +1,7 @@
 # This Docker file is intended for the CI
 # A prerequisite is a published application in the .build/release  
 
-FROM microsoft/dotnet:2.0-runtime 
+FROM microsoft/dotnet:2.1-aspnetcore-runtime
 
 EXPOSE 80
 ENV ASPNETCORE_URLS http://+:80

LICENSE

@@ -1,5 +1,7 @@
+BSD 3-Clause License
+https://opensource.org/licenses/BSD-3-Clause
+
 Copyright (c) .NET Foundation. All rights reserved.
-BSD 3-Clause License - https://opensource.org/licenses/BSD-3-Clause
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -25,4 +27,3 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-

NuGet.config

@@ -3,7 +3,6 @@
   <packageSources>
     <clear />
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
-      <!-- This feed is used for customized packages which are not published on Nuget.org, and other upstream feeds -->
     <add key="OrchardCore" value="https://www.myget.org/F/orchardcore-dev/api/v3/index.json" />
   </packageSources>
   <disabledPackageSources />