Merge branch 'release/1.1.0'

Author: pascalberger

README.md

@@ -332,6 +332,42 @@ be removed, if not needed.)
 }
 ```
 
+#### For every feature branch under the "MyRepository" and "MyRepository2" repositories in the "MyProject" project
+
+```json
+{
+    "type": "Require a merge strategy",
+
+    "project": "MyProject",
+    "branch": "feature/*",
+    "repositories": ["MyRepository", "MyRepository2"],
+
+    "isBlocking": true,
+
+    "settings": {
+        "useSquashMerge":  false
+    }
+}
+```
+
+#### For the master and every feature branch under the "MyRepository" and "MyRepository2" repositories in the "MyProject" project
+
+```json
+{
+    "type": "Require a merge strategy",
+
+    "project": "MyProject",
+    "branches": [ "master", "feature/*" ],
+    "repositories": ["MyRepository", "MyRepository2"],
+
+    "isBlocking": true,
+
+    "settings": {
+        "useSquashMerge":  false
+    }
+}
+```
+
 #### Subtype definition
 
 ```json

nuspec/chocolatey/AzureDevOpsPolicyConfigurator.nuspec

@@ -26,6 +26,7 @@ Azure DevOps policy configurator allows to apply policy settings on an Azure Dev
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright>Copyright © BBT Software AG and contributors</copyright>
     <tags>bbt bbtsoftware policy devops azure</tags>
+    <releaseNotes>https://github.com/bbtsoftware/AzureDevOpsPolicyConfigurator/releases/tag/1.1.0</releaseNotes>
   </metadata>
   <files>
     <file src="..\..\BuildArtifacts\temp\_Packages\**" target="tools" />

setup.cake

@@ -1,4 +1,4 @@
-#load nuget:https://www.myget.org/F/cake-contrib/api/v2?package=Cake.Recipe&prerelease
+#load nuget:?package=Cake.Recipe&version=1.0.0
 
 Environment.SetVariableNames();
 

src/AzureDevOpsPolicyConfigurator.Tests/AzureDevOpsPolicyConfigurator.Tests.csproj

@@ -11,7 +11,7 @@
 
 
   <ItemGroup>
-    <PackageReference Include="Moq" Version="4.10.1" />
+    <PackageReference Include="Moq" Version="4.11.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />

src/AzureDevOpsPolicyConfigurator.Tests/MultiBranchDefinitionTests.cs

