Skip to content

Commit

Permalink
Merge branch 'master' into pei-changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@lkinsella
lkinsella committed Jan 24, 2020
2 parents bbdf0b6 + c320fb1 commit c5e248a
Show file tree
Hide file tree
Showing 40 changed files with 38 additions and 14 deletions.
7 changes: 7 additions & 0 deletions dotNET PE.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,25 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Workshell.PE.Tests", "tests
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
CI|Any CPU = CI|Any CPU
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{2DF6E85A-7269-46C6-9032-1C3A8F029AE3}.CI|Any CPU.ActiveCfg = CI|Any CPU
{2DF6E85A-7269-46C6-9032-1C3A8F029AE3}.CI|Any CPU.Build.0 = CI|Any CPU
{2DF6E85A-7269-46C6-9032-1C3A8F029AE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2DF6E85A-7269-46C6-9032-1C3A8F029AE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2DF6E85A-7269-46C6-9032-1C3A8F029AE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2DF6E85A-7269-46C6-9032-1C3A8F029AE3}.Release|Any CPU.Build.0 = Release|Any CPU
{DBED9C9E-0B8C-46B5-AE1D-865722B68E44}.CI|Any CPU.ActiveCfg = CI|Any CPU
{DBED9C9E-0B8C-46B5-AE1D-865722B68E44}.CI|Any CPU.Build.0 = CI|Any CPU
{DBED9C9E-0B8C-46B5-AE1D-865722B68E44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DBED9C9E-0B8C-46B5-AE1D-865722B68E44}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DBED9C9E-0B8C-46B5-AE1D-865722B68E44}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DBED9C9E-0B8C-46B5-AE1D-865722B68E44}.Release|Any CPU.Build.0 = Release|Any CPU
{8A5FC684-11D6-4902-B0E0-7FEBC36BA21F}.CI|Any CPU.ActiveCfg = CI|Any CPU
{8A5FC684-11D6-4902-B0E0-7FEBC36BA21F}.CI|Any CPU.Build.0 = CI|Any CPU
{8A5FC684-11D6-4902-B0E0-7FEBC36BA21F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8A5FC684-11D6-4902-B0E0-7FEBC36BA21F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8A5FC684-11D6-4902-B0E0-7FEBC36BA21F}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
0 ...l.PE.Resources/Properties/AssrmblyInfo.cs → ...l.PE.Resources/Properties/AssemblyInfo.cs
View file
File renamed without changes.
12 changes: 9 additions & 3 deletions src/Workshell.PE.Resources/Workshell.PE.Resources.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>Workshell.PE.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>Workshell.snk</AssemblyOriginatorKeyFile>
<Configurations>Debug;Release;CI</Configurations>
</PropertyGroup>

<PropertyGroup>
Expand Down Expand Up @@ -34,6 +35,11 @@
<DefineConstants>TRACE</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='CI|AnyCPU'">
<OutputPath>..\..\bin\ci</OutputPath>
<DefineConstants>TRACE;SIGNED</DefineConstants>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\CommonAssemblyInfo.cs" Link="Properties\CommonAssemblyInfo.cs" />
</ItemGroup>
Expand All @@ -42,8 +48,8 @@
<PackageReference Include="System.Drawing.Common" Version="4.6.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Workshell.PE\Workshell.PE.csproj" />
<ItemGroup>
<ProjectReference Include="..\Workshell.PE\Workshell.PE.csproj" />
</ItemGroup>

