Skip to content

Additional rebased commits on top of the january merge #926

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

Merged
merged 185 commits into from
Feb 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
185 commits
Select commit Hold shift + click to select a range
235d102
Merge pull request #7759 from dotnet/merges/master-to-release/dev16.5
brettfo Oct 22, 2019
287f485
Merge pull request #7758 from dotnet/merges/release/dev16.4-to-releas…
brettfo Oct 22, 2019
ad81c6d
update version numbers for vs 16.5 (#7763)
brettfo Oct 22, 2019
70e6f65
insert dev16.5 builds into vs master
brettfo Oct 28, 2019
3428102
Merge pull request #7778 from dotnet/dev16.5-insertion
KevinRansom Oct 30, 2019
8aca5a3
Merge branch 'release/dev16.5' into merges/release/dev16.4-to-release…
brettfo Oct 30, 2019
f73d290
Merge pull request #7771 from dotnet/merges/release/dev16.4-to-releas…
KevinRansom Oct 31, 2019
8e7bc4f
Merge pull request #7786 from dotnet/merges/master-to-release/dev16.5
KevinRansom Oct 31, 2019
e448805
Merge pull request #7799 from dotnet/merges/master-to-release/dev16.5
KevinRansom Nov 2, 2019
ac3e0d7
Merge branch 'release/dev16.5' into merges/release/dev16.4-to-release…
KevinRansom Nov 6, 2019
c2b6d59
Merge pull request #7819 from dotnet/merges/master-to-release/dev16.5
KevinRansom Nov 6, 2019
9125f75
Merge pull request #7814 from dotnet/merges/release/dev16.4-to-releas…
brettfo Nov 8, 2019
b71a1b0
Merge pull request #7822 from dotnet/merges/master-to-release/dev16.5
brettfo Nov 8, 2019
603ff33
Merge pull request #7833 from dotnet/merges/master-to-release/dev16.5
brettfo Nov 8, 2019
bbb45d1
Merge pull request #7836 from dotnet/merges/master-to-release/dev16.5
brettfo Nov 12, 2019
7053e66
Merge pull request #7848 from dotnet/merges/master-to-release/dev16.5
brettfo Nov 14, 2019
e7cf4c6
Merge pull request #7863 from dotnet/merges/master-to-release/dev16.5
brettfo Nov 15, 2019
aaf5e01
Merge pull request #7870 from dotnet/merges/master-to-release/dev16.5
KevinRansom Nov 25, 2019
cb08595
Merge pull request #7903 from dotnet/merges/master-to-release/dev16.5
brettfo Nov 26, 2019
407911e
Merge pull request #7910 from dotnet/merges/master-to-release/dev16.5
brettfo Dec 2, 2019
8e92cca
Merge pull request #7921 from dotnet/merges/master-to-release/dev16.5
KevinRansom Dec 3, 2019
4936143
Merge pull request #7927 from dotnet/merges/master-to-release/dev16.5
KevinRansom Dec 4, 2019
8cb7d15
Update dependencies from https://github.com/dotnet/arcade build 20191…
dotnet-maestro[bot] Dec 6, 2019
32b1249
Update to 3.1.100 rtm sdk (#7942)
mmitche Dec 9, 2019
94da88c
add internal package feed (#7949)
brettfo Dec 10, 2019
ade8d01
Merge branch 'release/dev16.5' into merges/master-to-release/dev16.5
brettfo Dec 10, 2019
695d772
Merge pull request #7938 from dotnet/merges/master-to-release/dev16.5
brettfo Dec 11, 2019
3154523
Merge remote-tracking branch 'upstream/release/dev16.5' into merges/r…
brettfo Dec 11, 2019
ce6e593
Merge pull request #7928 from dotnet/merges/release/dev16.5-to-releas…
brettfo Dec 12, 2019
eea11ac
Merge branch 'release/dev16.5' into merges/master-to-release/dev16.5
brettfo Dec 12, 2019
8bef78e
Merge branch 'release/fsharp5' into merges/master-to-release/fsharp5
brettfo Dec 12, 2019
736d420
Merge pull request #7956 from dotnet/merges/master-to-release/fsharp5
brettfo Dec 12, 2019
8572870
Merge pull request #7955 from dotnet/merges/master-to-release/dev16.5
brettfo Dec 12, 2019
ccf22bf
Improve package reference diags (#7909)
KevinRansom Dec 15, 2019
940d1a2
Merge branch 'release/dev16.5' into merges/master-to-release/dev16.5
KevinRansom Dec 16, 2019
ffce8c2
Merge branch 'release/fsharp5' into merges/master-to-release/fsharp5
KevinRansom Dec 16, 2019
e85fb14
Merge pull request #7981 from dotnet/merges/master-to-release/fsharp5
KevinRansom Dec 16, 2019
71ee93c
Merge pull request #7975 from dotnet/merges/master-to-release/dev16.5
KevinRansom Dec 16, 2019
dd9a06a
Merge pull request #7987 from dotnet/merges/master-to-release/fsharp5
KevinRansom Dec 16, 2019
f4031f9
Merge pull request #7996 from dotnet/merges/master-to-release/fsharp5
KevinRansom Dec 17, 2019
9c2cd6e
Merge branch 'release/fsharp5' into merges/release/dev16.5-to-release…
KevinRansom Dec 17, 2019
de637a9
Merge pull request #7985 from dotnet/merges/master-to-release/dev16.5
KevinRansom Dec 17, 2019
8dd2426
Merge pull request #7995 from dotnet/merges/release/dev16.5-to-releas…
KevinRansom Dec 17, 2019
9f9e8fd
Merge pull request #8001 from dotnet/merges/release/dev16.5-to-releas…
KevinRansom Dec 18, 2019
b40c15c
Merge pull request #8009 from dotnet/merges/master-to-release/fsharp5
KevinRansom Dec 18, 2019
5c869dd
merge
KevinRansom Dec 28, 2019
a9ab2f0
Merge pull request #8046 from dotnet/merges/master-to-release/dev16.5
KevinRansom Dec 28, 2019
4224b30
Merge pull request #8049 from dotnet/merges/master-to-release/dev16.5
KevinRansom Dec 30, 2019
5771279
Merge pull request #8061 from dotnet/merges/master-to-release/dev16.5
KevinRansom Jan 1, 2020
1ce0850
merge
KevinRansom Jan 1, 2020
a2eea30
remove dupe
KevinRansom Jan 1, 2020
ad45a0a
merge
KevinRansom Jan 1, 2020
bd4a21b
Merge pull request #8056 from dotnet/merges/master-to-release/fsharp5
KevinRansom Jan 1, 2020
428b764
Merge branch 'release/fsharp5' into merges/release/dev16.5-to-release…
KevinRansom Jan 1, 2020
994efa8
Merge pull request #8055 from dotnet/merges/release/dev16.5-to-releas…
KevinRansom Jan 1, 2020
6822bcb
Merge pull request #8065 from dotnet/merges/master-to-release/dev16.5
KevinRansom Jan 2, 2020
2d0d39b
Merge pull request #8070 from dotnet/merges/master-to-release/fsharp5
KevinRansom Jan 2, 2020
3df0d73
Merge branch 'release/fsharp5' into merges/release/dev16.5-to-release…
brettfo Jan 2, 2020
e7eb143
Update dependencies from https://github.com/dotnet/arcade build 20200…
dotnet-maestro[bot] Jan 2, 2020
e89e35f
Merge pull request #8078 from dotnet/darc-release/fsharp5-e8af463f-3a…
brettfo Jan 2, 2020
33d1206
Merge remote-tracking branch 'upstream/master' into merges/master-to-…
brettfo Jan 3, 2020
0c4f8e6
Merge pull request #8076 from dotnet/merges/release/dev16.5-to-releas…
brettfo Jan 3, 2020
db2c2f1
Merge pull request #8080 from dotnet/merges/master-to-release/fsharp5
brettfo Jan 3, 2020
faaedc4
Merge branch 'release/dev16.5' into merges/master-to-release/dev16.5
brettfo Jan 3, 2020
f7578df
Merge pull request #8082 from dotnet/merges/master-to-release/dev16.5
brettfo Jan 3, 2020
49134eb
Merge remote-tracking branch 'upstream/release/dev16.5' into merges/r…
brettfo Jan 4, 2020
d6a30ba
Merge pull request #8088 from dotnet/merges/master-to-release/fsharp5
brettfo Jan 4, 2020
7ceacaa
Merge pull request #8087 from dotnet/merges/release/dev16.5-to-releas…
brettfo Jan 4, 2020
50c6465
Merge pull request #8086 from dotnet/merges/master-to-release/dev16.5
brettfo Jan 4, 2020
032b109
Update dependencies from https://github.com/dotnet/arcade build 20200…
dotnet-maestro[bot] Jan 4, 2020
97c87d7
Merge branch 'release/fsharp5' into merges/release/dev16.5-to-release…
KevinRansom Jan 5, 2020
92ea808
Merge pull request #8090 from dotnet/darc-release/fsharp5-b2907839-de…
KevinRansom Jan 5, 2020
eafb6a1
Update dependencies from https://github.com/dotnet/arcade build 20200…
dotnet-maestro[bot] Jan 5, 2020
8f5253a
Merge pull request #8089 from dotnet/merges/release/dev16.5-to-releas…
KevinRansom Jan 5, 2020
6b696a7
Merge pull request #8097 from dotnet/darc-release/fsharp5-296049fe-58…
KevinRansom Jan 5, 2020
111fae7
Update dependencies from https://github.com/dotnet/arcade build 20200…
dotnet-maestro[bot] Jan 6, 2020
a78da06
Update dependencies from https://github.com/dotnet/arcade build 20200…
dotnet-maestro[bot] Jan 7, 2020
60ba57a
Merge branch 'release/fsharp5' into feature/Float32WithoutDot
KevinRansom Jan 7, 2020
0534b65
Merge pull request #7839 from gdziadkiewicz/feature/Float32WithoutDot
KevinRansom Jan 7, 2020
d04e2a0
Merge pull request #8111 from dotnet/darc-release/fsharp5-9c7f5c0f-0f…
KevinRansom Jan 7, 2020
19c5773
Allow --langversion:preview to disable ExperimentalAttribut warning. …
KevinRansom Jan 8, 2020
74f453b
Update dependencies from https://github.com/dotnet/arcade build 20200…
dotnet-maestro[bot] Jan 8, 2020
7c5530e
merge
KevinRansom Jan 8, 2020
9fd8fc7
Fix merge errors
KevinRansom Jan 8, 2020
6f3bae2
Merge pull request #8124 from dotnet/merges/master-to-release/fsharp5
KevinRansom Jan 9, 2020
0312a46
Merge pull request #8130 from dotnet/darc-release/fsharp5-8f657d4f-4b…
KevinRansom Jan 9, 2020
79a519b
Merge remote-tracking branch 'upstream/release/fsharp5' into merges/f…
KevinRansom Jan 9, 2020
fadf667
Back to master
KevinRansom Jan 9, 2020
f98a8ab
Command line help + tests
KevinRansom Jan 9, 2020
d146743
Version it
KevinRansom Jan 9, 2020
7537502
Correctly identify default
KevinRansom Jan 9, 2020
6f8e9ee
Merge pull request #8147 from KevinRansom/merges/fsharp5-to-master
KevinRansom Jan 9, 2020
f7ef22a
Fix merge issue with dotnet files (#8163)
KevinRansom Jan 10, 2020
613d69c
Document baseline update and allow tests to run in debug mode without…
dsyme Jan 13, 2020
e99777c
Use for..in..do instead of List.iter to prevent function allocations …
TIHan Jan 13, 2020
4b15d8d
Scripting package (#8173)
KevinRansom Jan 13, 2020
e1559cf
Path to dotnet tools that supports 4.8
KevinRansom Jan 14, 2020
77c5356
Merge pull request #8198 from KevinRansom/cp_8197
KevinRansom Jan 14, 2020
f9e7026
restore templates removed in #7379 (#8205)
brettfo Jan 15, 2020
0962ff1
Remove ILGlobals dependency on ILMetadataReader (#8041)
TIHan Jan 15, 2020
6cec616
Add Expr.NewStructTuple constructor and active pattern (#8193)
eiriktsarpalis Jan 15, 2020
c627f27
Inline List.iter/List.iteri for performance (#8176)
TIHan Jan 15, 2020
68ea1f9
Fix the .bsl spurious whitespace (#8219)
smoothdeveloper Jan 16, 2020
51f4083
Fixed exception that prevented creating a memory mapped file that sha…
TIHan Jan 17, 2020
88c7a2b
Using ArrayPool for AssocTable (#8234)
TIHan Jan 17, 2020
4d1e140
Cleanup additional merge issue from fsharp5 to master (#8249)
KevinRansom Jan 17, 2020
04119ce
improve build telemetry (#8239)
brettfo Jan 17, 2020
0a37c38
cleanup and whitespace
dsyme Jan 17, 2020
45d9b1a
Move Finalize from TcImports to another object (#8251)
TIHan Jan 17, 2020
0595fec
Added keepAllBackgroundSymbolUses to FSharpChecker (#8256)
TIHan Jan 18, 2020
c0cc024
revert xlf
KevinRansom Jan 18, 2020
27d4652
Merge pull request #8254 from dsyme/pre-ext
KevinRansom Jan 18, 2020
e690e92
Do not convert back and forth from list (#8262)
forki Jan 19, 2020
7b3c2af
Allow length of zero for ByteMemory (#8273)
TIHan Jan 19, 2020
e07132b
Inline isRecdTy (#8274)
forki Jan 19, 2020
b7a3bf8
Remove Finalize on obj holder for RawByteMemory (#8237)
TIHan Jan 20, 2020
e20fc26
Remove project cracker (#8288)
Krzysztof-Cieslak Jan 20, 2020
b328e20
cleanup begin / end (#8290)
forki Jan 20, 2020
06e0ed4
Calculate final only when needed (#8284)
forki Jan 20, 2020
6b18904
tryDestAppTy instead of isAppTy (#8285)
forki Jan 20, 2020
6839169
clarify language feature list (#8289)
dsyme Jan 20, 2020
1069553
cleanup begin / end (#8292)
forki Jan 20, 2020
fbf60bc
Remove tryRawToLabel (#8293)
forki Jan 20, 2020
be70bd9
Reduce Number of isAppTy calls (#8275)
forki Jan 21, 2020
bb46e37
Reduce isAppTy calls in TypeDefinitelyHasEquality (#8286)
forki Jan 21, 2020
a373efb
Fixed consuming CSharp interface with an inref parameter (#8287)
TIHan Jan 21, 2020
d3d5e30
Merge dependency manager and fsi script testing (#8276)
KevinRansom Jan 21, 2020
db2ba9e
[RFC 1082] - uint type abbreviation (#8185)
cartermp Jan 21, 2020
1a695c9
Expose more services (#8291)
Krzysztof-Cieslak Jan 21, 2020
e086149
save the contents of the NuGet package cache as a build artifact (#8303)
brettfo Jan 22, 2020
d2158a1
Fix nuget and ref assemblies (#8252)
KevinRansom Jan 22, 2020
fd3fedb
fix whitespace in resource (#8312)
brettfo Jan 22, 2020
83f1785
Include System.Buffers in vsix (#8277)
TIHan Jan 22, 2020
b8c748c
fix 5580 and better encapsulate constraint solver (#8294)
dsyme Jan 22, 2020
5ef3492
add more tests for SRTP resolution (#8318)
dsyme Jan 22, 2020
5a01170
delete language server (#8241)
brettfo Jan 22, 2020
36d7799
only dump package list if the run failed (#8320)
brettfo Jan 22, 2020
4a95e6a
cleanup and alignment (#8319)
dsyme Jan 22, 2020
d35b0e9
Slicing and copying on ByteMemory should not throw if length is zero …
TIHan Jan 23, 2020
a0cf13d
safely delete test files and directories
brettfo Jan 23, 2020
5e89847
re-fix xlf comments (#8337)
brettfo Jan 23, 2020
ba87a35
Merge pull request #8338 from brettfo/safe-delete
KevinRansom Jan 23, 2020
70883fb
Remove unused ProjectDiagnosticAnalyzer (#8304)
tmat Jan 23, 2020
a14840b
Clean up nuget project file (#8327)
KevinRansom Jan 27, 2020
3f9172a
squash and-bang implementation (#7756)
dsyme Jan 28, 2020
95e71b1
Typos -- fix a couple of types in the last pm PR (#8358)
KevinRansom Jan 28, 2020
98341d4
tryDestAppTy should be called tryTcrefOfAppTy (#8264)
forki Jan 28, 2020
82f2483
Feed back (#8365)
KevinRansom Jan 28, 2020
aa54c06
ngen dependency manager (#8372)
KevinRansom Jan 28, 2020
1cc3555
Update dependencies from https://github.com/dotnet/arcade build 20200…
dotnet-maestro[bot] Jan 28, 2020
9eeaa25
Do it properly (#8373)
KevinRansom Jan 28, 2020
fd74e2c
add test and prospecttive fix for missing framework versions
baronfel Jan 29, 2020
e7555f2
cleanup and alignment (#8319)
dsyme Jan 22, 2020
452da0c
Slicing and copying on ByteMemory should not throw if length is zero …
TIHan Jan 23, 2020
73ec438
safely delete test files and directories
brettfo Jan 23, 2020
5453faa
Merge pull request #8338 from brettfo/safe-delete
KevinRansom Jan 23, 2020
df66009
Clean up nuget project file (#8327)
KevinRansom Jan 27, 2020
54ab82a
squash and-bang implementation (#7756)
dsyme Jan 28, 2020
78f210e
Typos -- fix a couple of types in the last pm PR (#8358)
KevinRansom Jan 28, 2020
43d9b7b
tryDestAppTy should be called tryTcrefOfAppTy (#8264)
forki Jan 28, 2020
5bcb3b8
Feed back (#8365)
KevinRansom Jan 28, 2020
722ff2f
ngen dependency manager (#8372)
KevinRansom Jan 28, 2020
2825f09
Update dependencies from https://github.com/dotnet/arcade build 20200…
dotnet-maestro[bot] Jan 28, 2020
6272697
Do it properly (#8373)
KevinRansom Jan 28, 2020
c8517d9
Remove assembly load notification (#8393)
KevinRansom Jan 30, 2020
b32124d
Remove unnecessary diagnostics (#8401)
KevinRansom Jan 30, 2020
fe29cc4
always run mac tests on latest os (#8405)
brettfo Jan 31, 2020
3016aea
Remove add include event notification (#8416)
KevinRansom Jan 31, 2020
de0637f
Refactor dependency manager for notebooks and C# (#8415)
KevinRansom Jan 31, 2020
7f14ea0
add more tests for SRTP variations (#8435)
dsyme Feb 3, 2020
3b9f82b
Enable language preview option for fsi in the ide (#8443)
KevinRansom Feb 3, 2020
3cefbba
Reattach comment (#8445)
KevinRansom Feb 3, 2020
e71fd03
Update dependency notification (#8455)
KevinRansom Feb 5, 2020
ff20f70
cross-platform wrapper around memory-backed memorymappedfile creation…
baronfel Feb 5, 2020
060581f
Merge pull request #8390 from dotnet/merges/master-to-feature/and-bang
KevinRansom Jan 29, 2020
40ebcbb
Merge pull request #8399 from dotnet/merges/master-to-feature/and-bang
KevinRansom Jan 30, 2020
1e1f83a
Merge pull request #8411 from dotnet/merges/master-to-feature/and-bang
KevinRansom Jan 31, 2020
5c9ba21
Merge pull request #8430 from dotnet/merges/master-to-feature/and-bang
KevinRansom Jan 31, 2020
af648f3
Merge pull request #8441 from dotnet/merges/master-to-feature/and-bang
KevinRansom Feb 1, 2020
08eccbb
Merge pull request #8469 from dotnet/merges/master-to-feature/and-bang
KevinRansom Feb 5, 2020
519e5c5
Merge pull request #8479 from dotnet/feature/and-bang
KevinRansom Feb 5, 2020
3e7f2fc
update release notes
baronfel Feb 5, 2020
d220690
fake verbosity
baronfel Feb 5, 2020
0868a46
Revert "fake verbosity"
baronfel Feb 6, 2020
f878196
bump to 3.1, fix paths in build script for buildtools
baronfel Feb 6, 2020
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
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ osx_image: xcode11.2
mono:
- weekly
- latest
- 6.0.0
- 6.6.0

dotnet: 3.0.100
dotnet: 3.1.100

sudo: false

Expand Down
22 changes: 22 additions & 0 deletions eng/DumpPackageRoot/DumpPackageRoot.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

<!-- Used as a diagnostic tool to view the state of the NuGet package cache as it existed immediately after a restore/build. -->

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageRootFiles Include="$(NuGetPackageRoot)/**" />
</ItemGroup>

<Target Name="_DumpPackageRootDirectoryListing"
AfterTargets="Build">
<PropertyGroup>
<PackageRootArtifactDirectory>$(ArtifactsDir)NugetPackageRootContents</PackageRootArtifactDirectory>
<PackageRootContentsFile>$(PackageRootArtifactDirectory)/package_contents.txt</PackageRootContentsFile>
</PropertyGroup>
<MakeDir Directories="$(PackageRootArtifactDirectory)" Condition="!Exists('$(PackageRootArtifactDirectory)')" />
<WriteLinesToFile File="$(PackageRootContentsFile)" Lines="@(PackageRootFiles)" />
</Target>
</Project>
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20057.5">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20077.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d0833c8e5e58cfc507ce3c8da364e55931190263</Sha>
<Sha>69a67461460d99125742d5c2dd94dad83add84a3</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@
<NUnitVersion>3.11.0</NUnitVersion>
<NUnit3TestAdapterVersion>3.11.2</NUnit3TestAdapterVersion>
<NUnitLiteVersion>3.11.0</NUnitLiteVersion>
<NunitXmlTestLoggerVersion>2.1.36</NunitXmlTestLoggerVersion>
<NunitXmlTestLoggerVersion>2.1.41</NunitXmlTestLoggerVersion>
<RoslynToolsSignToolVersion>1.0.0-beta2-dev3</RoslynToolsSignToolVersion>
<StrawberryPerlVersion>5.28.0.1</StrawberryPerlVersion>
<StreamJsonRpcVersion>2.0.187</StreamJsonRpcVersion>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\netfx.props" />
<Import Project="..\..\eng\Versions.props"/> <!-- keep our test deps in line with the overall compiler -->
<PropertyGroup>
<TargetFrameworks>$(FcsTargetNetFxFramework);netcoreapp3.0</TargetFrameworks>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
Expand Down Expand Up @@ -66,6 +67,9 @@
<Compile Include="$(FSharpSourcesRoot)\..\tests\service\TreeVisitorTests.fs">
<Link>TreeVisitorTests.fs</Link>
</Compile>
<Compile Include="$(FSharpSourcesRoot)\..\tests\service\ScriptOptionsTests.fs">
<Link>ScriptOptionsTests.fs</Link>
</Compile>
<Compile Include="$(FSharpSourcesRoot)\..\tests\service\Program.fs" Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<Link>Program.fs</Link>
</Compile>
Expand All @@ -77,10 +81,10 @@
<ItemGroup>
<PackageReference Include="FSharp.Core" Version="$(FcsFSharpCorePkgVersion)" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
<PackageReference Include="NUnit" Version="3.9.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
<PackageReference Include="NunitXml.TestLogger" Version="2.1.36" />
<PackageReference Include="Dotnet.ProjInfo" Version="0.20.0" />
<PackageReference Include="NUnit" Version="$(NUnitVersion)" />
<PackageReference Include="NUnit3TestAdapter" Version="$(NUnit3TestAdapterVersion)" />
<PackageReference Include="NunitXml.TestLogger" Version="$(NunitXmlTestLoggerVersion)" />
<ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == '$(FcsTargetNetFxFramework)'">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace Microsoft.VisualStudio.FSharp.Editor.Tests.Roslyn
open System
open System.Collections.Generic
open System.IO
open System.Linq
open System.Linq
open System.Reflection

open NUnit.Framework
Expand Down
18 changes: 16 additions & 2 deletions fcs/FSharp.Compiler.Service.Tests/ProjectOptionsBuilder.fs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,19 @@ open System.IO
open System.Xml.Linq
open FSharp.Compiler.SourceCodeServices

module FileSystemHelpers =
let safeDeleteFile (path: string) =
try
File.Delete(path)
with
| _ -> ()

let safeDeleteDirectory (path: string) =
try
Directory.Delete(path)
with
| _ -> ()

type FSharpProject =
{
Directory: string
Expand All @@ -29,9 +42,10 @@ type FSharpProject =
member this.Dispose() =
// delete each source file
this.Files
|> List.iter (fun (path, _contents) -> File.Delete(path))
|> List.map fst
|> List.iter FileSystemHelpers.safeDeleteFile
// delete the directory
Directory.Delete(this.Directory)
FileSystemHelpers.safeDeleteDirectory (this.Directory)
// project file doesn't really exist, nothing to delete
()

Expand Down
9 changes: 5 additions & 4 deletions fcs/RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#### 34.0.0
#### 34.0.1

Contains commits from 32b124966 to 5a0117048 from dotnet/fsharp. Notable changes include:
Contains commits from 32b124966 to d7018737c from dotnet/fsharp. Notable changes include:

* lowered allocations for large strings and char arrays (notable source file texts)
* lowered allocations for large strings and char arrays (notably source file texts)
* improved support for byreflike rules with regards to type abbreviations
* better support for scopes in recursive modules
* better location of .net core reference assemblies
Expand All @@ -11,8 +11,9 @@ Contains commits from 32b124966 to 5a0117048 from dotnet/fsharp. Notable changes
* FSharpChecker learned how to keep background symbol uses
* Project cracker/project cracker tool were removed
* Better support for consuming C# inref parameters
* preview-level functionality for #r "nuget" in scripts
* new services around simplifing names and finding unused declarations
* package management in scripts (in preview)
* and-bang syntax support (in preview)

#### 33.0.1

Expand Down
10 changes: 5 additions & 5 deletions fcs/build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,18 @@ Target.create "BuildVersion" (fun _ ->

Target.create "Build" (fun _ ->
runDotnet __SOURCE_DIRECTORY__ "build" "../src/buildtools/buildtools.proj -v n -c Proto"
let fslexPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fslex/Proto/netcoreapp2.1/fslex.dll"
let fsyaccPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fsyacc/Proto/netcoreapp2.1/fsyacc.dll"
let fslexPath = Path.GetFullPath <| Path.Combine(__SOURCE_DIRECTORY__, "../artifacts/bin/fslex/Proto/netcoreapp3.1/fslex.dll")
let fsyaccPath = Path.GetFullPath <| Path.Combine(__SOURCE_DIRECTORY__, "../artifacts/bin/fsyacc/Proto/netcoreapp3.1/fsyacc.dll")
runDotnet __SOURCE_DIRECTORY__ "build" (sprintf "FSharp.Compiler.Service.sln -nodereuse:false -v n -c Release /p:DisableCompilerRedirection=true /p:FsLexPath=%s /p:FsYaccPath=%s" fslexPath fsyaccPath)
)

Target.create "Test" (fun _ ->
// This project file is used for the netcoreapp2.0 tests to work out reference sets
runDotnet __SOURCE_DIRECTORY__ "build" "../tests/projects/Sample_NETCoreSDK_FSharp_Library_netstandard2_0/Sample_NETCoreSDK_FSharp_Library_netstandard2_0.fsproj -nodereuse:false -v n /restore /p:DisableCompilerRedirection=true"

// Now run the tests
let logFilePath = Path.Combine(__SOURCE_DIRECTORY__, "..", "artifacts", "TestResults", "Release", "FSharp.Compiler.Service.Test.xml")
runDotnet __SOURCE_DIRECTORY__ "test" (sprintf "FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj --no-restore --no-build -nodereuse:false -v n -c Release --test-adapter-path . --logger \"nunit;LogFilePath=%s\"" logFilePath)
// Now run the tests (different output files per TFM)
let logFilePath = Path.Combine(__SOURCE_DIRECTORY__, "..", "artifacts", "TestResults", "Release", "FSharp.Compiler.Service.Test.{framework}.xml")
runDotnet __SOURCE_DIRECTORY__ "test" (sprintf "FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj --no-restore --no-build -nodereuse:false -v n -c Release --logger \"nunit;LogFilePath=%s\"" logFilePath)
)

Target.create "NuGet" (fun _ ->
Expand Down
2 changes: 1 addition & 1 deletion fcs/global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "3.0.100"
"version": "3.1.100"
}
}
2 changes: 1 addition & 1 deletion fcs/samples/FscExe/FscMain.fs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ open System.IO
open System.Reflection
open System.Runtime.CompilerServices
open FSharp.Compiler.SourceCodeServices
open FSharp.Compiler.AbstractIL.IL // runningOnMono
open FSharp.Compiler.AbstractIL.Internal.Utils // runningOnMono
open FSharp.Compiler.AbstractIL.Internal.Library
open FSharp.Compiler.ErrorLogger

Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19616.5",
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20077.3",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
}
}
Loading