Skip to content

Commit a771a5f

Browse files
authored
Merge pull request #854 from dsyme/i57
use explicit version flag until visualfsharp #3113 is fixed
2 parents 97e1c15 + 403272b commit a771a5f

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Import Project="..\netfx.props" />
77
<PropertyGroup>
88
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
9-
<NoWarn>$(NoWarn);44;</NoWarn>
9+
<NoWarn>$(NoWarn);44;75;</NoWarn>
1010
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1111
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1212
<OutputPath>..\..\$(Configuration.ToLower())\fcs</OutputPath>

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
Yu can push the packages if you have permissions, either automatically using ``build Release`` or manually
6161

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

6767

6868
### Use of Paket and FAKE

fcs/RELEASE_NOTES.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#### 22.0.2
2+
* Use correct version number in DLLs (needed until https://github.com/Microsoft/visualfsharp/issues/3113 is fixed)
3+
14
#### 22.0.1
25
* Integrate visualfsharp master
36
* Includes recent memory usage reduction work for ByteFile and ILAttributes

fcs/fcs.props

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

6-
<VersionPrefix>22.0.1</VersionPrefix>
6+
<VersionPrefix>22.0.2</VersionPrefix>
7+
<OtherFlags>--version:$(VersionPrefix)</OtherFlags>
78
<!-- FSharp.Compiler.Tools is currently only used to get a working FSI.EXE to execute some scripts during the build -->
89
<!-- The LKG FSI.EXE requires MSBuild 15 to be installed, which is painful -->
910
<FsiToolPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools</FsiToolPath>

0 commit comments

Comments
 (0)