murocast · brase · Oct 15, 2020 · Oct 17, 2020 · Oct 17, 2020 · Oct 17, 2020
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,16 +3,28 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "6.0.0-alpha014",
+      "version": "7.0.0-alpha003",
       "commands": [
         "paket"
       ]
     },
     "fake-cli": {
-      "version": "5.20.3",
+      "version": "5.21.0-alpha003",
       "commands": [
         "fake"
       ]
+    },
+    "fable": {
+      "version": "3.6.3",
+      "commands": [
+        "fable"
+      ]
+    },
+    "femto": {
+      "version": "0.12.0",
+      "commands": [
+        "femto"
+      ]
     }
   }
 }
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
-        dotnet: [3.1.402]
+        dotnet: [6.0.101]
     runs-on: ${{ matrix.os }}
 
     steps:

diff --git a/.github/workflows/dockerpublish.yml b/.github/workflows/dockerpublish.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.402
+        dotnet-version: 6.0.101
     - name: Restore tools
       run: dotnet tool restore
     - name: Restore dependencies

diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,6 @@ Castos.v3.ncrunchsolution.user
 
 .ionide
 src/Server/appsettings.json
+
+*.fs.js
+*.fs.js.map
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
@@ -159,7 +159,7 @@
 		This value should match the version in the props generated by paket
 		If they differ, this means we need to do a restore in order to ensure correct dependencies
 	-->
-    <PropertyGroup Condition="'$(PaketPropsVersion)' != '5.185.3' ">
+    <PropertyGroup Condition="'$(PaketPropsVersion)' != '6.0.0' ">
       <PaketRestoreRequired>true</PaketRestoreRequired>
     </PropertyGroup>
 
@@ -236,13 +236,16 @@
         <PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
         <PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
         <AllPrivateAssets>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])</AllPrivateAssets>
-        <CopyLocal Condition="'%(PaketReferencesFileLinesInfo.Splits)' == '6'">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5])</CopyLocal>
+        <CopyLocal Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 6">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5])</CopyLocal>
+        <OmitContent Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 7">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[6])</OmitContent>
+        <ImportTargets Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 8">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[7])</ImportTargets>
       </PaketReferencesFileLinesInfo>
       <PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
         <Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
         <PrivateAssets Condition=" ('%(PaketReferencesFileLinesInfo.AllPrivateAssets)' == 'true') Or ('$(PackAsTool)' == 'true') ">All</PrivateAssets>
-        <ExcludeAssets Condition=" '%(PaketReferencesFileLinesInfo.Splits)' == '6' And %(PaketReferencesFileLinesInfo.CopyLocal) == 'false'">runtime</ExcludeAssets>
-        <ExcludeAssets Condition=" '%(PaketReferencesFileLinesInfo.Splits)' != '6' And %(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
+        <ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.CopyLocal) == 'false' or %(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
+        <ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.OmitContent) == 'true'">$(ExcludeAssets);contentFiles</ExcludeAssets>
+        <ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.ImportTargets) == 'false'">$(ExcludeAssets);build;buildMultitargeting;buildTransitive</ExcludeAssets>
         <Publish Condition=" '$(PackAsTool)' == 'true' ">true</Publish>
         <AllowExplicitVersion>true</AllowExplicitVersion>
       </PackageReference>
@@ -289,14 +292,16 @@
     <PropertyGroup>
       <PaketProjectFile>$(MSBuildProjectDirectory)/$(MSBuildProjectFile)</PaketProjectFile>
       <ContinuePackingAfterGeneratingNuspec>true</ContinuePackingAfterGeneratingNuspec>
+      <UseMSBuild16_10_Pack>false</UseMSBuild16_10_Pack>
+      <UseMSBuild16_10_Pack Condition=" '@(MSBuildMajorVersion)' >= '16' AND '@(MSBuildMinorVersion)' > '10' ">true</UseMSBuild16_10_Pack>
       <UseMSBuild16_0_Pack>false</UseMSBuild16_0_Pack>
-      <UseMSBuild16_0_Pack Condition=" '@(MSBuildMajorVersion)' >= '16' ">true</UseMSBuild16_0_Pack>
+      <UseMSBuild16_0_Pack Condition=" '@(MSBuildMajorVersion)' >= '16' AND (! $(UseMSBuild16_10_Pack)) ">true</UseMSBuild16_0_Pack>
       <UseMSBuild15_9_Pack>false</UseMSBuild15_9_Pack>
       <UseMSBuild15_9_Pack Condition=" '@(MSBuildMajorVersion)' == '15' AND '@(MSBuildMinorVersion)' > '8' ">true</UseMSBuild15_9_Pack>
       <UseMSBuild15_8_Pack>false</UseMSBuild15_8_Pack>
