Skip to content

Commit 0061aa7

Browse files
author
Omar Tawfik
committed
Merge pull request #963 from enricosada/use_fssrgen_package
Use FsSrGen nuget package
2 parents 077051f + ca9d289 commit 0061aa7

File tree

11 files changed

+10
-76
lines changed

11 files changed

+10
-76
lines changed

‎.nuget/NuGet.Config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
<add key="myget.org fsharp-daily" value="https://www.myget.org/F/fsharp-daily/" />
1010
<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
1111
</packageSources>
12-
</configuration>
12+
</configuration>

‎DEVGUIDE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ Restart Visual Studio, it should now be running your freshly-built Visual F# IDE
160160

161161
1. The `update.cmd` script adds required strong name validation skips, and NGens the compiler and libraries. This requires admin privileges.
162162
1. The compiler binaries produced are "private" and strong-named signed with a test key.
163-
1. Some additional tools are required to build the compiler, notably `fslex.exe`, `fsyacc.exe`, `FSharp.PowerPack.Build.Tasks.dll`, `FsSrGen.exe`, `FSharp.SRGen.Build.Tasks.dll`, and the other tools found in the `lkg` directory.
163+
1. Some additional tools are required to build the compiler, notably `fslex.exe`, `fsyacc.exe`, `FSharp.PowerPack.Build.Tasks.dll` and the other tools found in the `lkg` directory.
164164
1. The overall bootstrapping process executes as follows
165165
- We first need an existing F# compiler. We use the one in the `lkg` directory. Let's assume this compiler has an `FSharp.Core.dll` with version X.
166166
- We use this compiler to compile the source in this distribution, to produce a "proto" compiler, dropped to the `proto` directory. When run, this compiler still relies on `FSharp.Core.dll` with version X.

‎lkg/FSharp-14.0.23413.0/bin/FSharp.Core/README.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
The copy of FSharp.Core in this directory is version 2.0.50726.900, required by FSharp.SRGen.Build.Tasks.dll and other legacy Power Pack libraries in the parent directory.
1+
The copy of FSharp.Core in this directory is version 2.0.50726.900, required by legacy Power Pack libraries in the parent directory.
22

33
This copy of FSharp.Core.dll should not be referenced as an LKG, it is present merely as a workaround to enable the legacy libraries to work without needing to update the GAC.

‎lkg/FSharp-14.0.23413.0/bin/FSharp.SRGen.Build.Tasks.dll‎

-1.05 MB
Binary file not shown.

‎lkg/FSharp-14.0.23413.0/bin/FSharp.SRGen.targets‎

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎lkg/FSharp-14.0.23413.0/bin/FindUnusedResources.exe‎

-909 KB
Binary file not shown.

‎lkg/FSharp-14.0.23413.0/bin/FsSrGen.exe‎

-1.09 MB
Binary file not shown.

‎packages.config‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@
44
<package id="NUnit.Runners" version="3.0.0" targetFramework="net45" />
55
<package id="NUnit" version="3.0.0" targetFramework="net45" />
66
<package id="NUnit.Console" version="3.0.0" targetFramework="net45" />
7-
</packages>
7+
<package id="FsSrGen" version="2.0.0" targetFramework="net46" />
8+
<package id="FSharp.SRGen.Build.Tasks" version="2.0.0" targetFramework="net46" />
9+
</packages>

‎src/FSharpSource.targets‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@
112112
<FsCheckVersion>2.0.3</FsCheckVersion>
113113
<FsCheckFullVersion>2.0.3.0</FsCheckFullVersion>
114114
<FsCheckLibDir>$(FSharpSourcesRoot)\..\packages\FsCheck.$(FsCheckVersion)\lib\</FsCheckLibDir>
115+
<FsSrGenVersion>2.0.0</FsSrGenVersion>
116+
<FsSrGenBuildTasksVersion>2.0.0</FsSrGenBuildTasksVersion>
115117
</PropertyGroup>
116118

117119
<!-- v2.0-specific flags -->
@@ -707,7 +709,7 @@
707709

708710
<!-- Reference an existing FSI.EXE for use from within MSBuild -->
709711
<PropertyGroup>
710-
<FsSrGenToolPath>$(FSharpSourcesRoot)\..\lkg\FSharp-$(LkgVersion)\bin</FsSrGenToolPath>
712+
<FsSrGenToolPath>$(FSharpSourcesRoot)\..\packages\FsSrGen.$(FsSrGenVersion)\lib\net46</FsSrGenToolPath>
711713
<FsLexToolPath>$(FSharpSourcesRoot)\..\lkg\FSharp-$(LkgVersion)\bin</FsLexToolPath>
712714
<FsYaccToolPath>$(FSharpSourcesRoot)\..\lkg\FSharp-$(LkgVersion)\bin</FsYaccToolPath>
713715
<FsLexToolExe>fslex.exe</FsLexToolExe>
@@ -720,7 +722,6 @@
720722
<CompileDependsOn>ValidateConfiguration;$(CompileDependsOn);CustomCopyLocalFiles</CompileDependsOn>
721723
<RootNamespace></RootNamespace>
722724
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
723-
<EnsureThereAreNoUnusedFsSrGenResources>false</EnsureThereAreNoUnusedFsSrGenResources>
724725
</PropertyGroup>
725726

726727
<Target Name="ValidateConfiguration">
@@ -758,7 +759,7 @@
758759
</CreateItem>
759760
</Target>
760761

761-
<Import Project="..\lkg\FSharp-$(LkgVersion)\bin\FSharp.SRGen.targets" />
762+
<Import Project="..\packages\FSharp.SRGen.Build.Tasks.$(FsSrGenBuildTasksVersion)\content\FSharp.SRGen.targets" />
762763

763764
<Target Name="ReorderCompileItems"
764765
BeforeTargets="CoreCompile"

‎vsintegration/tests/unittests/Resources.MockTypeProviders/DummyProviderForLanguageServiceTesting/DummyProviderForLanguageServiceTesting.fsproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<TargetType>LIBRARY</TargetType>
1717
<NoWarn>58;75</NoWarn>
1818
<GenerateDocumentationFile>false</GenerateDocumentationFile>
19-
<EnsureThereAreNoUnusedFsSrGenResources>False</EnsureThereAreNoUnusedFsSrGenResources>
2019
<DefineConstants>DEBUG;TRACE;$(DefineConstants)</DefineConstants>
2120
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
2221
<CustomOutputPath>true</CustomOutputPath>

0 commit comments

Comments
 (0)