Merge pull request #26 from jimsch/master

Setup for easier deploys
cose-wg · Jun 24, 2017 · 0650e18 · 0650e18
2 parents 84bb785 + 83e6a38
commit 0650e18
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,9 @@ build/
 [Bb]in/
 [Oo]bj/
 *.nupkg
+*.snk
+cose.dev.*
+*.bat
 
 
 # Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets

diff --git a/COSE/COSE.Net40.csproj b/COSE/COSE.Net40.csproj
@@ -49,8 +49,8 @@
       <HintPath>packages\BouncyCastle.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="CBOR, Version=2.5.1.0, Culture=neutral, PublicKeyToken=9cd62db60ea5554c, processorArchitecture=MSIL">
-      <HintPath>packages\PeterO.Cbor.2.5.1\lib\portable-net40+sl5+win+wpa81+wp80\CBOR.dll</HintPath>
+    <Reference Include="CBOR, Version=2.5.2.0, Culture=neutral, PublicKeyToken=9cd62db60ea5554c, processorArchitecture=MSIL">
+      <HintPath>packages\PeterO.Cbor.2.5.2\lib\portable-net40+sl5+win+wpa81+wp80\CBOR.dll</HintPath>
     </Reference>
     <Reference Include="Numbers, Version=0.4.0.0, Culture=neutral, PublicKeyToken=9cd62db60ea5554c, processorArchitecture=MSIL">
       <HintPath>packages\PeterO.Numbers.0.4.0\lib\portable-net40+sl5+win+wpa81+wp80\Numbers.dll</HintPath>

diff --git a/COSE/COSE.Net45.csproj b/COSE/COSE.Net45.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -42,15 +42,15 @@
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Deploy45\COSE.xml</DocumentationFile>
     <AssemblyOriginatorKeyFile>AugustCellarsStrongKey.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
       <HintPath>packages\BouncyCastle.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="CBOR, Version=2.5.1.0, Culture=neutral, PublicKeyToken=9cd62db60ea5554c, processorArchitecture=MSIL">
-      <HintPath>packages\PeterO.Cbor.2.5.1\lib\portable-net45+dnxcore50+netcore45+win+wpa81+wp80\CBOR.dll</HintPath>
+    <Reference Include="CBOR, Version=2.5.2.0, Culture=neutral, PublicKeyToken=9cd62db60ea5554c, processorArchitecture=MSIL">
+      <HintPath>packages\PeterO.Cbor.2.5.2\lib\portable-net45+dnxcore50+netcore45+win+wpa81+wp80\CBOR.dll</HintPath>
     </Reference>
     <Reference Include="Numbers, Version=0.4.0.0, Culture=neutral, PublicKeyToken=9cd62db60ea5554c, processorArchitecture=MSIL">
       <HintPath>packages\PeterO.Numbers.0.4.0\lib\portable-net45+dnxcore50+netcore45+win+wpa81+wp80\Numbers.dll</HintPath>
@@ -94,4 +94,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/COSE/COSE.Tests/COSE.Net40.Tests.csproj b/COSE/COSE.Tests/COSE.Net40.Tests.csproj
@@ -49,8 +49,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CBOR, Version=2.5.1.0, Culture=neutral, PublicKeyToken=9cd62db60ea5554c, processorArchitecture=MSIL">
-      <HintPath>packages\PeterO.Cbor.2.5.1\lib\portable-net40+sl5+win+wpa81+wp80\CBOR.dll</HintPath>
+    <Reference Include="CBOR, Version=2.5.2.0, Culture=neutral, PublicKeyToken=9cd62db60ea5554c, processorArchitecture=MSIL">
+      <HintPath>packages\PeterO.Cbor.2.5.2\lib\portable-net40+sl5+win+wpa81+wp80\CBOR.dll</HintPath>
     </Reference>
     <Reference Include="Numbers, Version=0.4.0.0, Culture=neutral, PublicKeyToken=9cd62db60ea5554c, processorArchitecture=MSIL">
       <HintPath>packages\PeterO.Numbers.0.4.0\lib\portable-net40+sl5+win+wpa81+wp80\Numbers.dll</HintPath>

diff --git a/COSE/COSE.Tests/COSE.Net45.Tests.csproj b/COSE/COSE.Tests/COSE.Net45.Tests.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -49,8 +49,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CBOR, Version=2.5.1.0, Culture=neutral, PublicKeyToken=9cd62db60ea5554c, processorArchitecture=MSIL">
-      <HintPath>..\packages\PeterO.Cbor.2.5.1\lib\portable-net45+dnxcore50+netcore45+win+wpa81+wp80\CBOR.dll</HintPath>
+    <Reference Include="CBOR, Version=2.5.2.0, Culture=neutral, PublicKeyToken=9cd62db60ea5554c, processorArchitecture=MSIL">
+      <HintPath>..\packages\PeterO.Cbor.2.5.2\lib\portable-net45+dnxcore50+netcore45+win+wpa81+wp80\CBOR.dll</HintPath>
     </Reference>
     <Reference Include="Numbers, Version=0.4.0.0, Culture=neutral, PublicKeyToken=9cd62db60ea5554c, processorArchitecture=MSIL">
       <HintPath>..\packages\PeterO.Numbers.0.4.0\lib\portable-net45+dnxcore50+netcore45+win+wpa81+wp80\Numbers.dll</HintPath>
@@ -118,4 +118,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/COSE/COSE.Tests/packages.config b/COSE/COSE.Tests/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="NUnit" version="3.5.0" targetFramework="net40" />
-  <package id="PeterO.Cbor" version="2.5.1" targetFramework="net45" />
+  <package id="PeterO.Cbor" version="2.5.2" targetFramework="net45" />
   <package id="PeterO.Numbers" version="0.4.0" targetFramework="net45" />
 </packages>
diff --git a/COSE/COSE.nuspec b/COSE/COSE.nuspec
@@ -2,13 +2,15 @@
 <package>
   <metadata>
     <id>Com.AugustCellars.COSE</id>
-    <version>1.0.5.0</version>
+    <version>1.0.5.2</version>
     <authors>Jim Schaad</authors>
     <owners>jimsch</owners>
     <licenseUrl>https://github.com/cose-wg/COSE-csharp/license.md</licenseUrl>
     <projectUrl>https://github.com/cose-wg/COSE-csharp</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <releaseNotes>
+1.0.5.2
+  - Update net 4.5 file to use latest CBOR      
 1.0.5
   - Add strong signature to the net 4.5 file.      
 1.0.4
@@ -30,7 +32,7 @@
     <copyright>Copyright @2016-7 Jim Schaad</copyright>
     <tags>COSE CBOR</tags>
     <dependencies>
-      <dependency id="PeterO.CBOR" version="2.5.1"/>
+      <dependency id="PeterO.CBOR" version="2.5.2"/>
       <dependency id="PeterO.Numbers" version="0.4.0"/>
       <dependency id="BouncyCastle" version="1.8.1"/>
     </dependencies>

diff --git a/COSE/packages.config b/COSE/packages.config
@@ -10,6 +10,6 @@
   <package id="NUnit.Extension.TeamCityEventListener" version="1.0.2" targetFramework="net40" />
   <package id="NUnit.Extension.VSProjectLoader" version="3.5.0" targetFramework="net40" />
   <package id="NUnit3TestAdapter" version="3.6.0" targetFramework="net40" />
-  <package id="PeterO.Cbor" version="2.5.1" targetFramework="net40" />
+  <package id="PeterO.Cbor" version="2.5.2" targetFramework="net45" />
   <package id="PeterO.Numbers" version="0.4.0" targetFramework="net40" />
 </packages>