Skip to content

Commit

Permalink
Migrate to ".net sdk style projects" and consume dependencies from nu…
Browse files Browse the repository at this point in the history
…get. Also support being packaged as nuget pkg
  • Loading branch information
MeFisto94 committed Nov 26, 2023
1 parent 8f393b2 commit 1a158af
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 94 deletions.
109 changes: 40 additions & 69 deletions Andraste.Payload.Generic.csproj
Original file line number Diff line number Diff line change
@@ -1,69 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{D204EA37-9912-40DF-9517-F3417DF2015E}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Andraste.Payload.Generic</RootNamespace>
<AssemblyName>Andraste.Payload.Generic</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="EasyHook">
<HintPath>..\Andraste.Payload\EasyHookCompiled\EasyHook.dll</HintPath>
</Reference>
<Reference Include="EasyLoad32">
<HintPath>..\Andraste.Payload\EasyHookCompiled\EasyLoad32.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="GenericEntryPoint.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Andraste.Payload\Andraste.Payload.csproj">
<Project>{dc66653b-1223-48b3-b925-e6711d1e9c70}</Project>
<Name>Andraste.Payload</Name>
</ProjectReference>
<ProjectReference Include="..\Andraste.Shared\Andraste.Shared.csproj">
<Project>{2b934b30-def2-415d-9f58-c50210b8caae}</Project>
<Name>Andraste.Shared</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->

</Project>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<ProjectGuid>{D204EA37-9912-40DF-9517-F3417DF2015E}</ProjectGuid>
<TargetFramework>net48</TargetFramework>
<AssemblyTitle>Andraste.Payload.Generic</AssemblyTitle>
<Product>Andraste.Payload.Generic</Product>
<OutputPath>bin\$(Configuration)\</OutputPath>

<!-- NuGet -->
<Copyright>Copyright 2023 The AndrasteFramework Team</Copyright>
<PackageId>Andraste.Payload.Generic</PackageId>
<Version>0.1.4</Version>
<Authors>MeFisto94</Authors>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageProjectUrl>https://andrasteframework.github.io/</PackageProjectUrl>
<RepositoryUrl>https://github.com/AndrasteFramework/Payload.Generic</RepositoryUrl>
<RepositoryType>git</RepositoryType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Andraste.EasyHook" Version="1.0.2" />
<PackageReference Include="Andraste.Payload" Version="0.1.4" />
<PackageReference Include="Andraste.Shared" Version="0.1.3" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Runtime.Remoting" />
</ItemGroup>
<!-- Local Dev -->
<!-- <ItemGroup>
<ProjectReference Include="..\Andraste.Payload\Andraste.Payload.csproj" />
<ProjectReference Include="..\Andraste.Shared\Andraste.Shared.csproj" />
</ItemGroup>
-->
</Project>
14 changes: 14 additions & 0 deletions App.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?><configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
25 changes: 0 additions & 25 deletions Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,35 +1,10 @@
using System.Reflection;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Andraste.Payload.Generic")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Andraste.Payload.Generic")]
[assembly: AssemblyCopyright("Copyright © 2022")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("D204EA37-9912-40DF-9517-F3417DF2015E")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

0 comments on commit 1a158af

Please sign in to comment.