Downgrade webkey dependency of NewtonSoft.Json for net 45 and bumped …

…the versions to publish a package with right assembly version
maririos · Nov 21, 2016 · 685280f · 685280f
1 parent d7cc630
commit 685280f
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 24 deletions.
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault.Cryptography.Tests/project.json b/src/KeyVault/Microsoft.Azure.KeyVault.Cryptography.Tests/project.json
@@ -43,8 +43,8 @@
   "dependencies": {
     "dotnet-test-xunit": "2.2.0-preview2-build1029",
     "Microsoft.Azure.KeyVault.Core": "[2.0.3-preview, 3.0)",
-    "Microsoft.Azure.KeyVault.Cryptography": "[2.0.2-preview, 3.0)",
-    "Microsoft.Azure.KeyVault.WebKey": "[2.0.2-preview, 3.0)",
+    "Microsoft.Azure.KeyVault.Cryptography": "[2.0.3-preview, 3.0)",
+    "Microsoft.Azure.KeyVault.WebKey": "[2.0.3-preview, 3.0)",
     "xunit": "2.2.0-beta2-build3300"
   }
 }
diff --git a/src/KeyVault/Microsoft.Azure.KeyVault.Cryptography/Properties/AssemblyInfo.cs b/src/KeyVault/Microsoft.Azure.KeyVault.Cryptography/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyDescription("Microsoft Azure Key Vault Cryptography Class Library.")]
 
 [assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.2.0")]
+[assembly: AssemblyFileVersion("2.0.3.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft")]
 [assembly: AssemblyProduct("Azure .NET SDK")]

diff --git a/src/KeyVault/Microsoft.Azure.KeyVault.Cryptography/project.json b/src/KeyVault/Microsoft.Azure.KeyVault.Cryptography/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.2-preview",
+  "version": "2.0.3-preview",
   "title": "Microsoft Azure Key Vault Cryptography",
   "description": "Microsoft Azure Key Vault Cryptography Class Library",
   "authors": [ "Microsoft" ],

diff --git a/src/KeyVault/Microsoft.Azure.KeyVault.Extensions.Tests/project.json b/src/KeyVault/Microsoft.Azure.KeyVault.Extensions.Tests/project.json
@@ -34,9 +34,9 @@
   },
 
   "dependencies": {
-    "Microsoft.Azure.KeyVault": "[2.0.4-preview, 3.0)",
-    "Microsoft.Azure.KeyVault.Cryptography": "[2.0.2-preview, 3.0)",
-    "Microsoft.Azure.KeyVault.Extensions": "[2.0.2-preview, 3.0)",
+    "Microsoft.Azure.KeyVault": "[2.0.5-preview, 3.0)",
+    "Microsoft.Azure.KeyVault.Cryptography": "[2.0.3-preview, 3.0)",
+    "Microsoft.Azure.KeyVault.Extensions": "[2.0.3-preview, 3.0)",
     "Microsoft.Azure.KeyVault.Core": "[2.0.3-preview, 3.0)",
     "Microsoft.Rest.ClientRuntime.Azure.TestFramework": "[1.3.5-preview, 2.0.0)",
     "Microsoft.Azure.KeyVault.TestFramework": "[2.0.2-preview, 3.0)",

diff --git a/src/KeyVault/Microsoft.Azure.KeyVault.Extensions/Properties/AssemblyInfo.cs b/src/KeyVault/Microsoft.Azure.KeyVault.Extensions/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyDescription("Microsoft Azure Key Vault Extensions Class Library")]
 
 [assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.2.0")]
+[assembly: AssemblyFileVersion("2.0.3.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft")]
 [assembly: AssemblyProduct("Azure .NET SDK")]

diff --git a/src/KeyVault/Microsoft.Azure.KeyVault.Extensions/project.json b/src/KeyVault/Microsoft.Azure.KeyVault.Extensions/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.2-preview",
+  "version": "2.0.3-preview",
   "title": "Microsoft Azure Key Vault Extensions",
   "description": "Microsoft Azure Key Vault Extensions Class Library",
   "authors": [ "Microsoft" ],
@@ -19,10 +19,10 @@
   },
 
   "dependencies": {
-    "Microsoft.Azure.KeyVault": "[2.0.4-preview, 3.0)",
+    "Microsoft.Azure.KeyVault": "[2.0.5-preview, 3.0)",
     "Microsoft.Azure.KeyVault.Core": "[2.0.3-preview, 3.0)",
-    "Microsoft.Azure.KeyVault.Cryptography": "[2.0.2-preview, 3.0)",
-    "Microsoft.Azure.KeyVault.WebKey": "[2.0.2-preview, 3.0)"
+    "Microsoft.Azure.KeyVault.Cryptography": "[2.0.3-preview, 3.0)",
+    "Microsoft.Azure.KeyVault.WebKey": "[2.0.3-preview, 3.0)"
   },
 
   "frameworks": {

diff --git a/src/KeyVault/Microsoft.Azure.KeyVault.TestFramework/project.json b/src/KeyVault/Microsoft.Azure.KeyVault.TestFramework/project.json
@@ -14,7 +14,7 @@
     "Microsoft.Rest.ClientRuntime": "[2.3.2, 3.0)",
     "Microsoft.Rest.ClientRuntime.Azure": "[3.3.1, 4.0)",
     "Microsoft.Azure.Graph.RBAC": "2.2.2-preview",
-    "Microsoft.Azure.KeyVault": "[2.0.4-preview, 3.0)",
+    "Microsoft.Azure.KeyVault": "[2.0.5-preview, 3.0)",
     "Microsoft.Azure.Management.ResourceManager": "1.1.4-preview",
     "Microsoft.Rest.ClientRuntime.Azure.TestFramework": "[1.3.5-preview, 2.0.0)",
     "Microsoft.Extensions.Configuration": "1.0.0",

diff --git a/src/KeyVault/Microsoft.Azure.KeyVault.Tests/project.json b/src/KeyVault/Microsoft.Azure.KeyVault.Tests/project.json
@@ -15,7 +15,7 @@
 
   "dependencies": {
     "dotnet-test-xunit": "2.2.0-preview2-build1029",
-    "Microsoft.Azure.KeyVault": "[2.0.4-preview, 3.0)",
+    "Microsoft.Azure.KeyVault": "[2.0.5-preview, 3.0)",
     "Microsoft.AspNet.WebApi.Client": "5.2.2",
     "Microsoft.Azure.KeyVault.TestFramework": "[2.0.2-preview, 3.0)",
     "xunit": "2.2.0-beta2-build3300"

diff --git a/src/KeyVault/Microsoft.Azure.KeyVault.WebKey.Tests/project.json b/src/KeyVault/Microsoft.Azure.KeyVault.WebKey.Tests/project.json
@@ -14,7 +14,7 @@
 
   "dependencies": {
     "dotnet-test-xunit": "2.2.0-preview2-build1029",
-    "Microsoft.Azure.KeyVault.WebKey": "[2.0.2-preview, 3.0)",
+    "Microsoft.Azure.KeyVault.WebKey": "[2.0.3-preview, 3.0)",
     "xunit": "2.2.0-beta2-build3300"
   },
 

diff --git a/src/KeyVault/Microsoft.Azure.KeyVault.WebKey/Properties/AssemblyInfo.cs b/src/KeyVault/Microsoft.Azure.KeyVault.WebKey/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyDescription("Microsoft Azure Key Vault WebKey Class Library.")]
 
 [assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.2.0")]
+[assembly: AssemblyFileVersion("2.0.3.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft")]
 [assembly: AssemblyProduct("Azure .NET SDK")]

diff --git a/src/KeyVault/Microsoft.Azure.KeyVault.WebKey/project.json b/src/KeyVault/Microsoft.Azure.KeyVault.WebKey/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.2-preview",
+  "version": "2.0.3-preview",
   "title": "Microsoft Azure Key Vault WebKey",
   "description": "Microsoft Azure Key Vault WebKey Class Library",
   "authors": [ "Microsoft" ],
@@ -17,9 +17,6 @@
     "publicSign": false,
     "keyFile": "../../../tools/MSSharedLibKey.snk"
   },
-  "dependencies": {
-    "Newtonsoft.Json": "9.0.1"
-  },
   "frameworks": {
     "net45": {
       "buildOptions": {
@@ -29,6 +26,7 @@
       "frameworkAssemblies": {
       },
       "dependencies": {
+        "Newtonsoft.Json": "6.0.8"
       }
     },
     "netstandard1.5": {
@@ -42,7 +40,8 @@
         "System.Runtime": "4.1.0",
         "System.Security.Cryptography.Algorithms": "4.2.0",
         "System.Collections.Concurrent": "4.0.12",
-        "System.Linq": "4.1.0"
+        "System.Linq": "4.1.0",
+        "Newtonsoft.Json": "[9.0.1,10.0)"
       }
     }
   },

diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/Properties/AssemblyInfo.cs b/src/KeyVault/Microsoft.Azure.KeyVault/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyDescription("Azure Key Vault enables users to store and use cryptographic keys within the Microsoft Azure environment. Azure Key Vault supports multiple key types and algorithms and enables the use of Hardware Security Modules (HSM) for high value customer keys. In addition, Azure Key Vault allows users to securely store secrets in a Key Vault; secrets are limited size octet objects and Azure Key Vault applies no specific semantics to these objects. A Key Vault may contain a mix of keys and secrets at the same time, and access control for the two types of object is independently controlled. Users, subject to appropriate authorization, may: 1) Manage cryptographic keys using Create, Import, Update, Delete and other operations 2) Manage secrets using Get, Set, Delete and other operations 3) Use cryptographic keys with Sign/Verify, WrapKey/UnwrapKey and Encrypt/Decrypt operations. Operations against Key Vaults are authenticated and authorized using Azure Active Directory.")]
 
 [assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.4.0")]
+[assembly: AssemblyFileVersion("2.0.5.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft")]
 [assembly: AssemblyProduct("Azure .NET SDK")]

diff --git a/src/KeyVault/Microsoft.Azure.KeyVault/project.json b/src/KeyVault/Microsoft.Azure.KeyVault/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.4-preview",
+  "version": "2.0.5-preview",
   "title": "Microsoft Azure key vault",
   "description": "Azure Key Vault enables users to store and use cryptographic keys within the Microsoft Azure environment. Azure Key Vault supports multiple key types and algorithms and enables the use of Hardware Security Modules (HSM) for high value customer keys. In addition, Azure Key Vault allows users to securely store secrets in a Key Vault; secrets are limited size octet objects and Azure Key Vault applies no specific semantics to these objects. A Key Vault may contain a mix of keys and secrets at the same time, and access control for the two types of object is independently controlled. Users, subject to appropriate authorization, may: 1) Manage cryptographic keys using Create, Import, Update, Delete and other operations 2) Manage secrets using Get, Set, Delete and other operations 3) Use cryptographic keys with Sign/Verify, WrapKey/UnwrapKey and Encrypt/Decrypt operations. Operations against Key Vaults are authenticated and authorized using Azure Active Directory. Key Vault now supports certificates, a complex type that makes use of existing key and secret infrastructure for certificate operations. KV certificates also support notification and auto-renewal as well as other management features.",
   "authors": [ "Microsoft" ],
@@ -21,7 +21,7 @@
   },
 
   "dependencies": {
-    "Microsoft.Azure.KeyVault.WebKey": "[2.0.2-preview, 3.0)",
+    "Microsoft.Azure.KeyVault.WebKey": "[2.0.3-preview, 3.0)",
     "Microsoft.Rest.ClientRuntime": "[2.3.2, 3.0)",
     "Microsoft.Rest.ClientRuntime.Azure": "[3.3.1, 4.0)"
   },