Update IdentityModel dependencies to 5.2.0.

aspnet · Jan 29, 2018 · 6ab8574 · 6ab8574
1 parent 1687e9a
commit 6ab8574
Show file tree

Hide file tree

Showing 15 changed files with 71 additions and 71 deletions.
diff --git a/build/Sakefile.shade b/build/Sakefile.shade
@@ -5,7 +5,7 @@ var SHIP='${Version(4, 0, 0, "preview1")}'
 var DEV='${Version(0, 31, 0, "pre")}'
 set FINAL_MILESTONE='${false}'
 var AZUREAD_VERSION='5.2.0'
-var AZUREAD_SUFFIX='-preview2-41113220915'
+var AZUREAD_SUFFIX=''
 var VERSION='${SHIP.VERSION}'
 var FULL_VERSION='${SHIP.FULL_VERSION}'
 var EULA='https://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm'

diff --git a/src/Microsoft.Owin.Security.ActiveDirectory/Microsoft.Owin.Security.ActiveDirectory.csproj b/src/Microsoft.Owin.Security.ActiveDirectory/Microsoft.Owin.Security.ActiveDirectory.csproj
@@ -41,27 +41,27 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.IdentityModel.Logging, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.IdentityModel.Logging.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Logging.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.IdentityModel.Logging.5.2.0\lib\net451\Microsoft.IdentityModel.Logging.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Protocols, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.IdentityModel.Protocols.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Protocols.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.IdentityModel.Protocols.5.2.0\lib\net451\Microsoft.IdentityModel.Protocols.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Protocols.WsFederation, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.IdentityModel.Protocols.WsFederation.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Protocols.WsFederation.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.IdentityModel.Protocols.WsFederation.5.2.0\lib\net451\Microsoft.IdentityModel.Protocols.WsFederation.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Tokens, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.IdentityModel.Tokens.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Tokens.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.IdentityModel.Tokens.5.2.0\lib\net451\Microsoft.IdentityModel.Tokens.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Tokens.Saml, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.IdentityModel.Tokens.Saml.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Tokens.Saml.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.IdentityModel.Tokens.Saml.5.2.0\lib\net451\Microsoft.IdentityModel.Tokens.Saml.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Xml, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.IdentityModel.Xml.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Xml.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.IdentityModel.Xml.5.2.0\lib\net451\Microsoft.IdentityModel.Xml.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -76,7 +76,7 @@
     <Reference Include="System.Core" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.IdentityModel.Tokens.Jwt, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.0-preview2-41113220915\lib\net451\System.IdentityModel.Tokens.Jwt.dll</HintPath>
+      <HintPath>..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.0\lib\net451\System.IdentityModel.Tokens.Jwt.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Net.Http" />

diff --git a/src/Microsoft.Owin.Security.ActiveDirectory/packages.config b/src/Microsoft.Owin.Security.ActiveDirectory/packages.config
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.IdentityModel.Logging" version="5.2.0-preview2-41113220915" targetFramework="net451" />
-  <package id="Microsoft.IdentityModel.Protocols" version="5.2.0-preview2-41113220915" targetFramework="net451" />
-  <package id="Microsoft.IdentityModel.Protocols.WsFederation" version="5.2.0-preview2-41113220915" targetFramework="net451" />
-  <package id="Microsoft.IdentityModel.Tokens" version="5.2.0-preview2-41113220915" targetFramework="net451" />
-  <package id="Microsoft.IdentityModel.Tokens.Saml" version="5.2.0-preview2-41113220915" targetFramework="net451" />
-  <package id="Microsoft.IdentityModel.Xml" version="5.2.0-preview2-41113220915" targetFramework="net451" />
+  <package id="Microsoft.IdentityModel.Logging" version="5.2.0" targetFramework="net451" />
+  <package id="Microsoft.IdentityModel.Protocols" version="5.2.0" targetFramework="net451" />
+  <package id="Microsoft.IdentityModel.Protocols.WsFederation" version="5.2.0" targetFramework="net451" />
+  <package id="Microsoft.IdentityModel.Tokens" version="5.2.0" targetFramework="net451" />
+  <package id="Microsoft.IdentityModel.Tokens.Saml" version="5.2.0" targetFramework="net451" />
+  <package id="Microsoft.IdentityModel.Xml" version="5.2.0" targetFramework="net451" />
   <package id="Newtonsoft.Json" version="10.0.1" targetFramework="net451" />
   <package id="Owin" version="1.0" targetFramework="net45" />
