Skip to content

Commit ff1f20a

Browse files
committed
Release rc1
2 parents 5631a69 + 4fbee41 commit ff1f20a

File tree

1,585 files changed

+58851
-102000
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,585 files changed

+58851
-102000
lines changed

.gitignore

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,20 @@ nuget.exe
187187
node_modules/
188188

189189
wwwroot
190+
Localization
190191
!src/OrchardCore.Modules/**/wwwroot
191192
!src/OrchardCore.Themes/**/wwwroot
193+
!src/OrchardCore.Modules/**/Localization
194+
!src/OrchardCore.Themes/**/Localization
192195
!src/Templates/**/content/**
196+
src/Templates/**/content/**/[Bb]in/
197+
src/Templates/**/content/**/[Oo]bj/
193198
.template.config/
194199
/OrchardCore.sln.GhostDoc.xml
200+
201+
# Rider
202+
/.idea
203+
204+
# BenchmarkDotNet artifacts
205+
BenchmarkDotNet.Artifacts
206+

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ language: csharp
1010
sudo: required
1111
services:
1212
- docker
13-
dist: trusty
13+
dist: xenial
1414
mono: none
1515
# dotnet: 2.1.300
1616
branches:
@@ -24,9 +24,9 @@ env:
2424
os:
2525
- linux
2626
- osx
27-
osx_image: xcode8.3
27+
osx_image: xcode10.1
2828
script:
29-
- curl https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.sh | bash /dev/stdin --version 2.2.103
29+
- curl https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.sh | bash /dev/stdin --version 3.0.100
3030
- if test "$TRAVIS_OS_NAME" == "linux"; then export PATH="/home/travis/.dotnet":"$PATH"; fi
3131
- if test "$TRAVIS_OS_NAME" == "osx"; then export PATH="/Users/travis/.dotnet":"$PATH"; fi
3232
- dotnet --info
@@ -36,7 +36,7 @@ script:
3636
rm -rf ./App_Data;
3737
dotnet publish -c Release -o $TRAVIS_BUILD_DIR/.build/release;
3838
cd $TRAVIS_BUILD_DIR;
39-
docker build -t orchardproject/orchardcore-cms-linux:latest -t orchardproject/orchardcore-cms-linux:1.0.0-beta3 .;
39+
docker build -t orchardproject/orchardcore-cms-linux:latest -t orchardproject/orchardcore-cms-linux:1.0.0-rc1 .;
4040
echo "$DOCKER_PASS" | docker login -u="$DOCKER_USER" --password-stdin;
4141
docker push orchardproject/orchardcore-cms-linux;
4242
fi;

