Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev experiments branch #430

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions CHANGE_LOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Unreleased

# 2023-12

## dotnet SDK and CI Infrastructure updates

* cleanup: delete xunit test output from the repository
* adjust all tests to be under FSharp.Data.SqlClient.Tests namespace, removing all the conditional about "legacy namespace" support in context of tests.
* adjust .sln to have few more useful stuff in the solution explorer
* few launch settings to make it possible to launch in debug vscode
* appveyor, what breaks if I switch this?
* try VS2022 appveyor image
* net start mssql 2019 in appveyor
* pick msbuild from vs2022 or vs2019 and remove older ones (vs2017 and msbuild15.0)
24 changes: 24 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<Project>
<PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.fsproj'">
<!--
note: tolerate obsolete calls
-->
<WarningsNotAsErrors>$(WarningsNotAsErrors);44;</WarningsNotAsErrors>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<Deterministic>true</Deterministic>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<!--
note: preclude few nuget warnings of breaking the build
NU1504: Duplicate 'PackageReference' items found. Remove the duplicate items or use the Update functionality to ensure a consistent restore behavior. The duplicate 'PackageReference' items are: xxx 4.5.1, xxx 4.8.2.
NU1701: Package 'xxx 14.0.1016.290' was restored using 'yyy' instead of the project target framework 'zzz'. This package may not be fully compatible with your project.
NU1903: Package 'xxx' 2.0.0 has a known moderate severity vulnerability, https://github.com/advisories/xxx
NU1903: Package 'xxx' 2.0.0 has a known high severity vulnerability, https://github.com/advisories/xxx
NU1904: Package 'xxx' 5.0.0 has a known critical severity vulnerability, https://github.com/advisories/xxx
-->
<WarningsNotAsErrors>$(WarningsNotAsErrors);NU1504;NU1701;NU1902;NU1903;NU1904</WarningsNotAsErrors>
</PropertyGroup>
</Project>
8 changes: 5 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
init:
- git config --global core.autocrlf input
image: Visual Studio 2017
- net start MSSQL$SQL2019
image: Visual Studio 2022
#before_build:
# switch on dotnet 8 on appveyor: https://github.com/appveyor/ci/issues/3897#issuecomment-1827682384
#- choco install dotnet-sdk --version 8.0.100
build_script:
- cmd: build.cmd GenerateDocs
test: off
version: 0.0.1.{build}
artifacts:
- path: bin
name: bin
services:
- mssql2014
9 changes: 4 additions & 5 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,14 @@ let runMsBuild project =
(fun args ->
let toolPath =
[
@"C:\Program Files\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin"
@"C:\Program Files\Microsoft Visual Studio\2022\Preview\MSBuild\current\Bin"
@"C:\Program Files\Microsoft Visual Studio\2022\Professional\MSBuild\current\Bin"
@"C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\current\Bin"
@"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin"
@"C:\Program Files (x86)\Microsoft Visual Studio\2019\Preview\MSBuild\current\Bin"
@"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\MSBuild\current\Bin"
@"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\current\Bin"
@"C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin"
@"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin"
@"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin"
@"C:\Program Files (x86)\MSBuild\15.0\Bin"
@"\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin"
args.ToolPath
]
|> List.map (fun p -> Path.Combine(p, "MSBuild.exe"))
Expand Down
8 changes: 7 additions & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
{ "sdk": { "version": "2.1.402" } }
{
"sdk":
{
"version": "7.0.100"
, "rollForward": "latestFeature"
}
}
3 changes: 2 additions & 1 deletion src/SqlClient.TestProjects/Lib/Lib.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
<Content Include="App.config" />
</ItemGroup>
<ItemGroup>
<Reference Include="netstandard" />
<!-- TODO: investigate why netstandard assembly was put here, or if it is the thing breaking appveyor for #430 -->
<!--<Reference Include="netstandard" />-->
<Reference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="FSharp.Data.SqlClient">
<HintPath>..\..\..\bin\netstandard2.0\FSharp.Data.SqlClient.dll</HintPath>
</Reference>
Expand Down
Loading