diff options
author | Yann Herklotz <ymherklotz@gmail.com> | 2018-08-25 18:15:47 +0100 |
---|---|---|
committer | Yann Herklotz <ymherklotz@gmail.com> | 2018-08-25 18:15:47 +0100 |
commit | a2f4f1a66d6fcb2733be143603b866f77fde5ca2 (patch) | |
tree | 21a5e7dd730a805a5263d4485fc740c3639a1c9b /FMark | |
parent | 039da048d1c8531988664732edc2f0233983907a (diff) | |
download | FMark-a2f4f1a66d6fcb2733be143603b866f77fde5ca2.tar.gz FMark-a2f4f1a66d6fcb2733be143603b866f77fde5ca2.zip |
Cleaning up repository
Diffstat (limited to 'FMark')
-rw-r--r-- | FMark/.paket/Paket.Restore.targets | 53 | ||||
-rw-r--r-- | FMark/FABLE_README.md | 87 | ||||
-rw-r--r-- | FMark/FMarkFable.sln | 17 |
3 files changed, 38 insertions, 119 deletions
diff --git a/FMark/.paket/Paket.Restore.targets b/FMark/.paket/Paket.Restore.targets index e7c1bc0..6be03ac 100644 --- a/FMark/.paket/Paket.Restore.targets +++ b/FMark/.paket/Paket.Restore.targets @@ -43,23 +43,26 @@ <!-- Step 1 Check if lockfile is properly restored --> <PropertyGroup> <PaketRestoreRequired>true</PaketRestoreRequired> - <NoWarn>$(NoWarn);NU1603</NoWarn> + <NoWarn>$(NoWarn);NU1603;NU1604;NU1605;NU1608</NoWarn> </PropertyGroup> <!-- Because ReadAllText is slow on osx/linux, try to find shasum and awk --> <PropertyGroup> - <PaketRestoreCachedHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreCachedHasher)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum $(PaketRestoreCacheFile) | /usr/bin/awk '{ print $1 }'</PaketRestoreCachedHasher> - <PaketRestoreLockFileHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreLockFileHash)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum $(PaketLockFilePath) | /usr/bin/awk '{ print $1 }'</PaketRestoreLockFileHasher> + <PaketRestoreCachedHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreCachedHasher)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum "$(PaketRestoreCacheFile)" | /usr/bin/awk '{ print $1 }'</PaketRestoreCachedHasher> + <PaketRestoreLockFileHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreLockFileHash)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum "$(PaketLockFilePath)" | /usr/bin/awk '{ print $1 }'</PaketRestoreLockFileHasher> </PropertyGroup> <!-- If shasum and awk exist get the hashes --> <Exec StandardOutputImportance="Low" Condition=" '$(PaketRestoreCachedHasher)' != '' " Command="$(PaketRestoreCachedHasher)" ConsoleToMSBuild='true'> - <Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreCachedHash" /> + <Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreCachedHash" /> </Exec> <Exec StandardOutputImportance="Low" Condition=" '$(PaketRestoreLockFileHasher)' != '' " Command="$(PaketRestoreLockFileHasher)" ConsoleToMSBuild='true'> - <Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreLockFileHash" /> + <Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreLockFileHash" /> </Exec> + <!-- Debug whats going on --> + <Message Importance="low" Text="calling paket restore with targetframework=$(TargetFramework) targetframeworks=$(TargetFrameworks)" /> + <PropertyGroup Condition="Exists('$(PaketRestoreCacheFile)') "> <!-- if no hash has been done yet fall back to just reading in the files and comparing them --> <PaketRestoreCachedHash Condition=" '$(PaketRestoreCachedHash)' == '' ">$([System.IO.File]::ReadAllText('$(PaketRestoreCacheFile)'))</PaketRestoreCachedHash> @@ -69,11 +72,22 @@ <PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '' ">true</PaketRestoreRequired> </PropertyGroup> + <PropertyGroup Condition="'$(PaketPropsVersion)' != '5.174.2' "> + <PaketRestoreRequired>true</PaketRestoreRequired> + </PropertyGroup> + <!-- Do a global restore if required --> <Exec Command='$(PaketBootStrapperCommand)' Condition="Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" /> <Exec Command='$(PaketCommand) restore' Condition=" '$(PaketRestoreRequired)' == 'true' " ContinueOnError="false" /> <!-- Step 2 Detect project specific changes --> + <ItemGroup> + <MyTargetFrameworks Condition="'$(TargetFramework)' != '' " Include="$(TargetFramework)"></MyTargetFrameworks> + <!-- Don't include all frameworks when msbuild explicitly asks for a single one --> + <MyTargetFrameworks Condition="'$(TargetFrameworks)' != '' AND '$(TargetFramework)' == '' " Include="$(TargetFrameworks)"></MyTargetFrameworks> + <PaketResolvedFilePaths Include="@(MyTargetFrameworks -> '$(MSBuildProjectDirectory)\obj\$(MSBuildProjectFile).%(Identity).paket.resolved')"></PaketResolvedFilePaths> + </ItemGroup> + <Message Importance="low" Text="MyTargetFrameworks=@(MyTargetFrameworks) PaketResolvedFilePaths=@(PaketResolvedFilePaths)" /> <PropertyGroup> <PaketReferencesCachedFilePath>$(MSBuildProjectDirectory)\obj\$(MSBuildProjectFile).paket.references.cached</PaketReferencesCachedFilePath> <!-- MyProject.fsproj.paket.references has the highest precedence --> @@ -82,7 +96,9 @@ <PaketOriginalReferencesFilePath Condition=" !Exists('$(PaketOriginalReferencesFilePath)')">$(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references</PaketOriginalReferencesFilePath> <!-- paket.references --> <PaketOriginalReferencesFilePath Condition=" !Exists('$(PaketOriginalReferencesFilePath)')">$(MSBuildProjectDirectory)\paket.references</PaketOriginalReferencesFilePath> - <PaketResolvedFilePath>$(MSBuildProjectDirectory)\obj\$(MSBuildProjectFile).$(TargetFramework).paket.resolved</PaketResolvedFilePath> + + <DoAllResolvedFilesExist>false</DoAllResolvedFilesExist> + <DoAllResolvedFilesExist Condition="Exists(%(PaketResolvedFilePaths.Identity))">true</DoAllResolvedFilesExist> <PaketRestoreRequired>true</PaketRestoreRequired> <PaketRestoreRequiredReason>references-file-or-cache-not-found</PaketRestoreRequiredReason> </PropertyGroup> @@ -101,24 +117,29 @@ </PropertyGroup> <!-- Step 2 b detect relevant changes in project file (new targetframework) --> - <PropertyGroup Condition=" !Exists('$(PaketResolvedFilePath)') AND '$(TargetFramework)' != '' "> + <PropertyGroup Condition=" '$(DoAllResolvedFilesExist)' != 'true' "> <PaketRestoreRequired>true</PaketRestoreRequired> - <PaketRestoreRequiredReason>target-framework '$(TargetFramework)'</PaketRestoreRequiredReason> + <PaketRestoreRequiredReason>target-framework '$(TargetFramework)' or '$(TargetFrameworks)' files @(PaketResolvedFilePaths)</PaketRestoreRequiredReason> </PropertyGroup> <!-- Step 3 Restore project specific stuff if required --> <Message Condition=" '$(PaketRestoreRequired)' == 'true' " Importance="low" Text="Detected a change ('$(PaketRestoreRequiredReason)') in the project file '$(MSBuildProjectFullPath)', calling paket restore" /> - <Exec Command='$(PaketCommand) restore --project "$(MSBuildProjectFullPath)"' Condition=" '$(PaketRestoreRequired)' == 'true' " ContinueOnError="false" /> + <Exec Command='$(PaketCommand) restore --project "$(MSBuildProjectFullPath)" --target-framework "$(TargetFrameworks)"' Condition=" '$(PaketRestoreRequired)' == 'true' AND '$(TargetFramework)' == '' " ContinueOnError="false" /> + <Exec Command='$(PaketCommand) restore --project "$(MSBuildProjectFullPath)" --target-framework "$(TargetFramework)"' Condition=" '$(PaketRestoreRequired)' == 'true' AND '$(TargetFramework)' != '' " ContinueOnError="false" /> <!-- This shouldn't actually happen, but just to be sure. --> - <Error Condition=" !Exists('$(PaketResolvedFilePath)') AND '$(TargetFramework)' != '' AND '$(ResolveNuGetPackages)' != 'False' " Text="Paket file '$(PaketResolvedFilePath)' is missing while restoring $(MSBuildProjectFile). Please delete 'paket-files/paket.restore.cached' and call 'paket restore'." /> + <PropertyGroup> + <DoAllResolvedFilesExist>false</DoAllResolvedFilesExist> + <DoAllResolvedFilesExist Condition="Exists(%(PaketResolvedFilePaths.Identity))">true</DoAllResolvedFilesExist> + </PropertyGroup> + <Error Condition=" '$(DoAllResolvedFilesExist)' != 'true' AND '$(ResolveNuGetPackages)' != 'False' " Text="One Paket file '@(PaketResolvedFilePaths)' is missing while restoring $(MSBuildProjectFile). Please delete 'paket-files/paket.restore.cached' and call 'paket restore'." /> <!-- Step 4 forward all msbuild properties (PackageReference, DotNetCliToolReference) to msbuild --> - <ReadLinesFromFile Condition="Exists('$(PaketResolvedFilePath)')" File="$(PaketResolvedFilePath)" > + <ReadLinesFromFile Condition="($(DesignTimeBuild) != true OR '$(PaketPropsLoaded)' != 'true') AND '@(PaketResolvedFilePaths)' != ''" File="%(PaketResolvedFilePaths.Identity)" > <Output TaskParameter="Lines" ItemName="PaketReferencesFileLines"/> </ReadLinesFromFile> - <ItemGroup Condition=" Exists('$(PaketResolvedFilePath)') AND '@(PaketReferencesFileLines)' != '' " > + <ItemGroup Condition="($(DesignTimeBuild) != true OR '$(PaketPropsLoaded)' != 'true') AND '@(PaketReferencesFileLines)' != '' " > <PaketReferencesFileLinesInfo Include="@(PaketReferencesFileLines)" > <PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName> <PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion> @@ -126,7 +147,9 @@ </PaketReferencesFileLinesInfo> <PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)"> <Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version> - <PrivateAssets Condition="%(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'true'">All</PrivateAssets> + <PrivateAssets Condition=" ('%(PaketReferencesFileLinesInfo.AllPrivateAssets)' == 'true') Or ('$(PackAsTool)' == 'true') ">All</PrivateAssets> + <ExcludeAssets Condition="%(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets> + <Publish Condition=" '$(PackAsTool)' == 'true' ">true</Publish> </PackageReference> </ItemGroup> @@ -183,8 +206,8 @@ <ConvertToAbsolutePath Condition="@(_NuspecFiles) != ''" Paths="@(_NuspecFiles)"> <Output TaskParameter="AbsolutePaths" PropertyName="NuspecFileAbsolutePath" /> - </ConvertToAbsolutePath> - + </ConvertToAbsolutePath> + <!-- Call Pack --> <PackTask Condition="$(UseNewPack)" diff --git a/FMark/FABLE_README.md b/FMark/FABLE_README.md deleted file mode 100644 index 08f8b5d..0000000 --- a/FMark/FABLE_README.md +++ /dev/null @@ -1,87 +0,0 @@ -# Fable Simple Template - -This template can be used to generate a simple web app with [Fable](http://fable.io/). -You can find more templates by searching `Fable.Template` packages in [Nuget](https://www.nuget.org). - -## Requirements - -* [dotnet SDK](https://www.microsoft.com/net/download/core) 2.0 or higher -* [node.js](https://nodejs.org) 6.11 or higher -* A JS package manager: [yarn](https://yarnpkg.com) or [npm](http://npmjs.com/) - -> npm comes bundled with node.js, but we recommend to use at least npm 5. If you have npm installed, you can upgrade it by running `npm install -g npm`. - -Although is not a Fable requirement, on macOS and Linux you'll need [Mono](http://www.mono-project.com/) for other F# tooling like Paket or editor support. - -## Editor - -The project can be used by editors compatible with the new .fsproj format, like VS Code + [Ionide](http://ionide.io/), Emacs with [fsharp-mode](https://github.com/fsharp/emacs-fsharp-mode) or [Rider](https://www.jetbrains.com/rider/). **Visual Studio for Mac** is also compatible but in the current version the package auto-restore function conflicts with Paket so you need to disable it: `Preferences > Nuget > General`. - -## Installing the template - -In a terminal, run `dotnet new -i Fable.Template` to install or update the template to the latest version. - -## Creating a new project with the template - -In a terminal, run `dotnet new fable` to create a project in the current directory. Type `dotnet new fable -n MyApp` instead to create a subfolder named `MyApp` and put the new project there. - -> The project will have the name of the directory. You may get some issues if the directory name contains some special characters like hyphens - -## Building and running the app - -> In the commands below, yarn is the tool of choice. If you want to use npm, just replace `yarn` by `npm` in the commands. - -* Install JS dependencies: `yarn install` -* **Move to `src` folder**: `cd src` -* Install F# dependencies: `dotnet restore` -* Start Fable daemon and [Webpack](https://webpack.js.org/) dev server: `dotnet fable yarn-start` -* In your browser, open: http://localhost:8080/ - -> `dotnet fable yarn-start` (or `npm-start`) is used to start the Fable daemon and run a script in package.json concurrently. It's a shortcut of `yarn-run [SCRIPT_NAME]`, e.g. `dotnet fable yarn-run start`. - -If you are using VS Code + [Ionide](http://ionide.io/), you can also use the key combination: Ctrl+Shift+B (Cmd+Shift+B on macOS) instead of typing the `dotnet fable yarn-start` command. This also has the advantage that Fable-specific errors will be highlighted in the editor along with other F# errors. - -Any modification you do to the F# code will be reflected in the web page after saving. When you want to output the JS code to disk, run `dotnet fable yarn-build` and you'll get a minified JS bundle in the `public` folder. - -## JS Output - -This template uses [babel-preset-env](http://babeljs.io/env) to output JS code whose syntax is compatible with a wide range of browsers. Currently it's set to support browsers with at least 1% of market share. To change this (for example, if you don't need to support IE), [replace this line](https://github.com/fable-compiler/fable-templates/blob/7b9352cdaeb77ecd600b45ed4eab2f41c73b85e4/simple/Content/webpack.config.js#L13) with a query understood by [browserl.ist](http://browserl.ist/?q=%3E+1%25). - -To replace objects and APIs that may be missing in old browsers, the `index.html` file [submits a request](https://github.com/fable-compiler/fable-templates/blob/7b9352cdaeb77ecd600b45ed4eab2f41c73b85e4/simple/Content/public/index.html#L8) to [cdn.polyfill.io](https://polyfill.io/v2/docs/) that tailors the polyfill according to the user's browser. - -## Project structure - -### Paket - -[Paket](https://fsprojects.github.io/Paket/) is the package manager used for F# dependencies. It doesn't need a global installation, the binary is included in the `.paket` folder. Other Paket related files are: - -- **paket.dependencies**: contains all the dependencies in the repository. -- **paket.references**: there should be one such a file next to each `.fsproj` file. -- **paket.lock**: automatically generated, but should be committed to source control, [see why](https://fsprojects.github.io/Paket/faq.html#Why-should-I-commit-the-lock-file). -- **Nuget.Config**: prevents conflicts with Paket in machines with some Nuget configuration. - -> Paket dependencies will be installed in the `packages` directory. See [Paket website](https://fsprojects.github.io/Paket/) for more info. - -### yarn/npm - -- **package.json**: contains the JS dependencies together with other info, like development scripts. -- **yarn.lock**: is the lock file created by yarn. -- **package-lock.json**: is the lock file understood by npm 5, if you use it instead of yarn. - -> JS dependencies will be installed in `node_modules`. See [yarn](https://yarnpkg.com) and/or [npm](http://npmjs.com/) websites for more info. - -### Webpack - -[Webpack](https://webpack.js.org) is a bundler, which links different JS sources into a single file making deployment much easier. It also offers other features, like a static dev server that can automatically refresh the browser upon changes in your code or a minifier for production release. Fable interacts with Webpack through the `fable-loader`. - -- **webpack.config.js**: is the configuration file for Webpack. It allows you to set many things: like the path of the bundle, the port for the development server or [Babel](https://babeljs.io/) options. See [Webpack website](https://webpack.js.org) for more info. - -> Make sure to resolve all the paths [as well as Babel options](https://github.com/fable-compiler/fable-templates/blob/7b9352cdaeb77ecd600b45ed4eab2f41c73b85e4/simple/Content/webpack.config.js#L9) to make sure all the files referenced by Fable will be found by Babel/Webpack. - -### F# source files - -The template only contains two F# source files: the project (.fsproj) and a source file (.fs) in `src` folder. - -## Where to go from here - -Check more [Fable samples](https://github.com/fable-compiler/samples-browser), use another template like `Fable.Template.Elmish.React` or `SAFE.Template`, and check the [awesome-fable](https://github.com/kunjee17/awesome-fable#-awesome-fable) for a curated list of resources provided by the community.
\ No newline at end of file diff --git a/FMark/FMarkFable.sln b/FMark/FMarkFable.sln deleted file mode 100644 index d3c26b1..0000000 --- a/FMark/FMarkFable.sln +++ /dev/null @@ -1,17 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "FMarkFable", "src/FMarkFable/FMarkFable.fsproj", "{E5DEFC96-37CF-4844-9C9E-CFA0A9A8AED3}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E5DEFC96-37CF-4844-9C9E-CFA0A9A8AED3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5DEFC96-37CF-4844-9C9E-CFA0A9A8AED3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5DEFC96-37CF-4844-9C9E-CFA0A9A8AED3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5DEFC96-37CF-4844-9C9E-CFA0A9A8AED3}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection -EndGlobal |