Merge branch 'master' into enh-projectgroupconfiguration

OctopusDeploy · May 22, 2018 · 5fdc50d · 5fdc50d
2 parents fb747dd + 8ef4dec
commit 5fdc50d
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/...Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt b/...Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt
@@ -1043,7 +1043,6 @@ Octopus.Client.Model
     Octopus.Client.Model.Resource
   {
     .ctor()
-    Boolean ApplyToDynamicallyReferencedPackages { get; set; }
     Nullable<Int32> DeleteUnreleasedPackagesAfterDays { get; set; }
   }
   abstract class BuiltInTasks

diff --git a/.../PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt b/.../PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt
@@ -1513,7 +1513,6 @@ Octopus.Client.Model
     Octopus.Client.Model.Resource
   {
     .ctor()
-    Boolean ApplyToDynamicallyReferencedPackages { get; set; }
     Nullable<Int32> DeleteUnreleasedPackagesAfterDays { get; set; }
   }
   abstract class BuiltInTasks

diff --git a/source/Octopus.Client/Model/BuiltInRepositoryConfigurationResource.cs b/source/Octopus.Client/Model/BuiltInRepositoryConfigurationResource.cs
@@ -7,8 +7,5 @@ public class BuiltInRepositoryConfigurationResource : Resource
     {
         [Writeable]
         public int? DeleteUnreleasedPackagesAfterDays { get; set; }
-
-        [Writeable]
-        public bool ApplyToDynamicallyReferencedPackages { get; set; }
     }
 }
diff --git a/source/Octopus.Client/Serialization/EndpointConverter.cs b/source/Octopus.Client/Serialization/EndpointConverter.cs
@@ -19,7 +19,8 @@ public class EndpointConverter : InheritedClassConverter<EndpointResource, Commu
                 {CommunicationStyle.OfflineDrop, typeof (OfflineDropEndpointResource)},
                 {CommunicationStyle.AzureCloudService, typeof (CloudServiceEndpointResource)},
                 {CommunicationStyle.AzureWebApp, typeof (AzureWebAppEndpointResource)},
-                {CommunicationStyle.None, typeof (CloudRegionEndpointResource)}
+                {CommunicationStyle.None, typeof (CloudRegionEndpointResource)},
+                {CommunicationStyle.AzureServiceFabricCluster, typeof(ServiceFabricEndpointResource)}
           };
 
         protected override IDictionary<CommunicationStyle, Type> DerivedTypeMappings => EndpointTypes;