From 7f7723bdf254ae3b85df50fbb34b1279b1b6db7d Mon Sep 17 00:00:00 2001 From: Nate McMaster <natemcmaster@users.noreply.github.com> Date: Mon, 14 Jan 2019 12:01:31 -0800 Subject: [PATCH] Consume dependencies updates automatically via darc (#6676) This refactors the list of dependency versions to support consuming updates automatically via darc and maestro. --- .gitignore | 1 + Directory.Build.targets | 3 +- build/dependencies.folderbuilds.props | 7 - build/dependencies.props | 226 ----------- build/external-dependencies.props | 164 +------- build/repo.targets | 5 - build/tasks/RepoTasks.csproj | 4 +- eng/Dependencies.props | 20 +- eng/Version.Details.xml | 367 ++++++++++++++++++ eng/Versions.props | 177 ++++++++- src/AuthSamples/build/dependencies.props | 25 +- src/Framework/Directory.Build.props | 12 +- .../benchmarkapps/BasicApi/BasicApi.csproj | 12 +- .../BasicViews/BasicViews.csproj | 12 +- .../GetDocumentInsider.csproj | 3 +- ...kwardsCompatibility.FunctionalTests.csproj | 5 +- .../InProcessWebSite.csproj | 6 +- .../LoggingAggregate/build/dependencies.props | 2 +- src/Templating/Directory.Build.targets | 2 +- src/Templating/build/dependencies.props | 3 +- src/Templating/build/repo.props | 2 +- ...crosoft.DotNet.Web.ProjectTemplates.csproj | 2 +- 22 files changed, 593 insertions(+), 467 deletions(-) delete mode 100644 build/dependencies.folderbuilds.props delete mode 100644 build/dependencies.props create mode 100644 eng/Version.Details.xml diff --git a/.gitignore b/.gitignore index 529b82739e5..469825be569 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ BenchmarkDotNet.Artifacts/ korebuild-lock.txt .gradle/ src/SignalR/clients/**/dist/ +modules/ diff --git a/Directory.Build.targets b/Directory.Build.targets index c8927ff3fb0..de6e19d8e21 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -61,8 +61,7 @@ <IsPackable Condition="'$(IsPackable)' == '' AND '$(IsImplementationProject)' == 'true' ">true</IsPackable> <IsPackable Condition="'$(IsPackable)' == '' ">false</IsPackable> - <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreApp30PackageVersion)</RuntimeFrameworkVersion> - <NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion> + <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion> </PropertyGroup> <Import Project="eng\targets\ResolveIisReferences.targets" Condition=" '$(MSBuildProjectExtension)' != '.vcxproj' " /> diff --git a/build/dependencies.folderbuilds.props b/build/dependencies.folderbuilds.props deleted file mode 100644 index 232b7ab42a9..00000000000 --- a/build/dependencies.folderbuilds.props +++ /dev/null @@ -1,7 +0,0 @@ -<!-- This file is temporary while we rework dependencies management. It is used when building individual folders as if they were repos. --> -<Project> - <PropertyGroup> - <InternalAspNetCoreSdkPackageVersion Condition="'$(InternalAspNetCoreSdkPackageVersion)' == ''">3.0.0-build-20181214.1</InternalAspNetCoreSdkPackageVersion> - <MicrosoftAspNetCoreAuthenticationCorePackageVersion>3.0.0-preview-18606-0098</MicrosoftAspNetCoreAuthenticationCorePackageVersion> - </PropertyGroup> -</Project> diff --git a/build/dependencies.props b/build/dependencies.props deleted file mode 100644 index 51176ee3b51..00000000000 --- a/build/dependencies.props +++ /dev/null @@ -1,226 +0,0 @@ -<Project> - <PropertyGroup Label="Package Versions: .NET Core dependencies"> - - <!-- Packages from dotnet/core-setup --> - <MicrosoftExtensionsDependencyModelPackageVersion>3.0.0-preview-27219-3</MicrosoftExtensionsDependencyModelPackageVersion> - <MicrosoftNETCoreAppPackageVersion>3.0.0-preview-27219-3</MicrosoftNETCoreAppPackageVersion> - <MicrosoftNETCoreDotNetAppHostPackageVersion>3.0.0-preview-27219-3</MicrosoftNETCoreDotNetAppHostPackageVersion> - <MicrosoftDotNetPlatformAbstractionsPackageVersion>3.0.0-preview-27219-3</MicrosoftDotNetPlatformAbstractionsPackageVersion> - <MicrosoftNETCoreApp30PackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreApp30PackageVersion> - - <!-- Packages from dotnet/corefx --> - <MicrosoftCSharpPackageVersion>4.6.0-preview.18619.1</MicrosoftCSharpPackageVersion> - <MicrosoftWin32RegistryPackageVersion>4.6.0-preview.18619.1</MicrosoftWin32RegistryPackageVersion> - <SystemCollectionsImmutablePackageVersion>1.6.0-preview.18619.1</SystemCollectionsImmutablePackageVersion> - <SystemComponentModelAnnotationsPackageVersion>4.6.0-preview.18619.1</SystemComponentModelAnnotationsPackageVersion> - <SystemDataSqlClientPackageVersion>4.7.0-preview.18619.1</SystemDataSqlClientPackageVersion> - <SystemDiagnosticsDiagnosticSourcePackageVersion>4.6.0-preview.18619.1</SystemDiagnosticsDiagnosticSourcePackageVersion> - <SystemDiagnosticsEventLogPackageVersion>4.6.0-preview.18619.1</SystemDiagnosticsEventLogPackageVersion> - <SystemIOPipelinesPackageVersion>4.6.0-preview.18619.1</SystemIOPipelinesPackageVersion> - <SystemMemoryPackageVersion>4.5.2</SystemMemoryPackageVersion> - <SystemNetHttpWinHttpHandlerPackageVersion>4.6.0-preview.18619.1</SystemNetHttpWinHttpHandlerPackageVersion> - <SystemNetWebSocketsWebSocketProtocolPackageVersion>4.6.0-preview.18619.1</SystemNetWebSocketsWebSocketProtocolPackageVersion> - <SystemNumericsVectorsPackageVersion>4.6.0-preview.18619.1</SystemNumericsVectorsPackageVersion> - <SystemReflectionMetadataPackageVersion>1.7.0-preview.18619.1</SystemReflectionMetadataPackageVersion> - <SystemRuntimeCompilerServicesUnsafePackageVersion>4.6.0-preview.18619.1</SystemRuntimeCompilerServicesUnsafePackageVersion> - <SystemSecurityCryptographyCngPackageVersion>4.6.0-preview.18619.1</SystemSecurityCryptographyCngPackageVersion> - <SystemSecurityCryptographyPkcsPackageVersion>4.6.0-preview.18619.1</SystemSecurityCryptographyPkcsPackageVersion> - <SystemSecurityCryptographyXmlPackageVersion>4.6.0-preview.18619.1</SystemSecurityCryptographyXmlPackageVersion> - <SystemSecurityPermissionsPackageVersion>4.6.0-preview.18619.1</SystemSecurityPermissionsPackageVersion> - <SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview.18619.1</SystemSecurityPrincipalWindowsPackageVersion> - <SystemServiceProcessServiceControllerPackageVersion>4.6.0-preview.18619.1</SystemServiceProcessServiceControllerPackageVersion> - <SystemTextEncodingCodePagesPackageVersion>4.6.0-preview.18619.1</SystemTextEncodingCodePagesPackageVersion> - <SystemTextEncodingsWebPackageVersion>4.6.0-preview.18619.1</SystemTextEncodingsWebPackageVersion> - <SystemThreadingChannelsPackageVersion>4.6.0-preview.18619.1</SystemThreadingChannelsPackageVersion> - <SystemThreadingTasksDataflowPackageVersion>4.10.0-preview.18619.1</SystemThreadingTasksDataflowPackageVersion> - <SystemThreadingTasksExtensionsPackageVersion>4.6.0-preview.18619.1</SystemThreadingTasksExtensionsPackageVersion> - - <!-- Packages from aspnet/Extensions --> - <InternalAspNetCoreAnalyzersPackageVersion>3.0.0-preview.19059.4</InternalAspNetCoreAnalyzersPackageVersion> - <MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.0.0-preview.19059.4</MicrosoftAspNetCoreAnalyzerTestingPackageVersion> - <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.0.0-preview.19059.4</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion> - <MicrosoftAspNetCoreTestingPackageVersion>3.0.0-preview.19059.4</MicrosoftAspNetCoreTestingPackageVersion> - <MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion> - <MicrosoftExtensionsCachingAbstractionsPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsCachingAbstractionsPackageVersion> - <MicrosoftExtensionsCachingMemoryPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsCachingMemoryPackageVersion> - <MicrosoftExtensionsCachingSqlServerPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsCachingSqlServerPackageVersion> - <MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsCachingStackExchangeRedisPackageVersion> - <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion> - <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsConfigurationAbstractionsPackageVersion> - <MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion> - <MicrosoftExtensionsConfigurationBinderPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsConfigurationBinderPackageVersion> - <MicrosoftExtensionsConfigurationCommandLinePackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsConfigurationCommandLinePackageVersion> - <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion> - <MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion> - <MicrosoftExtensionsConfigurationIniPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsConfigurationIniPackageVersion> - <MicrosoftExtensionsConfigurationJsonPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsConfigurationJsonPackageVersion> - <MicrosoftExtensionsConfigurationKeyPerFilePackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsConfigurationKeyPerFilePackageVersion> - <MicrosoftExtensionsConfigurationPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsConfigurationPackageVersion> - <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsConfigurationUserSecretsPackageVersion> - <MicrosoftExtensionsConfigurationXmlPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsConfigurationXmlPackageVersion> - <MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion> - <MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsDependencyInjectionPackageVersion> - <MicrosoftExtensionsDependencyInjectionSpecificationTestsPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsDependencyInjectionSpecificationTestsPackageVersion> - <MicrosoftExtensionsDiagnosticAdapterPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsDiagnosticAdapterPackageVersion> - <MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsPackageVersion> - <MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion> - <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion> - <MicrosoftExtensionsFileProvidersCompositePackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsFileProvidersCompositePackageVersion> - <MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion> - <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsFileProvidersPhysicalPackageVersion> - <MicrosoftExtensionsFileSystemGlobbingPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsFileSystemGlobbingPackageVersion> - <MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion> - <MicrosoftExtensionsHostingAbstractionsPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsHostingAbstractionsPackageVersion> - <MicrosoftExtensionsHostingPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsHostingPackageVersion> - <MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion> - <MicrosoftExtensionsHttpPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsHttpPackageVersion> - <MicrosoftExtensionsLocalizationAbstractionsPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsLocalizationAbstractionsPackageVersion> - <MicrosoftExtensionsLocalizationPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsLocalizationPackageVersion> - <MicrosoftExtensionsLoggingAbstractionsPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsLoggingAbstractionsPackageVersion> - <MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsLoggingAzureAppServicesPackageVersion> - <MicrosoftExtensionsLoggingConfigurationPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsLoggingConfigurationPackageVersion> - <MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsLoggingConsolePackageVersion> - <MicrosoftExtensionsLoggingDebugPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsLoggingDebugPackageVersion> - <MicrosoftExtensionsLoggingEventSourcePackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsLoggingEventSourcePackageVersion> - <MicrosoftExtensionsLoggingPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsLoggingPackageVersion> - <MicrosoftExtensionsLoggingTestingPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsLoggingTestingPackageVersion> - <MicrosoftExtensionsLoggingTraceSourcePackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsLoggingTraceSourcePackageVersion> - <MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion> - <MicrosoftExtensionsObjectPoolPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsObjectPoolPackageVersion> - <MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion> - <MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion> - <MicrosoftExtensionsOptionsPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsOptionsPackageVersion> - <MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion> - <MicrosoftExtensionsPrimitivesPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsPrimitivesPackageVersion> - <MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsTypeNameHelperSourcesPackageVersion> - <MicrosoftExtensionsValueStopwatchSourcesPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsValueStopwatchSourcesPackageVersion> - <MicrosoftExtensionsWebEncodersPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsWebEncodersPackageVersion> - - - <!-- Packages from aspnet/EntityFrameworkCore --> - <MicrosoftEntityFrameworkCoreAbstractionsPackageVersion>3.0.0-preview.18604.3</MicrosoftEntityFrameworkCoreAbstractionsPackageVersion> - <MicrosoftEntityFrameworkCoreAnalyzersPackageVersion>3.0.0-preview.18604.3</MicrosoftEntityFrameworkCoreAnalyzersPackageVersion> - <MicrosoftEntityFrameworkCoreDesignPackageVersion>3.0.0-preview.18604.3</MicrosoftEntityFrameworkCoreDesignPackageVersion> - <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>3.0.0-preview.18604.3</MicrosoftEntityFrameworkCoreInMemoryPackageVersion> - <MicrosoftEntityFrameworkCoreRelationalPackageVersion>3.0.0-preview.18604.3</MicrosoftEntityFrameworkCoreRelationalPackageVersion> - <MicrosoftEntityFrameworkCoreSqlitePackageVersion>3.0.0-preview.18604.3</MicrosoftEntityFrameworkCoreSqlitePackageVersion> - <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>3.0.0-preview.18604.3</MicrosoftEntityFrameworkCoreSqlServerPackageVersion> - <MicrosoftEntityFrameworkCoreToolsPackageVersion>3.0.0-preview.18604.3</MicrosoftEntityFrameworkCoreToolsPackageVersion> - <MicrosoftEntityFrameworkCorePackageVersion>3.0.0-preview.18604.3</MicrosoftEntityFrameworkCorePackageVersion> - - <!-- Packages from aspnet/AspNetCore-Tooling --> - <MicrosoftNETSdkRazorPackageVersion>3.0.0-preview-19057-06</MicrosoftNETSdkRazorPackageVersion> - </PropertyGroup> - - <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " /> - <Import Project="dependencies.folderbuilds.props" Condition=" '$(IsUniverseBuild)' != 'true' AND '$(DotNetPackageVersionPropsPath)' == ''" /> - - <PropertyGroup> - <!-- Determined by build tools --> - <InternalAspNetCoreSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSdkPackageVersion> - <InternalAspNetCoreSiteExtensionSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSiteExtensionSdkPackageVersion> - <InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">3.0.0-build-20190110.4</InternalAspNetCoreSdkPackageVersion> - </PropertyGroup> - - <!-- These are package versions that should not be overridden or updated by automation. --> - <PropertyGroup Label="Package Versions: Pinned"> - <!-- 3rd party dependencies --> - <AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion> - <BenchmarkDotNetPackageVersion>0.10.13</BenchmarkDotNetPackageVersion> - - <!-- - BenchmarksOnly* package versions come from NuGet.org and are intended only for use in benchmarks apps where EF - is not otherwise referenced. They avoid unnecessary changes to the Universe build graph or to product - dependencies. Do not use these properties elsewhere. - --> - <BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion>2.1.1</BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion> - <BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlitePackageVersion>2.1.1</BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlitePackageVersion> - <BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.1.1</BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlServerPackageVersion> - <BenchmarksOnlyMySqlConnectorPackageVersion>0.43.0</BenchmarksOnlyMySqlConnectorPackageVersion> - <BenchmarksOnlyNpgsqlEntityFrameworkCorePostgreSQLPackageVersion>2.1.1.1</BenchmarksOnlyNpgsqlEntityFrameworkCorePostgreSQLPackageVersion> - <BenchmarksOnlyPomeloEntityFrameworkCoreMySqlPackageVersion>2.1.1</BenchmarksOnlyPomeloEntityFrameworkCoreMySqlPackageVersion> - - <CastleCorePackageVersion>4.2.1</CastleCorePackageVersion> - <DevDependency_MicrosoftExtensionsDependencyModelPackageVersion>2.1.0</DevDependency_MicrosoftExtensionsDependencyModelPackageVersion> - <DevDependency_WindowsAzureStoragePackageVersion>8.7.0</DevDependency_WindowsAzureStoragePackageVersion> - <FSharpCorePackageVersion>4.2.1</FSharpCorePackageVersion> - <IdentityServer4AspNetIdentityPackageVersion>2.3.0</IdentityServer4AspNetIdentityPackageVersion> - <IdentityServer4EntityFrameworkPackageVersion>2.3.0</IdentityServer4EntityFrameworkPackageVersion> - <IdentityServer4PackageVersion>2.3.0</IdentityServer4PackageVersion> - <GoogleProtobufPackageVersion>3.1.0</GoogleProtobufPackageVersion> - <LibuvPackageVersion>1.10.0</LibuvPackageVersion> - <MessagePackPackageVersion>1.7.3.4</MessagePackPackageVersion> - <MicrosoftApplicationInsightsAspNetCorePackageVersion>2.1.1</MicrosoftApplicationInsightsAspNetCorePackageVersion> - <MicrosoftAspNetCoreAspNetCoreModuleStablePackageVersion>2.2.0</MicrosoftAspNetCoreAspNetCoreModuleStablePackageVersion> - <MicrosoftAspNetCoreAspNetCoreModuleV2StablePackageVersion>2.2.0</MicrosoftAspNetCoreAspNetCoreModuleV2StablePackageVersion> - <MicrosoftAspNetCoreHostingAbstractions20PackageVersion>2.0.0</MicrosoftAspNetCoreHostingAbstractions20PackageVersion> - <MicrosoftAspNetIdentityEntityFrameworkPackageVersion>2.2.1</MicrosoftAspNetIdentityEntityFrameworkPackageVersion> - <MicrosoftAspNetCoreServerIISStablePackageVersion>2.2.0</MicrosoftAspNetCoreServerIISStablePackageVersion> - <MicrosoftAspNetWebApiClientPackageVersion>5.2.6</MicrosoftAspNetWebApiClientPackageVersion> - <MicrosoftAzureKeyVaultPackageVersion>2.3.2</MicrosoftAzureKeyVaultPackageVersion> - <MicrosoftAzureManagementFluentPackageVersion>1.1.3</MicrosoftAzureManagementFluentPackageVersion> - <MicrosoftAzureServicesAppAuthenticationPackageVersion>1.0.3</MicrosoftAzureServicesAppAuthenticationPackageVersion> - <MicrosoftBuildFrameworkPackageVersion>15.8.166</MicrosoftBuildFrameworkPackageVersion> - <MicrosoftBuildPackageVersion>15.8.166</MicrosoftBuildPackageVersion> - <MicrosoftBuildRuntimePackageVersion>15.8.166</MicrosoftBuildRuntimePackageVersion> - <MicrosoftBuildTasksCorePackageVersion>15.8.166</MicrosoftBuildTasksCorePackageVersion> - <MicrosoftBuildUtilitiesCorePackageVersion>15.8.166</MicrosoftBuildUtilitiesCorePackageVersion> - <MicrosoftCodeAnalysisCommonPackageVersion>2.8.0</MicrosoftCodeAnalysisCommonPackageVersion> - <MicrosoftCodeAnalysisCSharpPackageVersion>2.8.0</MicrosoftCodeAnalysisCSharpPackageVersion> - <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>2.8.0</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion> - <MicrosoftDiaSymReaderNativePackageVersion>1.7.0</MicrosoftDiaSymReaderNativePackageVersion> - <MicrosoftDotNetProjectModelPackageVersion>1.0.0-rc3-003121</MicrosoftDotNetProjectModelPackageVersion> - <MicrosoftExtensionsPlatformAbstractionsPackageVersion>1.1.0</MicrosoftExtensionsPlatformAbstractionsPackageVersion> - <MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>3.19.8</MicrosoftIdentityModelClientsActiveDirectoryPackageVersion> - <MicrosoftIdentityModelJsonWebTokensPackageVersion>5.3.0</MicrosoftIdentityModelJsonWebTokensPackageVersion> - <MicrosoftIdentityModelLoggingPackageVersion>5.3.0</MicrosoftIdentityModelLoggingPackageVersion> - <MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>5.3.0</MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion> - <MicrosoftIdentityModelProtocolsPackageVersion>5.3.0</MicrosoftIdentityModelProtocolsPackageVersion> - <MicrosoftIdentityModelProtocolsWsFederationPackageVersion>5.3.0</MicrosoftIdentityModelProtocolsWsFederationPackageVersion> - <MicrosoftIdentityModelTokensPackageVersion>5.3.0</MicrosoftIdentityModelTokensPackageVersion> - <MicrosoftInternalAspNetCoreH2SpecAllPackageVersion>2.1.1</MicrosoftInternalAspNetCoreH2SpecAllPackageVersion> - <MicrosoftNETCoreWindowsApiSetsPackageVersion>1.0.1</MicrosoftNETCoreWindowsApiSetsPackageVersion> - <MicrosoftNETFrameworkReferenceAssembliesPackageVersion>1.0.0-alpha-004</MicrosoftNETFrameworkReferenceAssembliesPackageVersion> - <MicrosoftNETTestSdkPackageVersion>15.9.0</MicrosoftNETTestSdkPackageVersion> - <MicrosoftOwinSecurityCookiesPackageVersion>3.0.1</MicrosoftOwinSecurityCookiesPackageVersion> - <MicrosoftOwinSecurityPackageVersion>3.0.1</MicrosoftOwinSecurityPackageVersion> - <MicrosoftOwinTestingPackageVersion>3.0.1</MicrosoftOwinTestingPackageVersion> - <MicrosoftWebAdministrationPackageVersion>11.1.0</MicrosoftWebAdministrationPackageVersion> - <MicrosoftWebXdtPackageVersion>1.4.0</MicrosoftWebXdtPackageVersion> - <MonoAddinsPackageVersion>1.3.8</MonoAddinsPackageVersion> - <MonoDevelopSdkPackageVersion>1.0.1</MonoDevelopSdkPackageVersion> - <MoqPackageVersion>4.10.0</MoqPackageVersion> - <NETStandard16PackageVersion>1.6.1</NETStandard16PackageVersion> - <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion> - <NewtonsoftJsonBsonPackageVersion>1.0.2</NewtonsoftJsonBsonPackageVersion> - <NewtonsoftJsonPackageVersion>12.0.1</NewtonsoftJsonPackageVersion> - <SeleniumFirefoxWebDriverPackageVersion>0.20.0</SeleniumFirefoxWebDriverPackageVersion> - <SeleniumSupportPackageVersion>3.12.1</SeleniumSupportPackageVersion> - <SeleniumWebDriverChromeDriverPackageVersion>2.43.0</SeleniumWebDriverChromeDriverPackageVersion> - <SeleniumWebDriverMicrosoftDriverPackageVersion>17.17134.0</SeleniumWebDriverMicrosoftDriverPackageVersion> - <SeleniumWebDriverPackageVersion>3.12.1</SeleniumWebDriverPackageVersion> - <SerilogExtensionsLoggingPackageVersion>1.4.0</SerilogExtensionsLoggingPackageVersion> - <SerilogSinksFilePackageVersion>4.0.0</SerilogSinksFilePackageVersion> - <StackExchangeRedisPackageVersion>2.0.513</StackExchangeRedisPackageVersion> - <StreamJsonRpcPackageVersion>1.3.23</StreamJsonRpcPackageVersion> - <StyleCopAnalyzersPackageVersion>1.0.0</StyleCopAnalyzersPackageVersion> - <SystemBuffersPackageVersion>4.5.0</SystemBuffersPackageVersion> - <SystemIdentityModelTokensJwtPackageVersion>5.3.0</SystemIdentityModelTokensJwtPackageVersion> - <SystemNetHttpPackageVersion>4.3.2</SystemNetHttpPackageVersion> - <SystemReactiveLinqPackageVersion>3.1.1</SystemReactiveLinqPackageVersion> - <SystemReflectionEmitPackageVersion>4.3.0</SystemReflectionEmitPackageVersion> - <SystemRuntimeInteropServicesRuntimeInformationPackageVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationPackageVersion> - <SystemValueTuplePackageVersion>4.5.0</SystemValueTuplePackageVersion> - <Utf8JsonPackageVersion>1.3.7</Utf8JsonPackageVersion> - <VisualStudio_NewtonsoftJsonPackageVersion>9.0.1</VisualStudio_NewtonsoftJsonPackageVersion> - <WindowsAzureStoragePackageVersion>8.1.4</WindowsAzureStoragePackageVersion> - <XunitAbstractionsPackageVersion>2.0.1</XunitAbstractionsPackageVersion> - <XunitAnalyzersPackageVersion>0.10.0</XunitAnalyzersPackageVersion> - <XunitAssertPackageVersion>2.3.1</XunitAssertPackageVersion> - <XunitCorePackageVersion>2.3.1</XunitCorePackageVersion> - <XunitExtensibilityCorePackageVersion>2.3.1</XunitExtensibilityCorePackageVersion> - <XunitExtensibilityExecutionPackageVersion>2.3.1</XunitExtensibilityExecutionPackageVersion> - <XunitPackageVersion>2.4.0</XunitPackageVersion> - <XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion> - </PropertyGroup> -</Project> diff --git a/build/external-dependencies.props b/build/external-dependencies.props index 499c5a029b9..494ba861dbc 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -1,5 +1,5 @@ <Project> - <Import Project="dependencies.props" /> + <Import Project="..\eng\Versions.props" /> <ItemDefinitionGroup> <ExternalDependency> @@ -10,27 +10,14 @@ <ItemGroup> <!-- Packages from aspnet/Extensions --> - <ExternalDependency Include="Internal.AspNetCore.Analyzers" Version="$(InternalAspNetCoreAnalyzersPackageVersion)" /> - <ExternalDependency Include="Microsoft.AspNetCore.Analyzer.Testing" Version="$(MicrosoftAspNetCoreAnalyzerTestingPackageVersion)" /> <ExternalDependency Include="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="$(MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion)" /> <ExternalDependency Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.ActivatorUtilities.Sources" Version="$(MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.Caching.Abstractions" Version="$(MicrosoftExtensionsCachingAbstractionsPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.Caching.SqlServer" Version="$(MicrosoftExtensionsCachingSqlServerPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="$(MicrosoftExtensionsCachingStackExchangeRedisPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.Configuration.Binder" Version="$(MicrosoftExtensionsConfigurationBinderPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MicrosoftExtensionsConfigurationFileExtensionsPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.Configuration.Ini" Version="$(MicrosoftExtensionsConfigurationIniPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.Configuration.KeyPerFile" Version="$(MicrosoftExtensionsConfigurationKeyPerFilePackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(MicrosoftExtensionsConfigurationUserSecretsPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.Configuration.Xml" Version="$(MicrosoftExtensionsConfigurationXmlPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="$(MicrosoftExtensionsDependencyInjectionSpecificationTestsPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" /> @@ -38,177 +25,36 @@ <ExternalDependency Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="$(MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="$(MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.FileProviders.Abstractions" Version="$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.FileProviders.Composite" Version="$(MicrosoftExtensionsFileProvidersCompositePackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.FileProviders.Physical" Version="$(MicrosoftExtensionsFileProvidersPhysicalPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.HashCodeCombiner.Sources" Version="$(MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(MicrosoftExtensionsHostingAbstractionsPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsHostingPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsHttpPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.Localization.Abstractions" Version="$(MicrosoftExtensionsLocalizationAbstractionsPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.Localization" Version="$(MicrosoftExtensionsLocalizationPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.Logging.AzureAppServices" Version="$(MicrosoftExtensionsLoggingAzureAppServicesPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.Logging.Configuration" Version="$(MicrosoftExtensionsLoggingConfigurationPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.Logging.EventSource" Version="$(MicrosoftExtensionsLoggingEventSourcePackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.Logging.TraceSource" Version="$(MicrosoftExtensionsLoggingTraceSourcePackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.NonCapturingTimer.Sources" Version="$(MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.Options.DataAnnotations" Version="$(MicrosoftExtensionsOptionsDataAnnotationsPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.ParameterDefaultValue.Sources" Version="$(MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.Primitives" Version="$(MicrosoftExtensionsPrimitivesPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.TypeNameHelper.Sources" Version="$(MicrosoftExtensionsTypeNameHelperSourcesPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.ValueStopwatch.Sources" Version="$(MicrosoftExtensionsValueStopwatchSourcesPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.WebEncoders" Version="$(MicrosoftExtensionsWebEncodersPackageVersion)" /> - <ExternalDependency Include="Microsoft.EntityFrameworkCore.Abstractions" Version="$(MicrosoftEntityFrameworkCoreAbstractionsPackageVersion)" /> - <ExternalDependency Include="Microsoft.EntityFrameworkCore.Analyzers" Version="$(MicrosoftEntityFrameworkCoreAnalyzersPackageVersion)" /> + + <!-- Packages from aspnet/EntityFrameworkCore --> + <ExternalDependency Include="dotnet-ef" Version="$(DotNetEfPackageVersion)" /> <ExternalDependency Include="Microsoft.EntityFrameworkCore.Design" Version="$(MicrosoftEntityFrameworkCoreDesignPackageVersion)" /> <ExternalDependency Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(MicrosoftEntityFrameworkCoreInMemoryPackageVersion)" /> - <ExternalDependency Include="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftEntityFrameworkCoreRelationalPackageVersion)" /> <ExternalDependency Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(MicrosoftEntityFrameworkCoreSqlitePackageVersion)" /> <ExternalDependency Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion)" /> <ExternalDependency Include="Microsoft.EntityFrameworkCore.Tools" Version="$(MicrosoftEntityFrameworkCoreToolsPackageVersion)" /> - <ExternalDependency Include="Microsoft.EntityFrameworkCore" Version="$(MicrosoftEntityFrameworkCorePackageVersion)" /> </ItemGroup> <ItemGroup> <ExternalDependency Include="AngleSharp" Version="$(AngleSharpPackageVersion)" /> <ExternalDependency Include="BenchmarkDotNet" Version="$(BenchmarkDotNetPackageVersion)" /> - <ExternalDependency Include="FSharp.Core" Version="$(FSharpCorePackageVersion)" /> - <ExternalDependency Include="Google.Protobuf" Version="$(GoogleProtobufPackageVersion)" /> <ExternalDependency Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkPackageVersion)" /> - <ExternalDependency Include="Internal.AspNetCore.SiteExtension.Sdk" Version="$(InternalAspNetCoreSiteExtensionSdkPackageVersion)" /> <ExternalDependency Include="Libuv" Version="$(LibuvPackageVersion)" /> - <ExternalDependency Include="Microsoft.ApplicationInsights.AspNetCore" Version="$(MicrosoftApplicationInsightsAspNetCorePackageVersion)" /> - <ExternalDependency Include="Microsoft.AspNet.Identity.EntityFramework" Version="$(MicrosoftAspNetIdentityEntityFrameworkPackageVersion)" /> - <ExternalDependency Include="Microsoft.AspNet.WebApi.Client" Version="$(MicrosoftAspNetWebApiClientPackageVersion)" /> - <ExternalDependency Include="Microsoft.Azure.KeyVault" Version="$(MicrosoftAzureKeyVaultPackageVersion)" /> - <ExternalDependency Include="Microsoft.Azure.Management.Fluent" Version="$(MicrosoftAzureManagementFluentPackageVersion)" /> - <ExternalDependency Include="Microsoft.Azure.Services.AppAuthentication" Version="$(MicrosoftAzureServicesAppAuthenticationPackageVersion)" /> - <ExternalDependency Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" /> <ExternalDependency Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" /> - <ExternalDependency Include="Microsoft.Build.Runtime" Version="$(MicrosoftBuildRuntimePackageVersion)" /> - <ExternalDependency Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCorePackageVersion)" /> <ExternalDependency Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" /> - <ExternalDependency Include="Microsoft.Internal.AspNetCore.H2Spec.All" Version="$(MicrosoftInternalAspNetCoreH2SpecAllPackageVersion)" /> - - <!-- Razor uses a custom version of roslyn packages --> - <ExternalDependency Include="Microsoft.CodeAnalysis.Common" Version="$(MicrosoftCodeAnalysisCommonPackageVersion)" /> - <ExternalDependency Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" /> - <ExternalDependency Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)" /> - - <!-- - BenchmarksOnly* package versions come from NuGet.org and are intended only for use in benchmarks apps where EF - is not otherwise referenced. They avoid unnecessary changes to the Universe build graph or to product - dependencies. Do not use these external dependencies elsewhere. - --> - <ExternalDependency Include="Microsoft.EntityFrameworkCore.Design" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion)" VariableName="BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion" /> - <ExternalDependency Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlitePackageVersion)" VariableName="BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlitePackageVersion" /> - <ExternalDependency Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlServerPackageVersion)" VariableName="BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlServerPackageVersion" /> - <ExternalDependency Include="MySqlConnector" Version="$(BenchmarksOnlyMySqlConnectorPackageVersion)" VariableName="BenchmarksOnlyMySqlConnectorPackageVersion" /> - <ExternalDependency Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(BenchmarksOnlyNpgsqlEntityFrameworkCorePostgreSQLPackageVersion)" VariableName="BenchmarksOnlyNpgsqlEntityFrameworkCorePostgreSQLPackageVersion" /> - <ExternalDependency Include="Pomelo.EntityFrameworkCore.MySql" Version="$(BenchmarksOnlyPomeloEntityFrameworkCoreMySqlPackageVersion)" VariableName="BenchmarksOnlyPomeloEntityFrameworkCoreMySqlPackageVersion" /> - - <ExternalDependency Include="Microsoft.CSharp" Version="$(MicrosoftCSharpPackageVersion)" /> - <ExternalDependency Include="Microsoft.DotNet.ProjectModel" Version="$(MicrosoftDotNetProjectModelPackageVersion)" /> - <ExternalDependency Include="Microsoft.DiaSymReader.Native" Version="$(MicrosoftDiaSymReaderNativePackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" /> - <ExternalDependency Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="$(MicrosoftIdentityModelClientsActiveDirectoryPackageVersion)" /> - <ExternalDependency Include="Microsoft.IdentityModel.JsonWebTokens" Version="$(MicrosoftIdentityModelJsonWebTokensPackageVersion)" /> - <ExternalDependency Include="Microsoft.IdentityModel.Logging" Version="$(MicrosoftIdentityModelLoggingPackageVersion)" /> - <ExternalDependency Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion)" /> - <ExternalDependency Include="Microsoft.IdentityModel.Protocols.WsFederation" Version="$(MicrosoftIdentityModelProtocolsWsFederationPackageVersion)" /> - <ExternalDependency Include="Microsoft.IdentityModel.Protocols" Version="$(MicrosoftIdentityModelProtocolsPackageVersion)" /> - <ExternalDependency Include="Microsoft.IdentityModel.Tokens" Version="$(MicrosoftIdentityModelTokensPackageVersion)" /> <ExternalDependency Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" /> - - <!-- Multiple versions of this package required to support all netcoreapp versions --> - <ExternalDependency Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp30PackageVersion)" VariableName="MicrosoftNETCoreApp30PackageVersion" /> - <!-- This variable should be used for anything that needs "latest" netcoreapp. --> - <ExternalDependency Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreAppPackageVersion)" VariableName="MicrosoftNETCoreAppPackageVersion" /> - - <!-- Microsoft.NetCore.DotNetAppHost for global tools--> - <ExternalDependency Include="Microsoft.NETCore.DotNetAppHost" Version="$(MicrosoftNETCoreDotNetAppHostPackageVersion)" /> - <ExternalDependency Include="Microsoft.DotNet.PlatformAbstractions" Version="$(MicrosoftDotNetPlatformAbstractionsPackageVersion)" /> - - <ExternalDependency Include="Microsoft.NETCore.Windows.ApiSets" Version="$(MicrosoftNETCoreWindowsApiSetsPackageVersion)" /> - <ExternalDependency Include="Microsoft.NETFramework.ReferenceAssemblies" Version="$(MicrosoftNETFrameworkReferenceAssembliesPackageVersion)" /> - <ExternalDependency Include="Microsoft.Owin.Security" Version="$(MicrosoftOwinSecurityPackageVersion)" /> - <ExternalDependency Include="Microsoft.Owin.Security.Cookies" Version="$(MicrosoftOwinSecurityCookiesPackageVersion)" /> - <ExternalDependency Include="Microsoft.Owin.Testing" Version="$(MicrosoftOwinTestingPackageVersion)" /> - <ExternalDependency Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)" /> - <ExternalDependency Include="Microsoft.Web.Administration" Version="$(MicrosoftWebAdministrationPackageVersion)" /> - <ExternalDependency Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" /> - <ExternalDependency Include="Mono.Addins" Version="$(MonoAddinsPackageVersion)" /> - <ExternalDependency Include="MonoDevelop.Sdk" Version="$(MonoDevelopSdkPackageVersion)" /> - <ExternalDependency Include="Moq" Version="$(MoqPackageVersion)" /> - <ExternalDependency Include="MessagePack" Version="$(MessagePackPackageVersion)" /> - - <!-- netstandard1.x --> - <ExternalDependency Include="NETStandard.Library" Version="$(NETStandard16PackageVersion)" VariableName="NETStandard16PackageVersion" /> - <!-- netstandard2.0 --> - <ExternalDependency Include="NETStandard.Library" Version="$(NETStandardLibrary20PackageVersion)" VariableName="NETStandardLibrary20PackageVersion" /> - - <!-- This version should be used by runtime packages --> + <ExternalDependency Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreAppPackageVersion)" /> <ExternalDependency Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" /> - <!-- This version is required by MSBuild tasks or Visual Studio extensions. --> - <ExternalDependency Include="Newtonsoft.Json" Version="$(VisualStudio_NewtonsoftJsonPackageVersion)" VariableName="VisualStudio_NewtonsoftJsonPackageVersion" /> - - <ExternalDependency Include="Newtonsoft.Json.Bson" Version="$(NewtonsoftJsonBsonPackageVersion)" /> - <ExternalDependency Include="Selenium.Firefox.WebDriver" Version="$(SeleniumFirefoxWebDriverPackageVersion)" /> <ExternalDependency Include="Selenium.Support" Version="$(SeleniumSupportPackageVersion)" /> <ExternalDependency Include="Selenium.WebDriver.MicrosoftDriver" Version="$(SeleniumWebDriverMicrosoftDriverPackageVersion)" /> <ExternalDependency Include="Selenium.WebDriver" Version="$(SeleniumWebDriverPackageVersion)" /> - <ExternalDependency Include="Serilog.Extensions.Logging" Version="$(SerilogExtensionsLoggingPackageVersion)" /> - <ExternalDependency Include="Serilog.Sinks.File" Version="$(SerilogSinksFilePackageVersion)" /> - <ExternalDependency Include="StackExchange.Redis" Version="$(StackExchangeRedisPackageVersion)" /> - <ExternalDependency Include="StreamJsonRpc" Version="$(StreamJsonRpcPackageVersion)" /> - <ExternalDependency Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzersPackageVersion)" /> - <ExternalDependency Include="System.Buffers" Version="$(SystemBuffersPackageVersion)" /> - <ExternalDependency Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutablePackageVersion)" /> - <ExternalDependency Include="System.ComponentModel.Annotations" Version="$(SystemComponentModelAnnotationsPackageVersion)" /> - <ExternalDependency Include="System.Data.SqlClient" Version="$(SystemDataSqlClientPackageVersion)" /> - <ExternalDependency Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" /> - <ExternalDependency Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" /> - <ExternalDependency Include="System.IdentityModel.Tokens.Jwt" Version="$(SystemIdentityModelTokensJwtPackageVersion)" /> - <ExternalDependency Include="System.IO.Pipelines" Version="$(SystemIOPipelinesPackageVersion)" /> <ExternalDependency Include="System.Memory" Version="$(SystemMemoryPackageVersion)" /> - <ExternalDependency Include="System.Net.Http.WinHttpHandler" Version="$(SystemNetHttpWinHttpHandlerPackageVersion)" /> - <ExternalDependency Include="System.Net.Http" Version="$(SystemNetHttpPackageVersion)" /> - <ExternalDependency Include="System.Net.WebSockets.WebSocketProtocol" Version="$(SystemNetWebSocketsWebSocketProtocolPackageVersion)" /> - <ExternalDependency Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsPackageVersion)" /> - <ExternalDependency Include="System.Reactive.Linq" Version="$(SystemReactiveLinqPackageVersion)" /> - <ExternalDependency Include="System.Reflection.Emit" Version="$(SystemReflectionEmitPackageVersion)" /> - <ExternalDependency Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataPackageVersion)" /> - <ExternalDependency Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafePackageVersion)" /> - <ExternalDependency Include="System.Runtime.InteropServices.RuntimeInformation" Version="$(SystemRuntimeInteropServicesRuntimeInformationPackageVersion)" /> - <ExternalDependency Include="System.Security.Cryptography.Cng" Version="$(SystemSecurityCryptographyCngPackageVersion)" /> - <ExternalDependency Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsPackageVersion)" /> - <ExternalDependency Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersion)" /> <ExternalDependency Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" /> - <ExternalDependency Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsPackageVersion)" /> - <ExternalDependency Include="System.ServiceProcess.ServiceController" Version="$(SystemServiceProcessServiceControllerPackageVersion)" /> - <ExternalDependency Include="System.Text.Encoding.CodePages" Version="$(SystemTextEncodingCodePagesPackageVersion)" /> <ExternalDependency Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" /> - <ExternalDependency Include="System.Threading.Channels" Version="$(SystemThreadingChannelsPackageVersion)" /> - <ExternalDependency Include="System.Threading.Tasks.Dataflow" Version="$(SystemThreadingTasksDataflowPackageVersion)" /> - <ExternalDependency Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsPackageVersion)" /> - <ExternalDependency Include="System.ValueTuple" Version="$(SystemValueTuplePackageVersion)" /> - <ExternalDependency Include="Utf8Json" Version="$(Utf8JsonPackageVersion)" /> - <ExternalDependency Include="WindowsAzure.Storage" Version="$(WindowsAzureStoragePackageVersion)" /> - <ExternalDependency Include="xunit.abstractions" Version="$(XunitAbstractionsPackageVersion)" /> <ExternalDependency Include="xunit.analyzers" Version="$(XunitAnalyzersPackageVersion)" /> - <ExternalDependency Include="xunit.assert" Version="$(XunitAssertPackageVersion)" /> - <ExternalDependency Include="xunit.core" Version="$(XunitCorePackageVersion)" /> - <ExternalDependency Include="xunit.extensibility.core" Version="$(XunitExtensibilityCorePackageVersion)" /> - <ExternalDependency Include="xunit.extensibility.execution" Version="$(XunitExtensibilityExecutionPackageVersion)" /> <ExternalDependency Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualstudioPackageVersion)" /> <ExternalDependency Include="xunit" Version="$(XunitPackageVersion)" /> </ItemGroup> diff --git a/build/repo.targets b/build/repo.targets index 891386d0d28..f69803ea18d 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -97,7 +97,6 @@ <!-- We need to pass the NETCoreApp package versions to msbuild so that it doesn't complain about us using a different one than it was restored against. --> <PropertyGroup> <DesignTimeBuildProps>$(BuildProperties);MicrosoftNETCoreAppPackageVersion=$(MicrosoftNETCoreAppPackageVersion);</DesignTimeBuildProps> - <DesignTimeBuildProps>$(DesignTimeBuildProps);MicrosoftNETCoreApp30PackageVersion=$(MicrosoftNETCoreApp30PackageVersion);</DesignTimeBuildProps> </PropertyGroup> <ItemGroup> @@ -210,13 +209,9 @@ Packages="@(_LineupPackages)" OutputPath="$(GeneratedPackageVersionPropsPath)" /> - <Copy SourceFiles="$(GeneratedPackageVersionPropsPath)" DestinationFolder="$(ArtifactsDir)" /> - <RepoTasks.GenerateRestoreSourcesPropsFile Sources="@(_RestoreSources)" OutputPath="$(GeneratedRestoreSourcesPropsPath)" /> - - <Copy SourceFiles="$(GeneratedPackageVersionPropsPath);$(GeneratedBrandingPropsPath)" DestinationFolder="$(ArtifactsDir)" /> </Target> <Target Name="CleanRepoArtifacts"> diff --git a/build/tasks/RepoTasks.csproj b/build/tasks/RepoTasks.csproj index 40050f65a4f..82c90e29a2b 100644 --- a/build/tasks/RepoTasks.csproj +++ b/build/tasks/RepoTasks.csproj @@ -10,8 +10,8 @@ <ItemGroup> <PackageReference Remove="Internal.AspNetCore.Sdk" /> <PackageReference Include="NuGet.Build.Tasks" Version="4.9.1" /> - <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(DevDependency_MicrosoftExtensionsDependencyModelPackageVersion)" /> - <PackageReference Include="WindowsAzure.Storage" Version="$(DevDependency_WindowsAzureStoragePackageVersion)" /> + <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" /> + <PackageReference Include="WindowsAzure.Storage" Version="8.7.0" /> </ItemGroup> <ItemGroup Condition="'$(BuildWindowsInstallers)' == 'true'"> diff --git a/eng/Dependencies.props b/eng/Dependencies.props index a1d4f65b482..09c4c702d62 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -103,7 +103,6 @@ and are generated based on the last package release. <LatestPackageReference Include="System.IO.Pipelines" Version="$(SystemIOPipelinesPackageVersion)" /> <LatestPackageReference Include="System.Memory" Version="$(SystemMemoryPackageVersion)" /> <LatestPackageReference Include="System.Net.Http.WinHttpHandler" Version="$(SystemNetHttpWinHttpHandlerPackageVersion)" /> - <LatestPackageReference Include="System.Net.Http.WinHttpHandler" Version="$(SystemNetHttpWinHttpHandlerPackageVersion)" /> <LatestPackageReference Include="System.Net.WebSockets.WebSocketProtocol" Version="$(SystemNetWebSocketsWebSocketProtocolPackageVersion)" /> <LatestPackageReference Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsPackageVersion)" /> <LatestPackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataPackageVersion)" /> @@ -115,7 +114,6 @@ and are generated based on the last package release. <LatestPackageReference Include="System.Threading.Channels" Version="$(SystemThreadingChannelsPackageVersion)" /> <LatestPackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsPackageVersion)" /> <LatestPackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" /> - <LatestPackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsPackageVersion)" /> </ItemGroup> <ItemGroup Label="External dependencies"> @@ -123,29 +121,25 @@ and are generated based on the last package release. <LatestPackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetPackageVersion)" /> <LatestPackageReference Include="FSharp.Core" Version="$(FSharpCorePackageVersion)" /> <LatestPackageReference Include="Google.ProtoBuf" Version="$(GoogleProtoBufPackageVersion)" /> + <LatestPackageReference Include="IdentityServer4.AspNetIdentity" Version="$(IdentityServer4AspNetIdentityPackageVersion)" /> + <LatestPackageReference Include="IdentityServer4.EntityFramework" Version="$(IdentityServer4EntityFrameworkPackageVersion)" /> + <LatestPackageReference Include="IdentityServer4" Version="$(IdentityServer4PackageVersion)" /> <LatestPackageReference Include="Libuv" Version="$(LibuvPackageVersion)" /> <LatestPackageReference Include="MessagePack" Version="$(MessagePackPackageVersion)" /> <LatestPackageReference Include="Microsoft.AspNet.WebApi.Client" Version="$(MicrosoftAspNetWebApiClientPackageVersion)" /> <LatestPackageReference Include="Microsoft.Azure.KeyVault" Version="$(MicrosoftAzureKeyVaultPackageVersion)" /> <LatestPackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" /> - <LatestPackageReference Include="IdentityServer4.AspNetIdentity" Version="$(IdentityServer4AspNetIdentityPackageVersion)" /> - <LatestPackageReference Include="IdentityServer4.EntityFramework" Version="$(IdentityServer4EntityFrameworkPackageVersion)" /> - <LatestPackageReference Include="IdentityServer4" Version="$(IdentityServer4PackageVersion)" /> <LatestPackageReference Include="Moq" Version="$(MoqPackageVersion)" /> <LatestPackageReference Include="Newtonsoft.Json.Bson" Version="$(NewtonsoftJsonBsonPackageVersion)" /> - <!-- This version is required by MSBuild tasks or Visual Studio extensions. --> - <LatestPackageReference Include="Newtonsoft.Json" Version="9.0.1" Condition="'$(UseMSBuildJsonNet)' == 'true'" /> - <!-- This version should be used by runtime packages --> - <LatestPackageReference Include="Newtonsoft.Json" Version="12.0.1" Condition="'$(UseMSBuildJsonNet)' != 'true'" /> - <LatestPackageReference Include="StackExchange.Redis" Version="2.0.513" /> - <LatestPackageReference Include="WindowsAzure.Storage" Version="8.1.4" /> - <LatestPackageReference Include="Selenium.WebDriver.ChromeDriver" Version="2.43.0" /> - <LatestPackageReference Include="Selenium.WebDriver" Version="3.12.1" /> + <LatestPackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" /> + <LatestPackageReference Include="Selenium.WebDriver.ChromeDriver" Version="$(SeleniumWebDriverChromeDriverPackageVersion)" /> + <LatestPackageReference Include="Selenium.WebDriver" Version="$(SeleniumWebDriverPackageVersion)" /> <LatestPackageReference Include="Serilog.Extensions.Logging" Version="$(SerilogExtensionsLoggingPackageVersion)" /> <LatestPackageReference Include="Serilog.Sinks.File" Version="$(SerilogSinksFilePackageVersion)" /> <LatestPackageReference Include="StackExchange.Redis" Version="$(StackExchangeRedisPackageVersion)" /> <LatestPackageReference Include="System.Reactive.Linq" Version="$(SystemReactiveLinqPackageVersion)" /> <LatestPackageReference Include="Utf8Json" Version="$(Utf8JsonPackageVersion)" /> + <LatestPackageReference Include="WindowsAzure.Storage" Version="$(WindowsAzureStoragePackageVersion)" /> <LatestPackageReference Include="xunit.abstractions" Version="$(XunitAbstractionsPackageVersion)" /> <LatestPackageReference Include="xunit.analyzers" Version="$(XunitAnalyzersPackageVersion)" /> <LatestPackageReference Include="xunit.assert" Version="$(XunitAssertPackageVersion)" /> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml new file mode 100644 index 00000000000..810775dee9d --- /dev/null +++ b/eng/Version.Details.xml @@ -0,0 +1,367 @@ +<?xml version="1.0" encoding="utf-8"?> +<Dependencies> + <ProductDependencies> + <Dependency Name="Microsoft.NET.Sdk.Razor" Version="3.0.0-preview-19057-06"> + <Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="dotnet-ef" Version="3.0.0-preview.18604.3"> + <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="3.0.0-preview.18604.3"> + <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="3.0.0-preview.18604.3"> + <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="3.0.0-preview.18604.3"> + <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0-preview.18604.3"> + <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0-preview.18604.3"> + <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0-preview.18604.3"> + <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.EntityFrameworkCore" Version="3.0.0-preview.18604.3"> + <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.AspNetCore.Analyzer.Testing" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.ActivatorUtilities.Sources" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Caching.SqlServer" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Configuration.AzureKeyVault" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Configuration.KeyPerFile" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Configuration" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.DiagnosticAdapter" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.FileProviders.Composite" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Hosting" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Http" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Localization.Abstractions" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Localization" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Logging.AzureAppServices" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Logging.Console" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Logging.Debug" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Logging.EventSource" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Logging.TraceSource" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Logging.Testing" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Logging" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.ObjectPool" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Options" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.ParameterDefaultValue.Sources" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.Primitives" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.TypeNameHelper.Sources" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.ValueStopWatch.Sources" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.WebEncoders" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.CSharp" Version="4.6.0-preview.18619.1"> + <Uri>https://github.com/dotnet/corefx</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview.18619.1"> + <Uri>https://github.com/dotnet/corefx</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="System.ComponentModel.Annotations" Version="4.6.0-preview.18619.1"> + <Uri>https://github.com/dotnet/corefx</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="System.Data.SqlClient" Version="4.7.0-preview.18619.1"> + <Uri>https://github.com/dotnet/corefx</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="System.Diagnostics.DiagnosticSource" Version="4.6.0-preview.18619.1"> + <Uri>https://github.com/dotnet/corefx</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview.18619.1"> + <Uri>https://github.com/dotnet/corefx</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="System.IO.Pipelines" Version="4.6.0-preview.18619.1"> + <Uri>https://github.com/dotnet/corefx</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="System.Net.Http.WinHttpHandler" Version="4.6.0-preview.18619.1"> + <Uri>https://github.com/dotnet/corefx</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="System.Net.WebSockets.WebSocketProtocol" Version="4.6.0-preview.18619.1"> + <Uri>https://github.com/dotnet/corefx</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="System.Numerics.Vectors" Version="4.6.0-preview.18619.1"> + <Uri>https://github.com/dotnet/corefx</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="System.Reflection.Metadata" Version="1.7.0-preview.18619.1"> + <Uri>https://github.com/dotnet/corefx</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="4.6.0-preview.18619.1"> + <Uri>https://github.com/dotnet/corefx</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="System.Security.Cryptography.Cng" Version="4.6.0-preview.18619.1"> + <Uri>https://github.com/dotnet/corefx</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="System.Security.Cryptography.Pkcs" Version="4.6.0-preview.18619.1"> + <Uri>https://github.com/dotnet/corefx</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-preview.18619.1"> + <Uri>https://github.com/dotnet/corefx</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="System.Security.Permissions" Version="4.6.0-preview.18619.1"> + <Uri>https://github.com/dotnet/corefx</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="System.Security.Principal.Windows" Version="4.6.0-preview.18619.1"> + <Uri>https://github.com/dotnet/corefx</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="System.ServiceProcess.ServiceController" Version="4.6.0-preview.18619.1"> + <Uri>https://github.com/dotnet/corefx</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="System.Text.Encodings.Web" Version="4.6.0-preview.18619.1"> + <Uri>https://github.com/dotnet/corefx</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="System.Threading.Channels" Version="4.6.0-preview.18619.1"> + <Uri>https://github.com/dotnet/corefx</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.0.0-preview-27219-3"> + <Uri>https://github.com/dotnet/core-setup</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview-27219-3"> + <Uri>https://github.com/dotnet/core-setup</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.DotNet.PlatformAbstractions" Version="3.0.0-preview-27219-3"> + <Uri>https://github.com/dotnet/core-setup</Uri> + <Sha>000000</Sha> + </Dependency> + </ProductDependencies> + <ToolsetDependencies> + <Dependency Name="Internal.AspNetCore.Analyzers" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + <Dependency Name="Microsoft.AspNetCore.Testing" Version="3.0.0-preview.19059.4"> + <Uri>https://github.com/aspnet/Extensions</Uri> + <Sha>000000</Sha> + </Dependency> + </ToolsetDependencies> +</Dependencies> diff --git a/eng/Versions.props b/eng/Versions.props index 8adc6dcbbd9..d0e0fa9d3ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,6 +3,179 @@ This file defines the versions of external dependencies used by ASP.NET Core. This file might be updated by automation. - TODO: move versions from build/dependencies.props into this location. Depends on https://github.com/aspnet/AspNetCore/issues/4246. --> -<Project /> +<Project> + <!-- These versions should be updated by automation. --> + <PropertyGroup Label="Automated"> + <!-- Packages from dotnet/core-setup --> + <MicrosoftExtensionsDependencyModelPackageVersion>3.0.0-preview-27219-3</MicrosoftExtensionsDependencyModelPackageVersion> + <MicrosoftNETCoreAppPackageVersion>3.0.0-preview-27219-3</MicrosoftNETCoreAppPackageVersion> + <MicrosoftDotNetPlatformAbstractionsPackageVersion>3.0.0-preview-27219-3</MicrosoftDotNetPlatformAbstractionsPackageVersion> + + <!-- Packages from dotnet/corefx --> + <MicrosoftCSharpPackageVersion>4.6.0-preview.18619.1</MicrosoftCSharpPackageVersion> + <MicrosoftWin32RegistryPackageVersion>4.6.0-preview.18619.1</MicrosoftWin32RegistryPackageVersion> + <SystemComponentModelAnnotationsPackageVersion>4.6.0-preview.18619.1</SystemComponentModelAnnotationsPackageVersion> + <SystemDataSqlClientPackageVersion>4.7.0-preview.18619.1</SystemDataSqlClientPackageVersion> + <SystemDiagnosticsDiagnosticSourcePackageVersion>4.6.0-preview.18619.1</SystemDiagnosticsDiagnosticSourcePackageVersion> + <SystemDiagnosticsEventLogPackageVersion>4.6.0-preview.18619.1</SystemDiagnosticsEventLogPackageVersion> + <SystemIOPipelinesPackageVersion>4.6.0-preview.18619.1</SystemIOPipelinesPackageVersion> + <SystemNetHttpWinHttpHandlerPackageVersion>4.6.0-preview.18619.1</SystemNetHttpWinHttpHandlerPackageVersion> + <SystemNetWebSocketsWebSocketProtocolPackageVersion>4.6.0-preview.18619.1</SystemNetWebSocketsWebSocketProtocolPackageVersion> + <SystemNumericsVectorsPackageVersion>4.6.0-preview.18619.1</SystemNumericsVectorsPackageVersion> + <SystemReflectionMetadataPackageVersion>1.7.0-preview.18619.1</SystemReflectionMetadataPackageVersion> + <SystemRuntimeCompilerServicesUnsafePackageVersion>4.6.0-preview.18619.1</SystemRuntimeCompilerServicesUnsafePackageVersion> + <SystemSecurityCryptographyCngPackageVersion>4.6.0-preview.18619.1</SystemSecurityCryptographyCngPackageVersion> + <SystemSecurityCryptographyPkcsPackageVersion>4.6.0-preview.18619.1</SystemSecurityCryptographyPkcsPackageVersion> + <SystemSecurityCryptographyXmlPackageVersion>4.6.0-preview.18619.1</SystemSecurityCryptographyXmlPackageVersion> + <SystemSecurityPermissionsPackageVersion>4.6.0-preview.18619.1</SystemSecurityPermissionsPackageVersion> + <SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview.18619.1</SystemSecurityPrincipalWindowsPackageVersion> + <SystemServiceProcessServiceControllerPackageVersion>4.6.0-preview.18619.1</SystemServiceProcessServiceControllerPackageVersion> + <SystemTextEncodingsWebPackageVersion>4.6.0-preview.18619.1</SystemTextEncodingsWebPackageVersion> + <SystemThreadingChannelsPackageVersion>4.6.0-preview.18619.1</SystemThreadingChannelsPackageVersion> + + <!-- Packages from aspnet/Extensions --> + <InternalAspNetCoreAnalyzersPackageVersion>3.0.0-preview.19059.4</InternalAspNetCoreAnalyzersPackageVersion> + <MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.0.0-preview.19059.4</MicrosoftAspNetCoreAnalyzerTestingPackageVersion> + <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.0.0-preview.19059.4</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion> + <MicrosoftAspNetCoreTestingPackageVersion>3.0.0-preview.19059.4</MicrosoftAspNetCoreTestingPackageVersion> + <MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion> + <MicrosoftExtensionsCachingAbstractionsPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsCachingAbstractionsPackageVersion> + <MicrosoftExtensionsCachingMemoryPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsCachingMemoryPackageVersion> + <MicrosoftExtensionsCachingSqlServerPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsCachingSqlServerPackageVersion> + <MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsCachingStackExchangeRedisPackageVersion> + <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion> + <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsConfigurationAbstractionsPackageVersion> + <MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion> + <MicrosoftExtensionsConfigurationBinderPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsConfigurationBinderPackageVersion> + <MicrosoftExtensionsConfigurationCommandLinePackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsConfigurationCommandLinePackageVersion> + <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion> + <MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion> + <MicrosoftExtensionsConfigurationIniPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsConfigurationIniPackageVersion> + <MicrosoftExtensionsConfigurationJsonPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsConfigurationJsonPackageVersion> + <MicrosoftExtensionsConfigurationKeyPerFilePackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsConfigurationKeyPerFilePackageVersion> + <MicrosoftExtensionsConfigurationPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsConfigurationPackageVersion> + <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsConfigurationUserSecretsPackageVersion> + <MicrosoftExtensionsConfigurationXmlPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsConfigurationXmlPackageVersion> + <MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion> + <MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsDependencyInjectionPackageVersion> + <MicrosoftExtensionsDependencyInjectionSpecificationTestsPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsDependencyInjectionSpecificationTestsPackageVersion> + <MicrosoftExtensionsDiagnosticAdapterPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsDiagnosticAdapterPackageVersion> + <MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsPackageVersion> + <MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion> + <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion> + <MicrosoftExtensionsFileProvidersCompositePackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsFileProvidersCompositePackageVersion> + <MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion> + <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsFileProvidersPhysicalPackageVersion> + <MicrosoftExtensionsFileSystemGlobbingPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsFileSystemGlobbingPackageVersion> + <MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion> + <MicrosoftExtensionsHostingAbstractionsPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsHostingAbstractionsPackageVersion> + <MicrosoftExtensionsHostingPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsHostingPackageVersion> + <MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion> + <MicrosoftExtensionsHttpPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsHttpPackageVersion> + <MicrosoftExtensionsLocalizationAbstractionsPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsLocalizationAbstractionsPackageVersion> + <MicrosoftExtensionsLocalizationPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsLocalizationPackageVersion> + <MicrosoftExtensionsLoggingAbstractionsPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsLoggingAbstractionsPackageVersion> + <MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsLoggingAzureAppServicesPackageVersion> + <MicrosoftExtensionsLoggingConfigurationPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsLoggingConfigurationPackageVersion> + <MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsLoggingConsolePackageVersion> + <MicrosoftExtensionsLoggingDebugPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsLoggingDebugPackageVersion> + <MicrosoftExtensionsLoggingEventSourcePackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsLoggingEventSourcePackageVersion> + <MicrosoftExtensionsLoggingPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsLoggingPackageVersion> + <MicrosoftExtensionsLoggingTestingPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsLoggingTestingPackageVersion> + <MicrosoftExtensionsLoggingTraceSourcePackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsLoggingTraceSourcePackageVersion> + <MicrosoftExtensionsObjectPoolPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsObjectPoolPackageVersion> + <MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion> + <MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion> + <MicrosoftExtensionsOptionsPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsOptionsPackageVersion> + <MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion> + <MicrosoftExtensionsPrimitivesPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsPrimitivesPackageVersion> + <MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsTypeNameHelperSourcesPackageVersion> + <MicrosoftExtensionsValueStopwatchSourcesPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsValueStopwatchSourcesPackageVersion> + <MicrosoftExtensionsWebEncodersPackageVersion>3.0.0-preview.19059.4</MicrosoftExtensionsWebEncodersPackageVersion> + + <!-- Packages from aspnet/EntityFrameworkCore --> + <DotNetEfPackageVersion>3.0.0-preview.18604.3</DotNetEfPackageVersion> + <MicrosoftEntityFrameworkCoreDesignPackageVersion>3.0.0-preview.18604.3</MicrosoftEntityFrameworkCoreDesignPackageVersion> + <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>3.0.0-preview.18604.3</MicrosoftEntityFrameworkCoreInMemoryPackageVersion> + <MicrosoftEntityFrameworkCoreRelationalPackageVersion>3.0.0-preview.18604.3</MicrosoftEntityFrameworkCoreRelationalPackageVersion> + <MicrosoftEntityFrameworkCoreSqlitePackageVersion>3.0.0-preview.18604.3</MicrosoftEntityFrameworkCoreSqlitePackageVersion> + <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>3.0.0-preview.18604.3</MicrosoftEntityFrameworkCoreSqlServerPackageVersion> + <MicrosoftEntityFrameworkCoreToolsPackageVersion>3.0.0-preview.18604.3</MicrosoftEntityFrameworkCoreToolsPackageVersion> + <MicrosoftEntityFrameworkCorePackageVersion>3.0.0-preview.18604.3</MicrosoftEntityFrameworkCorePackageVersion> + + <!-- Packages from aspnet/AspNetCore-Tooling --> + <MicrosoftNETSdkRazorPackageVersion>3.0.0-preview-19057-06</MicrosoftNETSdkRazorPackageVersion> + </PropertyGroup> + + <PropertyGroup Label="Build tool dependencies"> + <InternalAspNetCoreSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSdkPackageVersion> + <InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">3.0.0-build-20190110.4</InternalAspNetCoreSdkPackageVersion> + <MicrosoftNETFrameworkReferenceAssembliesPackageVersion>1.0.0-alpha-004</MicrosoftNETFrameworkReferenceAssembliesPackageVersion> + <MicrosoftNETTestSdkPackageVersion>15.9.0</MicrosoftNETTestSdkPackageVersion> + </PropertyGroup> + + <!-- These versions are not managed by automation. --> + <PropertyGroup Label="Pinned"> + <!-- Stable dotnet/corefx packages no longer updated for .NET Core 3 --> + <SystemBuffersPackageVersion>4.5.0</SystemBuffersPackageVersion> + <SystemMemoryPackageVersion>4.5.2</SystemMemoryPackageVersion> + <SystemThreadingTasksExtensionsPackageVersion>4.5.2</SystemThreadingTasksExtensionsPackageVersion> + <SystemNetHttpPackageVersion>4.3.2</SystemNetHttpPackageVersion> + + <!-- Packages developed by @aspnet, but manually updated as necessary. --> + <LibuvPackageVersion>1.10.0</LibuvPackageVersion> + <MicrosoftAspNetWebApiClientPackageVersion>5.2.6</MicrosoftAspNetWebApiClientPackageVersion> + + <!-- Partner teams --> + <MicrosoftAzureKeyVaultPackageVersion>2.3.2</MicrosoftAzureKeyVaultPackageVersion> + <MicrosoftBuildFrameworkPackageVersion>15.8.166</MicrosoftBuildFrameworkPackageVersion> + <MicrosoftBuildUtilitiesCorePackageVersion>15.8.166</MicrosoftBuildUtilitiesCorePackageVersion> + <MicrosoftCodeAnalysisCommonPackageVersion>2.8.0</MicrosoftCodeAnalysisCommonPackageVersion> + <MicrosoftCodeAnalysisCSharpPackageVersion>2.8.0</MicrosoftCodeAnalysisCSharpPackageVersion> + <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>2.8.0</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion> + <MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>3.19.8</MicrosoftIdentityModelClientsActiveDirectoryPackageVersion> + <MicrosoftIdentityModelLoggingPackageVersion>5.3.0</MicrosoftIdentityModelLoggingPackageVersion> + <MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>5.3.0</MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion> + <MicrosoftIdentityModelProtocolsWsFederationPackageVersion>5.3.0</MicrosoftIdentityModelProtocolsWsFederationPackageVersion> + <MicrosoftInternalAspNetCoreH2SpecAllPackageVersion>2.1.1</MicrosoftInternalAspNetCoreH2SpecAllPackageVersion> + <MicrosoftNETCoreWindowsApiSetsPackageVersion>1.0.1</MicrosoftNETCoreWindowsApiSetsPackageVersion> + <MicrosoftOwinSecurityCookiesPackageVersion>3.0.1</MicrosoftOwinSecurityCookiesPackageVersion> + <MicrosoftOwinTestingPackageVersion>3.0.1</MicrosoftOwinTestingPackageVersion> + <MicrosoftWebAdministrationPackageVersion>11.1.0</MicrosoftWebAdministrationPackageVersion> + <MicrosoftWebXdtPackageVersion>1.4.0</MicrosoftWebXdtPackageVersion> + <SystemIdentityModelTokensJwtPackageVersion>5.3.0</SystemIdentityModelTokensJwtPackageVersion> + <WindowsAzureStoragePackageVersion>8.1.4</WindowsAzureStoragePackageVersion> + + <!-- 3rd party dependencies --> + <AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion> + <BenchmarkDotNetPackageVersion>0.10.13</BenchmarkDotNetPackageVersion> + <CastleCorePackageVersion>4.2.1</CastleCorePackageVersion> + <FSharpCorePackageVersion>4.2.1</FSharpCorePackageVersion> + <IdentityServer4AspNetIdentityPackageVersion>2.3.0</IdentityServer4AspNetIdentityPackageVersion> + <IdentityServer4EntityFrameworkPackageVersion>2.3.0</IdentityServer4EntityFrameworkPackageVersion> + <IdentityServer4PackageVersion>2.3.0</IdentityServer4PackageVersion> + <GoogleProtobufPackageVersion>3.1.0</GoogleProtobufPackageVersion> + <MessagePackPackageVersion>1.7.3.4</MessagePackPackageVersion> + <MoqPackageVersion>4.10.0</MoqPackageVersion> + <NewtonsoftJsonBsonPackageVersion>1.0.2</NewtonsoftJsonBsonPackageVersion> + <NewtonsoftJsonPackageVersion>12.0.1</NewtonsoftJsonPackageVersion> + <SeleniumSupportPackageVersion>3.12.1</SeleniumSupportPackageVersion> + <SeleniumWebDriverMicrosoftDriverPackageVersion>17.17134.0</SeleniumWebDriverMicrosoftDriverPackageVersion> + <SeleniumWebDriverChromeDriverPackageVersion>2.43.0</SeleniumWebDriverChromeDriverPackageVersion> + <SeleniumWebDriverPackageVersion>3.12.1</SeleniumWebDriverPackageVersion> + <SerilogExtensionsLoggingPackageVersion>1.4.0</SerilogExtensionsLoggingPackageVersion> + <SerilogSinksFilePackageVersion>4.0.0</SerilogSinksFilePackageVersion> + <StackExchangeRedisPackageVersion>2.0.513</StackExchangeRedisPackageVersion> + <SystemReactiveLinqPackageVersion>3.1.1</SystemReactiveLinqPackageVersion> + <Utf8JsonPackageVersion>1.3.7</Utf8JsonPackageVersion> + <XunitAbstractionsPackageVersion>2.0.1</XunitAbstractionsPackageVersion> + <XunitAnalyzersPackageVersion>0.10.0</XunitAnalyzersPackageVersion> + <XunitAssertPackageVersion>2.3.1</XunitAssertPackageVersion> + <XunitExtensibilityCorePackageVersion>2.3.1</XunitExtensibilityCorePackageVersion> + <XunitExtensibilityExecutionPackageVersion>2.3.1</XunitExtensibilityExecutionPackageVersion> + <XunitPackageVersion>2.4.0</XunitPackageVersion> + <XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion> + </PropertyGroup> + +</Project> diff --git a/src/AuthSamples/build/dependencies.props b/src/AuthSamples/build/dependencies.props index 87bd618059e..8212c5b5641 100644 --- a/src/AuthSamples/build/dependencies.props +++ b/src/AuthSamples/build/dependencies.props @@ -32,42 +32,21 @@ <MicrosoftAspNetCoreStaticFilesPackageVersion>3.0.0-alpha1-10772</MicrosoftAspNetCoreStaticFilesPackageVersion> <MicrosoftAspNetCoreTestHostPackageVersion>3.0.0-alpha1-10772</MicrosoftAspNetCoreTestHostPackageVersion> <MicrosoftAspNetCoreTestingPackageVersion>3.0.0-preview-181106-14</MicrosoftAspNetCoreTestingPackageVersion> - <MicrosoftAspNetIdentityEntityFrameworkPackageVersion>2.2.1</MicrosoftAspNetIdentityEntityFrameworkPackageVersion> - <MicrosoftAzureKeyVaultPackageVersion>2.3.2</MicrosoftAzureKeyVaultPackageVersion> <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>3.0.0-alpha1-10706</MicrosoftEntityFrameworkCoreInMemoryPackageVersion> - <MicrosoftEntityFrameworkCoreRelationalPackageVersion>3.0.0-alpha1-10706</MicrosoftEntityFrameworkCoreRelationalPackageVersion> <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>3.0.0-alpha1-10706</MicrosoftEntityFrameworkCoreSqlServerPackageVersion> <MicrosoftEntityFrameworkCoreToolsPackageVersion>3.0.0-alpha1-10706</MicrosoftEntityFrameworkCoreToolsPackageVersion> <MicrosoftExtensionsConfigurationBinderPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsConfigurationBinderPackageVersion> - <MicrosoftExtensionsConfigurationCommandLinePackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsConfigurationCommandLinePackageVersion> <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion> - <MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion> - <MicrosoftExtensionsConfigurationJsonPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsConfigurationJsonPackageVersion> - <MicrosoftExtensionsConfigurationPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsConfigurationPackageVersion> <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsConfigurationUserSecretsPackageVersion> <MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsDependencyInjectionPackageVersion> - <MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion> - <MicrosoftExtensionsLoggingConfigurationPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsLoggingConfigurationPackageVersion> <MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsLoggingConsolePackageVersion> <MicrosoftExtensionsLoggingDebugPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsLoggingDebugPackageVersion> - <MicrosoftExtensionsLoggingPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsLoggingPackageVersion> - <MicrosoftExtensionsLoggingTestingPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsLoggingTestingPackageVersion> - <MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion> - <MicrosoftExtensionsOptionsPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsOptionsPackageVersion> - <MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>3.19.8</MicrosoftIdentityModelClientsActiveDirectoryPackageVersion> - <MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>5.3.0</MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion> - <MicrosoftNETCoreApp30PackageVersion>3.0.0-preview1-26907-05</MicrosoftNETCoreApp30PackageVersion> + <MicrosoftNETCoreAppPackageVersion>3.0.0-preview1-26907-05</MicrosoftNETCoreAppPackageVersion> <MicrosoftNETSdkRazorPackageVersion>3.0.0-preview.19053.2</MicrosoftNETSdkRazorPackageVersion> - <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion> - <MicrosoftOwinSecurityCookiesPackageVersion>3.0.1</MicrosoftOwinSecurityCookiesPackageVersion> - <MicrosoftOwinSecurityInteropPackageVersion>3.0.0-alpha1-10772</MicrosoftOwinSecurityInteropPackageVersion> - <MoqPackageVersion>4.10.0</MoqPackageVersion> - <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion> - <SystemComponentModelAnnotationsPackageVersion>4.6.0-preview1-26907-04</SystemComponentModelAnnotationsPackageVersion> + <MicrosoftNETTestSdkPackageVersion>15.9.0</MicrosoftNETTestSdkPackageVersion> <XunitAnalyzersPackageVersion>0.10.0</XunitAnalyzersPackageVersion> <XunitPackageVersion>2.3.1</XunitPackageVersion> <XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion> </PropertyGroup> <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " /> - <PropertyGroup Label="Package Versions: Pinned" /> </Project> diff --git a/src/Framework/Directory.Build.props b/src/Framework/Directory.Build.props index 27f7138ba4b..9f54c3ac3f1 100644 --- a/src/Framework/Directory.Build.props +++ b/src/Framework/Directory.Build.props @@ -1,15 +1,15 @@ <Project> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" /> - - <PropertyGroup> - <IsFrameworkMetapackage>true</IsFrameworkMetapackage> - </PropertyGroup> - <!-- Currently, the shared framework builds by using PackageReference to internally generate the deps.json files and move bits between projects. For local builds, this import is required to point to packages which actually exists. Run "build.cmd /t:GeneratePropsFiles /p:BuildNumberSuffix=xyz" to build the shared framework against a particular set of packages. --> <Import Condition="Exists('..\..\obj\dependencies.g.props') AND '$(DotNetPackageVersionPropsPath)' == ''" Project="..\..\obj\dependencies.g.props" /> + <Import Condition="'$(DotNetPackageVersionPropsPath)' != ''" Project="$(DotNetPackageVersionPropsPath)" /> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" /> + + <PropertyGroup> + <IsFrameworkMetapackage>true</IsFrameworkMetapackage> + </PropertyGroup> </Project> diff --git a/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj b/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj index 121ccb3d981..6e5e88e4536 100644 --- a/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj +++ b/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj @@ -11,12 +11,12 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion)" PrivateAssets="All" /> - <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlitePackageVersion)" /> - <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlServerPackageVersion)" /> - <PackageReference Include="MySqlConnector" Version="$(BenchmarksOnlyMySqlConnectorPackageVersion)" /> - <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(BenchmarksOnlyNpgsqlEntityFrameworkCorePostgreSQLPackageVersion)" /> - <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(BenchmarksOnlyPomeloEntityFrameworkCoreMySqlPackageVersion)" /> + <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.1" PrivateAssets="All" /> + <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.1" /> + <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.1" /> + <PackageReference Include="MySqlConnector" Version="0.43.0" /> + <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.1.1" /> + <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.1" /> </ItemGroup> <!-- These references are used when building locally or on CI. --> diff --git a/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj b/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj index 113947a0a12..10a068db815 100644 --- a/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj +++ b/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj @@ -11,16 +11,16 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(BenchmarksOnlyNpgsqlEntityFrameworkCorePostgreSQLPackageVersion)" /> + <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.1.1" /> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' != 'net461'"> - <PackageReference Include="MySqlConnector" Version="$(BenchmarksOnlyMySqlConnectorPackageVersion)" /> - <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(BenchmarksOnlyPomeloEntityFrameworkCoreMySqlPackageVersion)" /> + <PackageReference Include="MySqlConnector" Version="0.43.0" /> + <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.1" /> - <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion)" PrivateAssets="All" /> - <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlitePackageVersion)" /> - <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlServerPackageVersion)" /> + <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.1" PrivateAssets="All" /> + <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.1" /> + <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.1" /> </ItemGroup> <!-- These references are used when running locally --> diff --git a/src/Mvc/src/GetDocumentInsider/GetDocumentInsider.csproj b/src/Mvc/src/GetDocumentInsider/GetDocumentInsider.csproj index 6c6395955e5..81f0d939d72 100644 --- a/src/Mvc/src/GetDocumentInsider/GetDocumentInsider.csproj +++ b/src/Mvc/src/GetDocumentInsider/GetDocumentInsider.csproj @@ -17,7 +17,8 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="$(MicrosoftAspNetCoreHostingAbstractions20PackageVersion)" /> + <!-- Hard-coded to 2.0 because this project currently targets netcoreapp2.0 --> + <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.0.0" /> </ItemGroup> <Target Name="BuildX86" AfterTargets="Build" Condition=" '$(TargetFramework)' == 'net461' And '$(Platform)' != 'x86' "> diff --git a/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj index 58a8c695f93..244f054fa00 100644 --- a/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj @@ -21,8 +21,9 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="Microsoft.AspNetCore.AspNetCoreModule" Version="$(MicrosoftAspNetCoreAspNetCoreModuleStablePackageVersion)" /> - <PackageReference Include="Microsoft.AspNetCore.AspNetCoreModuleV2" Version="$(MicrosoftAspNetCoreAspNetCoreModuleV2StablePackageVersion)" /> + <!-- The versions on these references are hard-coded because we want to ensure we maintain backwards compatibility with ANCM 2.2.0 --> + <PackageReference Include="Microsoft.AspNetCore.AspNetCoreModule" Version="2.2.0" /> + <PackageReference Include="Microsoft.AspNetCore.AspNetCoreModuleV2" Version="2.2.0" /> </ItemGroup> <ItemGroup> diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj index f84a58e597d..ec78062e915 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj @@ -18,7 +18,11 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="$(MicrosoftAspNetCoreServerIISStablePackageVersion)" /> + <!-- This package is hard-coded to 2.2.0 as a part of ensuring ANCM stays forward compatible. --> + <PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="2.2.0" /> + </ItemGroup> + + <ItemGroup> <Reference Include="Microsoft.AspNetCore.ResponseCompression" /> <Reference Include="Microsoft.AspNetCore.Hosting" /> <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" /> diff --git a/src/SiteExtensions/LoggingAggregate/build/dependencies.props b/src/SiteExtensions/LoggingAggregate/build/dependencies.props index ef1eb218ffe..7fd2b962dc0 100644 --- a/src/SiteExtensions/LoggingAggregate/build/dependencies.props +++ b/src/SiteExtensions/LoggingAggregate/build/dependencies.props @@ -3,7 +3,7 @@ <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects> </PropertyGroup> - <Import Project="..\..\..\build\dependencies.props" /> + <Import Project="$(RepositoryRoot)Versions.props" /> <PropertyGroup Label="Package Versions"> <MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion>2.1.1-rtm-31076</MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion> diff --git a/src/Templating/Directory.Build.targets b/src/Templating/Directory.Build.targets index c73225cc3fd..f5a3f65909e 100644 --- a/src/Templating/Directory.Build.targets +++ b/src/Templating/Directory.Build.targets @@ -1,6 +1,6 @@ <Project> <PropertyGroup> - <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreApp30PackageVersion)</RuntimeFrameworkVersion> + <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion> </PropertyGroup> <PropertyGroup> diff --git a/src/Templating/build/dependencies.props b/src/Templating/build/dependencies.props index ac09eba34b5..ea9c1db1b35 100644 --- a/src/Templating/build/dependencies.props +++ b/src/Templating/build/dependencies.props @@ -21,10 +21,9 @@ <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>3.0.0-preview-181109-02</MicrosoftEntityFrameworkCoreSqlServerPackageVersion> <MicrosoftEntityFrameworkCoreToolsPackageVersion>3.0.0-preview-181109-02</MicrosoftEntityFrameworkCoreToolsPackageVersion> <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion> - <MicrosoftNETCoreApp30PackageVersion>3.0.0-preview1-26907-05</MicrosoftNETCoreApp30PackageVersion> + <MicrosoftNETCoreAppPackageVersion>3.0.0-preview1-26907-05</MicrosoftNETCoreAppPackageVersion> <MicrosoftNETSdkRazorPackageVersion>3.0.0-preview-18579-0056</MicrosoftNETSdkRazorPackageVersion> <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion> - <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion> <SeleniumSupportPackageVersion>3.12.1</SeleniumSupportPackageVersion> <SeleniumWebDriverMicrosoftDriverPackageVersion>17.17134.0</SeleniumWebDriverMicrosoftDriverPackageVersion> <SeleniumWebDriverPackageVersion>3.12.1</SeleniumWebDriverPackageVersion> diff --git a/src/Templating/build/repo.props b/src/Templating/build/repo.props index 0dcc5a7de21..bdaa4d3ed7b 100644 --- a/src/Templating/build/repo.props +++ b/src/Templating/build/repo.props @@ -6,7 +6,7 @@ </PropertyGroup> <ItemGroup> - <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp30PackageVersion)" /> + <DotNetCoreRuntime Include="$(MicrosoftNETCoreAppPackageVersion)" /> <!-- SkipAspNetCoreRuntimeInstall must be set when building templates before the shared framework is available --> <AspNetCoreRuntime Include="$(MicrosoftAspNetCoreAppPackageVersion)" diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj index 77fcaf26ec0..23b0ab922d8 100644 --- a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj +++ b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj @@ -39,7 +39,7 @@ MicrosoftEntityFrameworkCoreSqlServerPackageVersion=$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion); MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion=$(MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion); MicrosoftEntityFrameworkCoreToolsPackageVersion=$(MicrosoftEntityFrameworkCoreToolsPackageVersion); - MicrosoftNETCoreApp30PackageVersion=$(MicrosoftNETCoreApp30PackageVersion); + MicrosoftNETCoreAppPackageVersion=$(MicrosoftNETCoreAppPackageVersion); </GeneratedContentProperties> </PropertyGroup> -- GitLab