@@ -8,7 +8,7 @@ open System.Text.RegularExpressions
8
8
open Paket
9
9
10
10
[<Test>]
11
- let ``install should redirect required assemblies only`` () =
11
+ let ``install should redirect required assemblies only`` () =
12
12
use __ = paket " install --redirects --createnewbindingfiles" " i001187-binding-redirect" |> fst
13
13
14
14
let path = Path.Combine( scenarioTempPath " i001187-binding-redirect" )
@@ -86,9 +86,9 @@ let ``#2408 should report wrong app.config parsing``() =
86
86
failwith " paket should fail"
87
87
with
88
88
| exn when exn.Message.Contains( " Project1" ) && exn.Message.Contains( " app.config" ) -> ()
89
-
89
+
90
90
[<Test>]
91
- let ``#1218 install should replace paket's binding redirects with required only`` () =
91
+ let ``#1218 install should replace paket's binding redirects with required only`` () =
92
92
use __ = paket " install --redirects --createnewbindingfiles" " i001218-binding-redirect" |> fst
93
93
94
94
let path = Path.Combine( scenarioTempPath " i001218-binding-redirect" )
@@ -166,25 +166,7 @@ let ``#1218 install should replace paket's binding redirects with required only`
166
166
167
167
168
168
[<Test>]
169
- let ``#1270 force redirects`` () =
170
- use __ = paket " install --createnewbindingfiles" " i001270-force-redirects" |> fst
171
- let path = Path.Combine( scenarioTempPath " i001270-force-redirects" )
172
- let configPath = Path.Combine( path, " MyClassLibrary" , " MyClassLibrary" , " app.config" )
173
-
174
- let ``FSharp.Core`` = """ <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />"""
175
- let AlphaFS = """ <assemblyIdentity name="AlphaFS" publicKeyToken="4d31a58f7d7ad5c9" culture="neutral" />"""
176
- let ``Newtonsoft.Json`` = """ <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />"""
177
- let ``Newtonsoft.Json.Schema`` = """ <assemblyIdentity name="Newtonsoft.Json.Schema" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />"""
178
-
179
- let config = File.ReadAllText( configPath)
180
-
181
- config |> shouldContainText `` FSharp.Core ``
182
- config.Contains AlphaFS |> shouldEqual false
183
- config.Contains `` Newtonsoft.Json `` |> shouldEqual false
184
- config.Contains `` Newtonsoft.Json.Schema `` |> shouldEqual false
185
-
186
- [<Test>]
187
- let ``#1270 redirects from references`` () =
169
+ let ``#1270 redirects from references`` () =
188
170
use __ = paket " install --createnewbindingfiles" " i001270-force-redirects" |> fst
189
171
let path = Path.Combine( scenarioTempPath " i001270-force-redirects" )
190
172
let configPath = Path.Combine( path, " MyClassLibrary" , " MyClassLibrary2" , " app.config" )
@@ -202,7 +184,7 @@ let ``#1270 redirects from references``() =
202
184
config.Contains `` Newtonsoft.Json `` |> shouldEqual false
203
185
204
186
[<Test>]
205
- let ``#1574 redirects GAC`` () =
187
+ let ``#1574 redirects GAC`` () =
206
188
use __ = paket " install --clean-redirects" " i001574-redirect-gac" |> fst
207
189
let path = Path.Combine( scenarioTempPath " i001574-redirect-gac" )
208
190
let configPath = Path.Combine( path, " BindingRedirectPaketBug" , " App.config" )
@@ -220,26 +202,24 @@ let ``#1621 generates binding redirect when references project with another targ
220
202
use __ = install scenario |> fst
221
203
let ``NUnit`` = """ <assemblyIdentity name="nunit.framework" publicKeyToken="2638cd05610744eb" culture="neutral" />"""
222
204
let ``NUnit correct version`` = " newVersion=\" 3.0.5813.39031\" "
223
-
205
+
224
206
let path = Path.Combine( scenarioTempPath scenario, " projectB" )
225
207
let configPath = Path.Combine( path, " app.config" )
226
208
227
209
let config = File.ReadAllText( configPath) |> normalizeLineEndings
228
-
210
+
229
211
config |> shouldContainText `` NUnit ``
230
212
config |> shouldContainText `` NUnit correct version ``
231
213
232
214
[<Test>]
233
215
let ``#1783 generates binding redirect when assembly with different version of main group`` () =
234
216
let scenario = " i001783-different-versions"
235
217
use __ = install scenario |> fst
236
- let ``FSharp.Core`` = """ <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />"""
237
218
let ``Newtonsoft.Json`` = """ <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />"""
238
-
219
+
239
220
let path = Path.Combine( scenarioTempPath scenario, " projectB" )
240
221
let configPath = Path.Combine( path, " app.config" )
241
222
242
223
let config = File.ReadAllText( configPath) |> normalizeLineEndings
243
-
244
- config |> shouldContainText `` FSharp.Core ``
224
+
245
225
config |> shouldContainText `` Newtonsoft.Json ``
0 commit comments