yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More renaming

Browse Source
This commit is contained in:
Elitsa Marinovska
2021-08-18 11:50:48 +02:00
parent 460df9bfd2
commit f3115a8b05
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/tasks.json vendored
View File

@@ -50,7 +50,7 @@
}, },
{ {
"label": "Dotnet watch", "label": "Dotnet watch",
"detail": "Dotnet run and watch of Web.UI.NetCore", "detail": "Dotnet run and watch of Web.UI",
"promptOnClose": true, "promptOnClose": true,
"command": "dotnet", "command": "dotnet",
"type": "process", "type": "process",

8
build/azure-pipelines.yml
View File

@@ -189,7 +189,7 @@ stages:
- powershell: Invoke-Sqlcmd -Query "CREATE DATABASE $env:UmbracoDatabaseName" -ServerInstance $env:UmbracoDatabaseServer - powershell: Invoke-Sqlcmd -Query "CREATE DATABASE $env:UmbracoDatabaseName" -ServerInstance $env:UmbracoDatabaseServer
displayName: Create database displayName: Create database
# - task: DotNetCoreCLI@2 # - task: DotNetCoreCLI@2
# displayName: dotnet build (Netcore) # displayName: dotnet build
# inputs: # inputs:
# command: build # command: build
# projects: '**/Umbraco.Web.UI.csproj' # projects: '**/Umbraco.Web.UI.csproj'
@@ -209,9 +209,9 @@ stages:
targets: build targets: build
workingDirectory: src\Umbraco.Web.UI.Client workingDirectory: src\Umbraco.Web.UI.Client
- powershell: Start-Process -FilePath "dotnet" -ArgumentList "run", "-p", "src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" - powershell: Start-Process -FilePath "dotnet" -ArgumentList "run", "-p", "src\Umbraco.Web.UI\Umbraco.Web.UI.csproj"
displayName: dotnet run (Netcore) displayName: dotnet run
# - powershell: dotnet run --no-build -p .\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj # - powershell: dotnet run --no-build -p .\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj
# displayName: dotnet run (Netcore) # displayName: dotnet run
- task: PowerShell@1 - task: PowerShell@1
displayName: Generate Cypress.env.json displayName: Generate Cypress.env.json
inputs: inputs:
@@ -302,7 +302,7 @@ stages:
targets: build targets: build
workingDirectory: src/Umbraco.Web.UI.Client workingDirectory: src/Umbraco.Web.UI.Client
- task: Bash@3 - task: Bash@3
displayName: dotnet run (Netcore) displayName: dotnet run
inputs: inputs:
targetType: 'inline' targetType: 'inline'
script: 'nohup dotnet run -p ./src/Umbraco.Web.UI/Umbraco.Web.UI.csproj &' script: 'nohup dotnet run -p ./src/Umbraco.Web.UI/Umbraco.Web.UI.csproj &'

4
src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs
View File

@@ -85,8 +85,8 @@ namespace Umbraco.Cms.Tests.Integration.DependencyInjection
currFolder = currFolder.Parent; currFolder = currFolder.Parent;
} }
DirectoryInfo netcoreUI = currFolder.GetDirectories("Umbraco.Web.UI", SearchOption.TopDirectoryOnly).First(); DirectoryInfo uiProject = currFolder.GetDirectories("Umbraco.Web.UI", SearchOption.TopDirectoryOnly).First();
var mainLangFolder = new DirectoryInfo(Path.Combine(netcoreUI.FullName, globalSettings.Value.UmbracoPath.TrimStart("~/"), "config", "lang")); var mainLangFolder = new DirectoryInfo(Path.Combine(uiProject.FullName, globalSettings.Value.UmbracoPath.TrimStart("~/"), "config", "lang"));
return new LocalizedTextServiceFileSources( return new LocalizedTextServiceFileSources(
loggerFactory.CreateLogger<LocalizedTextServiceFileSources>(), loggerFactory.CreateLogger<LocalizedTextServiceFileSources>(),