v1.1.7 fixing our NuGet package.
authorStephaneLenclud
Fri, 25 Sep 2015 19:22:44 +0200
changeset 3810d8128ccc60
parent 37 d3b88ef66bfe
child 39 c32f4955c166
v1.1.7 fixing our NuGet package.
LibMiniDisplay.nuspec
LibMiniDisplay.targets
     1.1 --- a/LibMiniDisplay.nuspec	Wed May 06 21:25:49 2015 +0200
     1.2 +++ b/LibMiniDisplay.nuspec	Fri Sep 25 19:22:44 2015 +0200
     1.3 @@ -2,7 +2,7 @@
     1.4  <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     1.5      <metadata>
     1.6          <id>LibMiniDisplay</id>
     1.7 -        <version>1.1.4</version>
     1.8 +        <version>1.1.7</version>
     1.9          <title>Mini Display Library</title>
    1.10          <authors>Stéphane Lenclud</authors>
    1.11          <licenseUrl>https://www.gnu.org/copyleft/gpl.html</licenseUrl>
    1.12 @@ -10,13 +10,21 @@
    1.13          <requireLicenseAcceptance>false</requireLicenseAcceptance>
    1.14          <description>Provide a C interface to drive some Futaba VFD displays.</description>
    1.15          <summary>Currently only supports HID USB conections.</summary>
    1.16 +        <releaseNotes>v1.1.7
    1.17 +Target file fix.
    1.18 +
    1.19 +v1.1.6
    1.20 +Do not use.
    1.21 +
    1.22 +v1.1.5
    1.23 +Do not use.</releaseNotes>
    1.24          <copyright>Stéphane Lenclud</copyright>
    1.25          <tags>VFD LCD display module Futaba</tags>
    1.26      </metadata>
    1.27      <files>
    1.28          <file src="LibMiniDisplay.targets" target="build\LibMiniDisplay.targets" />
    1.29          <file src="MiniDisplay.h" target="content\MiniDisplay.h" />
    1.30 -        <file src="Interop\bin\Release\MiniDisplayInterop.dll" target="lib\MiniDisplayInterop.dll" />
    1.31 +        <file src="Interop\bin\Release\MiniDisplayInterop.dll" target="lib\net20\MiniDisplayInterop.dll" />
    1.32          <file src="..\bin\MiniDisplay\Release\MiniDisplay.dll" target="native\x86\MiniDisplay.dll" />
    1.33      </files>
    1.34  </package>
    1.35 \ No newline at end of file
     2.1 --- a/LibMiniDisplay.targets	Wed May 06 21:25:49 2015 +0200
     2.2 +++ b/LibMiniDisplay.targets	Fri Sep 25 19:22:44 2015 +0200
     2.3 @@ -1,33 +1,29 @@
     2.4 +<?xml version="1.0" encoding="utf-8"?>
     2.5 +
     2.6  <!--
     2.7 -***********************************************************************************************
     2.8 -LibMiniDisplay.targets
     2.9 + Copyright (C) 2015 Stephane Lenclud.
    2.10  
    2.11 -WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
    2.12 -          created a backup copy.  Incorrect changes to this file will make it
    2.13 -          impossible to load or build your projects from the command-line or the IDE.
    2.14 + This file is part of MiniDisplay.
    2.15  
    2.16 -Copyright (c) Stephane Lenclud. All rights reserved.
    2.17 -***********************************************************************************************
    2.18 + MiniDisplay is free software: you can redistribute it and/or modify
    2.19 + it under the terms of the GNU General Public License as published by
    2.20 + the Free Software Foundation, either version 3 of the License, or
    2.21 + (at your option) any later version.
    2.22 +
    2.23 + MiniDisplay is distributed in the hope that it will be useful,
    2.24 + but WITHOUT ANY WARRANTY; without even the implied warranty of
    2.25 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    2.26 + GNU General Public License for more details.
    2.27 +
    2.28 + You should have received a copy of the GNU General Public License
    2.29 + along with MiniDisplay.  If not, see <http://www.gnu.org/licenses/>.
    2.30  -->
    2.31  
    2.32 -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    2.33 -  <PropertyGroup>
    2.34 -    <LibMiniDisplayDllPath Condition=" '$(LibMiniDisplayPath)' == '' ">$(MSBuildThisFileDirectory)..\native\$(Platform)\MiniDisplay.dll</LibMiniDisplayDllPath>
    2.35 -  </PropertyGroup>  
    2.36 -
    2.37 -  <Target Name="CopyLibMiniDisplayNativeReference">
    2.38 -    <!-- Make sure the platform has been set appropriately before trying to copy the native reference. -->
    2.39 -    <Error Code="LH0001" Text="The project platform must be set to x86 or x64. Please change your target platform and try again." Condition=" !Exists('$(LibMiniDisplayDllPath)') " 
    2.40 -           File="$(MSBuildProjectFile)"/>
    2.41 -    
    2.42 -    <Copy SourceFiles="$(LibMiniDisplayDllPath)" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true"/>
    2.43 -  </Target>
    2.44 -
    2.45 -  <PropertyGroup>
    2.46 -    <AfterBuildDependsOn>
    2.47 -      CopyLibMiniDisplayNativeReference;
    2.48 -    </AfterBuildDependsOn>
    2.49 -  </PropertyGroup>
    2.50 -  
    2.51 -  <Target Name="AfterBuild" DependsOnTargets="$(AfterBuildDependsOn)"/>
    2.52 +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    2.53 +    <ItemGroup>
    2.54 +        <None Include="$(MSBuildThisFileDirectory)\..\native\x86\MiniDisplay.dll">
    2.55 +            <Link>MiniDisplay.dll</Link>
    2.56 +            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    2.57 +        </None>
    2.58 +    </ItemGroup>
    2.59  </Project>
    2.60 \ No newline at end of file