Skip to content

Commit

Permalink
Release rc1
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastienros committed Sep 24, 2019
2 parents 5631a69 + 4fbee41 commit ff1f20a
Show file tree
Hide file tree
Showing 1,585 changed files with 58,851 additions and 102,000 deletions.
12 changes: 12 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,20 @@ nuget.exe
node_modules/

wwwroot
Localization
!src/OrchardCore.Modules/**/wwwroot
!src/OrchardCore.Themes/**/wwwroot
!src/OrchardCore.Modules/**/Localization
!src/OrchardCore.Themes/**/Localization
!src/Templates/**/content/**
src/Templates/**/content/**/[Bb]in/
src/Templates/**/content/**/[Oo]bj/
.template.config/
/OrchardCore.sln.GhostDoc.xml

# Rider
/.idea

# BenchmarkDotNet artifacts
BenchmarkDotNet.Artifacts

8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ language: csharp
sudo: required
services:
- docker
dist: trusty
dist: xenial
mono: none
# dotnet: 2.1.300
branches:
Expand All @@ -24,9 +24,9 @@ env:
os:
- linux
- osx
osx_image: xcode8.3
osx_image: xcode10.1
script:
- curl https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.sh | bash /dev/stdin --version 2.2.103
- curl https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.sh | bash /dev/stdin --version 3.0.100
- 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
Expand All @@ -36,7 +36,7 @@ script:
rm -rf ./App_Data;
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-beta3 .;
docker build -t orchardproject/orchardcore-cms-linux:latest -t orchardproject/orchardcore-cms-linux:1.0.0-rc1 .;
echo "$DOCKER_PASS" | docker login -u="$DOCKER_USER" --password-stdin;
docker push orchardproject/orchardcore-cms-linux;
fi;
Expand Down
34 changes: 17 additions & 17 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "Web App: Dotnet Build Debug",
"program": "${workspaceRoot}/src/OrchardCore.Cms.Web/bin/Debug/netcoreapp2.2/OrchardCore.Cms.Web.dll",
"program": "${workspaceRoot}/src/OrchardCore.Cms.Web/bin/Debug/netcoreapp3.0/OrchardCore.Cms.Web.dll",
"args": [],
"cwd": "${workspaceRoot}/src/OrchardCore.Cms.Web",
"env": {
"env": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"stopAtEntry": false
Expand All @@ -20,10 +20,10 @@
"request": "launch",
"internalConsoleOptions": "openOnSessionStart",
"preLaunchTask": "Web App: Dotnet Build Debug",
"program": "${workspaceRoot}/src/OrchardCore.Cms.Web/bin/Debug/netcoreapp2.2/OrchardCore.Cms.Web.dll",
"program": "${workspaceRoot}/src/OrchardCore.Cms.Web/bin/Debug/netcoreapp3.0/OrchardCore.Cms.Web.dll",
"args": [],
"cwd": "${workspaceRoot}/src/OrchardCore.Cms.Web",
"env": {
"env": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"stopAtEntry": false,
Expand All @@ -47,7 +47,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "Web App: Dotnet Build Release",
"program": "${workspaceRoot}/src/OrchardCore.Cms.Web/bin/Release/netcoreapp2.2/OrchardCore.Cms.Web.dll",
"program": "${workspaceRoot}/src/OrchardCore.Cms.Web/bin/Release/netcoreapp3.0/OrchardCore.Cms.Web.dll",
"args": [],
"cwd": "${workspaceRoot}/src/OrchardCore.Cms.Web",
"stopAtEntry": false,
Expand Down Expand Up @@ -86,17 +86,17 @@
}
},
{
"name": "Gulp Debug",
"type": "node",
"request": "launch",
"program": "${workspaceRoot}/node_modules/gulp/bin/gulp.js",
"stopOnEntry": false,
"args": [],
"cwd": "${workspaceRoot}",
"runtimeArgs": [
"--nolazy"
],
"console": "internalConsole",
}
"name": "Gulp Debug",
"type": "node",
"request": "launch",
"program": "${workspaceRoot}/node_modules/gulp/bin/gulp.js",
"stopOnEntry": false,
"args": [],
"cwd": "${workspaceRoot}",
"runtimeArgs": [
"--nolazy"
],
"console": "internalConsole",
}
]
}
28 changes: 28 additions & 0 deletions .vsconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"version": "1.0",
"components": [
"Component.Microsoft.Web.LibraryManager",
"Component.Microsoft.VisualStudio.RazorExtension",
"Microsoft.Component.MSBuild",
"Microsoft.Net.ComponentGroup.DevelopmentPrerequisites",
"Microsoft.NetCore.ComponentGroup.Web.2.1",
"Microsoft.VisualStudio.Component.Common.Azure.Tools",
"Microsoft.VisualStudio.Component.CoreEditor",
"Microsoft.VisualStudio.Component.JavaScript.TypeScript",
"Microsoft.VisualStudio.Component.JavaScript.Diagnostics",
"Microsoft.VisualStudio.Component.IISExpress",
"Microsoft.VisualStudio.Component.ManagedDesktop.Core",
"Microsoft.VisualStudio.Component.NuGet",
"Microsoft.VisualStudio.Component.Roslyn.Compiler",
"Microsoft.VisualStudio.Component.Roslyn.LanguageServices",
"Microsoft.VisualStudio.Component.TypeScript.3.5",
"Microsoft.VisualStudio.Component.TextTemplating",
"Microsoft.VisualStudio.Component.Web",
"Microsoft.VisualStudio.Component.WebDeploy",
"Microsoft.VisualStudio.ComponentGroup.Web",
"Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions",
"Microsoft.VisualStudio.Workload.CoreEditor",
"Microsoft.VisualStudio.Workload.NetWeb",
"Microsoft.VisualStudio.Workload.NetCoreTools"
]
}
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This Docker file is intended for the CI
# A prerequisite is a published application in the .build/release

FROM mcr.microsoft.com/dotnet/core/aspnet:2.2
FROM mcr.microsoft.com/dotnet/core/aspnet:3.0

EXPOSE 80
ENV ASPNETCORE_URLS http://+:80
Expand Down
1 change: 1 addition & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<packageSources>
<clear />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
<!-- This feed should not be used when shipping on Nuget. It should just be used in the dev branch while dependencies are not available on NuGet.org -->
<!--<add key="OrchardCore" value="https://www.myget.org/F/orchardcore-dev/api/v3/index.json" />-->
</packageSources>
<disabledPackageSources />
Expand Down
Loading

0 comments on commit ff1f20a

Please sign in to comment.