Skip to content

Commit

Permalink
renamings and fixing sln, fsproj references
Browse files Browse the repository at this point in the history
  • Loading branch information
RicoSaupe committed Dec 7, 2023
1 parent d4938ca commit 7ae37d4
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ before_install:
script:
- dotnet tool restore
- dotnet paket restore
- dotnet run --project tests/tests.fsproj
- dotnet run --project tests/Tests.fsproj
2 changes: 1 addition & 1 deletion Build.fs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ let run exe arg dir =

Target.create "Tests" (fun _ ->
let cmd = "run"
let args = "--project tests/tests.fsproj"
let args = "--project tests/Tests.fsproj"
let result = DotNet.exec (fun x -> { x with DotNetCliPath = "dotnet" }) cmd args
if not result.OK then failwithf "`dotnet %s %s` failed" cmd args
)
Expand Down
2 changes: 2 additions & 0 deletions Build.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

<ItemGroup>
<Compile Include="Build.fs" />
<None Include="paket.dependencies" />
<None Include="paket.references" />
</ItemGroup>

<Import Project=".paket\Paket.Restore.targets" />
Expand Down
2 changes: 2 additions & 0 deletions Content/default/Build.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
<ItemGroup>
<Compile Include="Helpers.fs" />
<Compile Include="Build.fs" />
<None Include="paket.dependencies" />
<None Include="paket.references" />
</ItemGroup>
<Import Project=".paket\Paket.Restore.targets" />
</Project>
2 changes: 0 additions & 2 deletions Content/default/SAFE.App.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@ VisualStudioVersion = 15.0.26124.0
MinimumVisualStudioVersion = 15.0.26124.0
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{08CCFCF6-2248-43ED-A6EF-E972A2DA0E6A}"
ProjectSection(SolutionItems) = preProject
paket.dependencies = paket.dependencies
package.json = package.json
README.md = README.md
.editorconfig = .editorconfig
.fantomasignore = .fantomasignore
.gitignore = .gitignore
.npmrc = .npmrc
paket.references = paket.references
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}"
Expand Down
1 change: 1 addition & 0 deletions Content/default/src/Client/Client.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<None Include="paket.references" />
<Compile Include="Index.fs" />
<Compile Include="App.fs" />
<None Include="vite.config.mts" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Shared\Shared.fsproj" />
Expand Down
12 changes: 11 additions & 1 deletion SAFE-template.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26124.0
MinimumVisualStudioVersion = 15.0.26124.0
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{73097E03-8B35-41B9-BE4A-BC15F49AF8B5}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
.gitignore = .gitignore
.travis.yml = .travis.yml
CONTRIBUTING.md = CONTRIBUTING.md
README.md = README.md
RELEASE_NOTES.md = RELEASE_NOTES.md
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Content", "Content", "{EA1006BA-C34E-4CF9-A3AF-64EF33440721}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "minimal", "minimal", "{BD8E7D51-C1E1-4895-9BE6-F079B7F6565C}"
Expand Down Expand Up @@ -33,7 +43,7 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Server.Tests", "Content\def
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Client.Tests", "Content\default\tests\Client\Client.Tests.fsproj", "{7AA65D2D-B5C0-427C-B39C-3BC25297E88C}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "tests", "tests\tests.fsproj", "{8B883735-9AA1-4A14-A7F9-69AE826C658D}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Tests", "tests\Tests.fsproj", "{8B883735-9AA1-4A14-A7F9-69AE826C658D}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Build", "Content\default\Build.fsproj", "{8FAEEF41-562F-4DE2-BF56-F6E5B27A6661}"
EndProject
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ steps:
version: '8.0.100'
- script: |
dotnet tool restore
dotnet run --project tests/tests.fsproj
dotnet run --project tests/Tests.fsproj
displayName: 'SAFE Template tests'

0 comments on commit 7ae37d4

Please sign in to comment.