From d30aa97559bf72d7cf2d756a7d25b8e704580f51 Mon Sep 17 00:00:00 2001 From: Washi Date: Thu, 16 Jun 2022 17:28:53 +0200 Subject: [PATCH] Shorten WindowsPdb to Pdb. --- AsmResolver.sln | 4 ++-- src/.gitignore | 2 ++ .../AsmResolver.Symbols.Pdb.csproj} | 0 .../Msf/Builder/FreeBlockMap.cs | 2 +- .../Msf/Builder/IMsfFileBuilder.cs | 2 +- .../Msf/Builder/MsfFileBuffer.cs | 2 +- .../Msf/Builder/SequentialMsfFileBuilder.cs | 2 +- .../Msf/MsfFile.cs | 4 ++-- .../Msf/MsfStream.cs | 2 +- .../Msf/MsfStreamDataSource.cs | 2 +- .../Msf/MsfSuperBlock.cs | 2 +- .../Msf/SerializedMsfFile.cs | 2 +- .../AsmResolver.Symbols.Pdb.Tests.csproj} | 2 +- .../Msf/MsfFileTest.cs | 4 ++-- .../Msf/MsfStreamDataSourceTest.cs | 4 ++-- .../Properties/Resources.Designer.cs | 20 +++++++++--------- .../Properties/Resources.resx | 0 .../Resources/.gitignore | 0 .../Resources/SimpleDll.pdb | Bin 19 files changed, 29 insertions(+), 27 deletions(-) create mode 100644 src/.gitignore rename src/{AsmResolver.Symbols.WindowsPdb/AsmResolver.Symbols.WindowsPdb.csproj => AsmResolver.Symbols.Pdb/AsmResolver.Symbols.Pdb.csproj} (100%) rename src/{AsmResolver.Symbols.WindowsPdb => AsmResolver.Symbols.Pdb}/Msf/Builder/FreeBlockMap.cs (94%) rename src/{AsmResolver.Symbols.WindowsPdb => AsmResolver.Symbols.Pdb}/Msf/Builder/IMsfFileBuilder.cs (88%) rename src/{AsmResolver.Symbols.WindowsPdb => AsmResolver.Symbols.Pdb}/Msf/Builder/MsfFileBuffer.cs (99%) rename src/{AsmResolver.Symbols.WindowsPdb => AsmResolver.Symbols.Pdb}/Msf/Builder/SequentialMsfFileBuilder.cs (97%) rename src/{AsmResolver.Symbols.WindowsPdb => AsmResolver.Symbols.Pdb}/Msf/MsfFile.cs (97%) rename src/{AsmResolver.Symbols.WindowsPdb => AsmResolver.Symbols.Pdb}/Msf/MsfStream.cs (98%) rename src/{AsmResolver.Symbols.WindowsPdb => AsmResolver.Symbols.Pdb}/Msf/MsfStreamDataSource.cs (98%) rename src/{AsmResolver.Symbols.WindowsPdb => AsmResolver.Symbols.Pdb}/Msf/MsfSuperBlock.cs (98%) rename src/{AsmResolver.Symbols.WindowsPdb => AsmResolver.Symbols.Pdb}/Msf/SerializedMsfFile.cs (98%) rename test/{AsmResolver.Symbols.WindowsPdb.Tests/AsmResolver.Symbols.WindowsPdb.Tests.csproj => AsmResolver.Symbols.Pdb.Tests/AsmResolver.Symbols.Pdb.Tests.csproj} (92%) rename test/{AsmResolver.Symbols.WindowsPdb.Tests => AsmResolver.Symbols.Pdb.Tests}/Msf/MsfFileTest.cs (87%) rename test/{AsmResolver.Symbols.WindowsPdb.Tests => AsmResolver.Symbols.Pdb.Tests}/Msf/MsfStreamDataSourceTest.cs (96%) rename test/{AsmResolver.Symbols.WindowsPdb.Tests => AsmResolver.Symbols.Pdb.Tests}/Properties/Resources.Designer.cs (88%) rename test/{AsmResolver.Symbols.WindowsPdb.Tests => AsmResolver.Symbols.Pdb.Tests}/Properties/Resources.resx (100%) rename test/{AsmResolver.Symbols.WindowsPdb.Tests => AsmResolver.Symbols.Pdb.Tests}/Resources/.gitignore (100%) rename test/{AsmResolver.Symbols.WindowsPdb.Tests => AsmResolver.Symbols.Pdb.Tests}/Resources/SimpleDll.pdb (100%) diff --git a/AsmResolver.sln b/AsmResolver.sln index cee77d8fe..90430c976 100644 --- a/AsmResolver.sln +++ b/AsmResolver.sln @@ -85,9 +85,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Directory.Build.props = Directory.Build.props EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsmResolver.Symbols.WindowsPdb", "src\AsmResolver.Symbols.WindowsPdb\AsmResolver.Symbols.WindowsPdb.csproj", "{9E311832-D0F2-42CA-84DD-9A91B88F0287}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsmResolver.Symbols.Pdb", "src\AsmResolver.Symbols.Pdb\AsmResolver.Symbols.Pdb.csproj", "{9E311832-D0F2-42CA-84DD-9A91B88F0287}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsmResolver.Symbols.WindowsPdb.Tests", "test\AsmResolver.Symbols.WindowsPdb.Tests\AsmResolver.Symbols.WindowsPdb.Tests.csproj", "{AAD604B6-ABE5-4DBC-A2D9-4EF8E815B2EE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsmResolver.Symbols.Pdb.Tests", "test\AsmResolver.Symbols.Pdb.Tests\AsmResolver.Symbols.Pdb.Tests.csproj", "{AAD604B6-ABE5-4DBC-A2D9-4EF8E815B2EE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/.gitignore b/src/.gitignore new file mode 100644 index 000000000..bebbea9fa --- /dev/null +++ b/src/.gitignore @@ -0,0 +1,2 @@ +!AsmResolver.Symbols.Pdb/ + diff --git a/src/AsmResolver.Symbols.WindowsPdb/AsmResolver.Symbols.WindowsPdb.csproj b/src/AsmResolver.Symbols.Pdb/AsmResolver.Symbols.Pdb.csproj similarity index 100% rename from src/AsmResolver.Symbols.WindowsPdb/AsmResolver.Symbols.WindowsPdb.csproj rename to src/AsmResolver.Symbols.Pdb/AsmResolver.Symbols.Pdb.csproj diff --git a/src/AsmResolver.Symbols.WindowsPdb/Msf/Builder/FreeBlockMap.cs b/src/AsmResolver.Symbols.Pdb/Msf/Builder/FreeBlockMap.cs similarity index 94% rename from src/AsmResolver.Symbols.WindowsPdb/Msf/Builder/FreeBlockMap.cs rename to src/AsmResolver.Symbols.Pdb/Msf/Builder/FreeBlockMap.cs index 4339d4daa..dea1712e0 100644 --- a/src/AsmResolver.Symbols.WindowsPdb/Msf/Builder/FreeBlockMap.cs +++ b/src/AsmResolver.Symbols.Pdb/Msf/Builder/FreeBlockMap.cs @@ -1,7 +1,7 @@ using System.Collections; using AsmResolver.IO; -namespace AsmResolver.Symbols.WindowsPdb.Msf.Builder; +namespace AsmResolver.Symbols.Pdb.Msf.Builder; /// /// Represents a block within a MSF file that contains information on which blocks in the MSF file are free to use. diff --git a/src/AsmResolver.Symbols.WindowsPdb/Msf/Builder/IMsfFileBuilder.cs b/src/AsmResolver.Symbols.Pdb/Msf/Builder/IMsfFileBuilder.cs similarity index 88% rename from src/AsmResolver.Symbols.WindowsPdb/Msf/Builder/IMsfFileBuilder.cs rename to src/AsmResolver.Symbols.Pdb/Msf/Builder/IMsfFileBuilder.cs index f340944a1..b51dcfe0b 100644 --- a/src/AsmResolver.Symbols.WindowsPdb/Msf/Builder/IMsfFileBuilder.cs +++ b/src/AsmResolver.Symbols.Pdb/Msf/Builder/IMsfFileBuilder.cs @@ -1,4 +1,4 @@ -namespace AsmResolver.Symbols.WindowsPdb.Msf.Builder; +namespace AsmResolver.Symbols.Pdb.Msf.Builder; /// /// Provides members for constructing new MSF files. diff --git a/src/AsmResolver.Symbols.WindowsPdb/Msf/Builder/MsfFileBuffer.cs b/src/AsmResolver.Symbols.Pdb/Msf/Builder/MsfFileBuffer.cs similarity index 99% rename from src/AsmResolver.Symbols.WindowsPdb/Msf/Builder/MsfFileBuffer.cs rename to src/AsmResolver.Symbols.Pdb/Msf/Builder/MsfFileBuffer.cs index 79ff2afc1..865715037 100644 --- a/src/AsmResolver.Symbols.WindowsPdb/Msf/Builder/MsfFileBuffer.cs +++ b/src/AsmResolver.Symbols.Pdb/Msf/Builder/MsfFileBuffer.cs @@ -3,7 +3,7 @@ using System.IO; using AsmResolver.IO; -namespace AsmResolver.Symbols.WindowsPdb.Msf.Builder; +namespace AsmResolver.Symbols.Pdb.Msf.Builder; /// /// Represents a mutable buffer for building up a new MSF file. diff --git a/src/AsmResolver.Symbols.WindowsPdb/Msf/Builder/SequentialMsfFileBuilder.cs b/src/AsmResolver.Symbols.Pdb/Msf/Builder/SequentialMsfFileBuilder.cs similarity index 97% rename from src/AsmResolver.Symbols.WindowsPdb/Msf/Builder/SequentialMsfFileBuilder.cs rename to src/AsmResolver.Symbols.Pdb/Msf/Builder/SequentialMsfFileBuilder.cs index 35195f776..ca02da2a9 100644 --- a/src/AsmResolver.Symbols.WindowsPdb/Msf/Builder/SequentialMsfFileBuilder.cs +++ b/src/AsmResolver.Symbols.Pdb/Msf/Builder/SequentialMsfFileBuilder.cs @@ -1,4 +1,4 @@ -namespace AsmResolver.Symbols.WindowsPdb.Msf.Builder; +namespace AsmResolver.Symbols.Pdb.Msf.Builder; /// /// Provides an implementation of the that places all blocks of every stream in sequence, diff --git a/src/AsmResolver.Symbols.WindowsPdb/Msf/MsfFile.cs b/src/AsmResolver.Symbols.Pdb/Msf/MsfFile.cs similarity index 97% rename from src/AsmResolver.Symbols.WindowsPdb/Msf/MsfFile.cs rename to src/AsmResolver.Symbols.Pdb/Msf/MsfFile.cs index 5e73e5d84..16aff99f9 100644 --- a/src/AsmResolver.Symbols.WindowsPdb/Msf/MsfFile.cs +++ b/src/AsmResolver.Symbols.Pdb/Msf/MsfFile.cs @@ -4,9 +4,9 @@ using System.Threading; using AsmResolver.Collections; using AsmResolver.IO; -using AsmResolver.Symbols.WindowsPdb.Msf.Builder; +using AsmResolver.Symbols.Pdb.Msf.Builder; -namespace AsmResolver.Symbols.WindowsPdb.Msf; +namespace AsmResolver.Symbols.Pdb.Msf; /// /// Models a file that is in the Microsoft Multi-Stream Format (MSF). diff --git a/src/AsmResolver.Symbols.WindowsPdb/Msf/MsfStream.cs b/src/AsmResolver.Symbols.Pdb/Msf/MsfStream.cs similarity index 98% rename from src/AsmResolver.Symbols.WindowsPdb/Msf/MsfStream.cs rename to src/AsmResolver.Symbols.Pdb/Msf/MsfStream.cs index 942bf0fab..f5e871498 100644 --- a/src/AsmResolver.Symbols.WindowsPdb/Msf/MsfStream.cs +++ b/src/AsmResolver.Symbols.Pdb/Msf/MsfStream.cs @@ -4,7 +4,7 @@ using AsmResolver.Collections; using AsmResolver.IO; -namespace AsmResolver.Symbols.WindowsPdb.Msf; +namespace AsmResolver.Symbols.Pdb.Msf; /// /// Represents a single stream in an Multi-Stream Format (MSF) file. diff --git a/src/AsmResolver.Symbols.WindowsPdb/Msf/MsfStreamDataSource.cs b/src/AsmResolver.Symbols.Pdb/Msf/MsfStreamDataSource.cs similarity index 98% rename from src/AsmResolver.Symbols.WindowsPdb/Msf/MsfStreamDataSource.cs rename to src/AsmResolver.Symbols.Pdb/Msf/MsfStreamDataSource.cs index 08e43ef2d..fa0e96cef 100644 --- a/src/AsmResolver.Symbols.WindowsPdb/Msf/MsfStreamDataSource.cs +++ b/src/AsmResolver.Symbols.Pdb/Msf/MsfStreamDataSource.cs @@ -4,7 +4,7 @@ using System.Runtime.CompilerServices; using AsmResolver.IO; -namespace AsmResolver.Symbols.WindowsPdb.Msf; +namespace AsmResolver.Symbols.Pdb.Msf; /// /// Implements a data source for a single MSF stream that pulls data from multiple (fragmented) blocks. diff --git a/src/AsmResolver.Symbols.WindowsPdb/Msf/MsfSuperBlock.cs b/src/AsmResolver.Symbols.Pdb/Msf/MsfSuperBlock.cs similarity index 98% rename from src/AsmResolver.Symbols.WindowsPdb/Msf/MsfSuperBlock.cs rename to src/AsmResolver.Symbols.Pdb/Msf/MsfSuperBlock.cs index 91dfe778d..cba31d1c8 100644 --- a/src/AsmResolver.Symbols.WindowsPdb/Msf/MsfSuperBlock.cs +++ b/src/AsmResolver.Symbols.Pdb/Msf/MsfSuperBlock.cs @@ -1,7 +1,7 @@ using System; using AsmResolver.IO; -namespace AsmResolver.Symbols.WindowsPdb.Msf; +namespace AsmResolver.Symbols.Pdb.Msf; /// /// Represents the first block in a Multi-Stream Format (MSF) file. diff --git a/src/AsmResolver.Symbols.WindowsPdb/Msf/SerializedMsfFile.cs b/src/AsmResolver.Symbols.Pdb/Msf/SerializedMsfFile.cs similarity index 98% rename from src/AsmResolver.Symbols.WindowsPdb/Msf/SerializedMsfFile.cs rename to src/AsmResolver.Symbols.Pdb/Msf/SerializedMsfFile.cs index 025780e57..5570f188d 100644 --- a/src/AsmResolver.Symbols.WindowsPdb/Msf/SerializedMsfFile.cs +++ b/src/AsmResolver.Symbols.Pdb/Msf/SerializedMsfFile.cs @@ -4,7 +4,7 @@ using AsmResolver.Collections; using AsmResolver.IO; -namespace AsmResolver.Symbols.WindowsPdb.Msf; +namespace AsmResolver.Symbols.Pdb.Msf; /// /// Provides an implementation for an MSF file that is read from an input file. diff --git a/test/AsmResolver.Symbols.WindowsPdb.Tests/AsmResolver.Symbols.WindowsPdb.Tests.csproj b/test/AsmResolver.Symbols.Pdb.Tests/AsmResolver.Symbols.Pdb.Tests.csproj similarity index 92% rename from test/AsmResolver.Symbols.WindowsPdb.Tests/AsmResolver.Symbols.WindowsPdb.Tests.csproj rename to test/AsmResolver.Symbols.Pdb.Tests/AsmResolver.Symbols.Pdb.Tests.csproj index ff11f109f..18d5ed468 100644 --- a/test/AsmResolver.Symbols.WindowsPdb.Tests/AsmResolver.Symbols.WindowsPdb.Tests.csproj +++ b/test/AsmResolver.Symbols.Pdb.Tests/AsmResolver.Symbols.Pdb.Tests.csproj @@ -36,7 +36,7 @@ - + diff --git a/test/AsmResolver.Symbols.WindowsPdb.Tests/Msf/MsfFileTest.cs b/test/AsmResolver.Symbols.Pdb.Tests/Msf/MsfFileTest.cs similarity index 87% rename from test/AsmResolver.Symbols.WindowsPdb.Tests/Msf/MsfFileTest.cs rename to test/AsmResolver.Symbols.Pdb.Tests/Msf/MsfFileTest.cs index 80298ad77..b17cd4b36 100644 --- a/test/AsmResolver.Symbols.WindowsPdb.Tests/Msf/MsfFileTest.cs +++ b/test/AsmResolver.Symbols.Pdb.Tests/Msf/MsfFileTest.cs @@ -1,9 +1,9 @@ using System.IO; using System.Linq; -using AsmResolver.Symbols.WindowsPdb.Msf; +using AsmResolver.Symbols.Pdb.Msf; using Xunit; -namespace AsmResolver.Symbols.WindowsPdb.Tests.Msf; +namespace AsmResolver.Symbols.Pdb.Tests.Msf; public class MsfFileTest { diff --git a/test/AsmResolver.Symbols.WindowsPdb.Tests/Msf/MsfStreamDataSourceTest.cs b/test/AsmResolver.Symbols.Pdb.Tests/Msf/MsfStreamDataSourceTest.cs similarity index 96% rename from test/AsmResolver.Symbols.WindowsPdb.Tests/Msf/MsfStreamDataSourceTest.cs rename to test/AsmResolver.Symbols.Pdb.Tests/Msf/MsfStreamDataSourceTest.cs index d8ce31566..c61fa8dc1 100644 --- a/test/AsmResolver.Symbols.WindowsPdb.Tests/Msf/MsfStreamDataSourceTest.cs +++ b/test/AsmResolver.Symbols.Pdb.Tests/Msf/MsfStreamDataSourceTest.cs @@ -1,10 +1,10 @@ using System; using System.Linq; using AsmResolver.IO; -using AsmResolver.Symbols.WindowsPdb.Msf; +using AsmResolver.Symbols.Pdb.Msf; using Xunit; -namespace AsmResolver.Symbols.WindowsPdb.Tests.Msf; +namespace AsmResolver.Symbols.Pdb.Tests.Msf; public class MsfStreamDataSourceTest { diff --git a/test/AsmResolver.Symbols.WindowsPdb.Tests/Properties/Resources.Designer.cs b/test/AsmResolver.Symbols.Pdb.Tests/Properties/Resources.Designer.cs similarity index 88% rename from test/AsmResolver.Symbols.WindowsPdb.Tests/Properties/Resources.Designer.cs rename to test/AsmResolver.Symbols.Pdb.Tests/Properties/Resources.Designer.cs index ccd260a2d..b115b2929 100644 --- a/test/AsmResolver.Symbols.WindowsPdb.Tests/Properties/Resources.Designer.cs +++ b/test/AsmResolver.Symbols.Pdb.Tests/Properties/Resources.Designer.cs @@ -7,34 +7,34 @@ // //------------------------------------------------------------------------------ -namespace AsmResolver.Symbols.WindowsPdb.Tests.Properties { +namespace AsmResolver.Symbols.Pdb.Tests.Properties { using System; - - + + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [System.Diagnostics.DebuggerNonUserCodeAttribute()] [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { - + private static System.Resources.ResourceManager resourceMan; - + private static System.Globalization.CultureInfo resourceCulture; - + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } - + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] internal static System.Resources.ResourceManager ResourceManager { get { if (object.Equals(null, resourceMan)) { - System.Resources.ResourceManager temp = new System.Resources.ResourceManager("AsmResolver.Symbols.WindowsPdb.Tests.Properties.Resources", typeof(Resources).Assembly); + System.Resources.ResourceManager temp = new System.Resources.ResourceManager("AsmResolver.Symbols.Pdb.Tests.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] internal static System.Globalization.CultureInfo Culture { get { @@ -44,7 +44,7 @@ internal static System.Globalization.CultureInfo Culture { resourceCulture = value; } } - + internal static byte[] SimpleDllPdb { get { object obj = ResourceManager.GetObject("SimpleDllPdb", resourceCulture); diff --git a/test/AsmResolver.Symbols.WindowsPdb.Tests/Properties/Resources.resx b/test/AsmResolver.Symbols.Pdb.Tests/Properties/Resources.resx similarity index 100% rename from test/AsmResolver.Symbols.WindowsPdb.Tests/Properties/Resources.resx rename to test/AsmResolver.Symbols.Pdb.Tests/Properties/Resources.resx diff --git a/test/AsmResolver.Symbols.WindowsPdb.Tests/Resources/.gitignore b/test/AsmResolver.Symbols.Pdb.Tests/Resources/.gitignore similarity index 100% rename from test/AsmResolver.Symbols.WindowsPdb.Tests/Resources/.gitignore rename to test/AsmResolver.Symbols.Pdb.Tests/Resources/.gitignore diff --git a/test/AsmResolver.Symbols.WindowsPdb.Tests/Resources/SimpleDll.pdb b/test/AsmResolver.Symbols.Pdb.Tests/Resources/SimpleDll.pdb similarity index 100% rename from test/AsmResolver.Symbols.WindowsPdb.Tests/Resources/SimpleDll.pdb rename to test/AsmResolver.Symbols.Pdb.Tests/Resources/SimpleDll.pdb