diff --git a/.vscode/tasks.json b/.vscode/tasks.json index a086d1fb3a..9d2a5248e8 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -50,7 +50,7 @@ }, { "label": "Dotnet watch", - "detail": "Dotnet run and watch of Web.UI.NetCore", + "detail": "Dotnet run and watch of Web.UI", "promptOnClose": true, "command": "dotnet", "type": "process", diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index 5dc9df3f3b..c9e29d84b1 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -189,7 +189,7 @@ stages: - powershell: Invoke-Sqlcmd -Query "CREATE DATABASE $env:UmbracoDatabaseName" -ServerInstance $env:UmbracoDatabaseServer displayName: Create database # - task: DotNetCoreCLI@2 -# displayName: dotnet build (Netcore) +# displayName: dotnet build # inputs: # command: build # projects: '**/Umbraco.Web.UI.csproj' @@ -209,9 +209,9 @@ stages: targets: build workingDirectory: src\Umbraco.Web.UI.Client - 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 -# displayName: dotnet run (Netcore) +# displayName: dotnet run - task: PowerShell@1 displayName: Generate Cypress.env.json inputs: @@ -302,7 +302,7 @@ stages: targets: build workingDirectory: src/Umbraco.Web.UI.Client - task: Bash@3 - displayName: dotnet run (Netcore) + displayName: dotnet run inputs: targetType: 'inline' script: 'nohup dotnet run -p ./src/Umbraco.Web.UI/Umbraco.Web.UI.csproj &' diff --git a/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs index ba0ca95fe0..1d7142d270 100644 --- a/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs +++ b/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs @@ -85,8 +85,8 @@ namespace Umbraco.Cms.Tests.Integration.DependencyInjection currFolder = currFolder.Parent; } - DirectoryInfo netcoreUI = currFolder.GetDirectories("Umbraco.Web.UI", SearchOption.TopDirectoryOnly).First(); - var mainLangFolder = new DirectoryInfo(Path.Combine(netcoreUI.FullName, globalSettings.Value.UmbracoPath.TrimStart("~/"), "config", "lang")); + DirectoryInfo uiProject = currFolder.GetDirectories("Umbraco.Web.UI", SearchOption.TopDirectoryOnly).First(); + var mainLangFolder = new DirectoryInfo(Path.Combine(uiProject.FullName, globalSettings.Value.UmbracoPath.TrimStart("~/"), "config", "lang")); return new LocalizedTextServiceFileSources( loggerFactory.CreateLogger(),