Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade Extension Package to AsyncPackage #206

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Upgrade Extension Package to AsyncPackage #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d410f5f
🔨 Transition from Helper packages
chrish619 Aug 9, 2019
47d7155
🎨 Add .editorconfig to keep styles consistent
chrish619 Aug 13, 2019
5bb2910
Retarget XAML files for 2015+
chrish619 Aug 13, 2019
163a98d
BUILD ISSUE: Constant cannot be embedded (!)
chrish619 Aug 13, 2019
63b5b4c
AxoCover native - fix build issues with EasyHook
chrish619 Aug 13, 2019
cb142e8
UPGRADE: Package to AsyncPackage, and allow background loading
chrish619 Aug 13, 2019
9b2002c
🔨 Target v140 C++ Toolset
chrish619 Aug 13, 2019
64d45ea
Remove Specific SDK target
chrish619 Aug 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[*.cs]
indent_size = 2
indent_style = space
13 changes: 1 addition & 12 deletions AxoCover.Dependencies/AxoCover.Dependencies.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Runtime" />
<Reference Include="System.Runtime.Remoting" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml" />
</ItemGroup>
Expand Down Expand Up @@ -124,22 +125,10 @@
</Content>
</ItemGroup>
<ItemGroup>
<Content Include="..\packages\EasyHookNativePackage.redist.*\build\native\bin\*\v110\Release\*.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<Link>%(Filename)%(Extension)</Link>
</Content>
<Content Include="..\Win32\EasyHook32.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<Link>x86\%(Filename)%(Extension)</Link>
</Content>
<Content Include="..\Win32\AxoCover.Native.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<Link>x86\%(Filename)%(Extension)</Link>
</Content>
<Content Include="..\x64\EasyHook64.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<Link>x64\%(Filename)%(Extension)</Link>
</Content>
<Content Include="..\x64\AxoCover.Native.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<Link>x64\%(Filename)%(Extension)</Link>
Expand Down
11 changes: 9 additions & 2 deletions AxoCover.Native/AxoCover.Native.Build.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@
<MSBuild Projects="$(MSBuildProjectDirectory)\AxoCover.Native.vcxproj" Properties="Configuration=$(Configuration);Platform=x86" Targets="Clean" />
<MSBuild Projects="$(MSBuildProjectDirectory)\AxoCover.Native.vcxproj" Properties="Configuration=$(Configuration);Platform=x64" Targets="Clean" />
</Target>
<Target Name="GetNativeManifest"/>
<Target Name="GetCopyToOutputDirectoryItems"/>
<Target Name="GetNativeManifest" />
<Target Name="GetCopyToOutputDirectoryItems" />
<Import Project="..\packages\EasyHookNativePackage.2.7.7097\build\native\EasyHookNativePackage.targets" Condition="Exists('..\packages\EasyHookNativePackage.2.7.7097\build\native\EasyHookNativePackage.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\EasyHookNativePackage.2.7.7097\build\native\EasyHookNativePackage.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EasyHookNativePackage.2.7.7097\build\native\EasyHookNativePackage.targets'))" />
</Target>
</Project>
30 changes: 14 additions & 16 deletions AxoCover.Native/AxoCover.Native.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,28 +28,28 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
<CLRSupport>true</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<CLRSupport>true</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<CLRSupport>true</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<CLRSupport>true</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
Expand Down Expand Up @@ -96,7 +96,7 @@
</ClCompile>
<Link>
<AdditionalDependencies />
<AdditionalLibraryDirectories>..\packages\EasyHookNativePackage.2.7.6270\build\native\lib\Win32\v110\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\packages\EasyHookNativePackage.2.7.7097\build\native\lib\Win32\v140\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
Expand All @@ -109,7 +109,7 @@
</ClCompile>
<Link>
<AdditionalDependencies />
<AdditionalLibraryDirectories>..\packages\EasyHookNativePackage.2.7.6270\build\native\lib\Win32\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\packages\EasyHookNativePackage.2.7.7097\build\native\lib\x64\v140\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
Expand All @@ -121,7 +121,7 @@
</ClCompile>
<Link>
<AdditionalDependencies />
<AdditionalLibraryDirectories>..\packages\EasyHookNativePackage.*\build\native\lib\Win32\v110\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\packages\EasyHookNativePackage.2.7.7097\build\native\lib\Win32\v140\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
Expand All @@ -133,7 +133,7 @@
</ClCompile>
<Link>
<AdditionalDependencies />
<AdditionalLibraryDirectories>..\packages\EasyHookNativePackage.*\build\native\lib\x64\v110\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\packages\EasyHookNativePackage.2.7.7097\build\native\lib\x64\v140\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
Expand All @@ -157,20 +157,18 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\EasyHookNativePackage.redist.2.7.6270\build\native\EasyHookNativePackage.redist.targets" Condition="Exists('..\packages\EasyHookNativePackage.redist.2.7.6270\build\native\EasyHookNativePackage.redist.targets')" />
<Import Project="..\packages\EasyHookNativePackage.2.7.6270\build\native\EasyHookNativePackage.targets" Condition="Exists('..\packages\EasyHookNativePackage.2.7.6270\build\native\EasyHookNativePackage.targets')" />
<Import Project="..\packages\EasyHookNativePackage.redist.2.7.7097\build\native\EasyHookNativePackage.redist.targets" Condition="Exists('..\packages\EasyHookNativePackage.redist.2.7.7097\build\native\EasyHookNativePackage.redist.targets')" />
<Import Project="..\packages\EasyHookNativePackage.2.7.7097\build\native\EasyHookNativePackage.targets" Condition="Exists('..\packages\EasyHookNativePackage.2.7.7097\build\native\EasyHookNativePackage.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\EasyHookNativePackage.redist.2.7.6270\build\native\EasyHookNativePackage.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EasyHookNativePackage.redist.2.7.6270\build\native\EasyHookNativePackage.redist.targets'))" />
<Error Condition="!Exists('..\packages\EasyHookNativePackage.2.7.6270\build\native\EasyHookNativePackage.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EasyHookNativePackage.2.7.6270\build\native\EasyHookNativePackage.targets'))" />
<Error Condition="!Exists('..\packages\EasyHookNativePackage.redist.2.7.7097\build\native\EasyHookNativePackage.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EasyHookNativePackage.redist.2.7.7097\build\native\EasyHookNativePackage.redist.targets'))" />
<Error Condition="!Exists('..\packages\EasyHookNativePackage.2.7.7097\build\native\EasyHookNativePackage.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EasyHookNativePackage.2.7.7097\build\native\EasyHookNativePackage.targets'))" />
</Target>
</Project>
</Project>
4 changes: 2 additions & 2 deletions AxoCover.Native/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EasyHookNativePackage" version="2.7.6270" targetFramework="native" />
<package id="EasyHookNativePackage.redist" version="2.7.6270" targetFramework="native" />
<package id="EasyHookNativePackage" version="2.7.7097" targetFramework="native" />
<package id="EasyHookNativePackage.redist" version="2.7.7097" targetFramework="native" />
</packages>
1 change: 1 addition & 0 deletions AxoCover.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AxoCover.Host-x64", "AxoCov
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A39C9015-0D1C-4389-B58D-E71142DD8518}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
.gitignore = .gitignore
appveyor.yml = appveyor.yml
README.md = README.md
Expand Down
Loading