Skip to content

Merge master to dev16.1 #6262

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.

Sign up for GitHub

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

Merged
14 commits merged into from
Feb 25, 2019
Merged

Merge master to dev16.1 #6262

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ec04e47
Additional comments and testing related to SRTP resolution (#3967)
dsyme Feb 20, 2019
a26d32a
Suggested namespace rename (#6248)
dsyme Feb 20, 2019
2cb27a9
Fixed minor typo in FSComp.txt
ncave Feb 20, 2019
ee70a43
Fix help text test for FSI (#6254)
dsyme Feb 20, 2019
9dfec82
Update Xlf
KevinRansom Feb 20, 2019
138f2b0
Update DEVGUIDE to mention net472 (#6242)
cartermp Feb 20, 2019
cd2b304
Merge pull request #6261 from KevinRansom/ncave-master
KevinRansom Feb 21, 2019
78c7b17
reformat some huge lines (#6249)
dsyme Feb 21, 2019
b0292b8
Anonymous record support for expressions in FCS (#6257)
dsyme Feb 21, 2019
bead034
Tests for coreclr (#6151)
KevinRansom Feb 21, 2019
2b43500
Make vsideunittests work on Dev16.0 (#6270)
KevinRansom Feb 22, 2019
6346800
Avoid multiple dotnet cli downloads (#6272)
KevinRansom Feb 22, 2019
2c8497b
Remove System.Data.SqlClient (#6274)
KevinRansom Feb 22, 2019
8a3cc20
Merge remote-tracking branch 'upstream/master' into merges/master-to-…
brettfo Feb 25, 2019
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
Prev Previous commit
Next Next commit
Remove System.Data.SqlClient (#6274) 
* Lets see what breaks without sql client

* Remove more
  • Loading branch information
@KevinRansom
KevinRansom authored Feb 22, 2019
commit 2c8497bb097d5c5d3ef12f355594873838a48494
1 change: 0 additions & 1 deletion build/targets/PackageVersions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
<SystemSecurityClaimsPackageVersion>4.3.0</SystemSecurityClaimsPackageVersion>
<SystemSecurityCryptographyAlgorithmsPackageVersion>4.3.0</SystemSecurityCryptographyAlgorithmsPackageVersion>
<SystemSecurityPrincipalPackageVersion>4.3.0</SystemSecurityPrincipalPackageVersion>
<SystemDataSqlClientPackageVersion>4.3.0</SystemDataSqlClientPackageVersion>
<SystemThreadingTasksParallelPackageVersion>4.3.0</SystemThreadingTasksParallelPackageVersion>
<SystemThreadingThreadPackageVersion>4.3.0</SystemThreadingThreadPackageVersion>
<SystemThreadingThreadPoolPackageVersion>4.3.0</SystemThreadingThreadPoolPackageVersion>
Expand Down
1 change: 0 additions & 1 deletion fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,6 @@
<PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.Data.SqlClient" Version="4.3.0" />
<PackageReference Include="System.Diagnostics.Process" Version="4.1.0" />
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.0.0" />
<PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
Expand Down
1 change: 0 additions & 1 deletion src/buildfromsource/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,6 @@

<ItemGroup>
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutablePackageVersion)" />
<PackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientPackageVersion)" />
<PackageReference Include="System.Diagnostics.Process" Version="$(SystemDiagnosticsProcessPackageVersion)" />
<PackageReference Include="System.Diagnostics.TraceSource" Version="$(SystemDiagnosticsTraceSourcePackageVersion)" />
<PackageReference Include="System.Linq.Expressions" Version="$(SystemLinqExpressionsPackageVersion)" />
Expand Down
3 changes: 1 addition & 2 deletions src/fsharp/CompileOps.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1854,8 +1854,7 @@ let DefaultReferencesForScriptsAndOutOfProjectSources(assumeDotNetFramework) =
yield Path.Combine(Path.GetDirectoryName(typeof<System.Object>.Assembly.Location), "mscorlib.dll") // mscorlib
yield typeof<System.Console>.Assembly.Location // System.Console
yield typeof<System.Collections.BitArray>.Assembly.Location // System.Collections
yield typeof<System.Data.SqlClient.SqlCommand>.Assembly.Location // System.Data.SqlClient
yield typeof<System.ComponentModel.PropertyChangedEventArgs>.Assembly.Location // System.ObjectModel
yield typeof<System.ComponentModel.PropertyChangedEventArgs>.Assembly.Location // System.ObjectModel
yield typeof<System.IO.File>.Assembly.Location // System.IO.FileSystem
yield typeof<System.IO.TextWriter>.Assembly.Location // System.IO
yield typeof<System.Linq.Enumerable>.Assembly.Location // System.Linq
Expand Down
1 change: 0 additions & 1 deletion src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,6 @@

<ItemGroup>
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutablePackageVersion)" />
<PackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientPackageVersion)" />
<PackageReference Include="System.Diagnostics.Process" Version="$(SystemDiagnosticsProcessPackageVersion)" />
<PackageReference Include="System.Diagnostics.TraceSource" Version="$(SystemDiagnosticsTraceSourcePackageVersion)" />
<PackageReference Include="System.Linq.Expressions" Version="$(SystemLinqExpressionsPackageVersion)" />
Expand Down