Skip to content

Commit

Permalink
Fixing devcontainer issues
Browse files Browse the repository at this point in the history
  • Loading branch information
TheAngryByrd committed Oct 18, 2022
1 parent a2dc7cc commit ed43d87
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 10 deletions.
8 changes: 3 additions & 5 deletions .devcontainer/install-dotnets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,19 @@
# downloads installer script https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-install-script
curl -SL --output dotnet-install.sh https://dot.net/v1/dotnet-install.sh


# Attempt to install via global.json first
FILE=global.json
if test -f "$FILE"; then
echo "installing dotnet via $FILE"
/bin/bash dotnet-install.sh --verbose --jsonfile $FILE
fi


# Add additional versions if required
DOTNET_VERSIONS=(
# 'latest'
# '5.0.100'
'5.0.408'
)
for version in ${DOTNET_VERSIONS[@]}; do
echo "installing dotnet $version"
/bin/bash dotnet-install.sh --verbose --version $version
echo "installing dotnet $version"
/bin/bash dotnet-install.sh --verbose --version $version
done
1 change: 1 addition & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ insert_final_newline = true
indent_style = space
indent_size = 4
trim_trailing_whitespace = true
end_of_line = lf

[*.{fs,fsi,fsx,config}]
# https://fsprojects.github.io/fantomas/docs/end-users/Configuration.html
Expand Down
27 changes: 27 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Auto detect text files
* text=auto

# Custom for Visual Studio
*.cs diff=csharp text=auto eol=lf
*.vb diff=csharp text=auto eol=lf
*.fs diff=csharp text=auto eol=lf
*.fsi diff=csharp text=auto eol=lf
*.fsx diff=csharp text=auto eol=lf
*.sln text eol=crlf merge=union
*.csproj merge=union
*.vbproj merge=union
*.fsproj merge=union
*.dbproj merge=union
*.sh text eol=lf

# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"editor.inlayHints.enabled": "off",
"FSharp.enableAdaptiveLspServer": true
"FSharp.enableAdaptiveLspServer": true,
"FSharp.enableMSBuildProjectGraph": true
}
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "6.0.100",
"version": "6.0.401",
"rollForward": "minor"
}
}
7 changes: 4 additions & 3 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,17 @@
<PackageLicenseFile>License</PackageLicenseFile>
</PropertyGroup>
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)../README.md" Pack="true" PackagePath="/"/>
<None Include="$(MSBuildThisFileDirectory)../README.md" Pack="true" PackagePath="/"/>
<None Include="$(MSBuildThisFileDirectory)..\License" Pack="true" PackagePath=""/>
</ItemGroup>

<PropertyGroup>
<DisableCheckingDuplicateNuGetItems>true</DisableCheckingDuplicateNuGetItems>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<IsPackable>true</IsPackable>
<IsTestProject>false</IsTestProject>
<PackageReadmeFile>README.md</PackageReadmeFile> <!--https://docs.microsoft.com/en-gb/nuget/reference/msbuild-targets#packagereadmefile -->

<NoWarn>$(NoWarn);NU1504;NU1505;NU1701</NoWarn>
<!-- Sourcelink -->
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
Expand All @@ -27,4 +28,4 @@
<WarningsAsErrors />
<NoWarn>FS2003</NoWarn>
</PropertyGroup>
</Project>
</Project>

0 comments on commit ed43d87

Please sign in to comment.