Skip to content

Commit ecb45a0

Browse files
authored
Merge pull request #851 from fsprojects/firefox-font
Get weights for roboto mono
2 parents 27cb3f2 + 53803d9 commit ecb45a0

File tree

29 files changed

+11
-2871
lines changed

29 files changed

+11
-2871
lines changed

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4-
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
4+
<RestorePackagesWithLockFile>false</RestorePackagesWithLockFile>
55
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
66
</PropertyGroup>
77
<ItemGroup>

RELEASE_NOTES.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 19.1.1
2+
3+
* Fix code rendering on firefox. [#851](https://github.com/fsprojects/FSharp.Formatting/pull/851)
4+
15
## 19.1.0
26

37
* Only reload css file when changed. [#845](https://github.com/fsprojects/FSharp.Formatting/pull/845)

build.fsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ pipeline "CI" {
7777
run $"dotnet build {solutionFile} --configuration {configuration}"
7878
}
7979

80-
stage "NuGet" { run $"dotnet pack {solutionFile} --output {artifactsDir} --configuration {configuration}" }
80+
stage "NuGet" { run $"dotnet pack {solutionFile} --output \"{artifactsDir}\" --configuration {configuration}" }
8181

8282
stage "Tests" {
8383
run
@@ -91,10 +91,10 @@ pipeline "CI" {
9191
// Τhe tool has been uninstalled when the
9292
// artifacts folder was removed in the Clean stage.
9393
run
94-
$"dotnet tool install --no-cache --version %s{release.NugetVersion} --add-source %s{artifactsDir} --tool-path %s{artifactsDir} fsdocs-tool"
94+
$"dotnet tool install --no-cache --version %s{release.NugetVersion} --add-source \"%s{artifactsDir}\" --tool-path \"%s{artifactsDir}\" fsdocs-tool"
9595

96-
run $"{fsdocTool} build --strict --clean --properties Configuration=Release"
97-
run $"dotnet tool uninstall fsdocs-tool --tool-path %s{artifactsDir}"
96+
run $"\"{fsdocTool}\" build --strict --clean --properties Configuration=Release"
97+
run $"dotnet tool uninstall fsdocs-tool --tool-path \"%s{artifactsDir}\""
9898
run (fun _ -> Shell.cleanDir ".packages")
9999
}
100100

docs/content/fsdocs-default.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import url('https://fonts.googleapis.com/css2?family=Hind+Vadodara&family=Roboto+Mono&display=swap');
1+
@import url('https://fonts.googleapis.com/css2?family=Hind+Vadodara&family=Roboto+Mono:wght@400;500;600&display=swap');
22
/*--------------------------------------------------------------------------
33
Formatting for page & standard document content
44
/*--------------------------------------------------------------------------*/

global.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"sdk": {
3-
"version": "7.0.400",
4-
"rollForward": "minor"
3+
"version": "7.0.400"
54
}
65
}

src/FSharp.Formatting.ApiDocs/packages.lock.json

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

src/FSharp.Formatting.CSharpFormat/packages.lock.json

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

src/FSharp.Formatting.CodeFormat/packages.lock.json

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

src/FSharp.Formatting.Common/packages.lock.json

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

0 commit comments

Comments
 (0)