clean start

Signed-off-by: Carl Sargunar <carl@sargunar.com>
This commit is contained in:
Carl Sargunar 2022-06-02 00:32:35 +01:00
parent b8cbf8b999
commit 27be926117
49 changed files with 22 additions and 15 deletions

View File

@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16 # Visual Studio Version 16
VisualStudioVersion = 16.0.30114.105 VisualStudioVersion = 16.0.30114.105
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco", "umbraco\umbraco.csproj", "{8CABE562-AC29-4C7C-9F6A-E2508D6B8C8A}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbracocms", "umbracocms\umbracocms.csproj", "{E1EACBB3-3F43-4C73-84A1-BB046BF1BFCD}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -14,9 +14,9 @@ Global
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8CABE562-AC29-4C7C-9F6A-E2508D6B8C8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E1EACBB3-3F43-4C73-84A1-BB046BF1BFCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8CABE562-AC29-4C7C-9F6A-E2508D6B8C8A}.Debug|Any CPU.Build.0 = Debug|Any CPU {E1EACBB3-3F43-4C73-84A1-BB046BF1BFCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8CABE562-AC29-4C7C-9F6A-E2508D6B8C8A}.Release|Any CPU.ActiveCfg = Release|Any CPU {E1EACBB3-3F43-4C73-84A1-BB046BF1BFCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8CABE562-AC29-4C7C-9F6A-E2508D6B8C8A}.Release|Any CPU.Build.0 = Release|Any CPU {E1EACBB3-3F43-4C73-84A1-BB046BF1BFCD}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal

View File

@ -6,12 +6,12 @@ FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
COPY . /src COPY . /src
WORKDIR /src WORKDIR /src
RUN ls RUN ls
RUN dotnet build "umbraco.csproj" -c Release -o /app/build RUN dotnet build "umbracocms.csproj" -c Release -o /app/build
FROM build AS publish FROM build AS publish
RUN dotnet publish "umbraco.csproj" -c Release -o /app/publish RUN dotnet publish "umbracocms.csproj" -c Release -o /app/publish
FROM base AS final FROM base AS final
WORKDIR /app WORKDIR /app
COPY --from=publish /app/publish . COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "umbraco.dll"] ENTRYPOINT ["dotnet", "umbracocms.dll"]

View File

@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using Umbraco.Cms.Web.Common.Hosting; using Umbraco.Cms.Web.Common.Hosting;
namespace umbraco namespace umbracocms
{ {
public class Program public class Program
{ {

View File

@ -4,8 +4,8 @@
"windowsAuthentication": false, "windowsAuthentication": false,
"anonymousAuthentication": true, "anonymousAuthentication": true,
"iisExpress": { "iisExpress": {
"applicationUrl": "http://localhost:41055", "applicationUrl": "http://localhost:23348",
"sslPort": 44339 "sslPort": 44389
} }
}, },
"profiles": { "profiles": {
@ -20,7 +20,7 @@
"commandName": "Project", "commandName": "Project",
"dotnetRunMessages": true, "dotnetRunMessages": true,
"launchBrowser": true, "launchBrowser": true,
"applicationUrl": "https://localhost:44339;http://localhost:41055", "applicationUrl": "https://localhost:44389;http://localhost:23348",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development" "ASPNETCORE_ENVIRONMENT": "Development"
} }

View File

@ -7,7 +7,7 @@ using Microsoft.Extensions.Hosting;
using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Extensions; using Umbraco.Extensions;
namespace umbraco namespace umbracocms
{ {
public class Startup public class Startup
{ {

View File

@ -1,5 +1,5 @@
@using Umbraco.Extensions @using Umbraco.Extensions
@using umbraco @using umbracocms
@using Umbraco.Cms.Web.Common.PublishedModels @using Umbraco.Cms.Web.Common.PublishedModels
@using Umbraco.Cms.Web.Common.Views @using Umbraco.Cms.Web.Common.Views
@using Umbraco.Cms.Core.Models.PublishedContent @using Umbraco.Cms.Core.Models.PublishedContent

View File

@ -13,7 +13,7 @@
"Umbraco": { "Umbraco": {
"CMS": { "CMS": {
"Global": { "Global": {
"Id": "8dbef9ca-2789-4e17-adfb-ef1fd05b6502", "Id": "396a60e4-0d4d-4d58-a26a-e85b06696637",
"SanitizeTinyMce": true "SanitizeTinyMce": true
}, },
"Content": { "Content": {

View File

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

Before

Width:  |  Height:  |  Size: 326 KiB

After

Width:  |  Height:  |  Size: 326 KiB

View File

@ -7,6 +7,13 @@ This sample project will start up the [Umbraco CMS](https://github.com/umbraco/U
## Credentials
hello@umbraco.com
1234567890
## crap below ## crap below
docker build --tag=umbraco .\umbraco docker build --tag=umbraco .\umbraco