Skip to content

Commit

Permalink
Fix #41: mismatch between solution file and actual project path
Browse files Browse the repository at this point in the history 
Explanation for the fix: dotnet/templating#1168 (comment)
  • Loading branch information
@Tarmil
Tarmil committed Nov 2, 2023
1 parent 6f055e1 commit d862add
Show file tree
Hide file tree
Showing 24 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion content/application/.template.config/template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"identity": "Bolero.Application.Template",
"groupIdentity": "Bolero.Application",
"shortName": "bolero-app",
"sourceName": "Bolero.Template",
"sourceName": "Bolero.Template.1",
"preferNameDirectory": true,
"symbols": {
"minimal": {
Expand Down
4 changes: 2 additions & 2 deletions content/application/Bolero.Template.sln → content/application/Bolero.Template.1.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{87F6C079-CBD7-4866-BDEB-CBDEA9E51D2A}"
EndProject
//#if (server)
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Bolero.Template.Server", "src\Bolero.Template.Server\Bolero.Template.Server.fsproj", "{4E2AA925-4694-4593-ADBC-F349D269587A}"
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}"
EndProject
//#endif
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Bolero.Template.Client", "src\Bolero.Template.Client\Bolero.Template.Client.fsproj", "{1481BBD6-A6DA-4912-A03A-134880D14701}"
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}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
0 ...late.Client/Bolero.Template.Client.fsproj → ...te.1.Client/Bolero.Template.Client.fsproj
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...cation/src/Bolero.Template.Client/Main.fs → ...tion/src/Bolero.Template.1.Client/Main.fs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module Bolero.Template.Client.Main
module Bolero.Template._1.Client.Main

open System
//#if (!server)
Expand Down
2 changes: 1 addition & 1 deletion ...rc/Bolero.Template.Client/Main.minimal.fs → .../Bolero.Template.1.Client/Main.minimal.fs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module Bolero.Template.Client.Main
module Bolero.Template._1.Client.Main

open Elmish
open Bolero
Expand Down
4 changes: 2 additions & 2 deletions ...ate.Client/Properties/launchSettings.json → ...e.1.Client/Properties/launchSettings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"Bolero.Template.Client": {
"Bolero.Template._1.Client": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {
Expand All @@ -24,4 +24,4 @@
"applicationUrl": "http://localhost:51067/"
}
}
}
}
2 changes: 1 addition & 1 deletion ...ion/src/Bolero.Template.Client/Startup.fs → ...n/src/Bolero.Template.1.Client/Startup.fs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Bolero.Template.Client
namespace Bolero.Template._1.Client

open Microsoft.AspNetCore.Components.WebAssembly.Hosting
//#if (server)
Expand Down
0 ...c/Bolero.Template.Client/paket.references → ...Bolero.Template.1.Client/paket.references
View file
File renamed without changes.
0 ...Bolero.Template.Client/wwwroot/books.json → ...lero.Template.1.Client/wwwroot/books.json
View file
File renamed without changes.
0 ...ero.Template.Client/wwwroot/css/index.css → ...o.Template.1.Client/wwwroot/css/index.css
View file
File renamed without changes.
0 ...olero.Template.Client/wwwroot/favicon.ico → ...ero.Template.1.Client/wwwroot/favicon.ico
View file
File renamed without changes.
0 ...lero.Template.Client/wwwroot/icon-512.png → ...ro.Template.1.Client/wwwroot/icon-512.png
View file
File renamed without changes
2 changes: 1 addition & 1 deletion ...Bolero.Template.Client/wwwroot/index.html → ...lero.Template.1.Client/wwwroot/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.7.4/css/bulma.min.css">
<link rel="stylesheet" href="css/index.css">
<!-- //#endif -->
<link rel="stylesheet" href="Bolero.Template.Client.styles.css">
<link rel="stylesheet" href="Bolero.Template._1.Client.styles.css">
<!-- //#if (pwa) -->
<link href="manifest.json" rel="manifest" />
<link rel="apple-touch-icon" sizes="512x512" href="icon-512.png" />
Expand Down
0 .../Bolero.Template.Client/wwwroot/main.html → ...olero.Template.1.Client/wwwroot/main.html
View file
File renamed without changes.
0 ...ero.Template.Client/wwwroot/manifest.json → ...o.Template.1.Client/wwwroot/manifest.json
View file
File renamed without changes.
0 ...Template.Client/wwwroot/service-worker.js → ...mplate.1.Client/wwwroot/service-worker.js
View file
File renamed without changes.
0 ...lient/wwwroot/service-worker.published.js → ...lient/wwwroot/service-worker.published.js
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...late.Server/Bolero.Template.Server.fsproj → ...te.1.Server/Bolero.Template.Server.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<Compile Include="Startup.fs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Bolero.Template.Client\Bolero.Template.Client.fsproj" />
<ProjectReference Include="..\Bolero.Template.1.Client\Bolero.Template.1.Client.fsproj" />
</ItemGroup>
<!-- //#if (paket) -->
<Import Project="..\..\.paket\Paket.Restore.targets" />
Expand Down
4 changes: 2 additions & 2 deletions ...src/Bolero.Template.Server/BookService.fs → ...c/Bolero.Template.1.Server/BookService.fs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Bolero.Template.Server
namespace Bolero.Template._1.Server

