From 234f089a0afeab3556ba50c3b977ad77add73fb6 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Mon, 1 Oct 2018 13:05:39 +0100 Subject: [PATCH] Always use forward-slashes in template primaryOutputs. Fixes #1497. --- .../.template.config.src/template.json | 18 +++--------------- .../.template.config.src/template.json | 12 ++---------- 2 files changed, 5 insertions(+), 25 deletions(-) diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/.template.config.src/template.json b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/.template.config.src/template.json index 93e54a7d95..04fff6f66d 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/.template.config.src/template.json +++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/.template.config.src/template.json @@ -21,27 +21,15 @@ "path": "BlazorHosted-CSharp.sln" }, { - "condition": "(OS == \"Windows_NT\" && HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", - "path": "BlazorHosted-CSharp.Server\\BlazorHosted-CSharp.Server.csproj" - }, - { - "condition": "(OS != \"Windows_NT\" && HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", "path": "BlazorHosted-CSharp.Server/BlazorHosted-CSharp.Server.csproj" }, { - "condition": "(OS == \"Windows_NT\" && HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", - "path": "BlazorHosted-CSharp.Client\\BlazorHosted-CSharp.Client.csproj" - }, - { - "condition": "(OS != \"Windows_NT\" && HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", "path": "BlazorHosted-CSharp.Client/BlazorHosted-CSharp.Client.csproj" }, { - "condition": "(OS == \"Windows_NT\" && HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", - "path": "BlazorHosted-CSharp.Shared\\BlazorHosted-CSharp.Shared.csproj" - }, - { - "condition": "(OS != \"Windows_NT\" && HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", "path": "BlazorHosted-CSharp.Shared/BlazorHosted-CSharp.Shared.csproj" } ], diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/.template.config.src/template.json b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/.template.config.src/template.json index 131d0d476a..2be54f5977 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/.template.config.src/template.json +++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/.template.config.src/template.json @@ -21,19 +21,11 @@ "path": "BlazorServerSide-CSharp.sln" }, { - "condition": "(OS == \"Windows_NT\" && HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", - "path": "BlazorServerSide-CSharp.Server\\BlazorServerSide-CSharp.Server.csproj" - }, - { - "condition": "(OS != \"Windows_NT\" && HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", "path": "BlazorServerSide-CSharp.Server/BlazorServerSide-CSharp.Server.csproj" }, { - "condition": "(OS == \"Windows_NT\" && HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", - "path": "BlazorServerSide-CSharp.App\\BlazorServerSide-CSharp.App.csproj" - }, - { - "condition": "(OS != \"Windows_NT\" && HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", "path": "BlazorServerSide-CSharp.App/BlazorServerSide-CSharp.App.csproj" } ],