Updated Diffplex dependecy to 1.6.1. Merged pull request from @bobhodge…

…, desjarlais#3. Merged pull request from @XJmichaelw, desjarlais#2.
bobhodge · May 6, 2020 · 254fa02 · 254fa02
1 parent 1e85782
commit 254fa02
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 8 deletions.
diff --git a/ScintillaDiff/Properties/AssemblyInfo.cs b/ScintillaDiff/Properties/AssemblyInfo.cs
@@ -58,5 +58,5 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.4")]
-[assembly: AssemblyFileVersion("1.0.0.4")]
+[assembly: AssemblyVersion("1.0.0.5")]
+[assembly: AssemblyFileVersion("1.0.0.5")]
diff --git a/ScintillaDiff/ScintillaDiff.csproj b/ScintillaDiff/ScintillaDiff.csproj
@@ -35,8 +35,9 @@
     <DocumentationFile>bin\Release\ScintillaDiff.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DiffPlex, Version=1.5.0.0, Culture=neutral, PublicKeyToken=1d35e91d1bd7bc0f, processorArchitecture=MSIL">
-      <HintPath>..\packages\DiffPlex.1.5.0\lib\net40\DiffPlex.dll</HintPath>
+    <Reference Include="DiffPlex, Version=1.6.1.0, Culture=neutral, PublicKeyToken=1d35e91d1bd7bc0f, processorArchitecture=MSIL">
+      <HintPath>..\packages\DiffPlex.1.6.1\lib\net40\DiffPlex.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="ScintillaNET, Version=3.6.3.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\jacobslusser.ScintillaNET.3.6.3\lib\net40\ScintillaNET.dll</HintPath>
@@ -95,4 +96,13 @@
     <None Include="Resources\diff.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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\Microsoft.NETFramework.ReferenceAssemblies.net47.1.0.0\build\Microsoft.NETFramework.ReferenceAssemblies.net47.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NETFramework.ReferenceAssemblies.net47.1.0.0\build\Microsoft.NETFramework.ReferenceAssemblies.net47.targets'))" />
+    <Error Condition="!Exists('..\packages\jnm2.ReferenceAssemblies.net35.1.0.1\build\jnm2.ReferenceAssemblies.net35.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\jnm2.ReferenceAssemblies.net35.1.0.1\build\jnm2.ReferenceAssemblies.net35.targets'))" />
+  </Target>
+  <Import Project="..\packages\Microsoft.NETFramework.ReferenceAssemblies.net47.1.0.0\build\Microsoft.NETFramework.ReferenceAssemblies.net47.targets" Condition="Exists('..\packages\Microsoft.NETFramework.ReferenceAssemblies.net47.1.0.0\build\Microsoft.NETFramework.ReferenceAssemblies.net47.targets')" />
+  <Import Project="..\packages\jnm2.ReferenceAssemblies.net35.1.0.1\build\jnm2.ReferenceAssemblies.net35.targets" Condition="Exists('..\packages\jnm2.ReferenceAssemblies.net35.1.0.1\build\jnm2.ReferenceAssemblies.net35.targets')" />
 </Project>
diff --git a/ScintillaDiff/ScintillaDiff.nuspec b/ScintillaDiff/ScintillaDiff.nuspec
@@ -9,11 +9,12 @@
     <projectUrl>https://github.com/VPKSoft/ScintillaDiff</projectUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>$description$</description>
-    <releaseNotes>Made the side-by-side view to sync with each other.</releaseNotes>
+    <releaseNotes>Updated Diffplex dependecy to 1.6.1. Merged pull request from @bobhodge, #3. Merged pull request from @XJmichaelw, #2.</releaseNotes>
     <copyright>Copyright © 2019 VPKSoft</copyright>
     <tags>wrapper winforms scintilla diff</tags>
     <license type="expression">MIT</license>
     <icon>vpksoft_logo.png</icon>
+    <iconUrl>http://icon_url_here_or_delete_this_line/</iconUrl>
   </metadata>
   <files>
     <file src="vpksoft_logo.png" target="" />

diff --git a/ScintillaDiff/packages.config b/ScintillaDiff/packages.config
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DiffPlex" version="1.5.0" targetFramework="net47" />
+  <package id="DiffPlex" version="1.6.1" targetFramework="net47" />
   <package id="jacobslusser.ScintillaNET" version="3.6.3" targetFramework="net47" />
+  <package id="jnm2.ReferenceAssemblies.net35" version="1.0.1" targetFramework="net47" developmentDependency="true" />
+  <package id="Microsoft.NETFramework.ReferenceAssemblies" version="1.0.0" targetFramework="net47" developmentDependency="true" />
+  <package id="Microsoft.NETFramework.ReferenceAssemblies.net47" version="1.0.0" targetFramework="net47" developmentDependency="true" />
 </packages>
diff --git a/TestApp/Properties/AssemblyInfo.cs b/TestApp/Properties/AssemblyInfo.cs
@@ -58,5 +58,5 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.4")]
-[assembly: AssemblyFileVersion("1.0.0.4")]
+[assembly: AssemblyVersion("1.0.0.5")]
+[assembly: AssemblyFileVersion("1.0.0.5")]