-  <package id="System.IdentityModel.Tokens.Jwt" version="5.2.0-preview2-41113220915" targetFramework="net451" />
+  <package id="System.IdentityModel.Tokens.Jwt" version="5.2.0" targetFramework="net451" />
 </packages>
diff --git a/src/Microsoft.Owin.Security.Jwt/Microsoft.Owin.Security.Jwt.csproj b/src/Microsoft.Owin.Security.Jwt/Microsoft.Owin.Security.Jwt.csproj
@@ -37,11 +37,11 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.IdentityModel.Logging, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.IdentityModel.Logging.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Logging.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.IdentityModel.Logging.5.2.0\lib\net451\Microsoft.IdentityModel.Logging.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Tokens, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.IdentityModel.Tokens.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Tokens.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.IdentityModel.Tokens.5.2.0\lib\net451\Microsoft.IdentityModel.Tokens.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -56,7 +56,7 @@
     <Reference Include="System.Core" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.IdentityModel.Tokens.Jwt, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.0-preview2-41113220915\lib\net451\System.IdentityModel.Tokens.Jwt.dll</HintPath>
+      <HintPath>..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.0\lib\net451\System.IdentityModel.Tokens.Jwt.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />

diff --git a/src/Microsoft.Owin.Security.Jwt/packages.config b/src/Microsoft.Owin.Security.Jwt/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.IdentityModel.Logging" version="5.2.0-preview2-41113220915" targetFramework="net451" />
-  <package id="Microsoft.IdentityModel.Tokens" version="5.2.0-preview2-41113220915" targetFramework="net451" />
+  <package id="Microsoft.IdentityModel.Logging" version="5.2.0" targetFramework="net451" />
+  <package id="Microsoft.IdentityModel.Tokens" version="5.2.0" targetFramework="net451" />
   <package id="Newtonsoft.Json" version="10.0.1" targetFramework="net451" />
   <package id="Owin" version="1.0" targetFramework="net45" />
-  <package id="System.IdentityModel.Tokens.Jwt" version="5.2.0-preview2-41113220915" targetFramework="net451" />
+  <package id="System.IdentityModel.Tokens.Jwt" version="5.2.0" targetFramework="net451" />
 </packages>
diff --git a/src/Microsoft.Owin.Security.OpenIdConnect/Microsoft.Owin.Security.OpenIdConnect.csproj b/src/Microsoft.Owin.Security.OpenIdConnect/Microsoft.Owin.Security.OpenIdConnect.csproj
@@ -41,19 +41,19 @@
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.IdentityModel.Logging, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.IdentityModel.Logging.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Logging.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.IdentityModel.Logging.5.2.0\lib\net451\Microsoft.IdentityModel.Logging.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Protocols, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.IdentityModel.Protocols.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Protocols.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.IdentityModel.Protocols.5.2.0\lib\net451\Microsoft.IdentityModel.Protocols.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.5.2.0\lib\net451\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Tokens, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.IdentityModel.Tokens.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Tokens.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.IdentityModel.Tokens.5.2.0\lib\net451\Microsoft.IdentityModel.Tokens.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -65,7 +65,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.IdentityModel.Tokens.Jwt, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.0-preview2-41113220915\lib\net451\System.IdentityModel.Tokens.Jwt.dll</HintPath>
+      <HintPath>..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.0\lib\net451\System.IdentityModel.Tokens.Jwt.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Net.Http" />

diff --git a/src/Microsoft.Owin.Security.OpenIdConnect/packages.config b/src/Microsoft.Owin.Security.OpenIdConnect/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.IdentityModel.Logging" version="5.2.0-preview2-41113220915" targetFramework="net451" />
-  <package id="Microsoft.IdentityModel.Protocols" version="5.2.0-preview2-41113220915" targetFramework="net451" />
-  <package id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="5.2.0-preview2-41113220915" targetFramework="net451" />
-  <package id="Microsoft.IdentityModel.Tokens" version="5.2.0-preview2-41113220915" targetFramework="net451" />
+  <package id="Microsoft.IdentityModel.Logging" version="5.2.0" targetFramework="net451" />
+  <package id="Microsoft.IdentityModel.Protocols" version="5.2.0" targetFramework="net451" />
+  <package id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="5.2.0" targetFramework="net451" />
+  <package id="Microsoft.IdentityModel.Tokens" version="5.2.0" targetFramework="net451" />
   <package id="Newtonsoft.Json" version="10.0.1" targetFramework="net451" />
   <package id="Owin" version="1.0" targetFramework="net45" />