.vscode/launch.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
"type": "coreclr",
77
"request": "launch",
88
"preLaunchTask": "Web App: Dotnet Build Debug",
9-
"program": "${workspaceRoot}/src/OrchardCore.Cms.Web/bin/Debug/netcoreapp2.2/OrchardCore.Cms.Web.dll",
9+
"program": "${workspaceRoot}/src/OrchardCore.Cms.Web/bin/Debug/netcoreapp3.0/OrchardCore.Cms.Web.dll",
1010
"args": [],
1111
"cwd": "${workspaceRoot}/src/OrchardCore.Cms.Web",
12-
"env": {
12+
"env": {
1313
"ASPNETCORE_ENVIRONMENT": "Development"
1414
},
1515
"stopAtEntry": false
@@ -20,10 +20,10 @@
2020
"request": "launch",
2121
"internalConsoleOptions": "openOnSessionStart",
2222
"preLaunchTask": "Web App: Dotnet Build Debug",
23-
"program": "${workspaceRoot}/src/OrchardCore.Cms.Web/bin/Debug/netcoreapp2.2/OrchardCore.Cms.Web.dll",
23+
"program": "${workspaceRoot}/src/OrchardCore.Cms.Web/bin/Debug/netcoreapp3.0/OrchardCore.Cms.Web.dll",
2424
"args": [],
2525
"cwd": "${workspaceRoot}/src/OrchardCore.Cms.Web",
26-
"env": {
26+
"env": {
2727
"ASPNETCORE_ENVIRONMENT": "Development"
2828
},
2929
"stopAtEntry": false,
@@ -47,7 +47,7 @@
4747
"type": "coreclr",
4848
"request": "launch",
4949
"preLaunchTask": "Web App: Dotnet Build Release",
50-
"program": "${workspaceRoot}/src/OrchardCore.Cms.Web/bin/Release/netcoreapp2.2/OrchardCore.Cms.Web.dll",
50+
"program": "${workspaceRoot}/src/OrchardCore.Cms.Web/bin/Release/netcoreapp3.0/OrchardCore.Cms.Web.dll",
5151
"args": [],
5252
"cwd": "${workspaceRoot}/src/OrchardCore.Cms.Web",
5353
"stopAtEntry": false,
@@ -86,17 +86,17 @@
8686
}
8787
},
8888
{
89-
"name": "Gulp Debug",
90-
"type": "node",
91-
"request": "launch",
92-
"program": "${workspaceRoot}/node_modules/gulp/bin/gulp.js",
93-
"stopOnEntry": false,
94-
"args": [],
95-
"cwd": "${workspaceRoot}",
96-
"runtimeArgs": [
97-
"--nolazy"
98-
],
99-
"console": "internalConsole",
100-
}
89+
"name": "Gulp Debug",
90+
"type": "node",
91+
"request": "launch",
92+
"program": "${workspaceRoot}/node_modules/gulp/bin/gulp.js",
93+
"stopOnEntry": false,
94+
"args": [],
95+
"cwd": "${workspaceRoot}",
96+
"runtimeArgs": [
97+
"--nolazy"
98+
],
99+
"console": "internalConsole",
100+
}
101101
]
102102
}

.vsconfig

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"version": "1.0",
3+
"components": [
4+
"Component.Microsoft.Web.LibraryManager",
5+
"Component.Microsoft.VisualStudio.RazorExtension",
6+
"Microsoft.Component.MSBuild",
7+
"Microsoft.Net.ComponentGroup.DevelopmentPrerequisites",
8+
"Microsoft.NetCore.ComponentGroup.Web.2.1",
9+
"Microsoft.VisualStudio.Component.Common.Azure.Tools",
10+
"Microsoft.VisualStudio.Component.CoreEditor",
11+
"Microsoft.VisualStudio.Component.JavaScript.TypeScript",
12+
"Microsoft.VisualStudio.Component.JavaScript.Diagnostics",
13+
"Microsoft.VisualStudio.Component.IISExpress",
14+
"Microsoft.VisualStudio.Component.ManagedDesktop.Core",
15+
"Microsoft.VisualStudio.Component.NuGet",
16+
"Microsoft.VisualStudio.Component.Roslyn.Compiler",
17+
"Microsoft.VisualStudio.Component.Roslyn.LanguageServices",
18+
"Microsoft.VisualStudio.Component.TypeScript.3.5",
19+
"Microsoft.VisualStudio.Component.TextTemplating",
20+
"Microsoft.VisualStudio.Component.Web",
21+
"Microsoft.VisualStudio.Component.WebDeploy",
22+
"Microsoft.VisualStudio.ComponentGroup.Web",
23+
"Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions",
24+
"Microsoft.VisualStudio.Workload.CoreEditor",
25+
"Microsoft.VisualStudio.Workload.NetWeb",
26+
"Microsoft.VisualStudio.Workload.NetCoreTools"
27+
]
28+
}

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This Docker file is intended for the CI
22
# A prerequisite is a published application in the .build/release
33

4-
FROM mcr.microsoft.com/dotnet/core/aspnet:2.2
4+
FROM mcr.microsoft.com/dotnet/core/aspnet:3.0
55

66
EXPOSE 80
77
ENV ASPNETCORE_URLS http://+:80

NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<packageSources>
44
<clear />
55
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
6+
<!-- 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 -->
67
<!--<add key="OrchardCore" value="https://www.myget.org/F/orchardcore-dev/api/v3/index.json" />-->
78
</packageSources>
89
<disabledPackageSources />

0 commit comments

Comments
 (0)