Merge branch 'AssemblyReaderFix' of https://github.com/haraldsteinlec…

…hner/Paket

integrationtests/Paket.IntegrationTests/PackSpecs.fs

@@ -315,4 +315,19 @@ let ``#1594 allows to pack directly``() =
     ZipFile.ExtractToDirectory(package, outPath)
 
     File.Exists(Path.Combine(outPath, "lib", "net35", "ClassLibrary1.dll")) |> shouldEqual true
+    File.Delete(templatePath)
+
+[<Test>]
+let ``#1596 pack works for reflected definition assemblies``() =
+    let scenario = "i001596-pack-reflectedDefinition"
+
+    let outPath = Path.Combine(scenarioTempPath scenario,"bin")
+    let templatePath = Path.Combine(scenarioTempPath scenario, "paket.template")
+    let r = paket "pack output bin version 1.0.0 templatefile paket.template" scenario 
+    printfn "paket.pack said: %A" r
+    let package = Path.Combine(outPath, "Project2.1.0.0.nupkg")
+
+    ZipFile.ExtractToDirectory(package, outPath)
+
+    File.Exists(Path.Combine(outPath, "lib", "net45", "Project2.dll")) |> shouldEqual true
     File.Delete(templatePath)

integrationtests/scenarios/i001596-pack-reflectedDefinition/before/ClassLibrary1.sln

@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Project2", "Project2.fsproj", "{BDF41042-8CB5-4723-AA90-18C05F9FFE85}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{BDF41042-8CB5-4723-AA90-18C05F9FFE85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BDF41042-8CB5-4723-AA90-18C05F9FFE85}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BDF41042-8CB5-4723-AA90-18C05F9FFE85}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BDF41042-8CB5-4723-AA90-18C05F9FFE85}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

integrationtests/scenarios/i001596-pack-reflectedDefinition/before/Project2.fsprojtemplate

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.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>bdf41042-8cb5-4723-aa90-18c05f9ffe85</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Project2</RootNamespace>
+    <AssemblyName>Project2</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
+    <Name>Project2</Name>
+    <TargetFrameworkProfile />
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <Tailcalls>false</Tailcalls>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <WarningLevel>3</WarningLevel>
+    <DocumentationFile>bin\Debug\fsharp_project_scaffold_tests.XML</DocumentationFile>
+    <StartAction>Project</StartAction>
+    <StartProgram>
+    </StartProgram>
+    <StartArguments>
+    </StartArguments>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <Tailcalls>true</Tailcalls>
+    <DefineConstants>TRACE</DefineConstants>
+    <WarningLevel>3</WarningLevel>
+    <DocumentationFile>bin\Release\Project2.xml</DocumentationFile>
+  </PropertyGroup>
+  <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)" />
+  <ItemGroup>
+    <Reference Include="mscorlib" />
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+	<Compile Include="Test.fs" />
+  </ItemGroup>
+  <!-- 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>

integrationtests/scenarios/i001596-pack-reflectedDefinition/before/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using 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("ClassLibrary1")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("ClassLibrary1")]
+[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("193980e1-4f3c-4522-9362-2dcfb4dd85b8")]
+
+// 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")]

integrationtests/scenarios/i001596-pack-reflectedDefinition/before/Test.fs

@@ -0,0 +1,6 @@
+namespace jasdf
+
+module Test =
+    [<ReflectedDefinition>]
+    let a () = 1123
+

integrationtests/scenarios/i001596-pack-reflectedDefinition/before/app.config

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <appSettings>
+    <!-- For Goldmine tests -->
+    <add key="GoldmineEntityType" value="Proxy" />
+    <!-- Google apps API keys -->
+    <add key="GoogleAppMigrationWizProjectApiKey-1" value="key1"/>
+    <add key="GoogleAppMigrationWizProjectApiKey-2" value="key2"/>
+    <add key="GoogleAppMigrationWizProjectApiKey-3" value="key3"/>
+    <add key="SendEmails" value="false"/>
+    <add key="BitTitanDropBoxAppKey" value="BitTitan" />
+    <add key="BitTitanDropBoxSecretKey" value="BitTitan" />
+  </appSettings>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+  </startup>
+</configuration>

integrationtests/scenarios/i001596-pack-reflectedDefinition/before/paket.dependencies

@@ -0,0 +1 @@
+source https://www.nuget.org/api/v2

integrationtests/scenarios/i001596-pack-reflectedDefinition/before/paket.lock

@@ -0,0 +1 @@
+

integrationtests/scenarios/i001596-pack-reflectedDefinition/before/paket.templatetemplate

@@ -0,0 +1,4 @@
+type project
+licenseUrl http://opensource.org/licenses/MIT
+authors blub
+description bla

paket.dependencies

@@ -6,7 +6,7 @@ nuget FSharp.Core redirects: force
 nuget Chessie
 
 github fsharp/FAKE src/app/FakeLib/Globbing/Globbing.fs
-github fsharp/FSharp.Data src/CommonProviderImplementation/AssemblyReader.fs
+github haraldsteinlechner/FSharp.Data src/CommonProviderImplementation/AssemblyReader.fs
 
 group Build
 

paket.lock

@@ -10,9 +10,9 @@ GITHUB
   remote: fsharp/FAKE
   specs:
     src/app/FakeLib/Globbing/Globbing.fs (59dfade480c5f9107107f11af366aaae1f4a9157)
-  remote: fsharp/FSharp.Data
+  remote: haraldsteinlechner/FSharp.Data
   specs:
-    src/CommonProviderImplementation/AssemblyReader.fs (f815de5e8108bb7de25dde75135707719afd8e09)
+    src/CommonProviderImplementation/AssemblyReader.fs (d4a30757dc5e5ef7096fffafc1ed377b6174771b)
 GROUP Build
 NUGET
   remote: https://www.nuget.org/api/v2
@@ -32,7 +32,7 @@ NUGET
       Microsoft.Bcl (>= 1.1.10)
       Microsoft.Bcl.Build (>= 1.0.14)
     Octokit (0.19)
-      Microsoft.Net.Http  - framework: net10, net11, net20, net30, net35, net40, net40-full
+      Microsoft.Net.Http
 GITHUB
   remote: fsharp/FAKE
   specs:

src/Paket.Core/Paket.Core.fsproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.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>
@@ -74,7 +74,7 @@
   -->
   <Import Project="$(SolutionDir)\.paket\paket.targets" />
   <ItemGroup>
-    <Compile Include="..\..\paket-files\fsharp\FSharp.Data\src\CommonProviderImplementation\AssemblyReader.fs">
+    <Compile Include="..\..\paket-files\haraldsteinlechner\FSharp.Data\src\CommonProviderImplementation\AssemblyReader.fs">
       <Paket>True</Paket>
       <Link>AssemblyReader.fs</Link>
     </Compile>