</Project>
0 ...PE/Annotations/EnumAnnotationAttribute.cs → ...PE/Annotations/EnumAnnotationAttribute.cs
View file
File renamed without changes.
0 ...rkshell.PE/Annotations/EnumAnnotations.cs → ...rkshell.PE/Annotations/EnumAnnotations.cs
View file
File renamed without changes.
0 ...E/Annotations/FieldAnnotationAttribute.cs → ...E/Annotations/FieldAnnotationAttribute.cs
View file
File renamed without changes.
0 Src/Workshell.PE/Content/CLR/CLR.cs → src/Workshell.PE/Content/CLR/CLR.cs
View file
File renamed without changes.
0 ...kshell.PE/Content/CLR/CLRDataDirectory.cs → ...kshell.PE/Content/CLR/CLRDataDirectory.cs
View file
File renamed without changes.
0 Src/Workshell.PE/Content/CLR/CLRHeader.cs → src/Workshell.PE/Content/CLR/CLRHeader.cs
View file
File renamed without changes.
0 Src/Workshell.PE/Content/CLR/CLRMetaData.cs → src/Workshell.PE/Content/CLR/CLRMetaData.cs
View file
File renamed without changes.
0 ...shell.PE/Content/CLR/CLRMetaDataHeader.cs → ...shell.PE/Content/CLR/CLRMetaDataHeader.cs
View file
File renamed without changes.
0 ...shell.PE/Content/CLR/CLRMetaDataStream.cs → ...shell.PE/Content/CLR/CLRMetaDataStream.cs
View file
File renamed without changes.
0 ....PE/Content/CLR/CLRMetaDataStreamTable.cs → ....PE/Content/CLR/CLRMetaDataStreamTable.cs
View file
File renamed without changes.
0 ...Content/LoadConfigurationCodeIntegrity.cs → ...Content/LoadConfigurationCodeIntegrity.cs
View file
File renamed without changes.
0 Src/Workshell.PE/DOSHeader.cs → src/Workshell.PE/DOSHeader.cs
View file
File renamed without changes.
0 Src/Workshell.PE/DOSStub.cs → src/Workshell.PE/DOSStub.cs
View file
File renamed without changes.
0 Src/Workshell.PE/DataDirectory.cs → src/Workshell.PE/DataDirectory.cs
View file
File renamed without changes.
0 Src/Workshell.PE/Extensions/Conversion.cs → src/Workshell.PE/Extensions/Conversion.cs
View file
File renamed without changes.
0 Src/Workshell.PE/FileHeader.cs → src/Workshell.PE/FileHeader.cs
View file
File renamed without changes.
0 Src/Workshell.PE/Location.cs → src/Workshell.PE/Location.cs
View file
File renamed without changes.
0 Src/Workshell.PE/LocationCalculator.cs → src/Workshell.PE/LocationCalculator.cs
View file
File renamed without changes.
0 Src/Workshell.PE/NTHeaders.cs → src/Workshell.PE/NTHeaders.cs
View file
File renamed without changes.
0 ...Workshell.PE/Native/IMAGE_COR20_HEADER.cs → ...Workshell.PE/Native/IMAGE_COR20_HEADER.cs
View file
File renamed without changes.
0 ...rkshell.PE/Native/IMAGE_DATA_DIRECTORY.cs → ...rkshell.PE/Native/IMAGE_DATA_DIRECTORY.cs
View file
File renamed without changes.
0 Src/Workshell.PE/Native/IMAGE_DOS_HEADER.cs → src/Workshell.PE/Native/IMAGE_DOS_HEADER.cs
View file
File renamed without changes.
0 Src/Workshell.PE/Native/IMAGE_FILE_HEADER.cs → src/Workshell.PE/Native/IMAGE_FILE_HEADER.cs
View file
File renamed without changes.
0 ....PE/Native/IMAGE_LOAD_CONFIG_DIRECTORY.cs → ....PE/Native/IMAGE_LOAD_CONFIG_DIRECTORY.cs
View file
File renamed without changes.
0 ...kshell.PE/Native/IMAGE_OPTIONAL_HEADER.cs → ...kshell.PE/Native/IMAGE_OPTIONAL_HEADER.cs
View file
File renamed without changes.
0 ...rkshell.PE/Native/IMAGE_SECTION_HEADER.cs → ...rkshell.PE/Native/IMAGE_SECTION_HEADER.cs
View file
File renamed without changes.
0 ...orkshell.PE/Native/IMAGE_TLS_DIRECTORY.cs → ...orkshell.PE/Native/IMAGE_TLS_DIRECTORY.cs
View file
File renamed without changes.
0 Src/Workshell.PE/Native/WIN_CERTIFICATE.cs → src/Workshell.PE/Native/WIN_CERTIFICATE.cs
View file
File renamed without changes.
0 Src/Workshell.PE/OptionalHeader.cs → src/Workshell.PE/OptionalHeader.cs
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions src/Workshell.PE/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
[assembly: InternalsVisibleTo("Workshell.PE.Resources")]
[assembly: InternalsVisibleTo("Workshell.PE.Tests")]
#else
[assembly: InternalsVisibleTo("Workshell.PE.Resources, PublicKey=0024000004800000940000000602000000240000525341310004000001000100259ed23116da6a496f873182c31284a428d040b37885524e9b53049cd99d5cc84feb00dbe77278afda8ebc9def14111b20b561f8d958e3f4aea2d492fed946245c528b16cad6ee785995ccfd7e6b7b34fe4be452a651069b2c0bbcf668bfb1dd9b99a7f30ab10d289525d61e82fd45e1ebcc11fc3d286e6096a1ee7edeee6091")]
[assembly: InternalsVisibleTo("Workshell.PE.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100259ed23116da6a496f873182c31284a428d040b37885524e9b53049cd99d5cc84feb00dbe77278afda8ebc9def14111b20b561f8d958e3f4aea2d492fed946245c528b16cad6ee785995ccfd7e6b7b34fe4be452a651069b2c0bbcf668bfb1dd9b99a7f30ab10d289525d61e82fd45e1ebcc11fc3d286e6096a1ee7edeee6091")]
[assembly: InternalsVisibleTo("Workshell.PE.Resources, PublicKey=0024000004800000940000000602000000240000525341310004000001000100ed0db04e6ef7cb7ae6c0dbecb36b42bc629609ae4f059d5aacd1f467be55281c480336bfd79e4c28a5304ccb6448502b5c4f5184dcf76f264ea7d2f78f6e7ab134ca12d526e2257b2ee88b8429dc7ace03ad9c21b6b2710ca2b82e770e62683382924c50f7e554402e838dd4fd90bfcc2ec730ef2cb9c9c9b9992061d37ed789")]
[assembly: InternalsVisibleTo("Workshell.PE.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100ed0db04e6ef7cb7ae6c0dbecb36b42bc629609ae4f059d5aacd1f467be55281c480336bfd79e4c28a5304ccb6448502b5c4f5184dcf76f264ea7d2f78f6e7ab134ca12d526e2257b2ee88b8429dc7ace03ad9c21b6b2710ca2b82e770e62683382924c50f7e554402e838dd4fd90bfcc2ec730ef2cb9c9c9b9992061d37ed789")]
#endif

