Merge pull request #25 from jimsch/master

Add a deploy target
cose-wg · Jun 23, 2017 · 84bb785 · 84bb785
2 parents 9519df7 + 533495b
commit 84bb785
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 11 deletions.
diff --git a/COSE/COSE.Net40.csproj b/COSE/COSE.Net40.csproj
@@ -31,6 +31,17 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Release40\COSE.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Deploy|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Deploy40\</OutputPath>
+    <IntermediateOutputPath>obj\Deploy40</IntermediateOutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <SignAssembly>true</SignAssembly>
+    <DocumentationFile>bin\Deploy40\COSE.xml</DocumentationFile>
     <AssemblyOriginatorKeyFile>AugustCellarsStrongKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>

diff --git a/COSE/COSE.Net40.sln b/COSE/COSE.Net40.sln
@@ -11,16 +11,21 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
+		Deploy|Any CPU = Deploy|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{D02F476F-BC2C-4D01-BEDE-EB8E79DD050E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D02F476F-BC2C-4D01-BEDE-EB8E79DD050E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D02F476F-BC2C-4D01-BEDE-EB8E79DD050E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D02F476F-BC2C-4D01-BEDE-EB8E79DD050E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D02F476F-BC2C-4D01-BEDE-EB8E79DD050E}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
+		{D02F476F-BC2C-4D01-BEDE-EB8E79DD050E}.Deploy|Any CPU.Build.0 = Deploy|Any CPU
 		{C97453B9-68FC-4C69-91BC-C777AEFE2688}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C97453B9-68FC-4C69-91BC-C777AEFE2688}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C97453B9-68FC-4C69-91BC-C777AEFE2688}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C97453B9-68FC-4C69-91BC-C777AEFE2688}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C97453B9-68FC-4C69-91BC-C777AEFE2688}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
+		{C97453B9-68FC-4C69-91BC-C777AEFE2688}.Deploy|Any CPU.Build.0 = Deploy|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/COSE/COSE.Net45.csproj b/COSE/COSE.Net45.csproj
@@ -31,7 +31,18 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Release45\COSE.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Deploy|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Deploy45\</OutputPath>
+    <IntermediateOutputPath>obj\Deploy45</IntermediateOutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Deploy45\COSE.xml</DocumentationFile>
     <AssemblyOriginatorKeyFile>AugustCellarsStrongKey.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942">

diff --git a/COSE/COSE.Net45.sln b/COSE/COSE.Net45.sln
@@ -11,16 +11,21 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
+                Deploy|Any CPU = Deploy|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{D02F476F-BC2C-4D01-BEDE-EB8E79DD050E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D02F476F-BC2C-4D01-BEDE-EB8E79DD050E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D02F476F-BC2C-4D01-BEDE-EB8E79DD050E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D02F476F-BC2C-4D01-BEDE-EB8E79DD050E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D02F476F-BC2C-4D01-BEDE-EB8E79DD050E}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
+		{D02F476F-BC2C-4D01-BEDE-EB8E79DD050E}.Deploy|Any CPU.Build.0 = Deploy|Any CPU
 		{C97453B9-68FC-4C69-91BC-C777AEFE2688}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C97453B9-68FC-4C69-91BC-C777AEFE2688}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C97453B9-68FC-4C69-91BC-C777AEFE2688}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C97453B9-68FC-4C69-91BC-C777AEFE2688}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C97453B9-68FC-4C69-91BC-C777AEFE2688}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
+		{C97453B9-68FC-4C69-91BC-C777AEFE2688}.Deploy|Any CPU.Build.0 = Deploy|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/COSE/COSE.Tests/COSE.Net40.Tests.csproj b/COSE/COSE.Tests/COSE.Net40.Tests.csproj
@@ -39,6 +39,15 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Deploy|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Deploy40\</OutputPath>
+    <IntermediateOutputPath>obj\Deploy40</IntermediateOutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <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>

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>
@@ -39,6 +39,15 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Deploy|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Deploy45\</OutputPath>
+    <IntermediateOutputPath>obj\Deploy45</IntermediateOutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <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>
@@ -109,4 +118,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/COSE/COSE.nuspec b/COSE/COSE.nuspec
@@ -2,13 +2,18 @@
 <package>
   <metadata>
     <id>Com.AugustCellars.COSE</id>
-    <version>1.0.3.0</version>
+    <version>1.0.5.0</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
+  - Add strong signature to the net 4.5 file.      
+1.0.4
+  - Add user data field to OneKey class
+  - Kill 
 1.0.3
   - Make the library be CLS Compliant and mark it as such.
   - Apply strong signing to distribution
@@ -31,11 +36,11 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="bin/Release40/COSE.dll" target="lib\portable-net40+sl5+win+wpa81+wp8"/>
-    <file src="bin/Release40/COSE.pdb" target="lib\portable-net40+sl5+win+wpa81+wp8"/>
-    <file src="bin/Release40/COSE.xml" target="lib\portable-net40+sl5+win+wpa81+wp8"/>
-    <file src="bin/Release45/COSE.dll" target="lib\portable-net45+dnxcore50+netcore45+win+wpa81+wp8"/>
-    <file src="bin/Release45/COSE.pdb" target="lib\portable-net45+dnxcore50+netcore45+win+wpa81+wp8"/>
-    <file src="bin/Release45/COSE.xml" target="lib\portable-net45+dnxcore50+netcore45+win+wpa81+wp8"/>
+    <file src="bin/Deploy40/COSE.dll" target="lib\portable-net40+sl5+win+wpa81+wp8"/>
+    <file src="bin/Deploy40/COSE.pdb" target="lib\portable-net40+sl5+win+wpa81+wp8"/>
+    <file src="bin/Deploy40/COSE.xml" target="lib\portable-net40+sl5+win+wpa81+wp8"/>
+    <file src="bin/Deploy45/COSE.dll" target="lib\portable-net45+dnxcore50+netcore45+win+wpa81+wp8"/>
+    <file src="bin/Deploy45/COSE.pdb" target="lib\portable-net45+dnxcore50+netcore45+win+wpa81+wp8"/>
+    <file src="bin/Deploy45/COSE.xml" target="lib\portable-net45+dnxcore50+netcore45+win+wpa81+wp8"/>
   </files>
 </package>
diff --git a/COSE/Properties/AssemblyInfo.cs b/COSE/Properties/AssemblyInfo.cs
@@ -34,8 +34,8 @@
 // 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.3.0")]
-[assembly: AssemblyFileVersion("1.0.3.0")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
 // [assembly: InternalsVisibleTo("COSE.Net40.Tests")]
 // [assembly: InternalsVisibleTo("COSE.Explorables")]