-      <UseMSBuild15_8_Pack Condition=" '$(NuGetToolVersion)' != '4.0.0' AND (! $(UseMSBuild15_9_Pack)) AND (! $(UseMSBuild16_0_Pack)) ">true</UseMSBuild15_8_Pack>
+      <UseMSBuild15_8_Pack Condition=" '$(NuGetToolVersion)' != '4.0.0' AND (! $(UseMSBuild15_9_Pack)) AND (! $(UseMSBuild16_0_Pack)) AND (! $(UseMSBuild16_10_Pack)) ">true</UseMSBuild15_8_Pack>
       <UseNuGet4_Pack>false</UseNuGet4_Pack>
-      <UseNuGet4_Pack Condition=" (! $(UseMSBuild15_8_Pack)) AND (! $(UseMSBuild15_9_Pack)) AND (! $(UseMSBuild16_0_Pack)) ">true</UseNuGet4_Pack>
+      <UseNuGet4_Pack Condition=" (! $(UseMSBuild15_8_Pack)) AND (! $(UseMSBuild15_9_Pack)) AND (! $(UseMSBuild16_0_Pack)) AND (! $(UseMSBuild16_10_Pack)) ">true</UseNuGet4_Pack>
       <AdjustedNuspecOutputPath>$(PaketIntermediateOutputPath)\$(Configuration)</AdjustedNuspecOutputPath>
       <AdjustedNuspecOutputPath Condition="@(_NuspecFilesNewLocation) == ''">$(PaketIntermediateOutputPath)</AdjustedNuspecOutputPath>
     </PropertyGroup>
@@ -314,6 +319,55 @@
     </ConvertToAbsolutePath>
 
     <!-- Call Pack -->
+    <PackTask Condition="$(UseMSBuild16_10_Pack)"
+              PackItem="$(PackProjectInputFile)"
+              PackageFiles="@(_PackageFiles)"
+              PackageFilesToExclude="@(_PackageFilesToExclude)"
+              PackageVersion="$(PackageVersion)"
+              PackageId="$(PackageId)"
+              Title="$(Title)"
+              Authors="$(Authors)"
+              Description="$(Description)"
+              Copyright="$(Copyright)"
+              RequireLicenseAcceptance="$(PackageRequireLicenseAcceptance)"
+              LicenseUrl="$(PackageLicenseUrl)"
+              ProjectUrl="$(PackageProjectUrl)"
+              IconUrl="$(PackageIconUrl)"
+              ReleaseNotes="$(PackageReleaseNotes)"
+              Tags="$(PackageTags)"
+              DevelopmentDependency="$(DevelopmentDependency)"
+              BuildOutputInPackage="@(_BuildOutputInPackage)"
+              TargetPathsToSymbols="@(_TargetPathsToSymbols)"
+              SymbolPackageFormat="$(SymbolPackageFormat)"
+              TargetFrameworks="@(_TargetFrameworks)"
+              AssemblyName="$(AssemblyName)"
+              PackageOutputPath="$(PackageOutputAbsolutePath)"
+              IncludeSymbols="$(IncludeSymbols)"
+              IncludeSource="$(IncludeSource)"
+              PackageTypes="$(PackageType)"
+              IsTool="$(IsTool)"
+              RepositoryUrl="$(RepositoryUrl)"
+              RepositoryType="$(RepositoryType)"
+              SourceFiles="@(_SourceFiles->Distinct())"
+              NoPackageAnalysis="$(NoPackageAnalysis)"
+              MinClientVersion="$(MinClientVersion)"
+              Serviceable="$(Serviceable)"
+              FrameworkAssemblyReferences="@(_FrameworkAssemblyReferences)"
+              ContinuePackingAfterGeneratingNuspec="$(ContinuePackingAfterGeneratingNuspec)"
+              NuspecOutputPath="$(AdjustedNuspecOutputPath)"
+              IncludeBuildOutput="$(IncludeBuildOutput)"
+              BuildOutputFolders="$(BuildOutputTargetFolder)"
+              ContentTargetFolders="$(ContentTargetFolders)"
+              RestoreOutputPath="$(RestoreOutputAbsolutePath)"
+              NuspecFile="$(NuspecFileAbsolutePath)"
+              NuspecBasePath="$(NuspecBasePath)"
+              NuspecProperties="$(NuspecProperties)"
+              PackageLicenseFile="$(PackageLicenseFile)"
+              PackageLicenseExpression="$(PackageLicenseExpression)"
+              PackageLicenseExpressionVersion="$(PackageLicenseExpressionVersion)"
+              Readme="$(PackageReadmeFile)"
+              NoDefaultExcludes="$(NoDefaultExcludes)"/>
+
     <PackTask Condition="$(UseMSBuild16_0_Pack)"
               PackItem="$(PackProjectInputFile)"
               PackageFiles="@(_PackageFiles)"
