Skip to content

Move to a more recent version of argu #3112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
forki merged 5 commits into from
Mar 13, 2018
Merged

Move to a more recent version of argu #3112

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
93a7bfe
Fix code for new argu
vbfox Mar 12, 2018
75c4c69
Update Argu
vbfox Mar 12, 2018
25722bd
Disable checks in argu at runtime
vbfox Mar 12, 2018
0de5cd1
test argu structure in unit tests
vbfox Mar 12, 2018
279cd77
One more checkStructure = false
vbfox Mar 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test argu structure in unit tests
  • Loading branch information
@vbfox
vbfox committed Mar 12, 2018
commit 0de5cd192a334411a93651f06bec89d90c9e3ef7
4 changes: 3 additions & 1 deletion tests/Paket.Tests.preview3/Paket.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@
<Compile Include="$(PaketTestsSourcesDir)\Packaging\TemplateFileParsing.fs" />
<Compile Include="$(PaketTestsSourcesDir)\Packaging\RemotePushUrlSpecs.fs" />
<Compile Include="$(PaketTestsSourcesDir)\ScriptGeneration\LoadingScriptTests.fs" />
<Compile Include="$(PaketTestsSourcesDir)\CommandsCheck.fs" />
<Content Include="$(PaketTestsSourcesDir)\App.config" />
</ItemGroup>

Expand All @@ -197,7 +198,7 @@

<Target Name="AddTestAssetAsNoneItems" BeforeTargets="PrepareForBuild">
<ItemGroup>
<!-- MSBUILD BLACK MAGIC!!! ....
<!-- MSBUILD BLACK MAGIC!!! ....
is just a `TestAsset list -> None list`, like `List.map`, dont be scared -->

<None Include="$(PaketTestsSourcesDir)\%(TestAsset.Identity)">
Expand All @@ -214,6 +215,7 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Paket.preview3\Paket.fsproj" />
<ProjectReference Include="..\..\src\Paket.Core.preview3\Paket.Core.fsproj" />
</ItemGroup>
</Project>
9 changes: 9 additions & 0 deletions tests/Paket.Tests/CommandsCheck.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module Paket.CommandsCheck

open Argu
open NUnit.Framework
open FsUnit

