Skip to content

Commit fb034bb

Browse files
sm6srwsm6srw
committed
Remove ASM229 (#14952)
1 parent 10915c0 commit fb034bb

File tree

9 files changed

+6
-69
lines changed

9 files changed

+6
-69
lines changed

‎src/DynamoApplications/StartupUtils.cs

-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ public static void PreloadShapeManager(ref string geometryFactoryPath, ref strin
158158
var versions = new[]
159159
{
160160
new Version(230,0,0),
161-
new Version(229,0,0),
162161
};
163162

164163
var preloader = new Preloader(rootFolder, versions);

‎src/DynamoCore/DynamoCore.csproj

+4-3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<PackageReference Include="Greg" Version="3.0.0.3175" />
3131
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="3.0.0.3331" GeneratePathProperty="true" />
3232
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" GeneratePathProperty="true" />
33+
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" GeneratePathProperty="true" />
3334
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" CopyXML="true" />
3435
<PackageReference Include="RestSharp" Version="108.0.1" CopyXML="true" />
3536
<PackageReference Include="Lucene.Net" Version="4.8.0-beta00016" />
@@ -116,10 +117,12 @@
116117
<LibGProtoGeometryDLL Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\ProtoGeometry.dll" />
117118
<LibGProtoGeometryXML Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\ProtoGeometry.XML" />
118119
<LibG229Deps Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\asm_deps.csproj" />
120+
<LibGInterface Include="$(PkgDynamoVisualProgramming_LibG_230_0_0)\tools\netstandard2.0\$(LibGOsToken)\LibG.Interface.dll" />
121+
<LibGProtoGeometryDLL Include="$(PkgDynamoVisualProgramming_LibG_230_0_0)\tools\netstandard2.0\$(LibGOsToken)\ProtoGeometry.dll" />
122+
<LibGProtoGeometryXML Include="$(PkgDynamoVisualProgramming_LibG_230_0_0)\tools\netstandard2.0\$(LibGOsToken)\ProtoGeometry.XML" />
119123
<LibG230Deps Include="$(PkgDynamoVisualProgramming_LibG_230_0_0)\tools\netstandard2.0\$(LibGOsToken)\asm_deps.csproj" />
120124
<LibGProtoGeometryUICulture Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\$(UICulture)\*" />
121125
<LibG230 Include="$(PkgDynamoVisualProgramming_LibG_230_0_0)\tools\netstandard2.0\$(LibGOsToken)\LibG_230_0_0\*" />
122-
<LibG229 Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\LibG_229_0_0\*" />
123126
<SampleFiles Include="$(SolutionDir)..\doc\distrib\Samples\**\*.*" />
124127
<NodeHelpMDFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.md" />
125128
<NodeHelpDYNFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.dyn" />
@@ -149,11 +152,9 @@
149152
<Copy SourceFiles="@(LibGProtoGeometryXml)" DestinationFolder="$(OutputPath)" />
150153
<Copy SourceFiles="@(LibGProtoGeometryXml)" DestinationFolder="$(OutputPath)\$(UICulture)" />
151154
<Copy SourceFiles="@(LibGProtoGeometryUICulture)" DestinationFolder="$(OutputPath)\$(UICulture)" />
152-
<Copy Condition="$(Platform.Contains('Linux'))" SourceFiles="@(LibG229Deps)" DestinationFolder="$(OutputPath)libg_229_0_0\asm_deps\" />
153155
<Copy Condition="$(Platform.Contains('Linux'))" SourceFiles="@(LibG230Deps)" DestinationFolder="$(OutputPath)libg_230_0_0\asm_deps\" />
154156
<Exec Command="$(PowerShellCommand) -ExecutionPolicy ByPass -Command Copy-Item -Path $(LibGProtoGeometryLibGLocale) -Destination $(OutputPath) -Recurse -Force" />
155157
<Copy SourceFiles="@(LibG230)" DestinationFolder="$(OutputPath)libg_230_0_0\" />
156-
<Copy SourceFiles="@(LibG229)" DestinationFolder="$(OutputPath)libg_229_0_0\" />
157158
<Copy SourceFiles="@(SampleFiles)" DestinationFolder="$(OutputPath)samples\%(RecursiveDir)" />
158159
<Copy SourceFiles="@(LocalizedResources)" DestinationFolder="$(OutputPath)%(RecursiveDir)" />
159160
<Copy SourceFiles="$(ProjectDir)\BuiltInAndOperators\Operators.xml" DestinationFolder="$(OutputPath)\$(UICulture)" />

‎src/Tools/DynamoShapeManager/Preloader.cs

-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ public Preloader(string rootFolder)
5959
: this(rootFolder, new[]
6060
{
6161
new Version(230,0,0),
62-
new Version(229,0,0),
6362
})
6463
{
6564
}

‎src/Tools/DynamoShapeManager/Utilities.cs

-47
Original file line numberDiff line numberDiff line change
@@ -91,51 +91,6 @@ private static List<string> ProductsWithASM
9191
"ASMWELD230A.DLL",
9292
"MMSDK.DLL",
9393
};
94-
private static readonly ISet<string> ASM229DllNames = new HashSet<string>()
95-
{
96-
"TBB.DLL",
97-
"TBBMALLOC.DLL",
98-
"TSPLINES11.DLL",
99-
"ASMAHL229A.DLL",
100-
"ASMBASE229A.DLL",
101-
"ASMBLND229A.DLL",
102-
"ASMBOOL229A.DLL",
103-
"ASMCOVR229A.DLL",
104-
"ASMCSTR229A.DLL",
105-
"ASMCT229A.DLL",
106-
"ASMDATAX229A.DLL",
107-
"ASMDEFM229A.DLL",
108-
"ASMEULR229A.DLL",
109-
"ASMFCT229A.DLL",
110-
"ASMFREC229A.DLL",
111-
"ASMGA229A.DLL",
112-
"ASMHEAL229A.DLL",
113-
"ASMIMPORT229A.DLL",
114-
"ASMINTR229A.DLL",
115-
"ASMKERN229A.DLL",
116-
"ASMLAW229A.DLL",
117-
"ASMLOP229A.DLL",
118-
"ASMLOPT229A.DLL",
119-
"ASMNPCH229A.DLL",
120-
"ASMOFST229A.DLL",
121-
"ASMOPER229A.DLL",
122-
"ASMPID229A.DLL",
123-
"ASMRBASE229A.DLL",
124-
"ASMRBI229A.DLL",
125-
"ASMREM229A.DLL",
126-
"ASMSASM229A.DLL",
127-
"ASMSBAP229A.DLL",
128-
"ASMSBOOL229A.DLL",
129-
"ASMSHL229A.DLL",
130-
"ASMSKIN229A.DLL",
131-
"ASMSWP229A.DLL",
132-
"ASMTOPT229A.DLL",
133-
"ASMTWK229A.DLL",
134-
"ASMUFLD229A.DLL",
135-
"ASMWELD229A.DLL",
136-
"MMSDK.DLL"
137-
};
138-
13994
#endregion
14095

14196
#region public properties
@@ -497,8 +452,6 @@ internal static bool IsASMInstallationComplete(IEnumerable<string> filePaths, in
497452
var fileNames = filePaths.Select(path => Path.GetFileName(path).ToUpper());
498453
switch (majorVersion)
499454
{
500-
case 229:
501-
return !ASM229DllNames.Except(fileNames).Any();
502455
case 230:
503456
return !ASM230DllNames.Except(fileNames).Any();
504457
default:

‎test/DynamoCoreTests/Logging/AnalyticsServiceTest.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ public void DisableAnalytics()
2020
{
2121
var versions = new List<Version>(){
2222

23-
new Version(229, 0,0),
24-
new Version(228, 6, 0)
23+
new Version(230, 0,0),
2524
};
2625

2726
var directory = new DirectoryInfo(Assembly.GetExecutingAssembly().Location);

‎test/DynamoCoreTests/libGPreloaderTests.cs

-11
Original file line numberDiff line numberDiff line change
@@ -460,17 +460,6 @@ public void PreloaderThatDoesNotFindASMDoesNotThrow()
460460
});
461461
}
462462

463-
[Test]
464-
public void ASM229InstallationsAreValidated()
465-
{
466-
var incomplete229List = LoadListFromCsv("incomplete229List.csv");
467-
Assert.IsFalse(DynamoShapeManager.Utilities.IsASMInstallationComplete(incomplete229List, 229));
468-
// Add missing DLLs. Now the the installation should be valid.
469-
incomplete229List.Add("tsplines11.dll");
470-
incomplete229List.Add("mmsdk.dll");
471-
Assert.IsTrue(DynamoShapeManager.Utilities.IsASMInstallationComplete(incomplete229List, 229));
472-
}
473-
474463
[Test]
475464
public void ASM230InstallationsAreValidated()
476465
{

‎test/Libraries/TestServices/TestSessionConfiguration.cs

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ public class TestSessionConfiguration
1919
private List<Version> supportedLibGVersions = new List<Version>
2020
{
2121
new Version(230,0,0),
22-
new Version(229,0,0),
2322
};
2423

2524
public string DynamoCorePath { get; private set; }

‎test/System/IntegrationTests/DynamoApplicationTests.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ public class DynamoApplicationTests
1414
public void DynamoSandboxLoadsASMFromValidPath()
1515
{
1616
var versions = new List<Version>(){
17-
new Version(229,0,0),
18-
new Version(228, 6, 0)
17+
new Version(230, 0, 0),
1918
};
2019

2120

‎test/core/libGPreloader/incomplete229List.csv

-1
This file was deleted.

0 commit comments

Comments
 (0)