Skip to content

Commit d862add

Browse files
TarmilTarmil
committed
Fix #41: mismatch between solution file and actual project path
Explanation for the fix: dotnet/templating#1168 (comment)
1 parent 6f055e1 commit d862add

24 files changed

+21
-21
lines changed

‎content/application/.template.config/template.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"identity": "Bolero.Application.Template",
1010
"groupIdentity": "Bolero.Application",
1111
"shortName": "bolero-app",
12-
"sourceName": "Bolero.Template",
12+
"sourceName": "Bolero.Template.1",
1313
"preferNameDirectory": true,
1414
"symbols": {
1515
"minimal": {

‎content/application/Bolero.Template.sln ‎content/application/Bolero.Template.1.sln

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ EndProject
1313
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{87F6C079-CBD7-4866-BDEB-CBDEA9E51D2A}"
1414
EndProject
1515
//#if (server)
16-
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Bolero.Template.Server", "src\Bolero.Template.Server\Bolero.Template.Server.fsproj", "{4E2AA925-4694-4593-ADBC-F349D269587A}"
16+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Bolero.Template.1.Server", "src\Bolero.Template.1.Server\Bolero.Template.1.Server.fsproj", "{4E2AA925-4694-4593-ADBC-F349D269587A}"
1717
EndProject
1818
//#endif
19-
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Bolero.Template.Client", "src\Bolero.Template.Client\Bolero.Template.Client.fsproj", "{1481BBD6-A6DA-4912-A03A-134880D14701}"
19+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Bolero.Template.1.Client", "src\Bolero.Template.1.Client\Bolero.Template.1.Client.fsproj", "{1481BBD6-A6DA-4912-A03A-134880D14701}"
2020
EndProject
2121
Global
2222
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎content/application/src/Bolero.Template.Client/Bolero.Template.Client.fsproj ‎content/application/src/Bolero.Template.1.Client/Bolero.Template.Client.fsproj

File renamed without changes.

‎content/application/src/Bolero.Template.Client/Main.fs ‎content/application/src/Bolero.Template.1.Client/Main.fs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module Bolero.Template.Client.Main
1+
module Bolero.Template._1.Client.Main
22

33
open System
44
//#if (!server)

‎content/application/src/Bolero.Template.Client/Main.minimal.fs ‎content/application/src/Bolero.Template.1.Client/Main.minimal.fs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module Bolero.Template.Client.Main
1+
module Bolero.Template._1.Client.Main
22

33
open Elmish
44
open Bolero

‎content/application/src/Bolero.Template.Client/Properties/launchSettings.json ‎content/application/src/Bolero.Template.1.Client/Properties/launchSettings.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"ASPNETCORE_ENVIRONMENT": "Development"
1616
}
1717
},
18-
"Bolero.Template.Client": {
18+
"Bolero.Template._1.Client": {
1919
"commandName": "Project",
2020
"launchBrowser": true,
2121
"environmentVariables": {
@@ -24,4 +24,4 @@
2424
"applicationUrl": "http://localhost:51067/"
2525
}
2626
}
27-
}
27+
}

‎content/application/src/Bolero.Template.Client/Startup.fs ‎content/application/src/Bolero.Template.1.Client/Startup.fs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Bolero.Template.Client
1+
namespace Bolero.Template._1.Client
22

33
open Microsoft.AspNetCore.Components.WebAssembly.Hosting
44
//#if (server)

‎content/application/src/Bolero.Template.Client/paket.references ‎content/application/src/Bolero.Template.1.Client/paket.references

File renamed without changes.

‎content/application/src/Bolero.Template.Client/wwwroot/books.json ‎content/application/src/Bolero.Template.1.Client/wwwroot/books.json

File renamed without changes.

‎content/application/src/Bolero.Template.Client/wwwroot/css/index.css ‎content/application/src/Bolero.Template.1.Client/wwwroot/css/index.css

File renamed without changes.

‎content/application/src/Bolero.Template.Client/wwwroot/favicon.ico ‎content/application/src/Bolero.Template.1.Client/wwwroot/favicon.ico

File renamed without changes.

‎content/application/src/Bolero.Template.Client/wwwroot/icon-512.png ‎content/application/src/Bolero.Template.1.Client/wwwroot/icon-512.png

File renamed without changes.

‎content/application/src/Bolero.Template.Client/wwwroot/index.html ‎content/application/src/Bolero.Template.1.Client/wwwroot/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.7.4/css/bulma.min.css">
1010
<link rel="stylesheet" href="css/index.css">
1111
<!-- //#endif -->
12-
<link rel="stylesheet" href="Bolero.Template.Client.styles.css">
12+
<link rel="stylesheet" href="Bolero.Template._1.Client.styles.css">
1313
<!-- //#if (pwa) -->
1414
<link href="manifest.json" rel="manifest" />
1515
<link rel="apple-touch-icon" sizes="512x512" href="icon-512.png" />

‎content/application/src/Bolero.Template.Client/wwwroot/main.html ‎content/application/src/Bolero.Template.1.Client/wwwroot/main.html

File renamed without changes.

‎content/application/src/Bolero.Template.Client/wwwroot/manifest.json ‎content/application/src/Bolero.Template.1.Client/wwwroot/manifest.json

File renamed without changes.

‎content/application/src/Bolero.Template.Client/wwwroot/service-worker.js ‎content/application/src/Bolero.Template.1.Client/wwwroot/service-worker.js

File renamed without changes.

‎content/application/src/Bolero.Template.Client/wwwroot/service-worker.published.js ‎content/application/src/Bolero.Template.1.Client/wwwroot/service-worker.published.js

