Skip to content

Commit

Permalink
Try to reproduce #1574
Browse files Browse the repository at this point in the history
  • Loading branch information
forki committed Apr 7, 2016
1 parent 71a687e commit b099dfe
Show file tree
Hide file tree
Showing 11 changed files with 1,214 additions and 2 deletions.
14 changes: 12 additions & 2 deletions integrationtests/Paket.IntegrationTests/BindingRedirect.fs
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,6 @@ let ``#1248 redirects off with --redirects``() =

config |> shouldEqual originalConfig


[<Test>]
let ``#1544 redirects off``() =
install "i001544-redirects" |> ignore
Expand All @@ -329,6 +328,18 @@ let ``#1544 redirects off``() =
let originalConfig = File.ReadAllText(originalConfigPath) |> normalizeLineEndings

config |> shouldEqual originalConfig

[<Test>]
let ``#1574 redirects GAC``() =
paket "install --force" "i001574-redirect-gac" |> ignore
let path = Path.Combine(scenarioTempPath "i001574-redirect-gac")
let configPath = Path.Combine(path, "BindingRedirectPaketBug", "App.config")
let originalConfigPath = Path.Combine(path, "BindingRedirectPaketBug", "App.config.expected")

let config = File.ReadAllText(configPath) |> normalizeLineEndings
let originalConfig = File.ReadAllText(originalConfigPath) |> normalizeLineEndings

config |> shouldEqual originalConfig

[<Test>]
let ``#1477 assembly redirects lock files``() =
Expand All @@ -342,6 +353,5 @@ let ``#1477 assembly redirects lock files``() =
Directory.Delete(scenarioTempPath scenario, true)
with e ->
failwith "could not delete directory, i.e. restore holds on to files"



30 changes: 30 additions & 0 deletions integrationtests/scenarios/i001574-redirect-gac/before/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@

#ignore thumbnails created by windows
Thumbs.db
#Ignore files build by Visual Studio
*.obj
*.exe
*.pdb
*.user
*.aps
*.pch
*.vspscc
*_i.c
*_p.c
*.ncb
*.suo
*.tlb
*.tlh
*.bak
*.cache
*.ilk
*.log
[Bb]in
[Dd]ebug*/
*.lib
*.sbr
obj/
[Rr]elease*/
_ReSharper*/
[Tt]est[Rr]esult*
packages/
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.40629.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BindingRedirectPaketBug", "BindingRedirectPaketBug\BindingRedirectPaketBug.csproj", "{CE87814D-6446-4D2F-A13E-E05FDF88563C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{CE87814D-6446-4D2F-A13E-E05FDF88563C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CE87814D-6446-4D2F-A13E-E05FDF88563C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CE87814D-6446-4D2F-A13E-E05FDF88563C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CE87814D-6446-4D2F-A13E-E05FDF88563C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>

<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>

<runtime>

<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<Paket>True</Paket>
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="4.3.1.0" />
</dependentAssembly>
</assemblyBinding></runtime>
</configuration>

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace BindingRedirectPaketBug
{
class Program
{
static void Main(string[] args)
{
}
}
}
Original file line number Diff line number Diff line change
@@ -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("BindingRedirectPaketBug")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("BindingRedirectPaketBug")]
[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("b32b86b3-e1f9-4d4f-926a-7fc29833c758")]

// 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")]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
FSharp.Core
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
redirects: off
source https://www.nuget.org/api/v2

nuget FSharp.Core redirects: force
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
REDIRECTS: OFF
NUGET
remote: https://www.nuget.org/api/v2
specs:
FSharp.Core (3.1.2.1) - redirects: force

0 comments on commit b099dfe

Please sign in to comment.