@@ -10,7 +10,7 @@ namespace AzureDevOpsPolicyConfigurator.Tests
     /// </summary>
     public class MultiBranchDefinitionTests
     {
-        [Fact(DisplayName = "Check Multi Branch Definition")]
+        [Fact(DisplayName = "Check multi branch definition")]
         private void TestMultiBranchDefinition()
         {
             var serializer = new JsonSerializer();
@@ -29,9 +29,9 @@ private void TestMultiBranchDefinition()
             policies = policies.FlattenBranches(serializer).ToList();
 
             Assert.Equal(2, policies.Count);
-            Assert.True(policies[0].Branch == "master");
+            Assert.Equal("master", policies[0].Branch);
             Assert.Null(policies[0].Branches);
-            Assert.True(policies[1].Branch == "release/my/master");
+            Assert.Equal("release/my/master", policies[1].Branch);
             Assert.Null(policies[1].Branches);
         }
 

src/AzureDevOpsPolicyConfigurator.Tests/MultiRepositoryDefinitionTests.cs

@@ -0,0 +1,87 @@
+using System.Collections.Generic;
+using System.Linq;
+using AzureDevOpsPolicyConfigurator.Data;
+using Xunit;
+
+namespace AzureDevOpsPolicyConfigurator.Tests
+{
+    /// <summary>
+    /// Multi branch definition test class.
+    /// </summary>
+    public class MultiRepositoryDefinitionTests
+    {
+        [Fact(DisplayName = "Check multi repository definition")]
+        private void TestMultiRepositoryDefinition()
+        {
+            var serializer = new JsonSerializer();
+
+            var policies = new List<Policy>()
+            {
+                new Policy()
+                {
+                    Repositories = new List<string>()
+                    {
+                        "myrepo1", "myrepo2"
+                    }
+                }
+            };
+
+            policies = policies.FlattenRepositories(serializer).ToList();
+
+            Assert.Equal(2, policies.Count);
+            Assert.Equal("myrepo1", policies[0].Repository);
+            Assert.Null(policies[0].Repositories);
+            Assert.Equal("myrepo2", policies[1].Repository);
+            Assert.Null(policies[1].Repositories);
+        }
+
+        [Fact(DisplayName = "Check multi repository with overriding", Skip = SkippingInformation.SkippingReason)]
+        private async void CheckMultiRepositoryWithOverriding()
+        {
+            var result = await new PolicyTester().RunTest(new TestData(@"
+            {
+              ""allowDeletion"":  false,
+              ""ignoreTypes"": [],
+              ""applyTo"": {
+                ""projects"": [ ""##Project##"" ],
+                ""repositories"": [""##Repository##""]
+              },
+              ""policies"": [
+                {
+                  ""type"": ""Minimum number of reviewers"",
+
+                  ""project"": ""##Project##"",
+                  ""repository"": ""##Repository##"",
+
+                  ""isBlocking"": true,
+
+                  ""settings"": {
+                    ""minimumApproverCount"": 3,
+                    ""creatorVoteCounts"": false,
+                    ""allowDownvotes"": false,
+                    ""resetOnSourcePush"": false
+                  }
+                },
+                {
+                  ""type"": ""Minimum number of reviewers"",
+
+                  ""project"": """",
+                  ""repositories"": [ ""##Repository##"" ],
+
+                  ""isBlocking"": true,
+
+                  ""settings"": {
+                    ""minimumApproverCount"": 6,
+                    ""creatorVoteCounts"": false,
+                    ""allowDownvotes"": false,
+                    ""resetOnSourcePush"": false
+                  }
+                }
+              ]
+            }")).ConfigureAwait(false);
+
+            Assert.DoesNotContain(result[LogLevel.Debug], x => x.Contains("\"minimumApproverCount\": 3"));
+            Assert.Contains(result[LogLevel.Debug], x => x.Contains("\"minimumApproverCount\": 6"));
+        }
+    }
+}

src/AzureDevOpsPolicyConfigurator/AzureDevOpsPolicyConfigurator.csproj

@@ -18,15 +18,15 @@
   <ItemGroup>
     <PackageReference Include="log4net" Version="2.0.8" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.3" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.3" />
     <PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="16.148.0-preview" />
     <PackageReference Include="Microsoft.VisualStudio.Services.InteractiveClient" Version="16.148.0-preview" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
     <PackageReference Include="Spectre.Cli" Version="0.20.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
 
     <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
-    <PackageReference Include="System.Net.Primitives" Version="4.3.0" />
+    <PackageReference Include="System.Net.Primitives" Version="4.3.1" />
   </ItemGroup>
 
   <ItemGroup>

src/AzureDevOpsPolicyConfigurator/Data/Policy.cs

@@ -87,10 +87,15 @@ public MatchKind MatchKind
         public List<string> Branches { get; set; }
 
         /// <summary>
-        /// Gets or sets the policy repository name or repository id.
+        /// Gets or sets the repository name or repository id.
         /// </summary>
         public string Repository { get; set; }
 
+        /// <summary>
+        /// Gets or sets a list of repository names or repository ids.
+        /// </summary>
+        public List<string> Repositories { get; set; }
+
         /// <summary>
         /// Gets or sets a value indicating whether a blocking is needed.
         /// </summary>

src/AzureDevOpsPolicyConfigurator/Helpers/PolicyExtension.cs

@@ -88,12 +88,11 @@ public static bool DoesSubTypeMatch(this PolicyConfiguration configuration, Poli
         /// <returns>Flattened policies</returns>
         public static IEnumerable<Policy> FlattenBranches(this IEnumerable<Policy> policies, IJsonSerializer serializer)
         {
-            var policiesToFlatten = policies.Where(x => x.Branches != null && x.Branches.Count > 0).ToList();
             var newPolicies = new List<Policy>();
 
             foreach (var policy in policies)
             {
-                if (policy.Branches != null && policy.Branches.Count > 0)
+                if (policy.Branches != null)
                 {
                     foreach (var branch in policy.Branches)
                     {
@@ -112,6 +111,37 @@ public static IEnumerable<Policy> FlattenBranches(this IEnumerable<Policy> polic
             return newPolicies;
         }
 
+        /// <summary>
+        /// Flattens the policies by repositories.
+        /// </summary>
+        /// <param name="policies">Policies</param>
+        /// <param name="serializer">Json serializer</param>
+        /// <returns>Flattened policies</returns>
+        public static IEnumerable<Policy> FlattenRepositories(this IEnumerable<Policy> policies, IJsonSerializer serializer)
+        {
+            var newPolicies = new List<Policy>();
+
+            foreach (var policy in policies)
+            {
+                if (policy.Repositories != null)
+                {
+                    foreach (var repository in policy.Repositories)
+                    {
+                        var newPolicy = serializer.Clone(policy);
+                        newPolicy.Repository = repository;
+                        newPolicy.Repositories = null;
+                        newPolicies.Add(newPolicy);
+                    }
+
+                    continue;
+                }
+
+                newPolicies.Add(policy);
+            }
+
+            return newPolicies;
+        }
+
         /// <summary>
         /// Returns the branch from the settings.
         /// </summary>

src/AzureDevOpsPolicyConfigurator/Logic/PolicyExecuterBase.cs

@@ -257,7 +257,9 @@ private IEnumerable<BranchPolicies> GetPoliciesForRepository(
             TeamProjectReference project,
             GitRepository repository)
         {
-            return policies.FlattenBranches(this.Serializer)
+            return policies
+                .FlattenRepositories(this.Serializer)
+                .FlattenBranches(this.Serializer)
                 .Where(x =>
                         (string.IsNullOrEmpty(x.Project) || // global or branch specific
                         (x.Project.ToLower() == project.Name.ToLower() || x.Project.ToLower() == project.Id.ToString().ToLower())) && // project or project branch specific