File renamed without changes.

‎content/application/src/Bolero.Template.Server/Bolero.Template.Server.fsproj ‎content/application/src/Bolero.Template.1.Server/Bolero.Template.Server.fsproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<Compile Include="Startup.fs" />
1414
</ItemGroup>
1515
<ItemGroup>
16-
<ProjectReference Include="..\Bolero.Template.Client\Bolero.Template.Client.fsproj" />
16+
<ProjectReference Include="..\Bolero.Template.1.Client\Bolero.Template.1.Client.fsproj" />
1717
</ItemGroup>
1818
<!-- //#if (paket) -->
1919
<Import Project="..\..\.paket\Paket.Restore.targets" />

‎content/application/src/Bolero.Template.Server/BookService.fs ‎content/application/src/Bolero.Template.1.Server/BookService.fs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Bolero.Template.Server
1+
namespace Bolero.Template._1.Server
22

33
open System
44
open System.IO
@@ -8,7 +8,7 @@ open Microsoft.AspNetCore.Hosting
88
open Bolero
99
open Bolero.Remoting
1010
open Bolero.Remoting.Server
11-
open Bolero.Template
11+
open Bolero.Template._1
1212

1313
type BookService(ctx: IRemoteContext, env: IWebHostEnvironment) =
1414
inherit RemoteHandler<Client.Main.BookService>()

‎content/application/src/Bolero.Template.Server/Index.fs ‎content/application/src/Bolero.Template.1.Server/Index.fs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
module Bolero.Template.Server.Index
1+
module Bolero.Template._1.Server.Index
22

33
open Bolero
44
open Bolero.Html
55
open Bolero.Server.Html
6-
open Bolero.Template
6+
open Bolero.Template._1
77

88
let page = doctypeHtml {
99
head {
@@ -15,7 +15,7 @@ let page = doctypeHtml {
1515
link { attr.rel "stylesheet"; attr.href "https://cdnjs.cloudflare.com/ajax/libs/bulma/0.7.4/css/bulma.min.css" }
1616
link { attr.rel "stylesheet"; attr.href "css/index.css" }
1717
//#endif
18-
link { attr.rel "stylesheet"; attr.href "Bolero.Template.Client.styles.css" }
18+
link { attr.rel "stylesheet"; attr.href "Bolero.Template._1.Client.styles.css" }
1919
//#if (pwa)
2020
link { attr.rel "manifest"; attr.href "manifest.json" }
2121
link { attr.rel "apple-touch-icon"; attr.sizes "512x512"; attr.href "icon-512.png" }

‎content/application/src/Bolero.Template.Server/Pages/_Host.cshtml ‎content/application/src/Bolero.Template.1.Server/Pages/_Host.cshtml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@page "/"
2-
@namespace Bolero.Template.Server
2+
@namespace Bolero.Template._1.Server
33
@using Bolero.Server.RazorHost
44
@inject IBoleroHostConfig BoleroHostConfig
55
<!DOCTYPE html>
@@ -13,7 +13,7 @@
1313
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.7.4/css/bulma.min.css">
1414
<link rel="stylesheet" href="css/index.css">
1515
<!-- //#endif -->
16-
<link rel="stylesheet" href="Bolero.Template.Client.styles.css">
16+
<link rel="stylesheet" href="Bolero.Template._1.Client.styles.css">
1717
<!-- //#if (pwa) -->
1818
<link href="manifest.json" rel="manifest" />
1919
<link rel="apple-touch-icon" sizes="512x512" href="icon-512.png" />
@@ -31,7 +31,7 @@
3131
</div>
3232
</nav>
3333
<!-- //#endif -->
34-
<div id="main">@(await Html.RenderComponentAsync<Bolero.Template.Client.Main.MyApp>(BoleroHostConfig))</div>
34+
<div id="main">@(await Html.RenderComponentAsync<Bolero.Template.1.Client.Main.MyApp>(BoleroHostConfig))</div>
3535
@Html.RenderBoleroScript(BoleroHostConfig)
3636
<!-- //#if (pwa) -->
3737
<script>navigator.serviceWorker.register('service-worker.js');</script>

‎content/application/src/Bolero.Template.Server/Properties/launchSettings.json ‎content/application/src/Bolero.Template.1.Server/Properties/launchSettings.json

File renamed without changes.

‎content/application/src/Bolero.Template.Server/Startup.fs ‎content/application/src/Bolero.Template.1.Server/Startup.fs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Bolero.Template.Server
1+
namespace Bolero.Template._1.Server
22

33
open Microsoft.AspNetCore
44
open Microsoft.AspNetCore.Authentication.Cookies
@@ -9,7 +9,7 @@ open Microsoft.Extensions.Hosting
99
open Bolero
1010
open Bolero.Remoting.Server
1111
open Bolero.Server
12-
open Bolero.Template
12+
open Bolero.Template._1
1313
//#if (hotreload_actual)
1414
open Bolero.Templating.Server
1515
//#endif
@@ -38,7 +38,7 @@ type Startup() =
3838
//#endif
3939
//#if (hotreload_actual)
4040
#if DEBUG
41-
.AddHotReload(templateDir = __SOURCE_DIRECTORY__ + "/../Bolero.Template.Client")
41+
.AddHotReload(templateDir = __SOURCE_DIRECTORY__ + "/../Bolero.Template.1.Client")
4242
#endif
4343
//#endif
4444
|> ignore

‎content/application/src/Bolero.Template.Server/paket.references ‎content/application/src/Bolero.Template.1.Server/paket.references

File renamed without changes.

0 commit comments

Comments
 (0)