@@ -343,6 +397,8 @@
               IsTool="$(IsTool)"
               RepositoryUrl="$(RepositoryUrl)"
               RepositoryType="$(RepositoryType)"
+              RepositoryBranch="$(RepositoryBranch)"
+              RepositoryCommit="$(RepositoryCommit)"
               SourceFiles="@(_SourceFiles->Distinct())"
               NoPackageAnalysis="$(NoPackageAnalysis)"
               MinClientVersion="$(MinClientVersion)"
@@ -359,7 +415,8 @@
               NuspecProperties="$(NuspecProperties)"
               PackageLicenseFile="$(PackageLicenseFile)"
               PackageLicenseExpression="$(PackageLicenseExpression)"
-              PackageLicenseExpressionVersion="$(PackageLicenseExpressionVersion)" />
+              PackageLicenseExpressionVersion="$(PackageLicenseExpressionVersion)"
+              NoDefaultExcludes="$(NoDefaultExcludes)" />
 
     <PackTask Condition="$(UseMSBuild15_9_Pack)"
               PackItem="$(PackProjectInputFile)"
@@ -390,6 +447,8 @@
               IsTool="$(IsTool)"
               RepositoryUrl="$(RepositoryUrl)"
               RepositoryType="$(RepositoryType)"
+              RepositoryBranch="$(RepositoryBranch)"
+              RepositoryCommit="$(RepositoryCommit)"
               SourceFiles="@(_SourceFiles->Distinct())"
               NoPackageAnalysis="$(NoPackageAnalysis)"
               MinClientVersion="$(MinClientVersion)"
@@ -433,6 +492,8 @@
               IsTool="$(IsTool)"
               RepositoryUrl="$(RepositoryUrl)"
               RepositoryType="$(RepositoryType)"
+              RepositoryBranch="$(RepositoryBranch)"
+              RepositoryCommit="$(RepositoryCommit)"
               SourceFiles="@(_SourceFiles->Distinct())"
               NoPackageAnalysis="$(NoPackageAnalysis)"
               MinClientVersion="$(MinClientVersion)"
@@ -475,6 +536,8 @@
               IsTool="$(IsTool)"
               RepositoryUrl="$(RepositoryUrl)"
               RepositoryType="$(RepositoryType)"
+              RepositoryBranch="$(RepositoryBranch)"
+              RepositoryCommit="$(RepositoryCommit)"
               SourceFiles="@(_SourceFiles->Distinct())"
               NoPackageAnalysis="$(NoPackageAnalysis)"
               MinClientVersion="$(MinClientVersion)"

