Unify IdentityModel versions in nuspecs

Author: Tratcher

build/Sakefile.shade

@@ -4,9 +4,8 @@ var AUTHORS='Microsoft'
 var SHIP='${Version(4, 0, 0, "alpha1")}'
 var DEV='${Version(0, 31, 0, "pre")}'
 set FINAL_MILESTONE='${false}'
-
-var AZUREAD_JWT_SUFFIX='.406020025-pre'
-var AZUREAD_EXT_SUFFIX='.406020025-pre'
+var AZUREAD_VERSION='5.2.0'
+var AZUREAD_SUFFIX='.406020025-pre'
 var VERSION='${SHIP.VERSION}'
 var FULL_VERSION='${SHIP.FULL_VERSION}'
 var EULA='https://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm'
@@ -271,16 +270,15 @@ var signing='${new List<string>()}'
     test if='OFFICIAL_BUILD && !RELEASE_BUILD'
       -title = title.Split(new[]{"("}, StringSplitOptions.None)[0] + string.Format(" (nightly {0:yyyy MMM dd})", DateTime.Now);
 
-    var azureAdJwtSuffix='${AZUREAD_JWT_SUFFIX}'
-    set azureAdJwtSuffix='' if='OFFICIAL_BUILD && RELEASE_BUILD && FINAL_MILESTONE'
-    var azureAdExtSuffix='${AZUREAD_EXT_SUFFIX}'
-    set azureAdExtSuffix='' if='OFFICIAL_BUILD && RELEASE_BUILD && FINAL_MILESTONE'
+    var azureAdVersion='${AZUREAD_VERSION}'
+    var azureAdSuffix='${AZUREAD_SUFFIX}'
+    set azureAdSuffix='' if='OFFICIAL_BUILD && RELEASE_BUILD && FINAL_MILESTONE'
 
     var licenseUrl='${EULA}'
     var projectUrl='${PROJECT_URL}'
     var tags='${TAGS}'
 
-    nuget-pack nuspecFile='${file}' outputDir='${TARGET_DIR}' extra='-NoPackageAnalysis -Symbols -Properties "id=${baseName};authors=${AUTHORS};author=${AUTHORS};title=${title};description=${description};licenseUrl=${licenseUrl};projectUrl=${projectUrl};tags=${tags};azureAdJwtSuffix=${azureAdJwtSuffix};azureAdExtSuffix=${azureAdExtSuffix}"'
+    nuget-pack nuspecFile='${file}' outputDir='${TARGET_DIR}' extra='-NoPackageAnalysis -Symbols -Properties "id=${baseName};authors=${AUTHORS};author=${AUTHORS};title=${title};description=${description};licenseUrl=${licenseUrl};projectUrl=${projectUrl};tags=${tags};azureAdVersion=${azureAdVersion};azureAdSuffix=${azureAdSuffix}"'
 
 #nuget-deploy target='deploy' description='Upload NuGet packages to gallery'
   var extra=''

src/Microsoft.Owin.Security.ActiveDirectory/Microsoft.Owin.Security.ActiveDirectory.nuspec

@@ -21,7 +21,7 @@
       <dependency id="Microsoft.Owin.Security" version="$version$" />
       <dependency id="Microsoft.Owin.Security.OAuth" version="$version$" />
       <dependency id="Microsoft.Owin.Security.Jwt" version="$version$" />
-      <dependency id="System.IdentityModel.Tokens.Jwt" version="5.2.0$azureAdJwtSuffix$" />
+      <dependency id="System.IdentityModel.Tokens.Jwt" version="$azureAdVersion$$azureAdSuffix$" />
     </dependencies>
   </metadata>
   <files>

src/Microsoft.Owin.Security.ActiveDirectory/WsFedCachingSecurityTokenProvider.cs

@@ -4,9 +4,9 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using System.IdentityModel.Tokens;
 using System.Net.Http;
 using System.Threading;
-using System.IdentityModel.Tokens;
 using Microsoft.Owin.Security.Jwt;
 
 namespace Microsoft.Owin.Security.ActiveDirectory

src/Microsoft.Owin.Security.Jwt/Microsoft.Owin.Security.Jwt.nuspec

@@ -16,7 +16,7 @@
       <dependency id="Microsoft.Owin" version="$version$" />
       <dependency id="Microsoft.Owin.Security" version="$version$" />
       <dependency id="Microsoft.Owin.Security.OAuth" version="$version$" />
-      <dependency id="System.IdentityModel.Tokens.Jwt" version="5.2.0$azureAdJwtSuffix$" />
+      <dependency id="System.IdentityModel.Tokens.Jwt" version="$azureAdVersion$$azureAdSuffix$" />
     </dependencies>
   </metadata>
   <files>

src/Microsoft.Owin.Security.OpenIdConnect/Microsoft.Owin.Security.OpenIdConnect.nuspec

@@ -21,11 +21,11 @@
       <dependency id="Owin" version="1.0" />
       <dependency id="Microsoft.Owin" version="$version$" />
       <dependency id="Microsoft.Owin.Security" version="$version$" />
-      <dependency id="System.IdentityModel.Tokens.Jwt" version="5.2.0$azureAdJwtSuffix$" />
-      <dependency id="Microsoft.IdentityModel.Logging" version="5.2.0$azureAdJwtSuffix$" />
-      <dependency id="Microsoft.IdentityModel.Protocols" version="5.2.0$azureAdJwtSuffix$" />
-      <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="5.2.0$azureAdJwtSuffix$" />
-      <dependency id="Microsoft.IdentityModel.Tokens" version="5.2.0$azureAdJwtSuffix$" />
+      <dependency id="System.IdentityModel.Tokens.Jwt" version="$azureAdVersion$$azureAdSuffix$" />
+      <dependency id="Microsoft.IdentityModel.Logging" version="$azureAdVersion$$azureAdSuffix$" />
+      <dependency id="Microsoft.IdentityModel.Protocols" version="$azureAdVersion$$azureAdSuffix$" />
+      <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="$azureAdVersion$$azureAdSuffix$" />
+      <dependency id="Microsoft.IdentityModel.Tokens" version="$azureAdVersion$$azureAdSuffix$" />
     </dependencies>
   </metadata>
   <files>

src/Microsoft.Owin.Security.WsFederation/Microsoft.Owin.Security.WsFederation.nuspec

@@ -21,8 +21,8 @@
       <dependency id="Owin" version="1.0" />
       <dependency id="Microsoft.Owin" version="$version$" />
       <dependency id="Microsoft.Owin.Security" version="$version$" />
-      <dependency id="System.IdentityModel.Tokens.Jwt" version="5.2.0$azureAdJwtSuffix$" />
-      <dependency id="Microsoft.IdentityModel.Protocols.WsFederation" version="5.2.0$azureAdExtSuffix$" />
+      <dependency id="System.IdentityModel.Tokens.Jwt" version="$azureAdVersion$$azureAdSuffix$" />
+      <dependency id="Microsoft.IdentityModel.Protocols.WsFederation" version="$azureAdVersion$$azureAdSuffix$" />
     </dependencies>
   </metadata>
   <files>