[<Test>]
let ``Argu commands can be checked``() =
ArgumentParser<Paket.Commands.Command>.CheckStructure()
104 changes: 103 additions & 1 deletion tests/Paket.Tests/Paket.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
</PropertyGroup>
</When>
</Choose>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
Expand Down Expand Up @@ -353,6 +353,7 @@
<Compile Include="Packaging\RemotePushUrlSpecs.fs" />
<Compile Include="ScriptGeneration\LoadingScriptTests.fs" />
<Compile Include="Performance\EventBoundarySpecs.fs" />
<Compile Include="CommandsCheck.fs" />
<Content Include="App.config" />
</ItemGroup>
<ItemGroup>
Expand All @@ -362,6 +363,11 @@
<Reference Include="System.Numerics" />
<Reference Include="System.Security" />
<Reference Include="System.Xml" />
<ProjectReference Include="..\..\src\Paket\Paket.fsproj">
<Name>Paket</Name>
<Project>{09b32f18-0c20-4489-8c83-5106d5c04c93}</Project>
<Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\..\src\Paket.Core\Paket.Core.fsproj">
<Name>Paket.Core</Name>
<Project>{7bab0ae2-089f-4761-b138-a717aa2f86c5}</Project>
Expand All @@ -370,6 +376,26 @@
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<Import Project="$(SolutionDir)\.paket\paket.targets" />
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')">
<ItemGroup>
<Reference Include="Argu">
<HintPath>..\..\packages\Argu\lib\net45\Argu.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="($(TargetFrameworkIdentifier) == '.NETCoreApp' And ($(TargetFrameworkVersion) == 'v2.0' Or $(TargetFrameworkVersion) == 'v2.1')) Or ($(TargetFrameworkIdentifier) == '.NETStandard' And $(TargetFrameworkVersion) == 'v2.0') Or ($(TargetFrameworkIdentifier) == '.NETCore' And $(TargetFrameworkVersion) == 'v5.0')">
<ItemGroup>
<Reference Include="Argu">
<HintPath>..\..\packages\Argu\lib\netstandard2.0\Argu.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
</Choose>
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')">
<ItemGroup>
Expand Down Expand Up @@ -962,6 +988,26 @@
</ItemGroup>
</When>
</Choose>
<Choose>
<When Condition="($(TargetFrameworkIdentifier) == '.NETCoreApp' And ($(TargetFrameworkVersion) == 'v2.0' Or $(TargetFrameworkVersion) == 'v2.1')) Or ($(TargetFrameworkIdentifier) == '.NETStandard' And $(TargetFrameworkVersion) == 'v2.0') Or ($(TargetFrameworkIdentifier) == '.NETCore' And $(TargetFrameworkVersion) == 'v5.0')">
<ItemGroup>
<Reference Include="System.Configuration.ConfigurationManager">
<HintPath>..\..\packages\System.Configuration.ConfigurationManager\lib\netstandard2.0\System.Configuration.ConfigurationManager.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="($(TargetFrameworkIdentifier) == '.NETCoreApp' And ($(TargetFrameworkVersion) == 'v2.0' Or $(TargetFrameworkVersion) == 'v2.1')) Or ($(TargetFrameworkIdentifier) == '.NETStandard' And $(TargetFrameworkVersion) == 'v2.0')">
<ItemGroup>
<Reference Include="System.Configuration.ConfigurationManager">
<HintPath>..\..\packages\System.Configuration.ConfigurationManager\ref\netstandard2.0\System.Configuration.ConfigurationManager.dll</HintPath>
<Private>False</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
</Choose>
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
<ItemGroup>
Expand Down Expand Up @@ -2062,6 +2108,62 @@
</ItemGroup>
</When>
</Choose>
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
<ItemGroup>
<Reference Include="System.Security.Cryptography.ProtectedData">
<HintPath>..\..\packages\System.Security.Cryptography.ProtectedData\lib\net46\System.Security.Cryptography.ProtectedData.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')">
<ItemGroup>
<Reference Include="System.Security.Cryptography.ProtectedData">
<HintPath>..\..\packages\System.Security.Cryptography.ProtectedData\lib\net461\System.Security.Cryptography.ProtectedData.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="($(TargetFrameworkIdentifier) == '.NETCoreApp' And ($(TargetFrameworkVersion) == 'v1.0' Or $(TargetFrameworkVersion) == 'v1.1')) Or ($(TargetFrameworkIdentifier) == '.NETStandard' And ($(TargetFrameworkVersion) == 'v1.3' Or $(TargetFrameworkVersion) == 'v1.4' Or $(TargetFrameworkVersion) == 'v1.5' Or $(TargetFrameworkVersion) == 'v1.6')) Or ($(TargetFrameworkIdentifier) == '.NETCore' And $(TargetFrameworkVersion) == 'v5.0')">
<ItemGroup>
<Reference Include="System.Security.Cryptography.ProtectedData">
<HintPath>..\..\packages\System.Security.Cryptography.ProtectedData\lib\netstandard1.3\System.Security.Cryptography.ProtectedData.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="($(TargetFrameworkIdentifier) == '.NETCoreApp' And ($(TargetFrameworkVersion) == 'v1.0' Or $(TargetFrameworkVersion) == 'v1.1')) Or ($(TargetFrameworkIdentifier) == '.NETStandard' And ($(TargetFrameworkVersion) == 'v1.3' Or $(TargetFrameworkVersion) == 'v1.4' Or $(TargetFrameworkVersion) == 'v1.5' Or $(TargetFrameworkVersion) == 'v1.6'))">
<ItemGroup>
<Reference Include="System.Security.Cryptography.ProtectedData">
<HintPath>..\..\packages\System.Security.Cryptography.ProtectedData\ref\netstandard1.3\System.Security.Cryptography.ProtectedData.dll</HintPath>
<Private>False</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="($(TargetFrameworkIdentifier) == '.NETCoreApp' And ($(TargetFrameworkVersion) == 'v2.0' Or $(TargetFrameworkVersion) == 'v2.1')) Or ($(TargetFrameworkIdentifier) == '.NETStandard' And $(TargetFrameworkVersion) == 'v2.0') Or ($(TargetFrameworkIdentifier) == '.NETCore' And $(TargetFrameworkVersion) == 'v5.0')">
<ItemGroup>
<Reference Include="System.Security.Cryptography.ProtectedData">
<HintPath>..\..\packages\System.Security.Cryptography.ProtectedData\lib\netstandard2.0\System.Security.Cryptography.ProtectedData.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="($(TargetFrameworkIdentifier) == '.NETCoreApp' And ($(TargetFrameworkVersion) == 'v2.0' Or $(TargetFrameworkVersion) == 'v2.1')) Or ($(TargetFrameworkIdentifier) == '.NETStandard' And $(TargetFrameworkVersion) == 'v2.0')">
<ItemGroup>
<Reference Include="System.Security.Cryptography.ProtectedData">
<HintPath>..\..\packages\System.Security.Cryptography.ProtectedData\ref\netstandard2.0\System.Security.Cryptography.ProtectedData.dll</HintPath>
<Private>False</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
</Choose>
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETCoreApp' And ($(TargetFrameworkVersion) == 'v1.0' Or $(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v2.1')">
<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions tests/Paket.Tests/paket.references
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FSharp.Core
Argu
Chessie
Newtonsoft.Json
FSharp.Compiler.Tools
Expand Down