NH-4064 - Unmerge Antlr3.Runtime

nhibernate · Aug 4, 2017 · 9dec8c7 · 9dec8c7
1 parent d938eef
commit 9dec8c7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 15 deletions.
diff --git a/Tools/ilrepack/ILRepack.exe b/Tools/ilrepack/ILRepack.exe
diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj
@@ -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>
     </Reference>
@@ -3902,4 +3902,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/src/NHibernate/NHibernate.csproj b/src/NHibernate/NHibernate.csproj
@@ -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>

diff --git a/src/NHibernate/NHibernate.nuspec.template b/src/NHibernate/NHibernate.nuspec.template
@@ -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