Skip to content
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.

Sign up for GitHub

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

Jump to bottom

use Microsoft.NETFramework.ReferenceAssemblies instead of netfx.props #161

Merged
merged 1 commit into from
Dec 21, 2019
Merged

use Microsoft.NETFramework.ReferenceAssemblies instead of netfx.props #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 0 additions & 21 deletions Content/Console/fsc.props
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions Content/Console/netfx.props
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions Content/Console/src/MyLib.1/MyLib.1.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,5 @@
<None Include="App.config" />
<Compile Include="Main.fs" />
</ItemGroup>
<!-- <Import Project="..\..\fsc.props" /> -->
<Import Project="..\..\netfx.props" />
<Import Project="..\..\.paket\Paket.Restore.targets" />
</Project>
2 changes: 0 additions & 2 deletions Content/Console/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,5 @@
<ItemGroup>
<ProjectReference Include="../../src/MyLib.1/MyLib.1.fsproj" />
</ItemGroup>
<!-- <Import Project="..\..\fsc.props" /> -->
<Import Project="..\..\netfx.props" />
<Import Project="..\..\.paket\Paket.Restore.targets" />
</Project>
1 change: 0 additions & 1 deletion Content/Library/docsTool/docsTool.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<Compile Include="Program.fs" />
</ItemGroup>

<Import Project="..\netfx.props" />
<Import Project="..\.paket\Paket.Restore.targets" />

</Project>
21 changes: 0 additions & 21 deletions Content/Library/fsc.props
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions Content/Library/netfx.props
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions Content/Library/paket.dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ storage: none
clitool dotnet-mono 0.5.2
nuget FSharp.Core 4.3.4
nuget Microsoft.SourceLink.GitHub prerelease copy_local: true
nuget Microsoft.NETFramework.ReferenceAssemblies copy_local: true
nuget Expecto 8.13.1
nuget YoloDev.Expecto.TestSdk 0.8.0
nuget Microsoft.NET.Test.Sdk 15.7.2
Expand Down
25 changes: 25 additions & 0 deletions Content/Library/paket.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,31 @@ NUGET
Microsoft.NETCore.DotNetAppHost (>= 3.0.1)
Microsoft.NETCore.Platforms (3.0) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (>= netcoreapp2.1)
Microsoft.NETCore.Targets (3.0) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (>= netcoreapp2.1)
Microsoft.NETFramework.ReferenceAssemblies (1.0) - copy_local: true
Microsoft.NETFramework.ReferenceAssemblies.net20 (>= 1.0) - restriction: && (>= net20) (< net40)
Microsoft.NETFramework.ReferenceAssemblies.net40 (>= 1.0) - restriction: && (>= net40) (< net45)
Microsoft.NETFramework.ReferenceAssemblies.net45 (>= 1.0) - restriction: && (>= net45) (< net451)
Microsoft.NETFramework.ReferenceAssemblies.net451 (>= 1.0) - restriction: && (>= net451) (< net452)
Microsoft.NETFramework.ReferenceAssemblies.net452 (>= 1.0) - restriction: && (>= net452) (< net46)
Microsoft.NETFramework.ReferenceAssemblies.net46 (>= 1.0) - restriction: && (>= net46) (< net461)
Microsoft.NETFramework.ReferenceAssemblies.net461 (>= 1.0) - restriction: && (>= net461) (< net462)
Microsoft.NETFramework.ReferenceAssemblies.net462 (>= 1.0) - restriction: && (>= net462) (< net47)
Microsoft.NETFramework.ReferenceAssemblies.net47 (>= 1.0) - restriction: && (>= net47) (< net471)
Microsoft.NETFramework.ReferenceAssemblies.net471 (>= 1.0) - restriction: && (>= net471) (< net472)
Microsoft.NETFramework.ReferenceAssemblies.net472 (>= 1.0) - restriction: && (>= net472) (< net48)
Microsoft.NETFramework.ReferenceAssemblies.net48 (>= 1.0) - restriction: >= net48
Microsoft.NETFramework.ReferenceAssemblies.net20 (1.0) - copy_local: true, restriction: && (>= net20) (< net40)
Microsoft.NETFramework.ReferenceAssemblies.net40 (1.0) - copy_local: true, restriction: && (>= net40) (< net45)
Microsoft.NETFramework.ReferenceAssemblies.net45 (1.0) - copy_local: true, restriction: && (>= net45) (< net451)
Microsoft.NETFramework.ReferenceAssemblies.net451 (1.0) - copy_local: true, restriction: && (>= net451) (< net452)
Microsoft.NETFramework.ReferenceAssemblies.net452 (1.0) - copy_local: true, restriction: && (>= net452) (< net46)
Microsoft.NETFramework.ReferenceAssemblies.net46 (1.0) - copy_local: true, restriction: && (>= net46) (< net461)
Microsoft.NETFramework.ReferenceAssemblies.net461 (1.0) - copy_local: true, restriction: && (>= net461) (< net462)
Microsoft.NETFramework.ReferenceAssemblies.net462 (1.0) - copy_local: true, restriction: && (>= net462) (< net47)
Microsoft.NETFramework.ReferenceAssemblies.net47 (1.0) - copy_local: true, restriction: && (>= net47) (< net471)
Microsoft.NETFramework.ReferenceAssemblies.net471 (1.0) - copy_local: true, restriction: && (>= net471) (< net472)
Microsoft.NETFramework.ReferenceAssemblies.net472 (1.0) - copy_local: true, restriction: && (>= net472) (< net48)
Microsoft.NETFramework.ReferenceAssemblies.net48 (1.0) - copy_local: true, restriction: >= net48
Microsoft.SourceLink.Common (1.0) - copy_local: true
Microsoft.SourceLink.GitHub (1.0) - copy_local: true
Microsoft.Build.Tasks.Git (>= 1.0)
Expand Down
2 changes: 0 additions & 2 deletions Content/Library/src/MyLib.1/MyLib.1.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,5 @@
<Compile Include="AssemblyInfo.fs" />
<Compile Include="Library.fs" />
</ItemGroup>
<!-- <Import Project="..\..\fsc.props" /> -->
<Import Project="..\..\netfx.props" />
<Import Project="..\..\.paket\Paket.Restore.targets" />
</Project>
3 changes: 2 additions & 1 deletion Content/Library/src/MyLib.1/paket.references
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
FSharp.Core
Microsoft.SourceLink.GitHub
Microsoft.SourceLink.GitHub
Microsoft.NETFramework.ReferenceAssemblies
2 changes: 0 additions & 2 deletions Content/Library/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,5 @@
<ItemGroup>
<ProjectReference Include="../../src/MyLib.1/MyLib.1.fsproj" />
</ItemGroup>
<!-- <Import Project="..\..\fsc.props" /> -->
<Import Project="..\..\netfx.props" />
<Import Project="..\..\.paket\Paket.Restore.targets" />
</Project>
1 change: 1 addition & 0 deletions Content/Library/tests/MyLib.1.Tests/paket.references
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ dotnet-mono
Microsoft.NET.Test.Sdk
YoloDev.Expecto.TestSdk
altcover
Microsoft.NETFramework.ReferenceAssemblies