Cherry pick DYN-6664 (#14954)

sm6srw · web-flow · commit d98b2d95ecea · 2024-02-20T10:22:41.000-05:00
* Remove ASM229 (#14952) * Only copy LibG for ASM230
diff --git a/src/DynamoApplications/StartupUtils.cs b/src/DynamoApplications/StartupUtils.cs
@@ -158,7 +158,6 @@ public static void PreloadShapeManager(ref string geometryFactoryPath, ref strin
             var versions = new[]
             {
                 new Version(230,0,0),
-                new Version(229,0,0),
             };
 
             var preloader = new Preloader(rootFolder, versions);
diff --git a/src/DynamoCore/DynamoCore.csproj b/src/DynamoCore/DynamoCore.csproj
@@ -28,7 +28,6 @@
   <ItemGroup Label="Common dependencies">
     <PackageReference Include="Autodesk.IDSDK" Version="1.1.6" />
     <PackageReference Include="Greg" Version="3.0.0.3175" />
-    <PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="3.0.0.3331" GeneratePathProperty="true" />
     <PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" GeneratePathProperty="true" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" CopyXML="true" />
     <PackageReference Include="RestSharp" Version="108.0.1" CopyXML="true" />
@@ -109,17 +108,15 @@
 
   <Target Name="BeforeBuildOps" BeforeTargets="Build">
     <PropertyGroup>
-      <LibGProtoGeometryLibGLocale>$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\libg_locale</LibGProtoGeometryLibGLocale>
+      <LibGProtoGeometryLibGLocale>$(PkgDynamoVisualProgramming_LibG_230_0_0)\tools\libg_locale</LibGProtoGeometryLibGLocale>
     </PropertyGroup>
     <ItemGroup>
-        <LibGInterface Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\LibG.Interface.dll" />
-        <LibGProtoGeometryDLL Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\ProtoGeometry.dll" />
-        <LibGProtoGeometryXML Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\ProtoGeometry.XML" />
-        <LibG229Deps Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\asm_deps.csproj" />
+        <LibGInterface Include="$(PkgDynamoVisualProgramming_LibG_230_0_0)\tools\netstandard2.0\$(LibGOsToken)\LibG.Interface.dll" />
+        <LibGProtoGeometryDLL Include="$(PkgDynamoVisualProgramming_LibG_230_0_0)\tools\netstandard2.0\$(LibGOsToken)\ProtoGeometry.dll" />
+        <LibGProtoGeometryXML Include="$(PkgDynamoVisualProgramming_LibG_230_0_0)\tools\netstandard2.0\$(LibGOsToken)\ProtoGeometry.XML" />
         <LibG230Deps Include="$(PkgDynamoVisualProgramming_LibG_230_0_0)\tools\netstandard2.0\$(LibGOsToken)\asm_deps.csproj" />
-        <LibGProtoGeometryUICulture Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\$(UICulture)\*" />
+        <LibGProtoGeometryUICulture Include="$(PkgDynamoVisualProgramming_LibG_230_0_0)\tools\netstandard2.0\$(LibGOsToken)\$(UICulture)\*" />
         <LibG230 Include="$(PkgDynamoVisualProgramming_LibG_230_0_0)\tools\netstandard2.0\$(LibGOsToken)\LibG_230_0_0\*" />
-        <LibG229 Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\LibG_229_0_0\*" />
         <SampleFiles Include="$(SolutionDir)..\doc\distrib\Samples\**\*.*" />
         <NodeHelpMDFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.md" />
         <NodeHelpDYNFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.dyn" />
@@ -149,11 +146,9 @@
     <Copy SourceFiles="@(LibGProtoGeometryXml)" DestinationFolder="$(OutputPath)" />
     <Copy SourceFiles="@(LibGProtoGeometryXml)" DestinationFolder="$(OutputPath)\$(UICulture)" />
     <Copy SourceFiles="@(LibGProtoGeometryUICulture)" DestinationFolder="$(OutputPath)\$(UICulture)" />
-    <Copy Condition="$(Platform.Contains('Linux'))" SourceFiles="@(LibG229Deps)" DestinationFolder="$(OutputPath)libg_229_0_0\asm_deps\" />
     <Copy Condition="$(Platform.Contains('Linux'))" SourceFiles="@(LibG230Deps)" DestinationFolder="$(OutputPath)libg_230_0_0\asm_deps\" />
     <Exec Command="$(PowerShellCommand) -ExecutionPolicy ByPass -Command Copy-Item -Path $(LibGProtoGeometryLibGLocale) -Destination $(OutputPath) -Recurse -Force" />
     <Copy SourceFiles="@(LibG230)" DestinationFolder="$(OutputPath)libg_230_0_0\" />
-    <Copy SourceFiles="@(LibG229)" DestinationFolder="$(OutputPath)libg_229_0_0\" />
     <Copy SourceFiles="@(SampleFiles)" DestinationFolder="$(OutputPath)samples\%(RecursiveDir)" />
     <Copy SourceFiles="@(LocalizedResources)" DestinationFolder="$(OutputPath)%(RecursiveDir)" />
     <Copy SourceFiles="$(ProjectDir)\BuiltInAndOperators\Operators.xml" DestinationFolder="$(OutputPath)\$(UICulture)" />
diff --git a/src/Tools/DynamoShapeManager/Preloader.cs b/src/Tools/DynamoShapeManager/Preloader.cs
@@ -59,7 +59,6 @@ public Preloader(string rootFolder)
             : this(rootFolder, new[]
             {
                 new Version(230,0,0),
-                new Version(229,0,0),
             })
         {
         }
diff --git a/src/Tools/DynamoShapeManager/Utilities.cs b/src/Tools/DynamoShapeManager/Utilities.cs
@@ -91,51 +91,6 @@ private static List<string> ProductsWithASM
             "ASMWELD230A.DLL",
             "MMSDK.DLL",
         };
-        private static readonly ISet<string> ASM229DllNames = new HashSet<string>()
-        {
-            "TBB.DLL",
-            "TBBMALLOC.DLL",
-            "TSPLINES11.DLL",
-            "ASMAHL229A.DLL",
-            "ASMBASE229A.DLL",
-            "ASMBLND229A.DLL",
-            "ASMBOOL229A.DLL",
-            "ASMCOVR229A.DLL",
-            "ASMCSTR229A.DLL",
-            "ASMCT229A.DLL",
-            "ASMDATAX229A.DLL",
-            "ASMDEFM229A.DLL",
-            "ASMEULR229A.DLL",
-            "ASMFCT229A.DLL",
-            "ASMFREC229A.DLL",
-            "ASMGA229A.DLL",
-            "ASMHEAL229A.DLL",
-            "ASMIMPORT229A.DLL",
-            "ASMINTR229A.DLL",
-            "ASMKERN229A.DLL",
-            "ASMLAW229A.DLL",
-            "ASMLOP229A.DLL",
-            "ASMLOPT229A.DLL",
-            "ASMNPCH229A.DLL",
-            "ASMOFST229A.DLL",
-            "ASMOPER229A.DLL",
-            "ASMPID229A.DLL",
-            "ASMRBASE229A.DLL",
-            "ASMRBI229A.DLL",
-            "ASMREM229A.DLL",
-            "ASMSASM229A.DLL",
-            "ASMSBAP229A.DLL",
-            "ASMSBOOL229A.DLL",
-            "ASMSHL229A.DLL",
-            "ASMSKIN229A.DLL",
-            "ASMSWP229A.DLL",
-            "ASMTOPT229A.DLL",
-            "ASMTWK229A.DLL",
-            "ASMUFLD229A.DLL",
-            "ASMWELD229A.DLL",
-            "MMSDK.DLL"
-        };
-
         #endregion
 
         #region public properties
@@ -497,8 +452,6 @@ internal static bool IsASMInstallationComplete(IEnumerable<string> filePaths, in
             var fileNames = filePaths.Select(path => Path.GetFileName(path).ToUpper());
             switch (majorVersion)
             {
-                case 229:
-                    return !ASM229DllNames.Except(fileNames).Any();
                 case 230:
                     return !ASM230DllNames.Except(fileNames).Any();
                 default:
diff --git a/test/DynamoCoreTests/Logging/AnalyticsServiceTest.cs b/test/DynamoCoreTests/Logging/AnalyticsServiceTest.cs
@@ -20,8 +20,7 @@ public void DisableAnalytics()
         {
             var versions = new List<Version>(){
 
-                    new Version(229, 0,0),
-                    new Version(228, 6, 0)
+                    new Version(230, 0,0),
             };
 
             var directory = new DirectoryInfo(Assembly.GetExecutingAssembly().Location);
diff --git a/test/DynamoCoreTests/libGPreloaderTests.cs b/test/DynamoCoreTests/libGPreloaderTests.cs
@@ -460,17 +460,6 @@ public void PreloaderThatDoesNotFindASMDoesNotThrow()
             });
         }
 
-        [Test]
-        public void ASM229InstallationsAreValidated()
-        {
-            var incomplete229List = LoadListFromCsv("incomplete229List.csv");
-            Assert.IsFalse(DynamoShapeManager.Utilities.IsASMInstallationComplete(incomplete229List, 229));
-            // Add missing DLLs. Now the the installation should be valid.
-            incomplete229List.Add("tsplines11.dll");
-            incomplete229List.Add("mmsdk.dll");
-            Assert.IsTrue(DynamoShapeManager.Utilities.IsASMInstallationComplete(incomplete229List, 229));
-        }
-
         [Test]
         public void ASM230InstallationsAreValidated()
         {
diff --git a/test/Libraries/TestServices/TestSessionConfiguration.cs b/test/Libraries/TestServices/TestSessionConfiguration.cs
@@ -19,7 +19,6 @@ public class TestSessionConfiguration
         private  List<Version> supportedLibGVersions = new List<Version>
                 {
                     new Version(230,0,0),
-                    new Version(229,0,0),
                 };
 
         public string DynamoCorePath { get; private set; }
diff --git a/test/System/IntegrationTests/DynamoApplicationTests.cs b/test/System/IntegrationTests/DynamoApplicationTests.cs
@@ -14,8 +14,7 @@ public class DynamoApplicationTests
         public void DynamoSandboxLoadsASMFromValidPath()
         {
             var versions = new List<Version>(){
-                    new Version(229,0,0),
-                    new Version(228, 6, 0)
+                new Version(230, 0, 0),
             };
 
 
diff --git a/test/core/libGPreloader/incomplete229List.csv b/test/core/libGPreloader/incomplete229List.csv

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,6 @@ public static void PreloadShapeManager(ref string geometryFactoryPath, ref strin`
`158`	`158`	`var versions = new[]`
`159`	`159`	`{`
`160`	`160`	`new Version(230,0,0),`
`161`		`- new Version(229,0,0),`
`162`	`161`	`};`
`163`	`162`
`164`	`163`	`var preloader = new Preloader(rootFolder, versions);`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,6 @@ public Preloader(string rootFolder)`
`59`	`59`	`: this(rootFolder, new[]`
`60`	`60`	`{`
`61`	`61`	`new Version(230,0,0),`
`62`		`- new Version(229,0,0),`
`63`	`62`	`})`
`64`	`63`	`{`
`65`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,7 @@ public void DisableAnalytics()`
`20`	`20`	`{`
`21`	`21`	`var versions = new List<Version>(){`
`22`	`22`
`23`		`- new Version(229, 0,0),`
`24`		`- new Version(228, 6, 0)`
	`23`	`+ new Version(230, 0,0),`
`25`	`24`	`};`
`26`	`25`
`27`	`26`	`var directory = new DirectoryInfo(Assembly.GetExecutingAssembly().Location);`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ public class TestSessionConfiguration`
`19`	`19`	`private List<Version> supportedLibGVersions = new List<Version>`
`20`	`20`	`{`
`21`	`21`	`new Version(230,0,0),`
`22`		`- new Version(229,0,0),`
`23`	`22`	`};`
`24`	`23`
`25`	`24`	`public string DynamoCorePath { get; private set; }`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,7 @@ public class DynamoApplicationTests`
`14`	`14`	`public void DynamoSandboxLoadsASMFromValidPath()`
`15`	`15`	`{`
`16`	`16`	`var versions = new List<Version>(){`
`17`		`- new Version(229,0,0),`
`18`		`- new Version(228, 6, 0)`
	`17`	`+ new Version(230, 0, 0),`
`19`	`18`	`};`
`20`	`19`
`21`	`20`