From d629f51221b069bd87989ae3a4d5db7e23854f76 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Tue, 28 Jun 2016 11:06:45 +0200 Subject: [PATCH] Remove flaky test --- .../Paket.IntegrationTests/InstallSpecs.fs | 9 - .../i001523-mixed-native/before/TestPaket.sln | 28 --- .../before/TestPaket/App.cpp | 8 - .../TestPaket/TestPaket.vcxproj.filters | 22 -- .../TestPaket/TestPaket.vcxprojtemplate | 214 ------------------ .../before/TestPaket/paket.references | 2 - .../before/paket.dependencies | 5 - .../i001523-mixed-native/before/paket.lock | 9 - .../Properties/AssemblyInfo.cs | 10 +- src/Paket.Core/AssemblyInfo.fs | 10 +- src/Paket.PowerShell/AssemblyInfo.fs | 10 +- src/Paket/AssemblyInfo.fs | 10 +- 12 files changed, 20 insertions(+), 317 deletions(-) delete mode 100644 integrationtests/scenarios/i001523-mixed-native/before/TestPaket.sln delete mode 100644 integrationtests/scenarios/i001523-mixed-native/before/TestPaket/App.cpp delete mode 100644 integrationtests/scenarios/i001523-mixed-native/before/TestPaket/TestPaket.vcxproj.filters delete mode 100644 integrationtests/scenarios/i001523-mixed-native/before/TestPaket/TestPaket.vcxprojtemplate delete mode 100644 integrationtests/scenarios/i001523-mixed-native/before/TestPaket/paket.references delete mode 100644 integrationtests/scenarios/i001523-mixed-native/before/paket.dependencies delete mode 100644 integrationtests/scenarios/i001523-mixed-native/before/paket.lock diff --git a/integrationtests/Paket.IntegrationTests/InstallSpecs.fs b/integrationtests/Paket.IntegrationTests/InstallSpecs.fs index cea47a365d..f96bea1aa1 100644 --- a/integrationtests/Paket.IntegrationTests/InstallSpecs.fs +++ b/integrationtests/Paket.IntegrationTests/InstallSpecs.fs @@ -314,15 +314,6 @@ let ``#1663 should install google apis``() = let s1 = File.ReadAllText oldFile |> normalizeLineEndings let s2 = File.ReadAllText newFile |> normalizeLineEndings s2 |> shouldEqual s1 - -[] -let ``#1523 should install native in mixed setting``() = - install "i001523-mixed-native" |> ignore - let newFile = Path.Combine(scenarioTempPath "i001523-mixed-native","TestPaket","TestPaket.vcxproj") - let oldFile = Path.Combine(originalScenarioPath "i001523-mixed-native","TestPaket","TestPaket.vcxprojtemplate") - let s1 = File.ReadAllText oldFile |> normalizeLineEndings - let s2 = File.ReadAllText newFile |> normalizeLineEndings - s2 |> shouldEqual s1 [] let ``#1523 should emit correct native in mixed setting``() = diff --git a/integrationtests/scenarios/i001523-mixed-native/before/TestPaket.sln b/integrationtests/scenarios/i001523-mixed-native/before/TestPaket.sln deleted file mode 100644 index 78094b7caf..0000000000 --- a/integrationtests/scenarios/i001523-mixed-native/before/TestPaket.sln +++ /dev/null @@ -1,28 +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("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestPaket", "TestPaket\TestPaket.vcxproj", "{BDBD2D92-542F-4AC4-BCDB-5C6EFC42FD44}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BDBD2D92-542F-4AC4-BCDB-5C6EFC42FD44}.Debug|x64.ActiveCfg = Debug|x64 - {BDBD2D92-542F-4AC4-BCDB-5C6EFC42FD44}.Debug|x64.Build.0 = Debug|x64 - {BDBD2D92-542F-4AC4-BCDB-5C6EFC42FD44}.Debug|x86.ActiveCfg = Debug|Win32 - {BDBD2D92-542F-4AC4-BCDB-5C6EFC42FD44}.Debug|x86.Build.0 = Debug|Win32 - {BDBD2D92-542F-4AC4-BCDB-5C6EFC42FD44}.Release|x64.ActiveCfg = Release|x64 - {BDBD2D92-542F-4AC4-BCDB-5C6EFC42FD44}.Release|x64.Build.0 = Release|x64 - {BDBD2D92-542F-4AC4-BCDB-5C6EFC42FD44}.Release|x86.ActiveCfg = Release|Win32 - {BDBD2D92-542F-4AC4-BCDB-5C6EFC42FD44}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/integrationtests/scenarios/i001523-mixed-native/before/TestPaket/App.cpp b/integrationtests/scenarios/i001523-mixed-native/before/TestPaket/App.cpp deleted file mode 100644 index 6424ec9456..0000000000 --- a/integrationtests/scenarios/i001523-mixed-native/before/TestPaket/App.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include -#include - -int main() -{ - std::cout << "hello world" << std::endl; - return 0; -} \ No newline at end of file diff --git a/integrationtests/scenarios/i001523-mixed-native/before/TestPaket/TestPaket.vcxproj.filters b/integrationtests/scenarios/i001523-mixed-native/before/TestPaket/TestPaket.vcxproj.filters deleted file mode 100644 index 942a5c6e41..0000000000 --- a/integrationtests/scenarios/i001523-mixed-native/before/TestPaket/TestPaket.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - \ No newline at end of file diff --git a/integrationtests/scenarios/i001523-mixed-native/before/TestPaket/TestPaket.vcxprojtemplate b/integrationtests/scenarios/i001523-mixed-native/before/TestPaket/TestPaket.vcxprojtemplate deleted file mode 100644 index aaa079fad7..0000000000 --- a/integrationtests/scenarios/i001523-mixed-native/before/TestPaket/TestPaket.vcxprojtemplate +++ /dev/null @@ -1,214 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {BDBD2D92-542F-4AC4-BCDB-5C6EFC42FD44} - Win32Proj - TestPaket - 8.1 - - - - Application - true - v140 - Unicode - - - Application - false - v140 - true - Unicode - - - Application - true - v140 - Unicode - - - Application - false - v140 - true - Unicode - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - - - - - - Level3 - Disabled - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - Level3 - - - MaxSpeed - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - - - - - - - ..\packages\boost_filesystem-vc140\lib\native\address-model-32\lib\boost_filesystem-vc140-mt-1_60.dll - True - True - - - ..\packages\boost_filesystem-vc140\lib\native\address-model-32\lib\boost_filesystem-vc140-mt-gd-1_60.dll - True - True - - - - - - - ..\packages\boost_filesystem-vc140\lib\native\address-model-64\lib\boost_filesystem-vc140-mt-1_60.dll - True - True - - - ..\packages\boost_filesystem-vc140\lib\native\address-model-64\lib\boost_filesystem-vc140-mt-gd-1_60.dll - True - True - - - - - - - - - ..\packages\boost_system-vc140\lib\native\address-model-32\lib\boost_system-vc140-mt-1_60.dll - True - True - - - ..\packages\boost_system-vc140\lib\native\address-model-32\lib\boost_system-vc140-mt-gd-1_60.dll - True - True - - - - - - - ..\packages\boost_system-vc140\lib\native\address-model-64\lib\boost_system-vc140-mt-1_60.dll - True - True - - - ..\packages\boost_system-vc140\lib\native\address-model-64\lib\boost_system-vc140-mt-gd-1_60.dll - True - True - - - - - - - - \ No newline at end of file diff --git a/integrationtests/scenarios/i001523-mixed-native/before/TestPaket/paket.references b/integrationtests/scenarios/i001523-mixed-native/before/TestPaket/paket.references deleted file mode 100644 index f90501ff05..0000000000 --- a/integrationtests/scenarios/i001523-mixed-native/before/TestPaket/paket.references +++ /dev/null @@ -1,2 +0,0 @@ -boost_filesystem-vc140 framework: native -boost_system-vc140 framework: native diff --git a/integrationtests/scenarios/i001523-mixed-native/before/paket.dependencies b/integrationtests/scenarios/i001523-mixed-native/before/paket.dependencies deleted file mode 100644 index 38623e0ced..0000000000 --- a/integrationtests/scenarios/i001523-mixed-native/before/paket.dependencies +++ /dev/null @@ -1,5 +0,0 @@ -framework: net452, native - -source https://www.nuget.org/api/v2 -nuget boost_filesystem-vc140 -nuget boost_system-vc140 diff --git a/integrationtests/scenarios/i001523-mixed-native/before/paket.lock b/integrationtests/scenarios/i001523-mixed-native/before/paket.lock deleted file mode 100644 index 1d38436141..0000000000 --- a/integrationtests/scenarios/i001523-mixed-native/before/paket.lock +++ /dev/null @@ -1,9 +0,0 @@ -FRAMEWORK: NET452 -NUGET - remote: https://www.nuget.org/api/v2 - specs: - boost (1.60.0) - boost_filesystem-vc140 (1.60.0) - boost (1.60.0.0) - boost_system-vc140 (1.60.0) - boost (1.60.0.0) diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index cb1a4f69ab..bc4a754c02 100644 --- a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs +++ b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs @@ -4,12 +4,12 @@ [assembly: AssemblyTitleAttribute("Paket.Bootstrapper")] [assembly: AssemblyProductAttribute("Paket")] [assembly: AssemblyDescriptionAttribute("A dependency manager for .NET with support for NuGet packages and git repositories.")] -[assembly: AssemblyVersionAttribute("3.3.6")] -[assembly: AssemblyFileVersionAttribute("3.3.6")] -[assembly: AssemblyInformationalVersionAttribute("3.3.6")] +[assembly: AssemblyVersionAttribute("3.4.0")] +[assembly: AssemblyFileVersionAttribute("3.4.0")] +[assembly: AssemblyInformationalVersionAttribute("3.4.0-alpha001")] namespace System { internal static class AssemblyVersionInformation { - internal const string Version = "3.3.6"; - internal const string InformationalVersion = "3.3.6"; + internal const string Version = "3.4.0"; + internal const string InformationalVersion = "3.4.0-alpha001"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index fc2af406f7..4cc7e48011 100644 --- a/src/Paket.Core/AssemblyInfo.fs +++ b/src/Paket.Core/AssemblyInfo.fs @@ -5,11 +5,11 @@ open System.Reflection [] [] [] -[] -[] -[] +[] +[] +[] do () module internal AssemblyVersionInformation = - let [] Version = "3.3.6" - let [] InformationalVersion = "3.3.6" + let [] Version = "3.4.0" + let [] InformationalVersion = "3.4.0-alpha001" diff --git a/src/Paket.PowerShell/AssemblyInfo.fs b/src/Paket.PowerShell/AssemblyInfo.fs index 33c7de6f9d..28d9b1f6d3 100644 --- a/src/Paket.PowerShell/AssemblyInfo.fs +++ b/src/Paket.PowerShell/AssemblyInfo.fs @@ -5,11 +5,11 @@ open System.Reflection [] [] [] -[] -[] -[] +[] +[] +[] do () module internal AssemblyVersionInformation = - let [] Version = "3.3.6" - let [] InformationalVersion = "3.3.6" + let [] Version = "3.4.0" + let [] InformationalVersion = "3.4.0-alpha001" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index b970437e2b..8913ce1847 100644 --- a/src/Paket/AssemblyInfo.fs +++ b/src/Paket/AssemblyInfo.fs @@ -5,11 +5,11 @@ open System.Reflection [] [] [] -[] -[] -[] +[] +[] +[] do () module internal AssemblyVersionInformation = - let [] Version = "3.3.6" - let [] InformationalVersion = "3.3.6" + let [] Version = "3.4.0" + let [] InformationalVersion = "3.4.0-alpha001"