build: improve nuget build process (#38)

Fixes #35.
dwmkerr · Apr 4, 2019 · 86f5d5e · 86f5d5e
2 parents 4505173 + 5be1b0d
commit 86f5d5e
Show file tree

Hide file tree

Showing 7 changed files with 92 additions and 69 deletions.
diff --git a/source/ConsoleControl.WPF/ConsoleControl.WPF.csproj b/source/ConsoleControl.WPF/ConsoleControl.WPF.csproj
@@ -88,7 +88,7 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <None Include="ConsoleControl.snk" />
-    <Content Include="ControlControl.WPF.nuspec" />
+    <None Include="ConsoleControl.WPF.nuspec" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

diff --git a/source/ConsoleControl.WPF/ConsoleControl.WPF.nuspec b/source/ConsoleControl.WPF/ConsoleControl.WPF.nuspec
@@ -10,7 +10,10 @@
         <projectUrl>https://github.com/dwmkerr/consolecontrol</projectUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>The ConsoleControl is a WPF control that you can drop into a WPF applcation to run an external process in a C# application.</description>
-        <copyright>Copyright © Dave Kerr 2018</copyright>
+        <copyright>Copyright © Dave Kerr 2019</copyright>
         <tags>Console,Shell</tags>
+        <dependencies>
+            <dependency id="ConsoleControlAPI" version="$version$" />
+        </dependencies>
     </metadata>
 </package>
diff --git a/source/ConsoleControl/ConsoleControl.csproj b/source/ConsoleControl/ConsoleControl.csproj
@@ -97,6 +97,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Console.ico" />
+    <None Include="ConsoleControl.nuspec" />
     <EmbeddedResource Include="ConsoleControl.bmp" />
   </ItemGroup>
   <ItemGroup>
@@ -123,7 +124,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="ConsoleControl.nuspec" />
     <None Include="ConsoleControl.snk" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/source/ConsoleControl/ConsoleControl.nuspec b/source/ConsoleControl/ConsoleControl.nuspec
@@ -10,7 +10,10 @@
         <projectUrl>https://github.com/dwmkerr/consolecontrol</projectUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>The ConsoleControl is a WinForms control that you can drop into a Form to run an external process in a C# application.</description>
-        <copyright>Copyright © Dave Kerr 2018</copyright>
+        <copyright>Copyright © Dave Kerr 2019</copyright>
         <tags>Console,Shell</tags>
+        <dependencies>
+            <dependency id="ConsoleControlAPI" version="$version$" />
+        </dependencies>
     </metadata>
 </package>
diff --git a/source/ConsoleControlAPI/ConsoleControlAPI.csproj b/source/ConsoleControlAPI/ConsoleControlAPI.csproj
@@ -1,69 +1,70 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{A4B8573F-EBFC-4140-B8AA-7C037919EF57}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ConsoleControlAPI</RootNamespace>
-    <AssemblyName>ConsoleControlAPI</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\ConsoleControlAPI.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>ConsoleControl.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="Imports.cs" />
-    <Compile Include="ProcessEventArgs.cs" />
-    <Compile Include="ProcessInterface.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ConsoleControl.snk" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{A4B8573F-EBFC-4140-B8AA-7C037919EF57}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ConsoleControlAPI</RootNamespace>
+    <AssemblyName>ConsoleControlAPI</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Release\ConsoleControlAPI.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>ConsoleControl.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\SharedAssemblyInfo.cs">
+      <Link>Properties\SharedAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="Imports.cs" />
+    <Compile Include="ProcessEventArgs.cs" />
+    <Compile Include="ProcessInterface.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ConsoleControl.snk" />
+    <None Include="ConsoleControlAPI.nuspec" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\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">
   </Target>
-  -->
+  -->
 </Project>
diff --git a/source/ConsoleControlAPI/ConsoleControlAPI.nuspec b/source/ConsoleControlAPI/ConsoleControlAPI.nuspec
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+    <metadata>
+        <id>$id$</id>
+        <version>$version$</version>
+        <title>ConsoleControl API</title>
+        <authors>Dave Kerr</authors>
+        <owners>Dave Kerr</owners>
+        <licenseUrl>https://github.com/dwmkerr/consolecontrol/LICENSE.md</licenseUrl>
+        <projectUrl>https://github.com/dwmkerr/consolecontrol</projectUrl>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>The ConsoleControl API provides common functionality used in the ConsoleControl and ConsoleControl.WPF libraries.</description>
+        <copyright>Copyright © Dave Kerr 2019</copyright>
+        <tags>Console,Shell</tags>
+    </metadata>
+</package>
diff --git a/source/SharedAssemblyInfo.cs b/source/SharedAssemblyInfo.cs
@@ -4,7 +4,7 @@
 
 [assembly: AssemblyCompany("Dave Kerr")]
 [assembly: AssemblyProduct("ConsoleControl")]
-[assembly: AssemblyCopyright("Copyright © Dave Kerr 2013-2015. http://www.dwmkerr.com")]
+[assembly: AssemblyCopyright("Copyright © Dave Kerr 2013-2019. http://www.dwmkerr.com")]
 
 // Version information for an assembly consists of the following four values:
 //
@@ -16,5 +16,5 @@
 // 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.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.2.1.0")]
+[assembly: AssemblyFileVersion("1.2.1.0")]