-  <package id="System.IdentityModel.Tokens.Jwt" version="5.2.0-preview2-41113220915" targetFramework="net451" />
+  <package id="System.IdentityModel.Tokens.Jwt" version="5.2.0" targetFramework="net451" />
 </packages>
diff --git a/src/Microsoft.Owin.Security.WsFederation/Microsoft.Owin.Security.WsFederation.csproj b/src/Microsoft.Owin.Security.WsFederation/Microsoft.Owin.Security.WsFederation.csproj
@@ -39,27 +39,27 @@
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.IdentityModel.Logging, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.IdentityModel.Logging.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Logging.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.IdentityModel.Logging.5.2.0\lib\net451\Microsoft.IdentityModel.Logging.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Protocols, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.IdentityModel.Protocols.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Protocols.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.IdentityModel.Protocols.5.2.0\lib\net451\Microsoft.IdentityModel.Protocols.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Protocols.WsFederation, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.IdentityModel.Protocols.WsFederation.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Protocols.WsFederation.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.IdentityModel.Protocols.WsFederation.5.2.0\lib\net451\Microsoft.IdentityModel.Protocols.WsFederation.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Tokens, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.IdentityModel.Tokens.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Tokens.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.IdentityModel.Tokens.5.2.0\lib\net451\Microsoft.IdentityModel.Tokens.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Tokens.Saml, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.IdentityModel.Tokens.Saml.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Tokens.Saml.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.IdentityModel.Tokens.Saml.5.2.0\lib\net451\Microsoft.IdentityModel.Tokens.Saml.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Xml, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.IdentityModel.Xml.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Xml.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.IdentityModel.Xml.5.2.0\lib\net451\Microsoft.IdentityModel.Xml.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -71,7 +71,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.IdentityModel.Tokens.Jwt, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.0-preview2-41113220915\lib\net451\System.IdentityModel.Tokens.Jwt.dll</HintPath>
+      <HintPath>..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.0\lib\net451\System.IdentityModel.Tokens.Jwt.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Net.Http" />

diff --git a/src/Microsoft.Owin.Security.WsFederation/packages.config b/src/Microsoft.Owin.Security.WsFederation/packages.config
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.IdentityModel.Logging" version="5.2.0-preview2-41113220915" targetFramework="net451" />
-  <package id="Microsoft.IdentityModel.Protocols" version="5.2.0-preview2-41113220915" targetFramework="net451" />
-  <package id="Microsoft.IdentityModel.Protocols.WsFederation" version="5.2.0-preview2-41113220915" targetFramework="net451" />
-  <package id="Microsoft.IdentityModel.Tokens" version="5.2.0-preview2-41113220915" targetFramework="net451" />
-  <package id="Microsoft.IdentityModel.Tokens.Saml" version="5.2.0-preview2-41113220915" targetFramework="net451" />
-  <package id="Microsoft.IdentityModel.Xml" version="5.2.0-preview2-41113220915" targetFramework="net451" />
+  <package id="Microsoft.IdentityModel.Logging" version="5.2.0" targetFramework="net451" />
+  <package id="Microsoft.IdentityModel.Protocols" version="5.2.0" targetFramework="net451" />
+  <package id="Microsoft.IdentityModel.Protocols.WsFederation" version="5.2.0" targetFramework="net451" />
+  <package id="Microsoft.IdentityModel.Tokens" version="5.2.0" targetFramework="net451" />
+  <package id="Microsoft.IdentityModel.Tokens.Saml" version="5.2.0" targetFramework="net451" />
+  <package id="Microsoft.IdentityModel.Xml" version="5.2.0" targetFramework="net451" />
   <package id="Newtonsoft.Json" version="10.0.1" targetFramework="net451" />
-  <package id="System.IdentityModel.Tokens.Jwt" version="5.2.0-preview2-41113220915" targetFramework="net451" />
+  <package id="System.IdentityModel.Tokens.Jwt" version="5.2.0" targetFramework="net451" />
 </packages>