diff --git a/integrationtests/Paket.IntegrationTests/InstallSpecs.fs b/integrationtests/Paket.IntegrationTests/InstallSpecs.fs index 33767d10e7..3094cc9b2e 100644 --- a/integrationtests/Paket.IntegrationTests/InstallSpecs.fs +++ b/integrationtests/Paket.IntegrationTests/InstallSpecs.fs @@ -374,55 +374,6 @@ let ``#1507 allows to download remote dependencies``() = File.Exists (Path.Combine(scenarioTempPath scenario, "paket-files", "forki", "PrivateEye", "privateeye.fsx")) |> shouldEqual true File.Exists (Path.Combine(scenarioTempPath scenario, "paket-files", "forki", "PrivateEye", "bin", "PrivateEye.Bridge.dll")) |> shouldEqual true -[] -let ``#1552 install mvvmlightlibs again``() = - let scenarioName = "i001552-install-mvvmlightlibs-again" - let scenarioPath = scenarioTempPath scenarioName - - let expected = File.ReadAllText (Path.Combine(originalScenarioPath scenarioName,"paket.locktemplate")) |> normalizeLineEndings - - let oldProjectFile = Path.Combine(originalScenarioPath scenarioName,"CSharp","CSharp.csprojtemplate") - let oldProjectFileText = File.ReadAllText oldProjectFile |> normalizeLineEndings - - let newLockFilePath = Path.Combine(scenarioPath,"paket.lock") - let lockFileShouldBeConsistentAfterCommand command = - directPaketInPath command scenarioPath |> ignore - - File.ReadAllText newLockFilePath |> normalizeLineEndings |> shouldEqual expected - - let newProjectFile = Path.Combine(scenarioPath,"CSharp","CSharp.csproj") - File.ReadAllText newProjectFile - |> normalizeLineEndings |> shouldEqual oldProjectFileText - - prepare scenarioName - let commands = - ["install -f" - "update -f" - "install" - "update"] - let rnd = new Random((int)DateTime.Now.Ticks) - for x in [1..10] do - let ind = if x<=4 then x-1 else rnd.Next(commands.Length) - let command = commands.[ind] - lockFileShouldBeConsistentAfterCommand command - -[] -let ``#1552 install mvvmlightlibs first time``() = - let scenarioName = "i001552-install-mvvmlightlibs-first-time" - - let expected = File.ReadAllText (Path.Combine(originalScenarioPath scenarioName,"paket.locktemplate")) |> normalizeLineEndings - - install scenarioName |> ignore - - let newLockFilePath = Path.Combine(scenarioTempPath scenarioName,"paket.lock") - File.ReadAllText newLockFilePath |> normalizeLineEndings |> shouldEqual expected - - directPaketInPath "install" (scenarioTempPath scenarioName) |> ignore - File.ReadAllText newLockFilePath |> normalizeLineEndings |> shouldEqual expected - - directPaketInPath "install -f" (scenarioTempPath scenarioName) |> ignore - File.ReadAllText newLockFilePath |> normalizeLineEndings |> shouldEqual expected - [] [] let ``#1589 http dep restore in parallel``() = diff --git a/integrationtests/scenarios/i001552-install-mvvmlightlibs-again/before/CSharp/App.config b/integrationtests/scenarios/i001552-install-mvvmlightlibs-again/before/CSharp/App.config deleted file mode 100644 index 8e15646352..0000000000 --- a/integrationtests/scenarios/i001552-install-mvvmlightlibs-again/before/CSharp/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/integrationtests/scenarios/i001552-install-mvvmlightlibs-again/before/CSharp/CSharp.csprojtemplate b/integrationtests/scenarios/i001552-install-mvvmlightlibs-again/before/CSharp/CSharp.csprojtemplate deleted file mode 100644 index 42ff729a7a..0000000000 --- a/integrationtests/scenarios/i001552-install-mvvmlightlibs-again/before/CSharp/CSharp.csprojtemplate +++ /dev/null @@ -1,291 +0,0 @@ - - - - - Debug - AnyCPU - {14EA9D55-F5F7-4DAC-8060-546288CA8D27} - Exe - Properties - CSharp - CSharp - v4.5 - 512 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - - - - ..\packages\CommonServiceLocator\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - True - True - - - - - - - - - ..\packages\MvvmLightLibs\lib\monoandroid1\GalaSoft.MvvmLight.Extras.dll - True - True - - - ..\packages\MvvmLightLibs\lib\monoandroid1\GalaSoft.MvvmLight.Platform.dll - True - True - - - ..\packages\MvvmLightLibs\lib\monoandroid1\GalaSoft.MvvmLight.dll - True - True - - - - - - - ..\packages\MvvmLightLibs\lib\net35\GalaSoft.MvvmLight.Extras.dll - True - True - - - ..\packages\MvvmLightLibs\lib\net35\GalaSoft.MvvmLight.dll - True - True - - - ..\packages\MvvmLightLibs\lib\net35\System.Windows.Interactivity.dll - True - True - - - - - - - ..\packages\MvvmLightLibs\lib\net40\GalaSoft.MvvmLight.Extras.dll - True - True - - - ..\packages\MvvmLightLibs\lib\net40\GalaSoft.MvvmLight.dll - True - True - - - ..\packages\MvvmLightLibs\lib\net40\System.Windows.Interactivity.dll - True - True - - - - - - - ..\packages\MvvmLightLibs\lib\net45\GalaSoft.MvvmLight.Extras.dll - True - True - - - ..\packages\MvvmLightLibs\lib\net45\GalaSoft.MvvmLight.Platform.dll - True - True - - - ..\packages\MvvmLightLibs\lib\net45\GalaSoft.MvvmLight.dll - True - True - - - ..\packages\MvvmLightLibs\lib\net45\System.Windows.Interactivity.dll - True - True - - - - - - - ..\packages\MvvmLightLibs\lib\portable-net45+wp8+wpa81+netcore45+monoandroid1+xamarin.ios10\GalaSoft.MvvmLight.Extras.dll - True - True - - - ..\packages\MvvmLightLibs\lib\portable-net45+wp8+wpa81+netcore45+monoandroid1+xamarin.ios10\GalaSoft.MvvmLight.dll - True - True - - - - - - - ..\packages\MvvmLightLibs\lib\SL5\GalaSoft.MvvmLight.Extras.dll - True - True - - - ..\packages\MvvmLightLibs\lib\SL5\GalaSoft.MvvmLight.dll - True - True - - - ..\packages\MvvmLightLibs\lib\SL5\System.Windows.Interactivity.dll - True - True - - - - - - - ..\packages\MvvmLightLibs\lib\windows81\GalaSoft.MvvmLight.Extras.dll - True - True - - - ..\packages\MvvmLightLibs\lib\windows81\GalaSoft.MvvmLight.Platform.dll - True - True - - - ..\packages\MvvmLightLibs\lib\windows81\GalaSoft.MvvmLight.dll - True - True - - - - - - - ..\packages\MvvmLightLibs\lib\wp8\GalaSoft.MvvmLight.Extras.dll - True - True - - - ..\packages\MvvmLightLibs\lib\wp8\GalaSoft.MvvmLight.Platform.dll - True - True - - - ..\packages\MvvmLightLibs\lib\wp8\GalaSoft.MvvmLight.dll - True - True - - - ..\packages\MvvmLightLibs\lib\wp8\System.Windows.Interactivity.dll - True - True - - - - - - - ..\packages\MvvmLightLibs\lib\wp81\GalaSoft.MvvmLight.Extras.dll - True - True - - - ..\packages\MvvmLightLibs\lib\wp81\GalaSoft.MvvmLight.Platform.dll - True - True - - - ..\packages\MvvmLightLibs\lib\wp81\GalaSoft.MvvmLight.dll - True - True - - - ..\packages\MvvmLightLibs\lib\wp81\System.Windows.Interactivity.dll - True - True - - - - - - - ..\packages\MvvmLightLibs\lib\wpa81\GalaSoft.MvvmLight.Extras.dll - True - True - - - ..\packages\MvvmLightLibs\lib\wpa81\GalaSoft.MvvmLight.Platform.dll - True - True - - - ..\packages\MvvmLightLibs\lib\wpa81\GalaSoft.MvvmLight.dll - True - True - - - - - - - ..\packages\MvvmLightLibs\lib\xamarin.ios10\GalaSoft.MvvmLight.Extras.dll - True - True - - - ..\packages\MvvmLightLibs\lib\xamarin.ios10\GalaSoft.MvvmLight.Platform.dll - True - True - - - ..\packages\MvvmLightLibs\lib\xamarin.ios10\GalaSoft.MvvmLight.dll - True - True - - - - - \ No newline at end of file diff --git a/integrationtests/scenarios/i001552-install-mvvmlightlibs-again/before/CSharp/Program.cs b/integrationtests/scenarios/i001552-install-mvvmlightlibs-again/before/CSharp/Program.cs deleted file mode 100644 index f66c42b459..0000000000 --- a/integrationtests/scenarios/i001552-install-mvvmlightlibs-again/before/CSharp/Program.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace CSharp -{ - class Program - { - static void Main(string[] args) - { - } - } -} diff --git a/integrationtests/scenarios/i001552-install-mvvmlightlibs-again/before/CSharp/Properties/AssemblyInfo.cs b/integrationtests/scenarios/i001552-install-mvvmlightlibs-again/before/CSharp/Properties/AssemblyInfo.cs deleted file mode 100644 index 2f7ab56df5..0000000000 --- a/integrationtests/scenarios/i001552-install-mvvmlightlibs-again/before/CSharp/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,34 +0,0 @@ -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("CSharp")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyProduct("CSharp")] -[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("14ea9d55-f5f7-4dac-8060-546288ca8d27")] - -// 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")] diff --git a/integrationtests/scenarios/i001552-install-mvvmlightlibs-again/before/CSharp/paket.references b/integrationtests/scenarios/i001552-install-mvvmlightlibs-again/before/CSharp/paket.references deleted file mode 100644 index 8523da2f05..0000000000 --- a/integrationtests/scenarios/i001552-install-mvvmlightlibs-again/before/CSharp/paket.references +++ /dev/null @@ -1 +0,0 @@ -MvvmLightLibs \ No newline at end of file diff --git a/integrationtests/scenarios/i001552-install-mvvmlightlibs-again/before/paket-MvvmLightLibs.sln b/integrationtests/scenarios/i001552-install-mvvmlightlibs-again/before/paket-MvvmLightLibs.sln deleted file mode 100644 index 7424417b59..0000000000 --- a/integrationtests/scenarios/i001552-install-mvvmlightlibs-again/before/paket-MvvmLightLibs.sln +++ /dev/null @@ -1,26 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharp", "CSharp\CSharp.csproj", "{14EA9D55-F5F7-4DAC-8060-546288CA8D27}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8EAA4587-A139-4FA9-8A14-416A6B2481E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8EAA4587-A139-4FA9-8A14-416A6B2481E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8EAA4587-A139-4FA9-8A14-416A6B2481E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8EAA4587-A139-4FA9-8A14-416A6B2481E1}.Release|Any CPU.Build.0 = Release|Any CPU - {14EA9D55-F5F7-4DAC-8060-546288CA8D27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14EA9D55-F5F7-4DAC-8060-546288CA8D27}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14EA9D55-F5F7-4DAC-8060-546288CA8D27}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14EA9D55-F5F7-4DAC-8060-546288CA8D27}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/integrationtests/scenarios/i001552-install-mvvmlightlibs-again/before/paket.dependencies b/integrationtests/scenarios/i001552-install-mvvmlightlibs-again/before/paket.dependencies deleted file mode 100644 index 93cba9293c..0000000000 --- a/integrationtests/scenarios/i001552-install-mvvmlightlibs-again/before/paket.dependencies +++ /dev/null @@ -1,3 +0,0 @@ -source https://nuget.org/api/v2 - -nuget MvvmLightLibs diff --git a/integrationtests/scenarios/i001552-install-mvvmlightlibs-again/before/paket.locktemplate b/integrationtests/scenarios/i001552-install-mvvmlightlibs-again/before/paket.locktemplate deleted file mode 100644 index 8dfff9d333..0000000000 --- a/integrationtests/scenarios/i001552-install-mvvmlightlibs-again/before/paket.locktemplate +++ /dev/null @@ -1,6 +0,0 @@ -NUGET - remote: https://www.nuget.org/api/v2 - CommonServiceLocator (1.3) - framework: >= net35, monoandroid, portable-net45+win8+wp8+wpa81, xamarinios, winv4.5.1, wpv8.0, wpv8.1, wpav8.1, sl50 - MvvmLightLibs (5.3) - CommonServiceLocator (>= 1.0) - framework: net35 - CommonServiceLocator (>= 1.3) - framework: >= net40, monoandroid, portable-net45+win8+wp8+wpa81, xamarinios, winv4.5.1, wpv8.0, wpv8.1, wpav8.1, sl50 diff --git a/integrationtests/scenarios/i001552-install-mvvmlightlibs-first-time/before/paket.dependencies b/integrationtests/scenarios/i001552-install-mvvmlightlibs-first-time/before/paket.dependencies deleted file mode 100644 index 93cba9293c..0000000000 --- a/integrationtests/scenarios/i001552-install-mvvmlightlibs-first-time/before/paket.dependencies +++ /dev/null @@ -1,3 +0,0 @@ -source https://nuget.org/api/v2 - -nuget MvvmLightLibs diff --git a/integrationtests/scenarios/i001552-install-mvvmlightlibs-first-time/before/paket.locktemplate b/integrationtests/scenarios/i001552-install-mvvmlightlibs-first-time/before/paket.locktemplate deleted file mode 100644 index 8dfff9d333..0000000000 --- a/integrationtests/scenarios/i001552-install-mvvmlightlibs-first-time/before/paket.locktemplate +++ /dev/null @@ -1,6 +0,0 @@ -NUGET - remote: https://www.nuget.org/api/v2 - CommonServiceLocator (1.3) - framework: >= net35, monoandroid, portable-net45+win8+wp8+wpa81, xamarinios, winv4.5.1, wpv8.0, wpv8.1, wpav8.1, sl50 - MvvmLightLibs (5.3) - CommonServiceLocator (>= 1.0) - framework: net35 - CommonServiceLocator (>= 1.3) - framework: >= net40, monoandroid, portable-net45+win8+wp8+wpa81, xamarinios, winv4.5.1, wpv8.0, wpv8.1, wpav8.1, sl50