From b529526bc3657f91e211222a21095061aeaff182 Mon Sep 17 00:00:00 2001 From: Jared Hester Date: Wed, 22 Mar 2017 04:08:42 -0400 Subject: [PATCH] adjust target resolution --- src/FSharp.CodeFormat/FSharp.CodeFormat.fsproj | 9 ++++----- .../FSharp.Formatting.CommandTool.fsproj | 8 ++++---- .../FSharp.Formatting.Common.fsproj | 8 ++++---- .../FSharp.Formatting.Razor.fsproj | 9 ++++----- src/FSharp.Literate/FSharp.Literate.fsproj | 8 ++++---- src/FSharp.Markdown/FSharp.Markdown.fsproj | 8 ++++---- .../FSharp.MetadataFormat.fsproj | 15 ++++++++------- .../FSharp.CodeFormat.Tests.fsproj | 8 ++++---- .../FSharp.Literate.Tests.fsproj | 8 ++++---- .../FSharp.Markdown.Tests.fsproj | 8 ++++---- .../FSharp.MetadataFormat.Tests.fsproj | 8 ++++---- .../files/FsLib/FsLib1.fsproj | 8 ++++---- .../files/FsLib/FsLib2.fsproj | 8 ++++---- .../files/TestLib/TestLib1.fsproj | 8 ++++---- .../files/TestLib/TestLib2.fsproj | 8 ++++---- .../files/crefLib/crefLib1.fsproj | 8 ++++---- .../files/crefLib/crefLib2.fsproj | 8 ++++---- 17 files changed, 72 insertions(+), 73 deletions(-) diff --git a/src/FSharp.CodeFormat/FSharp.CodeFormat.fsproj b/src/FSharp.CodeFormat/FSharp.CodeFormat.fsproj index af7c6bda8..27ba92d95 100644 --- a/src/FSharp.CodeFormat/FSharp.CodeFormat.fsproj +++ b/src/FSharp.CodeFormat/FSharp.CodeFormat.fsproj @@ -39,27 +39,26 @@ AnyCPU - 12.0 + 14.0 11 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets diff --git a/src/FSharp.Formatting.CommandTool/FSharp.Formatting.CommandTool.fsproj b/src/FSharp.Formatting.CommandTool/FSharp.Formatting.CommandTool.fsproj index 3e6c0f80d..3517bc1c6 100644 --- a/src/FSharp.Formatting.CommandTool/FSharp.Formatting.CommandTool.fsproj +++ b/src/FSharp.Formatting.CommandTool/FSharp.Formatting.CommandTool.fsproj @@ -103,7 +103,7 @@ - 12.0 + 14.0 11 @@ -112,17 +112,17 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets diff --git a/src/FSharp.Formatting.Common/FSharp.Formatting.Common.fsproj b/src/FSharp.Formatting.Common/FSharp.Formatting.Common.fsproj index 332709aa2..ff5e31883 100644 --- a/src/FSharp.Formatting.Common/FSharp.Formatting.Common.fsproj +++ b/src/FSharp.Formatting.Common/FSharp.Formatting.Common.fsproj @@ -34,7 +34,7 @@ ..\..\bin\FSharp.Formatting.Common.xml - 12.0 + 14.0 11 @@ -43,17 +43,17 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets diff --git a/src/FSharp.Formatting.Razor/FSharp.Formatting.Razor.fsproj b/src/FSharp.Formatting.Razor/FSharp.Formatting.Razor.fsproj index 564d19c08..817049da9 100644 --- a/src/FSharp.Formatting.Razor/FSharp.Formatting.Razor.fsproj +++ b/src/FSharp.Formatting.Razor/FSharp.Formatting.Razor.fsproj @@ -83,27 +83,26 @@ - 12.0 + 14.0 11 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets diff --git a/src/FSharp.Literate/FSharp.Literate.fsproj b/src/FSharp.Literate/FSharp.Literate.fsproj index 8614274a7..9a64ef6bc 100644 --- a/src/FSharp.Literate/FSharp.Literate.fsproj +++ b/src/FSharp.Literate/FSharp.Literate.fsproj @@ -36,7 +36,7 @@ ..\..\bin\FSharp.Literate.xml - 12.0 + 14.0 11 @@ -45,17 +45,17 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets diff --git a/src/FSharp.Markdown/FSharp.Markdown.fsproj b/src/FSharp.Markdown/FSharp.Markdown.fsproj index 64fb5865b..16829d237 100644 --- a/src/FSharp.Markdown/FSharp.Markdown.fsproj +++ b/src/FSharp.Markdown/FSharp.Markdown.fsproj @@ -73,7 +73,7 @@ - 12.0 + 14.0 11 @@ -82,17 +82,17 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets diff --git a/src/FSharp.MetadataFormat/FSharp.MetadataFormat.fsproj b/src/FSharp.MetadataFormat/FSharp.MetadataFormat.fsproj index a03e494cf..82bfab926 100644 --- a/src/FSharp.MetadataFormat/FSharp.MetadataFormat.fsproj +++ b/src/FSharp.MetadataFormat/FSharp.MetadataFormat.fsproj @@ -37,30 +37,31 @@ 3 ..\..\bin\FSharp.MetadataFormat.xml - - 12.0 - 11 - ..\..\bin\ + + + 14.0 + 11 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets diff --git a/tests/FSharp.CodeFormat.Tests/FSharp.CodeFormat.Tests.fsproj b/tests/FSharp.CodeFormat.Tests/FSharp.CodeFormat.Tests.fsproj index 56cb0ef4e..20aafb566 100644 --- a/tests/FSharp.CodeFormat.Tests/FSharp.CodeFormat.Tests.fsproj +++ b/tests/FSharp.CodeFormat.Tests/FSharp.CodeFormat.Tests.fsproj @@ -40,7 +40,7 @@ AnyCPU - 12.0 + 14.0 11 @@ -49,17 +49,17 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets diff --git a/tests/FSharp.Literate.Tests/FSharp.Literate.Tests.fsproj b/tests/FSharp.Literate.Tests/FSharp.Literate.Tests.fsproj index 62ec62b09..5d4ef9c8d 100644 --- a/tests/FSharp.Literate.Tests/FSharp.Literate.Tests.fsproj +++ b/tests/FSharp.Literate.Tests/FSharp.Literate.Tests.fsproj @@ -44,7 +44,7 @@ bin\Release\FSharp.Literate.Tests.xml - 12.0 + 14.0 11 @@ -53,17 +53,17 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets diff --git a/tests/FSharp.Markdown.Tests/FSharp.Markdown.Tests.fsproj b/tests/FSharp.Markdown.Tests/FSharp.Markdown.Tests.fsproj index 9413190c0..788ee1441 100644 --- a/tests/FSharp.Markdown.Tests/FSharp.Markdown.Tests.fsproj +++ b/tests/FSharp.Markdown.Tests/FSharp.Markdown.Tests.fsproj @@ -40,7 +40,7 @@ AnyCPU - 12.0 + 14.0 11 @@ -49,17 +49,17 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets diff --git a/tests/FSharp.MetadataFormat.Tests/FSharp.MetadataFormat.Tests.fsproj b/tests/FSharp.MetadataFormat.Tests/FSharp.MetadataFormat.Tests.fsproj index 8728aebbc..c783371ce 100644 --- a/tests/FSharp.MetadataFormat.Tests/FSharp.MetadataFormat.Tests.fsproj +++ b/tests/FSharp.MetadataFormat.Tests/FSharp.MetadataFormat.Tests.fsproj @@ -53,7 +53,7 @@ - 12.0 + 14.0 11 @@ -62,17 +62,17 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets diff --git a/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib1.fsproj b/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib1.fsproj index d38ed036b..fa6ac5a67 100644 --- a/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib1.fsproj +++ b/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib1.fsproj @@ -45,7 +45,7 @@ - 12.0 + 14.0 11 @@ -54,17 +54,17 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets diff --git a/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib2.fsproj b/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib2.fsproj index 50eadc43c..7ed5d3a8b 100644 --- a/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib2.fsproj +++ b/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib2.fsproj @@ -33,7 +33,7 @@ bin\Release\FsLib.XML - 12.0 + 14.0 11 @@ -42,17 +42,17 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets diff --git a/tests/FSharp.MetadataFormat.Tests/files/TestLib/TestLib1.fsproj b/tests/FSharp.MetadataFormat.Tests/files/TestLib/TestLib1.fsproj index 13254c6cf..3182d6263 100644 --- a/tests/FSharp.MetadataFormat.Tests/files/TestLib/TestLib1.fsproj +++ b/tests/FSharp.MetadataFormat.Tests/files/TestLib/TestLib1.fsproj @@ -33,7 +33,7 @@ bin\Release\TestLib1.XML - 12.0 + 14.0 11 @@ -42,17 +42,17 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets diff --git a/tests/FSharp.MetadataFormat.Tests/files/TestLib/TestLib2.fsproj b/tests/FSharp.MetadataFormat.Tests/files/TestLib/TestLib2.fsproj index f13c26050..0e2d704e2 100644 --- a/tests/FSharp.MetadataFormat.Tests/files/TestLib/TestLib2.fsproj +++ b/tests/FSharp.MetadataFormat.Tests/files/TestLib/TestLib2.fsproj @@ -45,7 +45,7 @@ - 12.0 + 14.0 11 @@ -54,17 +54,17 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets diff --git a/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib1.fsproj b/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib1.fsproj index 5265f4430..48ac041f2 100644 --- a/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib1.fsproj +++ b/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib1.fsproj @@ -45,7 +45,7 @@ - 12.0 + 14.0 11 @@ -54,17 +54,17 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets diff --git a/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib2.fsproj b/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib2.fsproj index c51868e95..f8ed9f861 100644 --- a/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib2.fsproj +++ b/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib2.fsproj @@ -53,7 +53,7 @@ - 12.0 + 14.0 11 @@ -62,17 +62,17 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets - + $(MSBuildProgramFiles32)\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets