From 09e1e021cd2d9074afa98c1b1a571fe0f2aed0b3 Mon Sep 17 00:00:00 2001 From: David Turner Date: Mon, 22 Jan 2018 06:12:39 -0700 Subject: [PATCH 1/6] Update to only consider Rock DLL's when comparing folders. --- .gitignore | 1 + Source/BitDiffer.Common/Detail/EntityDetail.cs | 4 ++++ Source/BitDiffer.Core/AssemblyComparer.cs | 9 +++++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f59977d..adb7caa 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ Thumbs.db [Dd]ebug*/ *.lib *.sbr +.vs/ obj/ [Rr]elease*/ _ReSharper*/ diff --git a/Source/BitDiffer.Common/Detail/EntityDetail.cs b/Source/BitDiffer.Common/Detail/EntityDetail.cs index b008dcc..e8aa974 100644 --- a/Source/BitDiffer.Common/Detail/EntityDetail.cs +++ b/Source/BitDiffer.Common/Detail/EntityDetail.cs @@ -27,6 +27,8 @@ public EntityDetail(RootDetail parent, Type type, bool takeVisibilityFromParent) List methods = FilterMethods(type.GetMethods(flags), type, false); foreach (MethodBase mi in methods) { + try + { MethodDetail md = new MethodDetail(this, mi); if (takeVisibilityFromParent) @@ -35,6 +37,8 @@ public EntityDetail(RootDetail parent, Type type, bool takeVisibilityFromParent) } _children.Add(md); + } + catch { } } List constructors = FilterMethods(type.GetConstructors(flags), type, false); diff --git a/Source/BitDiffer.Core/AssemblyComparer.cs b/Source/BitDiffer.Core/AssemblyComparer.cs index 563d31c..35aa03a 100644 --- a/Source/BitDiffer.Core/AssemblyComparer.cs +++ b/Source/BitDiffer.Core/AssemblyComparer.cs @@ -95,8 +95,13 @@ public AssemblyComparison CompareAssemblyDirectories(bool recurse, DiffConfig co { List entry = new List(); - entry.AddRange(AssemblyDirectoryEntry.From(dir, Directory.GetFiles(dir, "*.dll", option))); - entry.AddRange(AssemblyDirectoryEntry.From(dir, Directory.GetFiles(dir, "*.exe", option))); + //entry.AddRange(AssemblyDirectoryEntry.From(dir, Directory.GetFiles(dir, "*.dll", option))); + //entry.AddRange(AssemblyDirectoryEntry.From(dir, Directory.GetFiles(dir, "*.exe", option))); + + entry.AddRange( AssemblyDirectoryEntry.From( dir, Directory.GetFiles( dir, "Rock.dll", option ) ) ); + entry.AddRange( AssemblyDirectoryEntry.From( dir, Directory.GetFiles( dir, "Rock.*.dll", option ) ) ); + entry.AddRange( AssemblyDirectoryEntry.From( dir, Directory.GetFiles( dir, "DotLiquid.dll", option ) ) ); + entry.AddRange( AssemblyDirectoryEntry.From( dir, Directory.GetFiles( dir, "SignNowSDK.dll", option ) ) ); totalFiles += entry.Count; allEntries.Add(entry); From 95aa545ea5a9877b437b74a15034752a1e1eb2b4 Mon Sep 17 00:00:00 2001 From: ethan-sparkdevnetwork Date: Thu, 21 Jan 2021 09:46:53 -0700 Subject: [PATCH 2/6] - Updated solution to 4.7.2. --- Build/scripts/packages.config | 4 ++ Build/scripts/scripts.fsproj | 42 ++++++++++--------- Source/Aga.Controls/Aga.Controls.csproj | 2 +- .../Properties/Resources.Designer.cs | 2 +- Source/BitDiffer.Client/App.config | 4 +- .../BitDiffer.Client/BitDiffer.Client.csproj | 2 +- .../Properties/Resources.Designer.cs | 2 +- .../Properties/Settings.Designer.cs | 2 +- .../BitDiffer.Common/BitDiffer.Common.csproj | 2 +- Source/BitDiffer.Console/App.config | 2 +- .../BitDiffer.Console.csproj | 2 +- Source/BitDiffer.Core/AssemblyComparer.cs | 1 + Source/BitDiffer.Core/BitDiffer.Core.csproj | 2 +- .../BitDiffer.Extractor/AssemblyExtractor.cs | 1 + .../BitDiffer.Extractor.csproj | 2 +- .../BitDiffer.Tests.Reference1.csproj | 2 +- .../BitDiffer.Tests.Reference2.csproj | 2 +- .../BitDiffer.Tests.Subject1.csproj | 2 +- .../BitDiffer.Tests.Subject2.csproj | 2 +- Source/BitDiffer.Tests/App.config | 2 +- Source/BitDiffer.Tests/BitDiffer.Tests.csproj | 2 +- 21 files changed, 46 insertions(+), 38 deletions(-) create mode 100644 Build/scripts/packages.config diff --git a/Build/scripts/packages.config b/Build/scripts/packages.config new file mode 100644 index 0000000..ed9ab1a --- /dev/null +++ b/Build/scripts/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Build/scripts/scripts.fsproj b/Build/scripts/scripts.fsproj index a3321eb..4eb49dc 100644 --- a/Build/scripts/scripts.fsproj +++ b/Build/scripts/scripts.fsproj @@ -9,10 +9,11 @@ Library scripts scripts - v4.5.2 + v4.7.2 4.4.0.0 true scripts + true @@ -33,25 +34,6 @@ 3 bin\Release\scripts.XML - - - - True - - - - - - - - - - - - - - - 11 @@ -68,6 +50,26 @@ + + + + + + + + + + + + + + ..\..\Source\packages\FSharp.Core.5.0.0\lib\netstandard2.0\FSharp.Core.dll + + + + + + + + + + + + + +