Skip to content

Use FsSrGen package#963

Merged
OmarTawfik merged 17 commits intodotnet:masterfrom
enricosada:use_fssrgen_package
Feb 22, 2016
Merged

Use FsSrGen package#963
OmarTawfik merged 17 commits intodotnet:masterfrom
enricosada:use_fssrgen_package

Conversation

@enricosada
Copy link
Contributor

@enricosada enricosada commented Feb 12, 2016

ref #962

  • replace FsSrGen.exe
  • replace FsSrGen msbuild task
  • remove temp fssrgen ci feed, use standard nuget feed

the FsSrGen use .NET 4.6 instead of .NET 3.5

@OmarTawfik OmarTawfik mentioned this pull request Feb 16, 2016
Closed
@OmarTawfik
Copy link
Contributor

OmarTawfik commented Feb 16, 2016

@dotnet-bot test this please

@enricosada enricosada changed the title [WIP] Use FsSrGen package Use FsSrGen package Feb 19, 2016
@enricosada
Copy link
Contributor Author

enricosada commented Feb 19, 2016

ok, ready to review/merge.

the FsSrGen now use .NET 4.6 instead of .NET 3.5
I removed the FindUnusedResources.exe because was unused

OmarTawfik
OmarTawfik reviewed Feb 19, 2016
View reviewed changes
src/FSharpSource.targets Outdated
</Target>

<Import Project="..\lkg\FSharp-$(LkgVersion)\bin\FSharp.SRGen.targets" />
<Import Project="..\packages\FSharp.SRGen.Build.Tasks.2.0.0\content\FSharp.SRGen.targets" />
Copy link
Contributor

@OmarTawfik OmarTawfik Feb 19, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Can you add this path as well to the above properties? since we are using that group to keep track of all nuget versions.

Copy link
Contributor Author

@enricosada enricosada Feb 22, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@enricosada
Copy link
Contributor Author

enricosada commented Feb 22, 2016

ok parametrized FsSrGen packages versions, thx @otawfik-ms

@OmarTawfik
Copy link
Contributor

OmarTawfik commented Feb 22, 2016

Thanks @enricosada

OmarTawfik pushed a commit that referenced this pull request Feb 22, 2016
Merge pull request #963 from enricosada/use_fssrgen_package
0061aa7 
Use FsSrGen nuget package
@OmarTawfik OmarTawfik merged commit 0061aa7 into dotnet:master Feb 22, 2016
@KevinRansom
Copy link
Contributor

KevinRansom commented Feb 22, 2016

@enricosada I notice from GitHub that you have a dotnetcli built version of fsSrgen is there a nugget package containing that ?

@enricosada
Copy link
Contributor Author

enricosada commented Feb 22, 2016

@KevinRansom yes. I'll post tomorrow a coreclr branch with my wip dotnet cli build of fsharp.compiler.
The dotnet-fssrgen is in the myget feed
Fssrgen and fslexyac as dotnet cli tool are integrated in the dotnet build
I'll post fslexyac to master before that because @dsyme want to review it

@enricosada
Copy link
Contributor Author

enricosada commented Feb 22, 2016

Btw these packages are .net 4.6 but are built with dotnet cli and the coreclr fsc, no fsproj

KevinRansom added a commit that referenced this pull request Mar 10, 2016
@KevinRansom
Revert "Merge pull request #963 from enricosada/use_fssrgen_package"
b297b1a 
This reverts commit 0061aa7, reversing
changes made to 077051f.
enricosada added a commit to enricosada/visualfsharp that referenced this pull request Apr 12, 2016
@enricosada
Revert "Revert "Merge pull request dotnet#963 from enricosada/use_fss…
14de254 
…rgen_package""

This reverts commit b297b1a.
@enricosada enricosada mentioned this pull request Apr 12, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@enricosada @OmarTawfik @KevinRansom @msftclas