Merge pull request #793 from OctopusDeploy/scme/revert-changing-ilmerge

Revert "Add TinyTypes to first stage ILMerge in build (#790)"
OctopusDeploy · Oct 31, 2023 · 45fd97e · 45fd97e
2 parents 6bd94d5 + 83bd09b
commit 45fd97e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/build/Build.cs b/build/Build.cs
@@ -135,8 +135,7 @@ class Build : NukeBuild
             var stage1Assemblies = inputFolder.GlobFiles(
                     "Octopus.Server.Client.dll",
                     "Octopus.Server.MessageContracts.Base.dll",
-                    "Octopus.Server.MessageContracts.Base.HttpRoutes.dll",
-                    "Octopus.TinyTypes.dll"
+                    "Octopus.Server.MessageContracts.Base.HttpRoutes.dll"
                 )
                 .Select(x => x.ToString())
                 .OrderBy(x => x)

diff --git a/source/Octopus.Client.E2ETests/InlinedDependenciesFixture.cs b/source/Octopus.Client.E2ETests/InlinedDependenciesFixture.cs
@@ -46,7 +46,7 @@ public void OneTimeTearDown()
         [Test]
         [TestCase("Newtonsoft.Json", "Newtonsoft.Json.JsonConvert", Visibility.Internal)]
         [TestCase("Octodiff", "Octodiff.Core.DeltaBuilder", Visibility.Internal)]
-        [TestCase("Octopus.TinyTypes", "Octopus.TinyTypes.TinyType`1", Visibility.Public)]
+        [TestCase("Octopus.TinyTypes", "Octopus.TinyTypes.TinyType`1", Visibility.Internal)]
         [TestCase("Octopus.TinyTypes.Json", "Octopus.TinyTypes.Json.TinyTypeJsonConverter", Visibility.Internal)]
         [TestCase("Octopus.TinyTypes.TypeConverters", "Octopus.TinyTypes.TypeConverters.TinyTypeConverter`1", Visibility.Internal)]
         [TestCase("Octopus.Server.MessageContracts.Base", "Octopus.Server.MessageContracts.Base.ICommand`2", Visibility.Public)]