Skip to content

Commit 693a866

Browse files
authored
Merge pull request #889 from baronfel/make-version-27.0.1
bump version and prepare release notes for 27.0.1
2 parents 88e5f8e + 398183d commit 693a866

File tree

7 files changed

+21
-10
lines changed

7 files changed

+21
-10
lines changed

build/targets/PackageVersions.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
<SystemSecurityClaimsPackageVersion>4.3.0</SystemSecurityClaimsPackageVersion>
4545
<SystemSecurityCryptographyAlgorithmsPackageVersion>4.3.0</SystemSecurityCryptographyAlgorithmsPackageVersion>
4646
<SystemSecurityPrincipalPackageVersion>4.3.0</SystemSecurityPrincipalPackageVersion>
47-
<SystemDataSqlClientPackageVersion>4.3.0</SystemDataSqlClientPackageVersion>
4847
<SystemThreadingTasksParallelPackageVersion>4.3.0</SystemThreadingTasksParallelPackageVersion>
4948
<SystemThreadingThreadPackageVersion>4.3.0</SystemThreadingThreadPackageVersion>
5049
<SystemThreadingThreadPoolPackageVersion>4.3.0</SystemThreadingThreadPoolPackageVersion>

fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,6 @@
640640
<PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
641641
</ItemGroup>
642642
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
643-
<PackageReference Include="System.Data.SqlClient" Version="4.3.0" />
644643
<PackageReference Include="System.Diagnostics.Process" Version="4.1.0" />
645644
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.0.0" />
646645
<PackageReference Include="System.Reflection.Emit" Version="4.3.0" />

fcs/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ which does things like:
6060
You can push the packages if you have permissions, either automatically using ``build Release`` or manually
6161

6262
set APIKEY=...
63-
..\fsharp\.nuget\nuget.exe push %HOMEDRIVE%%HOMEPATH%\Downloads\FSharp.Compiler.Service.26.0.1.nupkg %APIKEY% -Source https://nuget.org
64-
..\fsharp\.nuget\nuget.exe push %HOMEDRIVE%%HOMEPATH%\Downloads\FSharp.Compiler.Service.MSBuild.v12.26.0.1.nupkg %APIKEY% -Source https://nuget.org
65-
..\fsharp\.nuget\nuget.exe push %HOMEDRIVE%%HOMEPATH%\Downloads\FSharp.Compiler.Service.ProjectCracker.26.0.1.nupkg %APIKEY% -Source https://nuget.org
63+
..\fsharp\.nuget\nuget.exe push %HOMEDRIVE%%HOMEPATH%\Downloads\FSharp.Compiler.Service.27.0.1.nupkg %APIKEY% -Source https://nuget.org
64+
..\fsharp\.nuget\nuget.exe push %HOMEDRIVE%%HOMEPATH%\Downloads\FSharp.Compiler.Service.MSBuild.v12.27.0.1.nupkg %APIKEY% -Source https://nuget.org
65+
..\fsharp\.nuget\nuget.exe push %HOMEDRIVE%%HOMEPATH%\Downloads\FSharp.Compiler.Service.ProjectCracker.27.0.1.nupkg %APIKEY% -Source https://nuget.org
6666

6767

6868
### Use of Paket and FAKE

fcs/RELEASE_NOTES.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
1+
#### 27.0.1
2+
* Integrate visualfsharp master from 5a5ca976ec296d02551e79c3eb8e8db809e4304d to 2c8497bb097d5c5d3ef12f355594873838a48494
3+
* Notable improvements include:
4+
* Anonymous Record support for expressions
5+
* Union Case Naming fixes
6+
* Trimming of the nuget package dependencies from 26.0.1
7+
18
#### 26.0.1
2-
* Integrate visualfsharp master to 99e307f3a3ef2109ba6542ffc58affe76fc0e2a0
9+
* Integrate visualfsharp master to 99e307f3a3ef2109ba6542ffc58affe76fc0e2a0
310

411
#### 25.0.1
512
* Integrate visualfsharp master to 15d9391e78c554f91824d2be2e69938cd811df68

fcs/build.fsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,14 @@ let isMono = false
2121
#endif
2222

2323

24-
let dotnetExePath = DotNetCli.InstallDotNetSDK "2.1.403"
24+
let dotnetExePath =
25+
// Build.cmd normally downloads a dotnet cli to: <repo-root>\artifacts\toolset\dotnet
26+
// check if there is one there to avoid downloading an additional one here
27+
let pathToCli = Path.Combine(__SOURCE_DIRECTORY__, @"..\artifacts\toolset\dotnet\dotnet.exe")
28+
if File.Exists(pathToCli) then
29+
pathToCli
30+
else
31+
DotNetCli.InstallDotNetSDK "2.1.403"
2532

2633
let runDotnet workingDir args =
2734
let result =

fcs/fcs.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
44
<PropertyGroup>
55

6-
<VersionPrefix>26.0.1</VersionPrefix>
6+
<VersionPrefix>27.0.1</VersionPrefix>
77
<OtherFlags>--version:$(VersionPrefix)</OtherFlags>
88
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
99
<!-- FSharp.Compiler.Tools is currently only used to get a working FSI.EXE to execute some scripts during the build -->

src/fsharp/CompileOps.fs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1854,8 +1854,7 @@ let DefaultReferencesForScriptsAndOutOfProjectSources(assumeDotNetFramework) =
18541854
yield Path.Combine(Path.GetDirectoryName(typeof<System.Object>.Assembly.Location), "mscorlib.dll") // mscorlib
18551855
yield typeof<System.Console>.Assembly.Location // System.Console
18561856
yield typeof<System.Collections.BitArray>.Assembly.Location // System.Collections
1857-
yield typeof<System.Data.SqlClient.SqlCommand>.Assembly.Location // System.Data.SqlClient
1858-
yield typeof<System.ComponentModel.PropertyChangedEventArgs>.Assembly.Location // System.ObjectModel
1857+
yield typeof<System.ComponentModel.PropertyChangedEventArgs>.Assembly.Location // System.ObjectModel
18591858
yield typeof<System.IO.File>.Assembly.Location // System.IO.FileSystem
18601859
yield typeof<System.IO.TextWriter>.Assembly.Location // System.IO
18611860
yield typeof<System.Linq.Enumerable>.Assembly.Location // System.Linq

0 commit comments

Comments
 (0)