Skip to content

NH-4064 - Unmerge Antlr3.Runtime #668

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
Aug 5, 2017
Merged

NH-4064 - Unmerge Antlr3.Runtime #668

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
Binary file removed Tools/ilrepack/ILRepack.exe
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions src/NHibernate.Test/NHibernate.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL" Condition=" '$(Configuration)' == 'Debug' ">
<Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
<HintPath>..\packages\Antlr3.Runtime.3.5.1\lib\net40-client\Antlr3.Runtime.dll</HintPath>
<Private>True</Private>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This private thing was removed from ReLinq when doing NH-3750. It does not seem it changes anything to the reference property window though. (Copy local stays same.) And it is still there for Iesi too. So well, should it be kept or removed, I do not know.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will be superseded by #605, so does not really matter. Oddly enough VS and MSBuild have different default behavior regards the copy local/private

</Reference>
Expand Down Expand Up @@ -3902,4 +3902,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
14 changes: 1 addition & 13 deletions src/NHibernate/NHibernate.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1825,19 +1825,7 @@
<Content Include="NamespaceSummary.xml" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\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" Condition=" '$(Configuration)' == 'Release' ">
<GetReferenceAssemblyPaths BypassFrameworkInstallChecks="False" TargetFrameworkMoniker="$(TargetFrameworkMoniker)">
<Output TaskParameter="FullFrameworkReferenceAssemblyPaths" PropertyName="_ReferenceAssembliesPath" />
<!-- Note: _ReferenceAssembliesPath will contain a trailing backslash which /targetplatform
can't handle. Circumvented by adding a trailing period below. -->
</GetReferenceAssemblyPaths>
<Exec Command="$(SolutionDir)..\Tools\ilrepack\ilrepack.exe /verbose /t:library /targetplatform:v4,&quot;$(_ReferenceAssembliesPath).&quot; /keyfile:$(AssemblyOriginatorKeyFile) /internalize /out:$(OutputPath)\NHibernate.dll $(IntermediateOutputPath)\NHibernate.dll $(OutputPath)\Antlr3.Runtime.dll" />
</Target>

<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>
Expand Down
1 change: 1 addition & 0 deletions src/NHibernate/NHibernate.nuspec.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<dependency id="Iesi.Collections" version="[4,5)" />
<dependency id="Remotion.Linq" version="[2.1.2, 3)" />
<dependency id="Remotion.Linq.EagerFetching" version="[2.1.0, 3)" />
<dependency id="Antlr3.Runtime" version="[3.5.1, 4)" />
</dependencies>
<projectUrl>
http://nhibernate.info
Expand Down