8000 Avoid reading and writing global state when loading native library by tmat · Pull Request #1563 · libgit2/libgit2sharp · GitHub
[go: up one dir, main page]
Skip to content

Avoid reading and writing global state when loading native library #1563

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

Merged
merged 14 commits into from
Apr 17, 2018
Merged

Avoid reading and writing global state when loading native library #1563

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b01c549
Avoid reading and writing global state when loading native library
tmat Apr 11, 2018
0e2665c
Add test.
tmat Apr 12, 2018
8a10035
Make test types internal
tmat Apr 12, 2018
748e596
PR feedback and test both x64 and x86 platforms
tmat Apr 12, 2018
671d058
Rename platform to architecture
tmat Apr 12, 2018
2c1e96d
Do not create packages for test app projects
tmat Apr 14, 2018
fc7b5b3
Search for native library in runtimes dir and allow setting NativeLib…
tmat Apr 14, 2018
fe71caa
Avoid IVT
tmat Apr 16, 2018
9aadf0b
Generate NativeDllName in tests
tmat Apr 16, 2018
896eb24
Rename TestApp to NativeLibraryLoadTestApp
tmat Apr 16, 2018
53e1fea
Fix path
tmat Apr 16, 2018 8000
e618156
Do not set default value for NativeLibararyPath on .NET Core
tmat Apr 16, 2018
d9496ba
Clean up trailing whitespace
bording Apr 17, 2018
497f91f
Add code generation targets to Solution Items
bording Apr 17, 2018
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
Prev Previous commit
Next Next commit
Avoid IVT
  • Loading branch information
@tmat
tmat committed Apr 16, 2018
commit fe71caa5b87adb09184f9233a2f94b99f36ebce2
2 changes: 0 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
<OutputPath>$(MSBuildThisFileDirectory)bin\$(MSBuildProjectName)\$(Configuration)\</OutputPath>
<BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
<DefineConstants Condition=" '$(ExtraDefine)' != '' ">$(DefineConstants);$(ExtraDefine)</DefineConstants>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)libgit2sharp.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

</Project>
12 changes: 7 additions & 5 deletions LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,22 @@
<PackageReference Include="xunit.skippablefact" Version="1.3.3" />
</ItemGroup>

<ItemGroup>
<Compile Include="..\LibGit2Sharp\Core\Epoch.cs" Link="TestHelpers\Epoch.cs" />
<Compile Include="..\LibGit2Sharp\Core\Platform.cs" Link="TestHelpers\Platform.cs" />
<Compile Remove="desktop\**" Condition=" '$(TargetFramework)' != 'net461' " />
</ItemGroup>

<Target Name="CopyTestAppExes" AfterTargets="ResolveProjectReferences">
<ItemGroup>
<_TestAppFile Include="@(TestAppExe->'%(RootDir)%(Directory)%(Filename).exe')" />
<_TestAppFile Include="@(TestAppExe->'%(RootDir)%(Directory)%(Filename).exe.config')" />
<_TestAppFile Include="@(TestAppExe->'%(RootDir)%(Directory)%(Filename).pdb')" />
</ItemGroup>

<ItemGroup>
<Content Include="@(_TestAppFile)" CopyToOutputDirectory="PreserveNewest" Visible="false" />
</ItemGroup>
</Target>

<ItemGroup Condition="'$(TargetFramework)' != 'net461'">
<Compile Remove="desktop\**" />
</ItemGroup>

</Project>
4 changes: 3 additions & 1 deletion LibGit2Sharp/LibGit2Sharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
<PackageTags>libgit2 git</PackageTags>
<PackageProjectUrl>https://github.com/libgit2/libgit2sharp/</PackageProjectUrl>
<Authors>LibGit2Sharp contributors</Authors>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<SignAssembly>true< A2BB ;/SignAssembly>
<AssemblyOriginatorKeyFile>..\libgit2sharp.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<!-- Disable SourceLink when running on Travis CI -->
Expand Down
3 changes: 0 additions & 3 deletions LibGit2Sharp/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
Expand All @@ -17,5 +16,3 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM

[assembly: Guid("c6f71967-5be1-49f5-b48e-861bff498ea3")]

[assembly: InternalsVisibleTo("LibGit2Sharp.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010013172CAC3D61EF825164EF8443ED2F97316D0C2A4A65D3B2F6E5C9175C6C589D6A0EAE803E3E7FC0DA9E6672B1DE036CF74E1D33E21DD83E1145E3A454F92E52107495082DCCD1D9F521592F79F41DF26ED727059F8A4E5D3C23ECC525306831A15F1E56B693FDE112137E973B599A13209A5B63E05EE00886DE594E70A993B5")]
0