fsprojects · forki · Aug 22, 2016 · Aug 19, 2016
diff --git a/integrationtests/Paket.IntegrationTests/InstallSpecs.fs b/integrationtests/Paket.IntegrationTests/InstallSpecs.fs
@@ -569,4 +569,11 @@ let ``#1815 duplicate fsharp core reference when using netstandard1.6``() =
       |> Seq.toList
 
     assemblies |> shouldEqual [ scenarioTempPath "i001815-multiple-dnc-refs" @@ "packages" @@ "Microsoft.FSharp.Core.netcore" @@ "lib" @@ "netstandard1.6" @@ "FSharp.Core.dll" ]
-    s2 |> shouldEqual s1
+    s2 |> shouldEqual s1
+
+[<Test>]
+let ``#1860 faulty condition was generated`` () =
+    let scenario = "i001860-condition-attribute"
+    install scenario |> ignore
+    let fsprojFile = (scenarioTempPath scenario) </> "Library1" </> "Library1.fsproj" |> File.ReadAllText
+    Assert.IsFalse (fsprojFile.Contains(" And ()"))
diff --git a/integrationtests/scenarios/i001860-condition-attribute/before/Library1/AssemblyInfo.fs b/integrationtests/scenarios/i001860-condition-attribute/before/Library1/AssemblyInfo.fs
@@ -0,0 +1,41 @@
+namespace Library1.AssemblyInfo
+
+open System.Reflection
+open System.Runtime.CompilerServices
+open System.Runtime.InteropServices
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[<assembly: AssemblyTitle("Library1")>]
+[<assembly: AssemblyDescription("")>]
+[<assembly: AssemblyConfiguration("")>]
+[<assembly: AssemblyCompany("")>]
+[<assembly: AssemblyProduct("Library1")>]
+[<assembly: AssemblyCopyright("Copyright ©  2016")>]
+[<assembly: AssemblyTrademark("")>]
+[<assembly: AssemblyCulture("")>]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[<assembly: ComVisible(false)>]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[<assembly: Guid("7206752f-0b03-48f4-a448-251dfdb1c67f")>]
+
+// Version information for an assembly consists of the following four values:
+// 
+//       Major Version
+//       Minor Version 
+//       Build Number
+//       Revision
+// 
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [<assembly: AssemblyVersion("1.0.*")>]
+[<assembly: AssemblyVersion("1.0.0.0")>]
+[<assembly: AssemblyFileVersion("1.0.0.0")>]
+
+do
+    ()
diff --git a/integrationtests/scenarios/i001860-condition-attribute/before/Library1/Library1.fs b/integrationtests/scenarios/i001860-condition-attribute/before/Library1/Library1.fs
@@ -0,0 +1,4 @@
+namespace Library1
+
+type Class1() = 
+    member this.X = "F#"
diff --git a/integrationtests/scenarios/i001860-condition-attribute/before/Library1/Library1.fsproj b/integrationtests/scenarios/i001860-condition-attribute/before/Library1/Library1.fsproj
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>7206752f-0b03-48f4-a448-251dfdb1c67f</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Library1</RootNamespace>
+    <AssemblyName>Library1</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Name>Library1</Name>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <Tailcalls>false</Tailcalls>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <WarningLevel>3</WarningLevel>
+    <DocumentationFile>bin\Debug\Library1.XML</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <Tailcalls>true</Tailcalls>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <WarningLevel>3</WarningLevel>
+    <DocumentationFile>bin\Release\Library1.XML</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="mscorlib" />
+    <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Numerics" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.fs" />
+    <Compile Include="Library1.fs" />
+    <None Include="Script.fsx" />
+  </ItemGroup>
+  <PropertyGroup>
+    <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Choose>
+    <When Condition="'$(VisualStudioVersion)' == '11.0'">
+      <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
+        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
+        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  <Import Project="$(FSharpTargetsPath)" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
diff --git a/integrationtests/scenarios/i001860-condition-attribute/before/Library1/Library1.sln b/integrationtests/scenarios/i001860-condition-attribute/before/Library1/Library1.sln
@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Library1", "Library1.fsproj", "{7206752F-0B03-48F4-A448-251DFDB1C67F}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{7206752F-0B03-48F4-A448-251DFDB1C67F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7206752F-0B03-48F4-A448-251DFDB1C67F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7206752F-0B03-48F4-A448-251DFDB1C67F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7206752F-0B03-48F4-A448-251DFDB1C67F}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/integrationtests/scenarios/i001860-condition-attribute/before/Library1/Script.fsx b/integrationtests/scenarios/i001860-condition-attribute/before/Library1/Script.fsx
@@ -0,0 +1,8 @@
+// Learn more about F# at http://fsharp.org. See the 'F# Tutorial' project
+// for more guidance on F# programming.
+
+#load "Library1.fs"
+open Library1
+
+// Define your library scripting code here
+
diff --git a/integrationtests/scenarios/i001860-condition-attribute/before/Library1/paket.references b/integrationtests/scenarios/i001860-condition-attribute/before/Library1/paket.references
@@ -0,0 +1,5 @@
+MBrace.Azure.Management
+MBrace.Flow
+Microsoft.Azure.Management.Compute
+Microsoft.Azure.Management.Sql
+Microsoft.IdentityModel.Clients.ActiveDirectory
diff --git a/integrationtests/scenarios/i001860-condition-attribute/before/paket.dependencies b/integrationtests/scenarios/i001860-condition-attribute/before/paket.dependencies
@@ -0,0 +1,14 @@
+strategy: max
+source https://www.nuget.org/api/v2
+redirects: on
+framework: >= net40
+
+nuget MBrace.Core condition: Azure
+nuget MBrace.Flow condition: Azure
+nuget MBrace.Runtime condition: Azure
+nuget MBrace.Azure condition: Azure
+nuget MBrace.Azure.Management condition: Azure
+nuget Microsoft.Azure.Management.Compute prerelease condition: Azure
+nuget Microsoft.Azure.Management.ResourceManager prerelease condition: Azure
+nuget Microsoft.Azure.Management.Sql prerelease condition: Azure
+nuget Microsoft.IdentityModel.Clients.ActiveDirectory condition: Azure
diff --git a/integrationtests/scenarios/i001860-condition-attribute/before/paket.lock b/integrationtests/scenarios/i001860-condition-attribute/before/paket.lock
@@ -0,0 +1,132 @@
+REDIRECTS: ON
+STRATEGY: MAX
+FRAMEWORK: >= NET40
+NUGET
+  remote: https://www.nuget.org/api/v2
+    Argu (3.2) - condition: azure
+    FSharp.Core (4.0.0.1) - condition: azure
+    FsPickler (2.1) - condition: azure
+    FsPickler.Json (2.1) - condition: azure
+      FsPickler (2.1)
+      Newtonsoft.Json (>= 6.0.5)
+    Hyak.Common (1.1) - condition: azure
+      Microsoft.Bcl (>= 1.1.9) - framework: >= net40-full
+      Microsoft.Bcl.Async (>= 1.0.168) - framework: >= net40-full
+      Microsoft.Bcl.Build (>= 1.0.14) - framework: >= net40-full
+      Microsoft.Net.Http (>= 2.2.22) - framework: >= net40-full
+      Newtonsoft.Json (>= 7.0.1) - framework: >= net40-full
+    MBrace.Azure (1.4.3) - condition: azure
+      Argu (>= 3.0 < 4.0)
+      MBrace.Core (>= 1.3 < 1.4)
+      MBrace.Runtime (>= 1.3 < 1.4)
+      System.Reflection.Metadata
+      WindowsAzure.ServiceBus (>= 3.0 < 4.0)
+      WindowsAzure.Storage (>= 7.0 < 8.0)
+    MBrace.Azure.Management (1.4.3) - condition: azure
+      MBrace.Azure (>= 1.4.3)
+      MBrace.Core (>= 1.3 < 1.4)
+      MBrace.Runtime (>= 1.3 < 1.4)
+      Microsoft.Bcl.Async (>= 1.0 < 2.0)
+      Microsoft.WindowsAzure.Management.Libraries (>= 2.0 < 3.0)
+      Microsoft.WindowsAzure.Management.ServiceBus (>= 0.18.0-prerelease < 1.0.0-prerelease)
+      WindowsAzure.ServiceBus (>= 3.0 < 4.0)
+      WindowsAzure.Storage (>= 7.0 < 8.0)
+    MBrace.Core (1.3.1) - condition: azure
+    MBrace.Flow (1.3.1) - condition: azure
+      FSharp.Core (>= 3.0)
+      MBrace.Core (1.3.1)
+      Streams (>= 0.4 < 0.5)
+    MBrace.Runtime (1.3.1) - condition: azure
+      FsPickler (>= 2.1 < 2.2)
+      FsPickler.Json (>= 2.1 < 2.2)
+      MBrace.Core (1.3.1)
+      Vagabond (>= 0.13.1 < 0.14)
+    Microsoft.Azure.Common (2.1) - condition: azure
+      Hyak.Common (>= 1.0.2)
+      Microsoft.Azure.Common.Dependencies (>= 1.0)
+    Microsoft.Azure.Common.Dependencies (1.0) - condition: azure
+      Microsoft.Bcl (>= 1.1.9)
+      Microsoft.Bcl.Async (>= 1.0.168)
+      Microsoft.Bcl.Build (>= 1.0.14)
+      Microsoft.Net.Http (>= 2.2.22)
+      Newtonsoft.Json (>= 6.0.4)
+    Microsoft.Azure.KeyVault.Core (1.0) - condition: azure
+    Microsoft.Azure.Management.Compute (13.0.4-prerelease) - condition: azure
+      Microsoft.Rest.ClientRuntime.Azure (>= 3.1 < 4.0) - framework: >= net45
+    Microsoft.Azure.Management.ResourceManager (1.1.5-preview) - condition: azure
+      Microsoft.Rest.ClientRuntime.Azure (>= 3.1 < 4.0) - framework: >= net45
+    Microsoft.Azure.Management.Sql (0.49.0-prerelease) - condition: azure
+      Microsoft.Azure.Common (>= 2.1 < 3.0)
+    Microsoft.Bcl (1.1.10) - condition: azure
+      Microsoft.Bcl.Build (>= 1.0.14)
+    Microsoft.Bcl.Async (1.0.168) - condition: azure
+      Microsoft.Bcl (>= 1.1.8)
+    Microsoft.Bcl.Build (1.0.21) - import_targets: false, condition: azure
+    Microsoft.Data.Edm (5.7) - condition: azure
+    Microsoft.Data.OData (5.7) - condition: azure
+      Microsoft.Data.Edm (5.7)
+      System.Spatial (5.7)
+    Microsoft.Data.Services.Client (5.7) - condition: azure
+      Microsoft.Data.OData (5.7)
+    Microsoft.Net.Http (2.2.29) - condition: azure
+      Microsoft.Bcl (>= 1.1.10)
+      Microsoft.Bcl.Build (>= 1.0.14)
+    Microsoft.Rest.ClientRuntime (2.3.2) - condition: azure, framework: >= net45
+      Newtonsoft.Json (>= 6.0.8) - framework: >= net45
+    Microsoft.Rest.ClientRuntime.Azure (3.3.2) - condition: azure
+      Microsoft.Rest.ClientRuntime (>= 2.3.2 < 3.0) - framework: >= net45
+    Microsoft.WindowsAzure.Common (1.4.1) - condition: azure
+      Microsoft.WindowsAzure.Common.Dependencies (>= 1.1.1)
+    Microsoft.WindowsAzure.Common.Dependencies (1.1.1) - condition: azure
+      Microsoft.Bcl (>= 1.1.9)
+      Microsoft.Bcl.Async (>= 1.0.168)
+      Microsoft.Bcl.Build (>= 1.0.14)
+      Microsoft.Net.Http (>= 2.2.22)
+      Newtonsoft.Json (>= 6.0.4)
+    Microsoft.WindowsAzure.Management (4.1.1) - condition: azure
+      Microsoft.Azure.Common (>= 2.0.4 < 3.0)
+    Microsoft.WindowsAzure.Management.Compute (13.0) - condition: azure
+      Microsoft.Azure.Common (>= 2.0.4 < 3.0)
+    Microsoft.WindowsAzure.Management.Libraries (2.0) - condition: azure
+      Microsoft.WindowsAzure.Common (>= 1.3 < 2.0)
+      Microsoft.WindowsAzure.Management (>= 2.0)
+      Microsoft.WindowsAzure.Management.Compute (>= 5.0)
+      Microsoft.WindowsAzure.Management.MediaServices (>= 2.0)
+      Microsoft.WindowsAzure.Management.Monitoring (>= 1.0)
+      Microsoft.WindowsAzure.Management.Network (>= 3.0)
+      Microsoft.WindowsAzure.Management.Scheduler (>= 3.0)
+      Microsoft.WindowsAzure.Management.Sql (>= 3.0)
+      Microsoft.WindowsAzure.Management.Storage (>= 3.0)
+      Microsoft.WindowsAzure.Management.WebSites (>= 3.0)
+    Microsoft.WindowsAzure.Management.MediaServices (4.1) - condition: azure
+      Microsoft.Azure.Common (>= 2.0.1 < 3.0)
+    Microsoft.WindowsAzure.Management.Monitoring (4.1) - condition: azure
+      Microsoft.Azure.Common (>= 2.0.1 < 3.0)
+    Microsoft.WindowsAzure.Management.Network (8.0) - condition: azure
+      Microsoft.Azure.Common (>= 2.1 < 3.0)
+    Microsoft.WindowsAzure.Management.Scheduler (6.2) - condition: azure
+      Microsoft.Azure.Common (>= 2.0.4 < 3.0)
+    Microsoft.WindowsAzure.Management.ServiceBus (0.19.0-preview) - condition: azure
+      Microsoft.Azure.Common (>= 2.0.4 < 3.0)
+    Microsoft.WindowsAzure.Management.Sql (5.2) - condition: azure
+      Microsoft.Azure.Common (>= 2.0.4 < 3.0)
+    Microsoft.WindowsAzure.Management.Storage (6.0.1) - condition: azure
+      Microsoft.Azure.Common (>= 2.0.4 < 3.0)
+    Microsoft.WindowsAzure.Management.WebSites (4.0) - condition: azure
+      Microsoft.WindowsAzure.Common (>= 1.3 < 2.0)
+    Mono.Cecil (0.9.6.4) - condition: azure
+    Newtonsoft.Json (9.0.1) - condition: azure
+    Streams (0.4.1) - condition: azure
+    System.Collections.Immutable (1.2) - condition: azure, framework: >= net45
+    System.Reflection.Metadata (1.3) - condition: azure
+      System.Collections.Immutable (>= 1.2) - framework: >= net45
+    System.Spatial (5.7) - condition: azure
+    Vagabond (0.13.1) - condition: azure
+      FsPickler (>= 2.1 < 2.2)
+      Mono.Cecil (>= 0.9.6.3 < 0.9.7)
+    WindowsAzure.ServiceBus (3.3.2) - condition: azure
+    WindowsAzure.Storage (7.2) - condition: azure
+      Microsoft.Azure.KeyVault.Core (>= 1.0)
+      Microsoft.Data.OData (>= 5.6.4)
+      Microsoft.Data.Services.Client (>= 5.6.4)
+      Newtonsoft.Json (>= 6.0.8)