Skip to content

Commit

Permalink
Dependency resolution for .NETFramework4.5 and .NETPortable0.0-wp8+ne…
Browse files Browse the repository at this point in the history
…tcore45+net45+wp81+wpa81 fixed - fixes #1753
  • Loading branch information
forki committed Jun 24, 2016
1 parent d8e1bfd commit a739d0c
Show file tree
Hide file tree
Showing 12 changed files with 550 additions and 279 deletions.
3 changes: 2 additions & 1 deletion RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#### 3.2.0-alpha005 - 23.06.2016
#### 3.2.0-alpha006 - 23.06.2016
* Show out-of-sync error message if paket.lock is not matching paket.dependencies - https://github.com/fsprojects/Paket/issues/1750
* BUGFIX: Dependency resolution for .NETFramework4.5 and .NETPortable0.0-wp8+netcore45+net45+wp81+wpa81 fixed - https://github.com/fsprojects/Paket/issues/1753
* BUGFIX: Don't report warnings for packages that are not installed for current target framework - https://github.com/fsprojects/Paket/issues/1693
* BUGFIX: Runtime deps are copied based on TargetFramework - https://github.com/fsprojects/Paket/issues/1751
* BUGFIX: Do not take over control over manual nodes - https://github.com/fsprojects/Paket/issues/1746
Expand Down
12 changes: 11 additions & 1 deletion integrationtests/Paket.IntegrationTests/InstallSpecs.fs
Original file line number Diff line number Diff line change
Expand Up @@ -520,10 +520,20 @@ let ``#1734 ncrunch condition``() =
s2 |> shouldEqual s1

[<Test>]
let ``#746 hard should be softer``() =
let ``#1746 hard should be softer``() =
install "i001746-hard-legacy" |> ignore
let newFile = Path.Combine(scenarioTempPath "i001746-hard-legacy","SilverlightClassLibrary1","SilverlightClassLibrary1.csproj")
let oldFile = Path.Combine(originalScenarioPath "i001746-hard-legacy","SilverlightClassLibrary1","SilverlightClassLibrary1.csprojtemplate")
let s1 = File.ReadAllText oldFile |> normalizeLineEndings
let s2 = File.ReadAllText newFile |> normalizeLineEndings
s2 |> shouldEqual s1


[<Test>]
let ``#1753 use net45 and not portable``() =
install "i001753-portablenet451" |> ignore
let newFile = Path.Combine(scenarioTempPath "i001753-portablenet451","SilverlightClassLibrary1","SilverlightClassLibrary1.csproj")
let oldFile = Path.Combine(originalScenarioPath "i001753-portablenet451","SilverlightClassLibrary1","SilverlightClassLibrary1.csprojtemplate")
let s1 = File.ReadAllText oldFile |> normalizeLineEndings
let s2 = File.ReadAllText newFile |> normalizeLineEndings
s2 |> shouldEqual s1
206 changes: 0 additions & 206 deletions integrationtests/scenarios/i001746-hard-legacy/before/.gitignore

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
using System;
using System.Net;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Documents;
using System.Windows.Ink;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Animation;
using System.Windows.Shapes;

namespace SilverlightClassLibrary1
{
public class Class1
{

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
// ***********************************************************************
// Copyright (c) 2009 Charlie Poole
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// ***********************************************************************

using System;
using System.IO;
using NUnitLite.Runner;
using NUnit.Framework.Internal;

namespace NUnitLite.Tests
{
public class Program
{
// The main program executes the tests. Output may be routed to
// various locations, depending on the arguments passed.
//
// Arguments:
//
// Arguments may be names of assemblies or options prefixed with '/'
// or '-'. Normally, no assemblies are passed and the calling
// assembly (the one containing this Main) is used. The following
// options are accepted:
//
// -test:<testname> Provides the name of a test to be exected.
// May be repeated. If this option is not used,
// all tests are run.
//
// -out:PATH Path to a file to which output is written.
// If omitted, Console is used, which means the
// output is lost on a platform with no Console.
//
// -full Print full report of all tests.
//
// -result:PATH Path to a file to which the XML test result is written.
//
// -explore[:Path] If specified, list tests rather than executing them. If a
// path is given, an XML file representing the tests is written
// to that location. If not, output is written to tests.xml.
//
// -noheader,noh Suppress display of the initial message.
//
// -wait Wait for a keypress before exiting.
//
// -include:categorylist
// If specified, nunitlite will only run the tests with a category
// that is in the comma separated list of category names.
// Example usage: -include:category1,category2 this command can be used
// in combination with the -exclude option also note that exlude takes priority
// over all includes.
//
// -exclude:categorylist
// If specified, nunitlite will not run any of the tests with a category
// that is in the comma separated list of category names.
// Example usage: -exclude:category1,category2 this command can be used
// in combination with the -include option also note that exclude takes priority
// over all includes
public static void Main(string[] args)
{
new TextUI().Execute(args);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
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("SilverlightClassLibrary1")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Philips")]
[assembly: AssemblyProduct("SilverlightClassLibrary1")]
[assembly: AssemblyCopyright("Copyright © Philips 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("de5a4de9-a6ea-4ceb-ac16-b82aacacd8bd")]

// 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 Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
Loading

0 comments on commit a739d0c

Please sign in to comment.