| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251 |
- commit 3c282a4f5af2601166d976261d8b862994694c81
- Author: Nate McMaster <[email protected]>
- Date: Fri Nov 16 15:07:40 2018 -0800
- Update projects and packages to netcoreapp3.0 (aspnet/AADIntegration#55)
- diff --git a/Directory.Build.targets b/Directory.Build.targets
- index 4bcc9df925d..7e3f8df92e4 100644
- --- a/Directory.Build.targets
- +++ b/Directory.Build.targets
- @@ -1,8 +1,6 @@
- <Project>
- <PropertyGroup>
- - <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreApp30PackageVersion)</RuntimeFrameworkVersion>
- + <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion>
- <NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
- - <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
- - <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
- </PropertyGroup>
- </Project>
- diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json
- index adc8b62fce9..66afb69831b 100644
- --- a/NuGetPackageVerifier.json
- +++ b/NuGetPackageVerifier.json
- @@ -7,14 +7,14 @@
- "Microsoft.AspNetCore.Authentication.AzureADB2C.UI": {
- "Exclusions": {
- "DOC_MISSING": {
- - "lib/netstandard2.0/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Views.dll": "This library contains precompiled views."
- + "lib/netcoreapp3.0/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Views.dll": "This library contains precompiled views."
- }
- }
- },
- "Microsoft.AspNetCore.Authentication.AzureAD.UI": {
- "Exclusions": {
- "DOC_MISSING": {
- - "lib/netstandard2.0/Microsoft.AspNetCore.Authentication.AzureAD.UI.Views.dll": "This library contains precompiled views."
- + "lib/netcoreapp3.0/Microsoft.AspNetCore.Authentication.AzureAD.UI.Views.dll": "This library contains precompiled views."
- }
- }
- }
- diff --git a/build/dependencies.props b/build/dependencies.props
- index 6d9528cea4d..95e6001a48f 100644
- --- a/build/dependencies.props
- +++ b/build/dependencies.props
- @@ -3,31 +3,30 @@
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
- <PropertyGroup Label="Package Versions">
- - <InternalAspNetCoreSdkPackageVersion>3.0.0-alpha1-20181031.3</InternalAspNetCoreSdkPackageVersion>
- - <MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>3.0.0-alpha1-10670</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>
- - <MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion>3.0.0-alpha1-10670</MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion>
- - <MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>3.0.0-alpha1-10670</MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>
- - <MicrosoftAspNetCoreAuthorizationPackageVersion>3.0.0-alpha1-10670</MicrosoftAspNetCoreAuthorizationPackageVersion>
- - <MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion>3.0.0-alpha1-10670</MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion>
- - <MicrosoftAspNetCoreHostingPackageVersion>3.0.0-alpha1-10670</MicrosoftAspNetCoreHostingPackageVersion>
- - <MicrosoftAspNetCoreHttpsPolicyPackageVersion>3.0.0-alpha1-10670</MicrosoftAspNetCoreHttpsPolicyPackageVersion>
- - <MicrosoftAspNetCoreMvcPackageVersion>3.0.0-a-alpha1-react-razor-design-19157</MicrosoftAspNetCoreMvcPackageVersion>
- - <MicrosoftAspNetCoreMvcTestingPackageVersion>3.0.0-a-alpha1-react-razor-design-19157</MicrosoftAspNetCoreMvcTestingPackageVersion>
- - <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.2.0-rtm-10670</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
- - <MicrosoftAspNetCoreServerKestrelHttpsPackageVersion>3.0.0-alpha1-10670</MicrosoftAspNetCoreServerKestrelHttpsPackageVersion>
- - <MicrosoftAspNetCoreServerKestrelPackageVersion>3.0.0-alpha1-10670</MicrosoftAspNetCoreServerKestrelPackageVersion>
- - <MicrosoftAspNetCoreStaticFilesPackageVersion>3.0.0-alpha1-10670</MicrosoftAspNetCoreStaticFilesPackageVersion>
- - <MicrosoftExtensionsConfigurationCommandLinePackageVersion>3.0.0-alpha1-10670</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
- - <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.0.0-alpha1-10670</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
- - <MicrosoftExtensionsConfigurationJsonPackageVersion>3.0.0-alpha1-10670</MicrosoftExtensionsConfigurationJsonPackageVersion>
- - <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>3.0.0-alpha1-10670</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
- - <MicrosoftExtensionsLoggingConfigurationPackageVersion>3.0.0-alpha1-10670</MicrosoftExtensionsLoggingConfigurationPackageVersion>
- - <MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-alpha1-10670</MicrosoftExtensionsLoggingConsolePackageVersion>
- - <MicrosoftExtensionsLoggingDebugPackageVersion>3.0.0-alpha1-10670</MicrosoftExtensionsLoggingDebugPackageVersion>
- - <MicrosoftExtensionsLoggingTestingPackageVersion>3.0.0-alpha1-10670</MicrosoftExtensionsLoggingTestingPackageVersion>
- - <MicrosoftNETCoreApp20PackageVersion>2.0.9</MicrosoftNETCoreApp20PackageVersion>
- - <MicrosoftNETCoreApp30PackageVersion>3.0.0-preview1-26907-05</MicrosoftNETCoreApp30PackageVersion>
- - <MicrosoftNETSdkRazorPackageVersion>3.0.0-a-alpha1-sdk-31869</MicrosoftNETSdkRazorPackageVersion>
- + <InternalAspNetCoreSdkPackageVersion>3.0.0-build-20181114.5</InternalAspNetCoreSdkPackageVersion>
- + <MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>
- + <MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion>
- + <MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>
- + <MicrosoftAspNetCoreAuthorizationPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthorizationPackageVersion>
- + <MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion>
- + <MicrosoftAspNetCoreHostingPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHostingPackageVersion>
- + <MicrosoftAspNetCoreHttpsPolicyPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHttpsPolicyPackageVersion>
- + <MicrosoftAspNetCoreMvcPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreMvcPackageVersion>
- + <MicrosoftAspNetCoreMvcTestingPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreMvcTestingPackageVersion>
- + <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
- + <MicrosoftAspNetCoreServerKestrelHttpsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreServerKestrelHttpsPackageVersion>
- + <MicrosoftAspNetCoreServerKestrelPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreServerKestrelPackageVersion>
- + <MicrosoftAspNetCoreStaticFilesPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreStaticFilesPackageVersion>
- + <MicrosoftExtensionsConfigurationCommandLinePackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
- + <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
- + <MicrosoftExtensionsConfigurationJsonPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsConfigurationJsonPackageVersion>
- + <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
- + <MicrosoftExtensionsLoggingConfigurationPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingConfigurationPackageVersion>
- + <MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingConsolePackageVersion>
- + <MicrosoftExtensionsLoggingDebugPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingDebugPackageVersion>
- + <MicrosoftExtensionsLoggingTestingPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingTestingPackageVersion>
- + <MicrosoftNETCoreAppPackageVersion>3.0.0-preview1-26907-05</MicrosoftNETCoreAppPackageVersion>
- + <MicrosoftNETSdkRazorPackageVersion>3.0.0-alpha1-10742</MicrosoftNETSdkRazorPackageVersion>
- <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
- <MoqPackageVersion>4.10.0</MoqPackageVersion>
- <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
- diff --git a/build/repo.props b/build/repo.props
- index e88aa908e59..4402da1d0d7 100644
- --- a/build/repo.props
- +++ b/build/repo.props
- @@ -8,7 +8,6 @@
- </PropertyGroup>
-
- <ItemGroup>
- - <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" />
- - <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp30PackageVersion)" />
- + <DotNetCoreRuntime Include="$(MicrosoftNETCoreAppPackageVersion)" />
- </ItemGroup>
- </Project>
- diff --git a/korebuild-lock.txt b/korebuild-lock.txt
- index 8494b2123ec..73613543d0a 100644
- --- a/korebuild-lock.txt
- +++ b/korebuild-lock.txt
- @@ -1,2 +1,2 @@
- -version:3.0.0-alpha1-20181031.3
- -commithash:93e5628f435045e3f2a766933dc5062048ac0426
- +version:3.0.0-build-20181114.5
- +commithash:880e9a204d4ee4a18dfd83c9fb05a192a28bca60
- diff --git a/samples/AzureADB2CSample/AzureADB2CSample.csproj b/samples/AzureADB2CSample/AzureADB2CSample.csproj
- index 1969732fa4a..1e4e228ccfd 100644
- --- a/samples/AzureADB2CSample/AzureADB2CSample.csproj
- +++ b/samples/AzureADB2CSample/AzureADB2CSample.csproj
- @@ -1,9 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk.Web">
-
- <PropertyGroup>
- - <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
- - <TargetFrameworks Condition=" '$(DeveloperBuild)' != 'true' ">$(TargetFrameworks)</TargetFrameworks>
- - <TargetFrameworks Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461</TargetFrameworks>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- </PropertyGroup>
-
- <PropertyGroup>
- diff --git a/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj b/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj
- index facb8db0ea7..00a3d367492 100644
- --- a/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj
- +++ b/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj
- @@ -3,7 +3,7 @@
- <PropertyGroup>
- <Description>ASP.NET Core Azure Active Directory Integration provides components for easily integrating Azure Active Directory authentication within your ASP.NET Core application.</Description>
- <RazorAssemblyDescription>Precompiled views assembly for the ASP.NET Core Azure Active Directory Integration package.</RazorAssemblyDescription>
- - <TargetFramework>netstandard2.0</TargetFramework>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- <PackageTags>aspnetcore;authentication;AzureAD</PackageTags>
- <GenerateDocumentationFile>true</GenerateDocumentationFile>
- <ProvideApplicationPartFactoryAttributeTypeName>Microsoft.AspNetCore.Mvc.ApplicationParts.NullApplicationPartFactory, Microsoft.AspNetCore.Mvc.Core</ProvideApplicationPartFactoryAttributeTypeName>
- diff --git a/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj b/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj
- index dd530e5e877..c1f77ce905d 100644
- --- a/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj
- +++ b/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj
- @@ -3,7 +3,7 @@
- <PropertyGroup>
- <Description>ASP.NET Core Azure Active Directory B2C Integration provides components for easily integrating Azure Active Directory B2C authentication within your ASP.NET Core application.</Description>
- <RazorAssemblyDescription>Precompiled views assembly for the ASP.NET Core Azure Active Directory B2C Integration package.</RazorAssemblyDescription>
- - <TargetFramework>netstandard2.0</TargetFramework>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- <PackageTags>aspnetcore;authentication;AzureADB2C</PackageTags>
- <GenerateDocumentationFile>true</GenerateDocumentationFile>
- <ProvideApplicationPartFactoryAttributeTypeName>Microsoft.AspNetCore.Mvc.ApplicationParts.NullApplicationPartFactory, Microsoft.AspNetCore.Mvc.Core</ProvideApplicationPartFactoryAttributeTypeName>
- diff --git a/test/Directory.Build.props b/test/Directory.Build.props
- index 8d36c0bf281..35b63d60ae7 100644
- --- a/test/Directory.Build.props
- +++ b/test/Directory.Build.props
- @@ -1,13 +1,6 @@
- <Project>
- <Import Project="..\Directory.Build.props" />
-
- - <PropertyGroup>
- - <DeveloperBuildTestTfms>netcoreapp3.0</DeveloperBuildTestTfms>
- - <StandardTestTfms>$(DeveloperBuildTestTfms)</StandardTestTfms>
- -
- - <StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(StandardTestTfms);net461</StandardTestTfms>
- - </PropertyGroup>
- -
- <PropertyGroup>
- <IsPackable>false</IsPackable>
- <WarningsNotAsErrors>xUnit1026:$(WarningsNotAsErrors)</WarningsNotAsErrors>
- diff --git a/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj
- index e0d1023e9ea..be07303a4c2 100644
- --- a/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj
- +++ b/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj
- @@ -1,8 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- - <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
- - <PlatformTarget Condition=" '$(TargetFramework)' == 'netcoreapp3.0' "></PlatformTarget>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- </PropertyGroup>
-
- <ItemGroup>
- diff --git a/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj b/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj
- index 4daafb39ac3..554232c8a4b 100644
- --- a/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj
- +++ b/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj
- @@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- - <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- <RootNamespace>Microsoft.AspNetCore.Authentication.AzureAD.UI</RootNamespace>
- </PropertyGroup>
-
- diff --git a/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj b/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj
- index a838fc27035..7becca1b5e9 100644
- --- a/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj
- +++ b/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj
- @@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- - <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- <RootNamespace>Microsoft.AspNetCore.Authentication.AzureADB2C.UI</RootNamespace>
- </PropertyGroup>
-
- diff --git a/test/WebSites/AzureAD.WebSite/AzureAD.WebSite.csproj b/test/WebSites/AzureAD.WebSite/AzureAD.WebSite.csproj
- index 4dac5569415..b23f727ae39 100644
- --- a/test/WebSites/AzureAD.WebSite/AzureAD.WebSite.csproj
- +++ b/test/WebSites/AzureAD.WebSite/AzureAD.WebSite.csproj
- @@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk.Web">
-
- <PropertyGroup>
- - <TargetFrameworks>$(StandardTestWebsiteTfms)</TargetFrameworks>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- </PropertyGroup>
-
- <ItemGroup>
- diff --git a/test/WebSites/Directory.Build.props b/test/WebSites/Directory.Build.props
- index 29cbcb75445..c8a4ec44406 100644
- --- a/test/WebSites/Directory.Build.props
- +++ b/test/WebSites/Directory.Build.props
- @@ -1,11 +1,4 @@
- <Project>
- <!-- Skip the parent directory so test websites do not get the test package references. -->
- <Import Project="..\..\Directory.Build.props" />
- -
- - <PropertyGroup>
- - <DeveloperBuildTestWebsiteTfms>netcoreapp3.0</DeveloperBuildTestWebsiteTfms>
- - <StandardTestWebsiteTfms>$(DeveloperBuildTestWebsiteTfms)</StandardTestWebsiteTfms>
- - <StandardTestWebsiteTfms Condition=" '$(DeveloperBuild)' != 'true' ">$(StandardTestWebsiteTfms)</StandardTestWebsiteTfms>
- - <StandardTestWebsiteTfms Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(StandardTestWebsiteTfms);net461</StandardTestWebsiteTfms>
- - </PropertyGroup>
- </Project>
|