Skip to content

Commit

Permalink
Remove ASM229
Browse files Browse the repository at this point in the history
  • Loading branch information
@sm6srw
sm6srw committed Feb 16, 2024
1 parent 05f4de8 commit d38c4fc
Show file tree
Hide file tree
Showing 9 changed files with 1 addition and 70 deletions.
1 change: 0 additions & 1 deletion src/DynamoApplications/StartupUtils.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
5 changes: 0 additions & 5 deletions src/DynamoCore/DynamoCore.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
<ItemGroup Label="Common dependencies">
<PackageReference Include="Autodesk.IDSDK" Version="1.1.8" />
<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.4074" GeneratePathProperty="true" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" CopyXML="true" />
<PackageReference Include="RestSharp" Version="108.0.1" CopyXML="true" />
Expand Down Expand Up @@ -119,11 +118,9 @@
<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" />
<LibG229Deps Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\asm_deps.csproj" />
<LibG230Deps Include="$(PkgDynamoVisualProgramming_LibG_230_0_0)\tools\netstandard2.0\$(LibGOsToken)\asm_deps.csproj" />
<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" />
Expand Down Expand Up @@ -153,11 +150,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)" />
Expand Down
1 change: 0 additions & 1 deletion src/Tools/DynamoShapeManager/Preloader.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ public Preloader(string rootFolder)
: this(rootFolder, new[]
{
new Version(230,0,0),
new Version(229,0,0),
})
{
}
Expand Down
47 changes: 0 additions & 47 deletions src/Tools/DynamoShapeManager/Utilities.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions test/DynamoCoreTests/Logging/AnalyticsServiceTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
11 changes: 0 additions & 11 deletions test/DynamoCoreTests/libGPreloaderTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
1 change: 0 additions & 1 deletion test/Libraries/TestServices/TestSessionConfiguration.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down
1 change: 0 additions & 1 deletion test/System/IntegrationTests/DynamoApplicationTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ public void DynamoSandboxLoadsASMFromValidPath()
{
var versions = new List<Version>(){
new Version(230, 0, 0),
new Version(229,0,0)
};


Expand Down
1 change: 0 additions & 1 deletion test/core/libGPreloader/incomplete229List.csv
View file

This file was deleted.

0 comments on commit d38c4fc

Please sign in to comment.