Skip to content

Commit c49895d

Browse files
LarocceauLarocceau
authored
Merge pull request #14 from SAFE-Stack/use-util-packages
Use util packages
2 parents 6fe9426 + 003d90e commit c49895d

13 files changed

Lines changed: 32 additions & 264 deletions

File tree

‎SAFE.Meta.sln‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SAFE.Server", "src\SAFE.Ser
1111
EndProject
1212
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Build", "Build\Build.fsproj", "{F49104E3-DBA9-4A2D-B839-B4E60BCAE698}"
1313
EndProject
14-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{387BFC82-96EA-4C10-A08E-C25588EE2223}"
14+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{30BCECCE-E11D-4028-A9DE-6A83DF2E3EEC}"
1515
EndProject
16-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SAFE.Client.Tests", "test\SAFE.Client.Tests\SAFE.Client.Tests.fsproj", "{ECC5C643-1340-4718-8381-E3D1E835C3E3}"
16+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SAFE.Client.Tests", "test\SAFE.Client.Tests\SAFE.Client.Tests.fsproj", "{66BAE342-23E0-4904-B98E-B0679D9370D7}"
1717
EndProject
1818
Global
1919
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -36,13 +36,14 @@ Global
3636
{F49104E3-DBA9-4A2D-B839-B4E60BCAE698}.Debug|Any CPU.Build.0 = Debug|Any CPU
3737
{F49104E3-DBA9-4A2D-B839-B4E60BCAE698}.Release|Any CPU.ActiveCfg = Release|Any CPU
3838
{F49104E3-DBA9-4A2D-B839-B4E60BCAE698}.Release|Any CPU.Build.0 = Release|Any CPU
39-
{ECC5C643-1340-4718-8381-E3D1E835C3E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
40-
{ECC5C643-1340-4718-8381-E3D1E835C3E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
41-
{ECC5C643-1340-4718-8381-E3D1E835C3E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
42-
{ECC5C643-1340-4718-8381-E3D1E835C3E3}.Release|Any CPU.Build.0 = Release|Any CPU
39+
{66BAE342-23E0-4904-B98E-B0679D9370D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
40+
{66BAE342-23E0-4904-B98E-B0679D9370D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
41+
{66BAE342-23E0-4904-B98E-B0679D9370D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
42+
{66BAE342-23E0-4904-B98E-B0679D9370D7}.Release|Any CPU.Build.0 = Release|Any CPU
4343
EndGlobalSection
4444
GlobalSection(NestedProjects) = preSolution
4545
{5BCFE180-027E-40F9-847B-7B36F10BD5D7} = {59161B7D-F517-4F4B-B28D-33E34B8A930E}
4646
{0C8F62AC-D5D8-43E6-A4C7-159E530C3CE5} = {59161B7D-F517-4F4B-B28D-33E34B8A930E}
47+
{66BAE342-23E0-4904-B98E-B0679D9370D7} = {30BCECCE-E11D-4028-A9DE-6A83DF2E3EEC}
4748
EndGlobalSection
48-
EndGlobal
49+
EndGlobal

‎paket.dependencies‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ nuget Fake.JavaScript.Npm
77
nuget FSharp.Core ~> 8
88

99
nuget Fable.Remoting.Giraffe ~> 5
10+
nuget SAFE.Client.Utils ~> 5
11+
nuget SAFE.Server.Utils ~> 5
1012
nuget Saturn ~> 0
1113

1214
nuget Fable.Core ~> 4

‎paket.lock‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,13 @@ NUGET
163163
Microsoft.IdentityModel.Logging (>= 7.7.1)
164164
Microsoft.IO.RecyclableMemoryStream (3.0.1)
165165
Newtonsoft.Json (13.0.3)
166+
SAFE.Client.Utils (5.0.1)
167+
Fable.Browser.Dom (>= 2.18.1)
168+
Fable.Remoting.Client (>= 7.32)
169+
Fable.SimpleJson (>= 3.24)
170+
FSharp.Core (>= 8.0.403 < 9.0)
171+
SAFE.Server.Utils (5.0)
172+
Fable.Remoting.Giraffe (>= 5.21)
166173
Saturn (0.17)
167174
FSharp.Control.Websockets (>= 0.2.2)
168175
Giraffe (>= 6.4)
@@ -172,5 +179,4 @@ NUGET
172179
Microsoft.IdentityModel.JsonWebTokens (>= 7.7.1)
173180
Microsoft.IdentityModel.Tokens (>= 7.7.1)
174181
System.Reactive (5.0)
175-
System.Text.Encodings.Web (8.0)
176182
System.Text.Json (8.0.5)

‎readme.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
This repository contains the two metapackages used by the SAFE Template.
22

33
## SAFE.Server
4-
Contains dependencies required for the SAFE Stack server component, as well as a set of helper types and utilities.
4+
Contains dependencies required for the SAFE Stack server component
55

66
## SAFE.Client
7-
Contains dependencies required for the SAFE Stack client component, as well as a set of helper types and utilities, including `AsyncMsg` and `Deferred` types.
7+
Contains dependencies required for the SAFE Stack client component

‎src/SAFE.Client/SAFE.Client.fsproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
</ItemGroup>
2929

3030
<ItemGroup>
31-
<Compile Include="SAFE.fs" />
3231
<Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
3332
</ItemGroup>
3433

‎src/SAFE.Client/SAFE.fs‎

Lines changed: 0 additions & 188 deletions
This file was deleted.

‎src/SAFE.Client/paket.references‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ Fable.Elmish.HMR
66
Fable.Mocha
77
Fable.Remoting.Client
88
Feliz
9-
Fable.SimpleJson
9+
Fable.SimpleJson
10+
SAFE.Client.Utils

‎src/SAFE.Client/readme.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Contains dependencies required for the SAFE Stack client component, as well as a set of helper types and utilities, including `AsyncMsg` and `Deferred` types.
1+
Contains dependencies required for the SAFE Stack client component

‎src/SAFE.Server/SAFE.Server.fsproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project Sdk="Microsoft.NET.Sdk">
23

34
<PropertyGroup>
45
<RootNamespace>SAFE</RootNamespace>
@@ -26,8 +27,5 @@
2627
<None Include="../../safe-logo.png" Pack="true" PackagePath="" />
2728
</ItemGroup>
2829

29-
<ItemGroup>
30-
<Compile Include="SAFE.fs" />
31-
</ItemGroup>
3230
<Import Project="..\..\.paket\Paket.Restore.targets" />
3331
</Project>

‎src/SAFE.Server/SAFE.fs‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)