diff --git a/.paket/paket.exe b/.paket/paket.exe
diff --git a/build.fsx b/build.fsx
@@ -64,9 +64,13 @@ Target.create "Clean" (fun _ ->
 
 Target.create "InstallClient" (fun _ -> npm "install" ".")
 
+Target.create "Build" (fun _ ->
+    dotnet "build" "."
+    dotnet (sprintf "fable %s --sourceMaps --verbose --run webpack --mode production" clientPath) "."
+)
+
 Target.create "Bundle" (fun _ ->
     dotnet (sprintf "publish -c Release -o \"%s\"" deployDir) serverPath
-    npm "run build" "."
 )
 
 Target.create "Run" (fun _ ->
@@ -103,6 +107,7 @@ open Fake.Core.TargetOperators
 
 "Clean"
     ==> "InstallClient"
+    ==> "Build"
     ==> "Bundle"
     ==> "Docker"
 

diff --git a/castos.sln b/castos.sln
@@ -1,21 +1,19 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27004.2005
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30517.126
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Client", "src\Client\Client.fsproj", "{73E8E820-C8AA-47CC-BB2B-152CA4D0B855}"
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Server", "src\Server\Server.fsproj", "{73E8E820-C8AA-47CC-BB2B-152CA4D0B856}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Smapi", "src\Smapi\Smapi.fsproj", "{C4A9FB13-66A6-4E32-83D6-A0ED229829AA}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{DDFDB8C6-E642-427C-B9D1-70C516DFCEEF}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Smapi.Tests", "tests\Smapi.Tests\Smapi.Tests.fsproj", "{43CF6E5F-3E88-4EA3-9AED-EBCF5F041EEC}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Smapi.Tests", "tests\Smapi.Tests\Smapi.Tests.fsproj", "{43CF6E5F-3E88-4EA3-9AED-EBCF5F041EEC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3D389B64-F763-4C13-8933-330000AE22F2}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Shared", "src\Shared\Shared.fsproj", "{BA7F2A5A-FCFA-4B1F-9AF4-01416FEF6090}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Shared", "src\Shared\Shared.fsproj", "{9280A632-14B1-4CF1-AB8E-F8A186BFE30F}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Smapi", "src\Smapi\Smapi.fsproj", "{08C85EB8-CFD5-417C-B8BD-37FE44D6873C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -24,36 +22,29 @@ Global
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{73E8E820-C8AA-47CC-BB2B-152CA4D0B855}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{73E8E820-C8AA-47CC-BB2B-152CA4D0B855}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{73E8E820-C8AA-47CC-BB2B-152CA4D0B855}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{73E8E820-C8AA-47CC-BB2B-152CA4D0B855}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C4A9FB13-66A6-4E32-83D6-A0ED229829AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C4A9FB13-66A6-4E32-83D6-A0ED229829AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C4A9FB13-66A6-4E32-83D6-A0ED229829AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C4A9FB13-66A6-4E32-83D6-A0ED229829AA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{43CF6E5F-3E88-4EA3-9AED-EBCF5F041EEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{43CF6E5F-3E88-4EA3-9AED-EBCF5F041EEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{43CF6E5F-3E88-4EA3-9AED-EBCF5F041EEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{43CF6E5F-3E88-4EA3-9AED-EBCF5F041EEC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9280A632-14B1-4CF1-AB8E-F8A186BFE30F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9280A632-14B1-4CF1-AB8E-F8A186BFE30F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9280A632-14B1-4CF1-AB8E-F8A186BFE30F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9280A632-14B1-4CF1-AB8E-F8A186BFE30F}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{73E8E820-C8AA-47CC-BB2B-152CA4D0B856}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{73E8E820-C8AA-47CC-BB2B-152CA4D0B856}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{73E8E820-C8AA-47CC-BB2B-152CA4D0B856}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{73E8E820-C8AA-47CC-BB2B-152CA4D0B856}.Release|Any CPU.Build.0 = Release|Any CPU
+		{43CF6E5F-3E88-4EA3-9AED-EBCF5F041EEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43CF6E5F-3E88-4EA3-9AED-EBCF5F041EEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA7F2A5A-FCFA-4B1F-9AF4-01416FEF6090}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA7F2A5A-FCFA-4B1F-9AF4-01416FEF6090}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA7F2A5A-FCFA-4B1F-9AF4-01416FEF6090}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA7F2A5A-FCFA-4B1F-9AF4-01416FEF6090}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08C85EB8-CFD5-417C-B8BD-37FE44D6873C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08C85EB8-CFD5-417C-B8BD-37FE44D6873C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08C85EB8-CFD5-417C-B8BD-37FE44D6873C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08C85EB8-CFD5-417C-B8BD-37FE44D6873C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7A0AA30E-4CD9-4359-9513-BA68E2E85245}
-	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{43CF6E5F-3E88-4EA3-9AED-EBCF5F041EEC} = {DDFDB8C6-E642-427C-B9D1-70C516DFCEEF}
-		{9280A632-14B1-4CF1-AB8E-F8A186BFE30F} = {3D389B64-F763-4C13-8933-330000AE22F2}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {7A0AA30E-4CD9-4359-9513-BA68E2E85245}
 	EndGlobalSection
 EndGlobal
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "3.1.402"
+        "version": "6.0.101"
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,3 +17,6 @@ Castos.v3.ncrunchsolution.user @@
     .ionide
     src/Server/appsettings.json
+    *.fs.js
+    *.fs.js.map