Skip to content

Fix InternalsVisibleTo for versioned assemblies #4581

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 1 commit into from
Apr 15, 2020
Merged

Fix InternalsVisibleTo for versioned assemblies #4581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,4 @@ project.lock.json
/src/.vs/restore.dg
# temporary location for doc generation
docs-temp
*.binlog
5 changes: 2 additions & 3 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<AssemblyOriginatorKeyFile>$(SolutionRoot)\build\keys\keypair.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition="$(IsPackable) == True">

<OutDir>bin/$(Configuration)/$(TargetFramework)/</OutDir>
<NoWarn>1591,1572,1571,1573,1587,1570,NU5048,</NoWarn>
<Prefer32Bit>false</Prefer32Bit>
<DebugSymbols>true</DebugSymbols>
Expand All @@ -23,8 +23,7 @@
>
<PropertyGroup>
<ExposedAssembly>%(InternalsVisibleTo.Identity)</ExposedAssembly>
<VersionNamespaced>$(ExposedAssembly.Replace("Nest","Nest$(MajorVersion)").Replace("Elasticsearch.Net","Elasticsearch.Net$(MajorVersion
)"))</VersionNamespaced>
<VersionNamespaced>$(ExposedAssembly.Replace("Nest", "Nest$(MajorVersion)").Replace("Elasticsearch.Net","Elasticsearch.Net$(MajorVersion)"))</VersionNamespaced>
</PropertyGroup>
<ItemGroup>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
Expand Down
2 changes: 0 additions & 2 deletions build/scripts/Versioning.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,6 @@ module Versioning =
| true -> validate dll name
| _ -> failwithf "Attempted to verify signature of %s but it was not found!" dll

let private assemblyRewriter = "assembly-rewriter"

let BuiltArtifacts (version: AnchoredVersion) =
let packages =
let allPackages = !! "build/output/_packages/*.nupkg" |> Seq.toList
Expand Down