[assembly: AssemblyTitle("Workshell.PE")]
Expand Down
0 Src/Workshell.PE/Section.cs → src/Workshell.PE/Section.cs
View file
File renamed without changes.
0 Src/Workshell.PE/SectionTable.cs → src/Workshell.PE/SectionTable.cs
View file
File renamed without changes.
0 Src/Workshell.PE/Supports.cs → src/Workshell.PE/Supports.cs
View file
File renamed without changes.
0 Src/Workshell.PE/Utils.cs → src/Workshell.PE/Utils.cs
View file
File renamed without changes.
14 changes: 7 additions & 7 deletions Src/Workshell.PE/Workshell.PE.csproj → src/Workshell.PE/Workshell.PE.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
<TargetFrameworks>netstandard1.6;net45</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>Workshell.PE.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>Workshell.snk</AssemblyOriginatorKeyFile>
<Configurations>Debug;Release;CI</Configurations>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -31,6 +32,11 @@

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\..\bin\release</OutputPath>
<DefineConstants>TRACE</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='CI|AnyCPU'">
<OutputPath>..\..\bin\ci</OutputPath>
<DefineConstants>TRACE;SIGNED</DefineConstants>
</PropertyGroup>

Expand All @@ -44,10 +50,4 @@
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.0" />
</ItemGroup>

<!--
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
<PackageReference Include="System.Net.Http" Version="4.3.3" />
</ItemGroup>
-->

</Project>
13 changes: 12 additions & 1 deletion tests/Workshell.PE.Tests/Workshell.PE.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,22 @@
<TargetFramework>netcoreapp2.0</TargetFramework>
<IsPackable>false</IsPackable>
<SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>Workshell.PE.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>Workshell.snk</AssemblyOriginatorKeyFile>
<Configurations>Debug;Release;CI</Configurations>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DefineConstants>TRACE;SIGNED</DefineConstants>
<OutputPath>..\..\bin\release</OutputPath>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='CI|AnyCPU'">
<DefineConstants>TRACE;SIGNED</DefineConstants>
<OutputPath>..\..\bin\ci</OutputPath>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<OutputPath>..\..\bin\debug</OutputPath>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion version.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.2
2.1.4

0 comments on commit c5e248a

Please sign in to comment.