Merge branch 'develop'

Invenietis · Jul 17, 2017 · 98ca232 · 98ca232
2 parents 34d9c9b + 3761c46
commit 98ca232
Show file tree

Hide file tree

Showing 8 changed files with 194 additions and 188 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,22 @@
+# Invenietis custom .editorconfig
+# See also: https://github.com/dotnet/roslyn/blob/master/src/Workspaces/CSharp/Portable/Formatting/CSharpFormattingOptions.cs
+# 20170522
+
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.json]
+indent_size = 2
+
+[*.cs]
+end_of_line = crlf
+csharp_space_between_method_call_parameter_list_parentheses = true
+csharp_space_between_method_declaration_parameter_list_parentheses = true
+csharp_space_after_keywords_in_control_flow_statements = false
+csharp_space_between_parentheses = control_flow_statements
diff --git a/CK.Core/CK.Core.csproj b/CK.Core/CK.Core.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CK.Text" Version="5.2.0" />
+    <PackageReference Include="CK.Text" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">

diff --git a/CK.Core/Util.cs b/CK.Core/Util.cs
@@ -310,7 +310,7 @@ public static T InterlockedSet<T, TArg>( ref T target, TArg a, Func<T, TArg, T>
         /// <typeparam name="T">Type of the item array.</typeparam>
         /// <param name="items">Reference (address) of the array. Can be null.</param>
         /// <param name="o">Item to remove.</param>
-        /// <returns>The array containing the new item. Note that it may differ from the "current" items content since another thread may have already changed it.</returns>
+        /// <returns>The array without the item. Note that it may differ from the "current" items content since another thread may have already changed it.</returns>
         public static T[] InterlockedRemove<T>( ref T[] items, T o )
         {
             return InterlockedSet( ref items, o, ( current, item ) =>

diff --git a/CodeCakeBuilder/App.config b/CodeCakeBuilder/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
     </startup>
-</configuration>
+</configuration>
diff --git a/CodeCakeBuilder/Build.cs b/CodeCakeBuilder/Build.cs
diff --git a/CodeCakeBuilder/CodeCakeBuilder.csproj b/CodeCakeBuilder/CodeCakeBuilder.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\SimpleGitVersion.Core.0.22.0-r\build\SimpleGitVersion.Core.props" Condition="Exists('..\packages\SimpleGitVersion.Core.0.22.0-r\build\SimpleGitVersion.Core.props')" />
+  <Import Project="..\packages\SimpleGitVersion.Core.0.28.0\build\SimpleGitVersion.Core.props" Condition="Exists('..\packages\SimpleGitVersion.Core.0.28.0\build\SimpleGitVersion.Core.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -10,11 +10,12 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CodeCakeBuilder</RootNamespace>
     <AssemblyName>CodeCakeBuilder</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -36,26 +37,27 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Cake.Common, Version=0.19.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Cake.Common.0.19.4\lib\net45\Cake.Common.dll</HintPath>
+    <Reference Include="Cake.Common, Version=0.21.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Cake.Common.0.21.1\lib\net45\Cake.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Cake.Core, Version=0.19.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Cake.Core.0.19.4\lib\net45\Cake.Core.dll</HintPath>
+    <Reference Include="Cake.Core, Version=0.21.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Cake.Core.0.21.1\lib\net45\Cake.Core.dll</HintPath>
     </Reference>
-    <Reference Include="CK.Text, Version=5.2.0.0, Culture=neutral, PublicKeyToken=731c291b31fb8d27, processorArchitecture=MSIL">
-      <HintPath>..\packages\CK.Text.5.2.0\lib\net451\CK.Text.dll</HintPath>
+    <Reference Include="CK.Text, Version=6.0.0.0, Culture=neutral, PublicKeyToken=731c291b31fb8d27, processorArchitecture=MSIL">
+      <HintPath>..\packages\CK.Text.6.0.0\lib\net451\CK.Text.dll</HintPath>
     </Reference>
     <Reference Include="Code.Cake, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Code.Cake.0.15.0\lib\net45\Code.Cake.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SimpleGitVersion.Cake, Version=0.22.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SimpleGitVersion.Cake.0.22.0-r\lib\net45\SimpleGitVersion.Cake.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="CSemVer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=731c291b31fb8d27, processorArchitecture=MSIL">
+      <HintPath>..\packages\CSemVer.1.0.1\lib\net461\CSemVer.dll</HintPath>
     </Reference>
-    <Reference Include="SimpleGitVersion.Core, Version=0.22.0.0, Culture=neutral, PublicKeyToken=731c291b31fb8d27, processorArchitecture=MSIL">
-      <HintPath>..\packages\SimpleGitVersion.Core.0.22.0-r\lib\net45\SimpleGitVersion.Core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="SimpleGitVersion.Cake, Version=0.28.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SimpleGitVersion.Cake.0.28.0\lib\net45\SimpleGitVersion.Cake.dll</HintPath>
+    </Reference>
+    <Reference Include="SimpleGitVersion.Core, Version=0.28.0.0, Culture=neutral, PublicKeyToken=731c291b31fb8d27, processorArchitecture=MSIL">
+      <HintPath>..\packages\SimpleGitVersion.Core.0.28.0\lib\net45\SimpleGitVersion.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
@@ -75,7 +77,7 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\SimpleGitVersion.Core.0.22.0-r\build\SimpleGitVersion.Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SimpleGitVersion.Core.0.22.0-r\build\SimpleGitVersion.Core.props'))" />
+    <Error Condition="!Exists('..\packages\SimpleGitVersion.Core.0.28.0\build\SimpleGitVersion.Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SimpleGitVersion.Core.0.28.0\build\SimpleGitVersion.Core.props'))" />
   </Target>
   <!-- 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.

diff --git a/CodeCakeBuilder/packages.config b/CodeCakeBuilder/packages.config
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Cake.Common" version="0.19.4" targetFramework="net451" developmentDependency="true" />
-  <package id="Cake.Core" version="0.19.4" targetFramework="net451" />
-  <package id="CK.Text" version="5.2.0" targetFramework="net451" />
+  <package id="Cake.Common" version="0.21.1" targetFramework="net461" developmentDependency="true" />
+  <package id="Cake.Core" version="0.21.1" targetFramework="net461" />
+  <package id="CK.Text" version="6.0.0" targetFramework="net461" />
   <package id="Code.Cake" version="0.15.0" targetFramework="net451" />
-  <package id="SimpleGitVersion.Cake" version="0.22.0-r" targetFramework="net451" developmentDependency="true" />
-  <package id="SimpleGitVersion.Core" version="0.22.0-r" targetFramework="net451" developmentDependency="true" />
+  <package id="CSemVer" version="1.0.1" targetFramework="net461" />
+  <package id="SimpleGitVersion.Cake" version="0.28.0" targetFramework="net461" developmentDependency="true" />
+  <package id="SimpleGitVersion.Core" version="0.28.0" targetFramework="net461" developmentDependency="true" />
 </packages>
diff --git a/Tests/CK.Core.Tests/StringMatcherCoreTests.cs b/Tests/CK.Core.Tests/StringMatcherCoreTests.cs
@@ -73,7 +73,7 @@ private static void CheckMatchError(StringMatcher m, Func<bool> fail)
             m.ErrorMessage.Should().NotBeNullOrEmpty();
             m.StartIndex.Should().Be(idx, "Head must not move on error.");
             m.Length.Should().Be(len, "Length must not change on error.");
-            m.SetSuccess();
+            m.ClearError();
         }
     }
 }