Security 995 B

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553
  1. commit e0538784647990905f9c5fdc5bc2f0e5c7388909
  2. Author: Nate McMaster <[email protected]>
  3. Date: Mon Nov 19 09:47:07 2018 -0800
  4. Upgrade packages and projects to target netcoreapp3.0 (aspnet/Security#1916)
  5. Changes:
  6. * Upgrade dependencies and build tools
  7. * Change TFM on Microsoft.AspNetCore.* packages to netcoreapp3.0
  8. * Remove .NET Framework tests
  9. * Disable Owin interop tests. They need to be completely refactored
  10. diff --git a/Directory.Build.targets b/Directory.Build.targets
  11. index 78626b773ea..7e3f8df92e4 100644
  12. --- a/Directory.Build.targets
  13. +++ b/Directory.Build.targets
  14. @@ -1,10 +1,6 @@
  15. <Project>
  16. <PropertyGroup>
  17. - <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
  18. - <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
  19. - <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">$(MicrosoftNETCoreApp22PackageVersion)</RuntimeFrameworkVersion>
  20. + <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion>
  21. <NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
  22. - <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
  23. - <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
  24. </PropertyGroup>
  25. </Project>
  26. diff --git a/benchmarks/Microsoft.AspNetCore.Security.Performance/Microsoft.AspNetCore.Security.Performance.csproj b/benchmarks/Microsoft.AspNetCore.Security.Performance/Microsoft.AspNetCore.Security.Performance.csproj
  27. index 7226b64be51..2f16dd66999 100644
  28. --- a/benchmarks/Microsoft.AspNetCore.Security.Performance/Microsoft.AspNetCore.Security.Performance.csproj
  29. +++ b/benchmarks/Microsoft.AspNetCore.Security.Performance/Microsoft.AspNetCore.Security.Performance.csproj
  30. @@ -1,7 +1,7 @@
  31. <Project Sdk="Microsoft.NET.Sdk">
  32. <PropertyGroup>
  33. - <TargetFramework>netcoreapp2.2</TargetFramework>
  34. + <TargetFramework>netcoreapp3.0</TargetFramework>
  35. <OutputType>Exe</OutputType>
  36. <ServerGarbageCollection>true</ServerGarbageCollection>
  37. <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  38. diff --git a/build/dependencies.props b/build/dependencies.props
  39. index 230a942c0cc..163a3d40047 100644
  40. --- a/build/dependencies.props
  41. +++ b/build/dependencies.props
  42. @@ -4,42 +4,40 @@
  43. </PropertyGroup>
  44. <PropertyGroup Label="Package Versions">
  45. <BenchmarkDotNetPackageVersion>0.10.13</BenchmarkDotNetPackageVersion>
  46. - <InternalAspNetCoreSdkPackageVersion>3.0.0-alpha1-20181004.7</InternalAspNetCoreSdkPackageVersion>
  47. - <MicrosoftAspNetCoreAuthenticationAbstractionsPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreAuthenticationAbstractionsPackageVersion>
  48. - <MicrosoftAspNetCoreAuthenticationCorePackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreAuthenticationCorePackageVersion>
  49. - <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.0.0-alpha1-10657</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
  50. - <MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion>
  51. - <MicrosoftAspNetCoreDataProtectionPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreDataProtectionPackageVersion>
  52. - <MicrosoftAspNetCoreDiagnosticsPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreDiagnosticsPackageVersion>
  53. - <MicrosoftAspNetCoreHostingPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreHostingPackageVersion>
  54. - <MicrosoftAspNetCoreHttpAbstractionsPackageVersion>3.0.0-a-alpha1-endpoint-extensions-namespace-16778</MicrosoftAspNetCoreHttpAbstractionsPackageVersion>
  55. - <MicrosoftAspNetCoreHttpExtensionsPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreHttpExtensionsPackageVersion>
  56. - <MicrosoftAspNetCoreHttpPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreHttpPackageVersion>
  57. - <MicrosoftAspNetCoreRoutingPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreRoutingPackageVersion>
  58. - <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
  59. - <MicrosoftAspNetCoreServerKestrelHttpsPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreServerKestrelHttpsPackageVersion>
  60. - <MicrosoftAspNetCoreServerKestrelPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreServerKestrelPackageVersion>
  61. - <MicrosoftAspNetCoreStaticFilesPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreStaticFilesPackageVersion>
  62. - <MicrosoftAspNetCoreTestHostPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreTestHostPackageVersion>
  63. - <MicrosoftAspNetCoreTestingPackageVersion>3.0.0-preview-181105-05</MicrosoftAspNetCoreTestingPackageVersion>
  64. - <MicrosoftExtensionsCachingMemoryPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsCachingMemoryPackageVersion>
  65. - <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
  66. - <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
  67. - <MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsDependencyInjectionPackageVersion>
  68. - <MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
  69. - <MicrosoftExtensionsLoggingAbstractionsPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
  70. - <MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsLoggingConsolePackageVersion>
  71. - <MicrosoftExtensionsLoggingDebugPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsLoggingDebugPackageVersion>
  72. - <MicrosoftExtensionsLoggingPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsLoggingPackageVersion>
  73. - <MicrosoftExtensionsOptionsPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsOptionsPackageVersion>
  74. - <MicrosoftExtensionsSecurityHelperSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsSecurityHelperSourcesPackageVersion>
  75. - <MicrosoftExtensionsWebEncodersPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsWebEncodersPackageVersion>
  76. + <InternalAspNetCoreSdkPackageVersion>3.0.0-build-20181114.5</InternalAspNetCoreSdkPackageVersion>
  77. + <MicrosoftAspNetCoreAuthenticationAbstractionsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthenticationAbstractionsPackageVersion>
  78. + <MicrosoftAspNetCoreAuthenticationCorePackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthenticationCorePackageVersion>
  79. + <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.0.0-preview-181113-11</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
  80. + <MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion>
  81. + <MicrosoftAspNetCoreDataProtectionPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreDataProtectionPackageVersion>
  82. + <MicrosoftAspNetCoreDiagnosticsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreDiagnosticsPackageVersion>
  83. + <MicrosoftAspNetCoreHostingPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHostingPackageVersion>
  84. + <MicrosoftAspNetCoreHttpAbstractionsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHttpAbstractionsPackageVersion>
  85. + <MicrosoftAspNetCoreHttpExtensionsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHttpExtensionsPackageVersion>
  86. + <MicrosoftAspNetCoreHttpPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHttpPackageVersion>
  87. + <MicrosoftAspNetCoreRoutingPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreRoutingPackageVersion>
  88. + <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
  89. + <MicrosoftAspNetCoreServerKestrelHttpsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreServerKestrelHttpsPackageVersion>
  90. + <MicrosoftAspNetCoreServerKestrelPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreServerKestrelPackageVersion>
  91. + <MicrosoftAspNetCoreStaticFilesPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreStaticFilesPackageVersion>
  92. + <MicrosoftAspNetCoreTestHostPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreTestHostPackageVersion>
  93. + <MicrosoftAspNetCoreTestingPackageVersion>3.0.0-preview-181113-11</MicrosoftAspNetCoreTestingPackageVersion>
  94. + <MicrosoftExtensionsCachingMemoryPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsCachingMemoryPackageVersion>
  95. + <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
  96. + <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
  97. + <MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsDependencyInjectionPackageVersion>
  98. + <MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
  99. + <MicrosoftExtensionsLoggingAbstractionsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
  100. + <MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingConsolePackageVersion>
  101. + <MicrosoftExtensionsLoggingDebugPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingDebugPackageVersion>
  102. + <MicrosoftExtensionsLoggingPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingPackageVersion>
  103. + <MicrosoftExtensionsOptionsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsOptionsPackageVersion>
  104. + <MicrosoftExtensionsSecurityHelperSourcesPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsSecurityHelperSourcesPackageVersion>
  105. + <MicrosoftExtensionsWebEncodersPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsWebEncodersPackageVersion>
  106. <MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>3.19.8</MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>
  107. <MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>5.3.0</MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>
  108. <MicrosoftIdentityModelProtocolsWsFederationPackageVersion>5.3.0</MicrosoftIdentityModelProtocolsWsFederationPackageVersion>
  109. - <MicrosoftNETCoreApp20PackageVersion>2.0.9</MicrosoftNETCoreApp20PackageVersion>
  110. - <MicrosoftNETCoreApp21PackageVersion>2.1.3</MicrosoftNETCoreApp21PackageVersion>
  111. - <MicrosoftNETCoreApp22PackageVersion>2.2.0-rtm-27105-02</MicrosoftNETCoreApp22PackageVersion>
  112. + <MicrosoftNETCoreAppPackageVersion>3.0.0-preview1-26907-05</MicrosoftNETCoreAppPackageVersion>
  113. <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
  114. <MicrosoftOwinSecurityCookiesPackageVersion>3.0.1</MicrosoftOwinSecurityCookiesPackageVersion>
  115. <MicrosoftOwinSecurityPackageVersion>3.0.1</MicrosoftOwinSecurityPackageVersion>
  116. diff --git a/build/repo.props b/build/repo.props
  117. index 6fc6af601d0..4402da1d0d7 100644
  118. --- a/build/repo.props
  119. +++ b/build/repo.props
  120. @@ -1,9 +1,6 @@
  121. <Project>
  122. <Import Project="dependencies.props" />
  123. - <ItemGroup>
  124. - <ExcludeFromTest Include="$(RepositoryRoot)test\Microsoft.Owin.Security.Interop.Test\*.csproj" Condition="'$(OS)' != 'Windows_NT'" />
  125. - </ItemGroup>
  126. <PropertyGroup>
  127. <!-- These properties are use by the automation that updates dependencies.props -->
  128. <LineupPackageId>Internal.AspNetCore.Universe.Lineup</LineupPackageId>
  129. @@ -11,8 +8,6 @@
  130. </PropertyGroup>
  131. <ItemGroup>
  132. - <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" />
  133. - <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)" />
  134. - <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp22PackageVersion)" />
  135. + <DotNetCoreRuntime Include="$(MicrosoftNETCoreAppPackageVersion)" />
  136. </ItemGroup>
  137. </Project>
  138. diff --git a/korebuild-lock.txt b/korebuild-lock.txt
  139. index 591cfd52ffb..73613543d0a 100644
  140. --- a/korebuild-lock.txt
  141. +++ b/korebuild-lock.txt
  142. @@ -1,2 +1,2 @@
  143. -version:3.0.0-alpha1-20181004.7
  144. -commithash:27fabdaf2b1d4753c3d2749581694ca65d78f7f2
  145. +version:3.0.0-build-20181114.5
  146. +commithash:880e9a204d4ee4a18dfd83c9fb05a192a28bca60
  147. diff --git a/samples/CookiePolicySample/CookiePolicySample.csproj b/samples/CookiePolicySample/CookiePolicySample.csproj
  148. index 48227eb07cf..010edb018e3 100644
  149. --- a/samples/CookiePolicySample/CookiePolicySample.csproj
  150. +++ b/samples/CookiePolicySample/CookiePolicySample.csproj
  151. @@ -1,7 +1,7 @@
  152. <Project Sdk="Microsoft.NET.Sdk.Web">
  153. <PropertyGroup>
  154. - <TargetFrameworks>net461;netcoreapp2.2</TargetFrameworks>
  155. + <TargetFramework>netcoreapp3.0</TargetFramework>
  156. </PropertyGroup>
  157. <ItemGroup>
  158. diff --git a/samples/CookieSample/CookieSample.csproj b/samples/CookieSample/CookieSample.csproj
  159. index 1029f18193d..bc92d68a211 100644
  160. --- a/samples/CookieSample/CookieSample.csproj
  161. +++ b/samples/CookieSample/CookieSample.csproj
  162. @@ -1,7 +1,7 @@
  163. <Project Sdk="Microsoft.NET.Sdk.Web">
  164. <PropertyGroup>
  165. - <TargetFrameworks>net461;netcoreapp2.2</TargetFrameworks>
  166. + <TargetFramework>netcoreapp3.0</TargetFramework>
  167. </PropertyGroup>
  168. <ItemGroup>
  169. diff --git a/samples/CookieSessionSample/CookieSessionSample.csproj b/samples/CookieSessionSample/CookieSessionSample.csproj
  170. index 19bd0437469..6230c98a537 100644
  171. --- a/samples/CookieSessionSample/CookieSessionSample.csproj
  172. +++ b/samples/CookieSessionSample/CookieSessionSample.csproj
  173. @@ -1,7 +1,7 @@
  174. <Project Sdk="Microsoft.NET.Sdk.Web">
  175. <PropertyGroup>
  176. - <TargetFrameworks>net461;netcoreapp2.2</TargetFrameworks>
  177. + <TargetFramework>netcoreapp3.0</TargetFramework>
  178. </PropertyGroup>
  179. <ItemGroup>
  180. diff --git a/samples/JwtBearerSample/JwtBearerSample.csproj b/samples/JwtBearerSample/JwtBearerSample.csproj
  181. index 3e0192a2335..58bf5e2d977 100644
  182. --- a/samples/JwtBearerSample/JwtBearerSample.csproj
  183. +++ b/samples/JwtBearerSample/JwtBearerSample.csproj
  184. @@ -1,7 +1,7 @@
  185. <Project Sdk="Microsoft.NET.Sdk.Web">
  186. <PropertyGroup>
  187. - <TargetFrameworks>net461;netcoreapp2.2</TargetFrameworks>
  188. + <TargetFramework>netcoreapp3.0</TargetFramework>
  189. <UserSecretsId>aspnet5-JwtBearerSample-20151210102827</UserSecretsId>
  190. </PropertyGroup>
  191. diff --git a/samples/OpenIdConnect.AzureAdSample/OpenIdConnect.AzureAdSample.csproj b/samples/OpenIdConnect.AzureAdSample/OpenIdConnect.AzureAdSample.csproj
  192. index 2abd57cd896..61754b60bf8 100644
  193. --- a/samples/OpenIdConnect.AzureAdSample/OpenIdConnect.AzureAdSample.csproj
  194. +++ b/samples/OpenIdConnect.AzureAdSample/OpenIdConnect.AzureAdSample.csproj
  195. @@ -1,7 +1,7 @@
  196. <Project Sdk="Microsoft.NET.Sdk.Web">
  197. <PropertyGroup>
  198. - <TargetFrameworks>net461;netcoreapp2.2</TargetFrameworks>
  199. + <TargetFramework>netcoreapp3.0</TargetFramework>
  200. <UserSecretsId>aspnet5-OpenIdConnectSample-20151210110318</UserSecretsId>
  201. </PropertyGroup>
  202. diff --git a/samples/OpenIdConnectSample/OpenIdConnectSample.csproj b/samples/OpenIdConnectSample/OpenIdConnectSample.csproj
  203. index bb02ef15951..137ee47ba26 100644
  204. --- a/samples/OpenIdConnectSample/OpenIdConnectSample.csproj
  205. +++ b/samples/OpenIdConnectSample/OpenIdConnectSample.csproj
  206. @@ -1,7 +1,7 @@
  207. <Project Sdk="Microsoft.NET.Sdk.Web">
  208. <PropertyGroup>
  209. - <TargetFrameworks>net461;netcoreapp2.2</TargetFrameworks>
  210. + <TargetFramework>netcoreapp3.0</TargetFramework>
  211. <UserSecretsId>aspnet5-OpenIdConnectSample-20151210110318</UserSecretsId>
  212. </PropertyGroup>
  213. diff --git a/samples/SocialSample/SocialSample.csproj b/samples/SocialSample/SocialSample.csproj
  214. index a08b9799d14..e1e2262b0d8 100644
  215. --- a/samples/SocialSample/SocialSample.csproj
  216. +++ b/samples/SocialSample/SocialSample.csproj
  217. @@ -1,7 +1,7 @@
  218. <Project Sdk="Microsoft.NET.Sdk.Web">
  219. <PropertyGroup>
  220. - <TargetFrameworks>net461;netcoreapp2.2</TargetFrameworks>
  221. + <TargetFramework>netcoreapp3.0</TargetFramework>
  222. <UserSecretsId>aspnet5-SocialSample-20151210111056</UserSecretsId>
  223. </PropertyGroup>
  224. diff --git a/samples/WsFedSample/WsFedSample.csproj b/samples/WsFedSample/WsFedSample.csproj
  225. index 4fb38fa3e35..e1191ac811b 100644
  226. --- a/samples/WsFedSample/WsFedSample.csproj
  227. +++ b/samples/WsFedSample/WsFedSample.csproj
  228. @@ -1,7 +1,7 @@
  229. <Project Sdk="Microsoft.NET.Sdk.Web">
  230. <PropertyGroup>
  231. - <TargetFrameworks>net461</TargetFrameworks>
  232. + <TargetFramework>netcoreapp3.0</TargetFramework>
  233. </PropertyGroup>
  234. <ItemGroup>
  235. diff --git a/src/Microsoft.AspNetCore.Authentication.Cookies/Microsoft.AspNetCore.Authentication.Cookies.csproj b/src/Microsoft.AspNetCore.Authentication.Cookies/Microsoft.AspNetCore.Authentication.Cookies.csproj
  236. index b188a58e085..093f60a3dea 100644
  237. --- a/src/Microsoft.AspNetCore.Authentication.Cookies/Microsoft.AspNetCore.Authentication.Cookies.csproj
  238. +++ b/src/Microsoft.AspNetCore.Authentication.Cookies/Microsoft.AspNetCore.Authentication.Cookies.csproj
  239. @@ -2,7 +2,7 @@
  240. <PropertyGroup>
  241. <Description>ASP.NET Core middleware that enables an application to use cookie based authentication.</Description>
  242. - <TargetFramework>netstandard2.0</TargetFramework>
  243. + <TargetFramework>netcoreapp3.0</TargetFramework>
  244. <DefineConstants>$(DefineConstants);SECURITY</DefineConstants>
  245. <NoWarn>$(NoWarn);CS1591</NoWarn>
  246. <GenerateDocumentationFile>true</GenerateDocumentationFile>
  247. diff --git a/src/Microsoft.AspNetCore.Authentication.Facebook/Microsoft.AspNetCore.Authentication.Facebook.csproj b/src/Microsoft.AspNetCore.Authentication.Facebook/Microsoft.AspNetCore.Authentication.Facebook.csproj
  248. index 62aee1367fe..f57fe26e0c8 100644
  249. --- a/src/Microsoft.AspNetCore.Authentication.Facebook/Microsoft.AspNetCore.Authentication.Facebook.csproj
  250. +++ b/src/Microsoft.AspNetCore.Authentication.Facebook/Microsoft.AspNetCore.Authentication.Facebook.csproj
  251. @@ -2,7 +2,7 @@
  252. <PropertyGroup>
  253. <Description>ASP.NET Core middleware that enables an application to support Facebook's OAuth 2.0 authentication workflow.</Description>
  254. - <TargetFramework>netstandard2.0</TargetFramework>
  255. + <TargetFramework>netcoreapp3.0</TargetFramework>
  256. <NoWarn>$(NoWarn);CS1591</NoWarn>
  257. <GenerateDocumentationFile>true</GenerateDocumentationFile>
  258. <PackageTags>aspnetcore;authentication;security</PackageTags>
  259. diff --git a/src/Microsoft.AspNetCore.Authentication.Google/Microsoft.AspNetCore.Authentication.Google.csproj b/src/Microsoft.AspNetCore.Authentication.Google/Microsoft.AspNetCore.Authentication.Google.csproj
  260. index de8867f91ad..eba5b98adfe 100644
  261. --- a/src/Microsoft.AspNetCore.Authentication.Google/Microsoft.AspNetCore.Authentication.Google.csproj
  262. +++ b/src/Microsoft.AspNetCore.Authentication.Google/Microsoft.AspNetCore.Authentication.Google.csproj
  263. @@ -2,7 +2,7 @@
  264. <PropertyGroup>
  265. <Description>ASP.NET Core contains middleware to support Google's OpenId and OAuth 2.0 authentication workflows.</Description>
  266. - <TargetFramework>netstandard2.0</TargetFramework>
  267. + <TargetFramework>netcoreapp3.0</TargetFramework>
  268. <NoWarn>$(NoWarn);CS1591</NoWarn>
  269. <GenerateDocumentationFile>true</GenerateDocumentationFile>
  270. <PackageTags>aspnetcore;authentication;security</PackageTags>
  271. diff --git a/src/Microsoft.AspNetCore.Authentication.JwtBearer/Microsoft.AspNetCore.Authentication.JwtBearer.csproj b/src/Microsoft.AspNetCore.Authentication.JwtBearer/Microsoft.AspNetCore.Authentication.JwtBearer.csproj
  272. index e5bae5a3da2..8a26c58f34d 100644
  273. --- a/src/Microsoft.AspNetCore.Authentication.JwtBearer/Microsoft.AspNetCore.Authentication.JwtBearer.csproj
  274. +++ b/src/Microsoft.AspNetCore.Authentication.JwtBearer/Microsoft.AspNetCore.Authentication.JwtBearer.csproj
  275. @@ -2,7 +2,7 @@
  276. <PropertyGroup>
  277. <Description>ASP.NET Core middleware that enables an application to receive an OpenID Connect bearer token.</Description>
  278. - <TargetFramework>netstandard2.0</TargetFramework>
  279. + <TargetFramework>netcoreapp3.0</TargetFramework>
  280. <NoWarn>$(NoWarn);CS1591</NoWarn>
  281. <GenerateDocumentationFile>true</GenerateDocumentationFile>
  282. <PackageTags>aspnetcore;authentication;security</PackageTags>
  283. diff --git a/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj b/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj
  284. index 0eddc6f7644..1841157c94f 100644
  285. --- a/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj
  286. +++ b/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj
  287. @@ -2,7 +2,7 @@
  288. <PropertyGroup>
  289. <Description>ASP.NET Core middleware that enables an application to support the Microsoft Account authentication workflow.</Description>
  290. - <TargetFramework>netstandard2.0</TargetFramework>
  291. + <TargetFramework>netcoreapp3.0</TargetFramework>
  292. <NoWarn>$(NoWarn);CS1591</NoWarn>
  293. <GenerateDocumentationFile>true</GenerateDocumentationFile>
  294. <PackageTags>aspnetcore;authentication;security</PackageTags>
  295. diff --git a/src/Microsoft.AspNetCore.Authentication.OAuth/Microsoft.AspNetCore.Authentication.OAuth.csproj b/src/Microsoft.AspNetCore.Authentication.OAuth/Microsoft.AspNetCore.Authentication.OAuth.csproj
  296. index 5c8a5e3a960..97d4a970364 100644
  297. --- a/src/Microsoft.AspNetCore.Authentication.OAuth/Microsoft.AspNetCore.Authentication.OAuth.csproj
  298. +++ b/src/Microsoft.AspNetCore.Authentication.OAuth/Microsoft.AspNetCore.Authentication.OAuth.csproj
  299. @@ -2,7 +2,7 @@
  300. <PropertyGroup>
  301. <Description>ASP.NET Core middleware that enables an application to support any standard OAuth 2.0 authentication workflow.</Description>
  302. - <TargetFramework>netstandard2.0</TargetFramework>
  303. + <TargetFramework>netcoreapp3.0</TargetFramework>
  304. <NoWarn>$(NoWarn);CS1591</NoWarn>
  305. <GenerateDocumentationFile>true</GenerateDocumentationFile>
  306. <PackageTags>aspnetcore;authentication;security</PackageTags>
  307. diff --git a/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj b/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj
  308. index b7f4c1704a9..65ca6b84292 100644
  309. --- a/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj
  310. +++ b/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj
  311. @@ -2,7 +2,7 @@
  312. <PropertyGroup>
  313. <Description>ASP.NET Core middleware that enables an application to support the OpenID Connect authentication workflow.</Description>
  314. - <TargetFramework>netstandard2.0</TargetFramework>
  315. + <TargetFramework>netcoreapp3.0</TargetFramework>
  316. <NoWarn>$(NoWarn);CS1591</NoWarn>
  317. <GenerateDocumentationFile>true</GenerateDocumentationFile>
  318. <PackageTags>aspnetcore;authentication;security</PackageTags>
  319. diff --git a/src/Microsoft.AspNetCore.Authentication.Twitter/Microsoft.AspNetCore.Authentication.Twitter.csproj b/src/Microsoft.AspNetCore.Authentication.Twitter/Microsoft.AspNetCore.Authentication.Twitter.csproj
  320. index f720d08f042..4f2aae61687 100644
  321. --- a/src/Microsoft.AspNetCore.Authentication.Twitter/Microsoft.AspNetCore.Authentication.Twitter.csproj
  322. +++ b/src/Microsoft.AspNetCore.Authentication.Twitter/Microsoft.AspNetCore.Authentication.Twitter.csproj
  323. @@ -2,7 +2,7 @@
  324. <PropertyGroup>
  325. <Description>ASP.NET Core middleware that enables an application to support Twitter's OAuth 1.0 authentication workflow.</Description>
  326. - <TargetFramework>netstandard2.0</TargetFramework>
  327. + <TargetFramework>netcoreapp3.0</TargetFramework>
  328. <NoWarn>$(NoWarn);CS1591</NoWarn>
  329. <GenerateDocumentationFile>true</GenerateDocumentationFile>
  330. <PackageTags>aspnetcore;authentication;security</PackageTags>
  331. diff --git a/src/Microsoft.AspNetCore.Authentication.WsFederation/Microsoft.AspNetCore.Authentication.WsFederation.csproj b/src/Microsoft.AspNetCore.Authentication.WsFederation/Microsoft.AspNetCore.Authentication.WsFederation.csproj
  332. index 4edb55cb356..ae4d52aff41 100644
  333. --- a/src/Microsoft.AspNetCore.Authentication.WsFederation/Microsoft.AspNetCore.Authentication.WsFederation.csproj
  334. +++ b/src/Microsoft.AspNetCore.Authentication.WsFederation/Microsoft.AspNetCore.Authentication.WsFederation.csproj
  335. @@ -2,7 +2,7 @@
  336. <PropertyGroup>
  337. <Description>ASP.NET Core middleware that enables an application to support the WsFederation authentication workflow.</Description>
  338. - <TargetFramework>netstandard2.0</TargetFramework>
  339. + <TargetFramework>netcoreapp3.0</TargetFramework>
  340. <GenerateDocumentationFile>true</GenerateDocumentationFile>
  341. <PackageTags>aspnetcore;authentication;security</PackageTags>
  342. </PropertyGroup>
  343. diff --git a/src/Microsoft.AspNetCore.Authentication/Microsoft.AspNetCore.Authentication.csproj b/src/Microsoft.AspNetCore.Authentication/Microsoft.AspNetCore.Authentication.csproj
  344. index 7e3ce4eb39e..9ae0a7bccc4 100644
  345. --- a/src/Microsoft.AspNetCore.Authentication/Microsoft.AspNetCore.Authentication.csproj
  346. +++ b/src/Microsoft.AspNetCore.Authentication/Microsoft.AspNetCore.Authentication.csproj
  347. @@ -2,7 +2,7 @@
  348. <PropertyGroup>
  349. <Description>ASP.NET Core common types used by the various authentication middleware components.</Description>
  350. - <TargetFramework>netstandard2.0</TargetFramework>
  351. + <TargetFramework>netcoreapp3.0</TargetFramework>
  352. <NoWarn>$(NoWarn);CS1591</NoWarn>
  353. <GenerateDocumentationFile>true</GenerateDocumentationFile>
  354. <PackageTags>aspnetcore;authentication;security</PackageTags>
  355. diff --git a/src/Microsoft.AspNetCore.Authorization.Policy/Microsoft.AspNetCore.Authorization.Policy.csproj b/src/Microsoft.AspNetCore.Authorization.Policy/Microsoft.AspNetCore.Authorization.Policy.csproj
  356. index aba88dd50c2..d3ad99a5111 100644
  357. --- a/src/Microsoft.AspNetCore.Authorization.Policy/Microsoft.AspNetCore.Authorization.Policy.csproj
  358. +++ b/src/Microsoft.AspNetCore.Authorization.Policy/Microsoft.AspNetCore.Authorization.Policy.csproj
  359. @@ -2,7 +2,7 @@
  360. <PropertyGroup>
  361. <Description>ASP.NET Core authorization policy helper classes.</Description>
  362. - <TargetFramework>netstandard2.0</TargetFramework>
  363. + <TargetFramework>netcoreapp3.0</TargetFramework>
  364. <NoWarn>$(NoWarn);CS1591;NU1605</NoWarn>
  365. <GenerateDocumentationFile>true</GenerateDocumentationFile>
  366. <PackageTags>aspnetcore;authorization</PackageTags>
  367. diff --git a/src/Microsoft.AspNetCore.Authorization/Microsoft.AspNetCore.Authorization.csproj b/src/Microsoft.AspNetCore.Authorization/Microsoft.AspNetCore.Authorization.csproj
  368. index ac4aa6c320a..9192ac8cfa4 100644
  369. --- a/src/Microsoft.AspNetCore.Authorization/Microsoft.AspNetCore.Authorization.csproj
  370. +++ b/src/Microsoft.AspNetCore.Authorization/Microsoft.AspNetCore.Authorization.csproj
  371. @@ -5,7 +5,7 @@
  372. Commonly used types:
  373. Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute
  374. Microsoft.AspNetCore.Authorization.AuthorizeAttribute</Description>
  375. - <TargetFramework>netstandard2.0</TargetFramework>
  376. + <TargetFramework>netcoreapp3.0</TargetFramework>
  377. <NoWarn>$(NoWarn);CS1591</NoWarn>
  378. <GenerateDocumentationFile>true</GenerateDocumentationFile>
  379. <PackageTags>aspnetcore;authorization</PackageTags>
  380. diff --git a/src/Microsoft.AspNetCore.CookiePolicy/Microsoft.AspNetCore.CookiePolicy.csproj b/src/Microsoft.AspNetCore.CookiePolicy/Microsoft.AspNetCore.CookiePolicy.csproj
  381. index 40f97633aed..81760d50ab0 100644
  382. --- a/src/Microsoft.AspNetCore.CookiePolicy/Microsoft.AspNetCore.CookiePolicy.csproj
  383. +++ b/src/Microsoft.AspNetCore.CookiePolicy/Microsoft.AspNetCore.CookiePolicy.csproj
  384. @@ -2,7 +2,7 @@
  385. <PropertyGroup>
  386. <Description>ASP.NET Core cookie policy classes to control the behavior of cookies.</Description>
  387. - <TargetFramework>netstandard2.0</TargetFramework>
  388. + <TargetFramework>netcoreapp3.0</TargetFramework>
  389. <NoWarn>$(NoWarn);CS1591</NoWarn>
  390. <GenerateDocumentationFile>true</GenerateDocumentationFile>
  391. <PackageTags>aspnetcore</PackageTags>
  392. diff --git a/test/Directory.Build.props b/test/Directory.Build.props
  393. index e3d2d9f1434..c42d54465fa 100644
  394. --- a/test/Directory.Build.props
  395. +++ b/test/Directory.Build.props
  396. @@ -1,13 +1,6 @@
  397. <Project>
  398. <Import Project="..\Directory.Build.props" />
  399. - <PropertyGroup>
  400. - <DeveloperBuildTestTfms>netcoreapp2.2</DeveloperBuildTestTfms>
  401. - <StandardTestTfms>$(DeveloperBuildTestTfms)</StandardTestTfms>
  402. - <StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' ">$(StandardTestTfms)</StandardTestTfms>
  403. - <StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(StandardTestTfms);net461</StandardTestTfms>
  404. - </PropertyGroup>
  405. -
  406. <ItemGroup>
  407. <PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
  408. <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
  409. diff --git a/test/Microsoft.AspNetCore.Authentication.Test/Microsoft.AspNetCore.Authentication.Test.csproj b/test/Microsoft.AspNetCore.Authentication.Test/Microsoft.AspNetCore.Authentication.Test.csproj
  410. index 6c8d518ffa9..c7a38086824 100644
  411. --- a/test/Microsoft.AspNetCore.Authentication.Test/Microsoft.AspNetCore.Authentication.Test.csproj
  412. +++ b/test/Microsoft.AspNetCore.Authentication.Test/Microsoft.AspNetCore.Authentication.Test.csproj
  413. @@ -1,7 +1,7 @@
  414. <Project Sdk="Microsoft.NET.Sdk">
  415. <PropertyGroup>
  416. - <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
  417. + <TargetFramework>netcoreapp3.0</TargetFramework>
  418. </PropertyGroup>
  419. <ItemGroup>
  420. diff --git a/test/Microsoft.AspNetCore.Authorization.Test/Microsoft.AspNetCore.Authorization.Test.csproj b/test/Microsoft.AspNetCore.Authorization.Test/Microsoft.AspNetCore.Authorization.Test.csproj
  421. index 40a8fff1283..9ff42a070c5 100644
  422. --- a/test/Microsoft.AspNetCore.Authorization.Test/Microsoft.AspNetCore.Authorization.Test.csproj
  423. +++ b/test/Microsoft.AspNetCore.Authorization.Test/Microsoft.AspNetCore.Authorization.Test.csproj
  424. @@ -1,7 +1,7 @@
  425. <Project Sdk="Microsoft.NET.Sdk">
  426. <PropertyGroup>
  427. - <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
  428. + <TargetFramework>netcoreapp3.0</TargetFramework>
  429. <NoWarn>$(NoWarn);NU1605</NoWarn>
  430. </PropertyGroup>
  431. diff --git a/test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test.csproj b/test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test.csproj
  432. index 20cd400ce78..2f38abff904 100644
  433. --- a/test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test.csproj
  434. +++ b/test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test.csproj
  435. @@ -1,7 +1,7 @@
  436. <Project Sdk="Microsoft.NET.Sdk">
  437. <PropertyGroup>
  438. - <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
  439. + <TargetFramework>netcoreapp3.0</TargetFramework>
  440. </PropertyGroup>
  441. <ItemGroup>
  442. diff --git a/test/Microsoft.AspNetCore.CookiePolicy.Test/Microsoft.AspNetCore.CookiePolicy.Test.csproj b/test/Microsoft.AspNetCore.CookiePolicy.Test/Microsoft.AspNetCore.CookiePolicy.Test.csproj
  443. index d7a42f3efb6..3dc3df2e227 100644
  444. --- a/test/Microsoft.AspNetCore.CookiePolicy.Test/Microsoft.AspNetCore.CookiePolicy.Test.csproj
  445. +++ b/test/Microsoft.AspNetCore.CookiePolicy.Test/Microsoft.AspNetCore.CookiePolicy.Test.csproj
  446. @@ -1,7 +1,7 @@
  447. <Project Sdk="Microsoft.NET.Sdk">
  448. <PropertyGroup>
  449. - <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
  450. + <TargetFramework>netcoreapp3.0</TargetFramework>
  451. </PropertyGroup>
  452. <ItemGroup>
  453. diff --git a/test/Microsoft.Owin.Security.Interop.Test/CookieInteropTests.cs b/test/Microsoft.Owin.Security.Interop.Test/CookieInteropTests.cs
  454. index e2e4fd7d078..24bf09722c4 100644
  455. --- a/test/Microsoft.Owin.Security.Interop.Test/CookieInteropTests.cs
  456. +++ b/test/Microsoft.Owin.Security.Interop.Test/CookieInteropTests.cs
  457. @@ -1,6 +1,10 @@
  458. // Copyright (c) .NET Foundation. All rights reserved.
  459. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
  460. +/* See https://github.com/aspnet/AspNetCore/issues/4074.
  461. +
  462. +This test is was disabled as a part of changing frameworks. This test will need to be re-written using separate .NET Core and .NET Framework processes.
  463. +
  464. using System.Collections.Generic;
  465. using System.IO;
  466. using System.Linq;
  467. @@ -330,3 +334,4 @@ namespace Microsoft.Owin.Security.Interop
  468. }
  469. }
  470. +*/
  471. diff --git a/test/Microsoft.Owin.Security.Interop.Test/Microsoft.Owin.Security.Interop.Test.csproj b/test/Microsoft.Owin.Security.Interop.Test/Microsoft.Owin.Security.Interop.Test.csproj
  472. index f369f1f01ad..57b224ef68e 100644
  473. --- a/test/Microsoft.Owin.Security.Interop.Test/Microsoft.Owin.Security.Interop.Test.csproj
  474. +++ b/test/Microsoft.Owin.Security.Interop.Test/Microsoft.Owin.Security.Interop.Test.csproj
  475. @@ -2,10 +2,11 @@
  476. <PropertyGroup>
  477. <TargetFramework>net461</TargetFramework>
  478. + <!-- Temporarily disables tests for this project. They need to be refactored now that aspnetcore only supports netcoreapp3.0. -->
  479. + <IsTestProject>false</IsTestProject>
  480. </PropertyGroup>
  481. <ItemGroup>
  482. - <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Cookies\Microsoft.AspNetCore.Authentication.Cookies.csproj" />
  483. <ProjectReference Include="..\..\src\Microsoft.Owin.Security.Interop\Microsoft.Owin.Security.Interop.csproj" />
  484. </ItemGroup>
  485. diff --git a/test/Microsoft.Owin.Security.Interop.Test/TicketInteropTests.cs b/test/Microsoft.Owin.Security.Interop.Test/TicketInteropTests.cs
  486. index 769adc015b3..ccff1e9367f 100644
  487. --- a/test/Microsoft.Owin.Security.Interop.Test/TicketInteropTests.cs
  488. +++ b/test/Microsoft.Owin.Security.Interop.Test/TicketInteropTests.cs
  489. @@ -1,6 +1,8 @@
  490. // Copyright (c) .NET Foundation. All rights reserved.
  491. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
  492. +/*
  493. +
  494. using System;
  495. using System.Linq;
  496. using System.Security.Claims;
  497. @@ -87,5 +89,6 @@ namespace Microsoft.Owin.Security.Interop.Test
  498. }
  499. }
  500. }
  501. +*/