open System
open System.IO
Expand All @@ -8,7 +8,7 @@ open Microsoft.AspNetCore.Hosting
open Bolero
open Bolero.Remoting
open Bolero.Remoting.Server
open Bolero.Template
open Bolero.Template._1

type BookService(ctx: IRemoteContext, env: IWebHostEnvironment) =
inherit RemoteHandler<Client.Main.BookService>()
Expand Down
6 changes: 3 additions & 3 deletions ...ation/src/Bolero.Template.Server/Index.fs → ...ion/src/Bolero.Template.1.Server/Index.fs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
module Bolero.Template.Server.Index
module Bolero.Template._1.Server.Index

open Bolero
open Bolero.Html
open Bolero.Server.Html
open Bolero.Template
open Bolero.Template._1

let page = doctypeHtml {
head {
Expand All @@ -15,7 +15,7 @@ let page = doctypeHtml {
link { attr.rel "stylesheet"; attr.href "https://cdnjs.cloudflare.com/ajax/libs/bulma/0.7.4/css/bulma.min.css" }
link { attr.rel "stylesheet"; attr.href "css/index.css" }
//#endif
link { attr.rel "stylesheet"; attr.href "Bolero.Template.Client.styles.css" }
link { attr.rel "stylesheet"; attr.href "Bolero.Template._1.Client.styles.css" }
//#if (pwa)
link { attr.rel "manifest"; attr.href "manifest.json" }
link { attr.rel "apple-touch-icon"; attr.sizes "512x512"; attr.href "icon-512.png" }
Expand Down
6 changes: 3 additions & 3 deletions ...Bolero.Template.Server/Pages/_Host.cshtml → ...lero.Template.1.Server/Pages/_Host.cshtml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@page "/"
@namespace Bolero.Template.Server
@namespace Bolero.Template._1.Server
@using Bolero.Server.RazorHost
@inject IBoleroHostConfig BoleroHostConfig
<!DOCTYPE html>
Expand All @@ -13,7 +13,7 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.7.4/css/bulma.min.css">
<link rel="stylesheet" href="css/index.css">
<!-- //#endif -->
<link rel="stylesheet" href="Bolero.Template.Client.styles.css">
<link rel="stylesheet" href="Bolero.Template._1.Client.styles.css">
<!-- //#if (pwa) -->
<link href="manifest.json" rel="manifest" />
<link rel="apple-touch-icon" sizes="512x512" href="icon-512.png" />
Expand All @@ -31,7 +31,7 @@
</div>
</nav>
<!-- //#endif -->
<div id="main">@(await Html.RenderComponentAsync<Bolero.Template.Client.Main.MyApp>(BoleroHostConfig))</div>
<div id="main">@(await Html.RenderComponentAsync<Bolero.Template.1.Client.Main.MyApp>(BoleroHostConfig))</div>
@Html.RenderBoleroScript(BoleroHostConfig)
<!-- //#if (pwa) -->
<script>navigator.serviceWorker.register('service-worker.js');</script>
Expand Down
0 ...ate.Server/Properties/launchSettings.json → ...e.1.Server/Properties/launchSettings.json
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions ...ion/src/Bolero.Template.Server/Startup.fs → ...n/src/Bolero.Template.1.Server/Startup.fs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Bolero.Template.Server
namespace Bolero.Template._1.Server

open Microsoft.AspNetCore
open Microsoft.AspNetCore.Authentication.Cookies
Expand All @@ -9,7 +9,7 @@ open Microsoft.Extensions.Hosting
open Bolero
open Bolero.Remoting.Server
open Bolero.Server
open Bolero.Template
open Bolero.Template._1
//#if (hotreload_actual)
open Bolero.Templating.Server
//#endif
Expand Down Expand Up @@ -38,7 +38,7 @@ type Startup() =
//#endif
//#if (hotreload_actual)
#if DEBUG
.AddHotReload(templateDir = __SOURCE_DIRECTORY__ + "/../Bolero.Template.Client")
.AddHotReload(templateDir = __SOURCE_DIRECTORY__ + "/../Bolero.Template.1.Client")
#endif
//#endif
|> ignore
Expand Down
0 ...c/Bolero.Template.Server/paket.references → ...Bolero.Template.1.Server/paket.references
View file
File renamed without changes.

0 comments on commit d862add

Please sign in to comment.