diff --git a/build/common.props b/build/common.props index db6fa6bd04..6552ad98ea 100644 --- a/build/common.props +++ b/build/common.props @@ -1,5 +1,4 @@ - Microsoft ASP.NET Core diff --git a/build/dependencies.props b/build/dependencies.props index eab6ee52e0..2a07c98a0d 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,508 +1,93 @@  - - - - - - - - - false - - false - - false - - false - - false - - false - - - + 0.10.3 + 6.1.3 + 4.2.1 + $(KoreBuildVersion) + 1.10.0 + 2.0.0 + 2.1.1 + 1.0.0-pre-10057 + $(KoreBuildVersion) + 2.2.1 + 5.2.2 + 2.3.2 + 15.3.409 + 15.3.409 + 15.3.409 + 15.3.409 + 2.3.1 + 2.3.1 + 2.3.1 + 2.3.1 + 4.4.0 + 2.0.3 + 1.0.0-rc3-003121 + 2.0.3 + 3.14.1 + 2.1.4 + 5.2.0 1.0.8 1.1.5 - 2.0.0 2.0.7-servicing-26322-01 - - - - - - - - - - - KRB2004 - RuntimeFrameworkVersion - netcoreapp2.0 - - - KRB2004 - MicrosoftNETCoreApp20PackageVersion - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 2.0.1 + 1.0.1 + 15.6.1 + 3.0.1 + 3.0.1 + 3.0.1 + 15.0.26606 + 7.10.6070 + 15.0.26606 + 10.0.30319 + 11.0.61030 + 12.0.30110 + 8.0.50727 + 9.0.30729 + 7.10.6071 + 1.4.0 + 4.4.0 + 4.7.49 + 2.0.1 + 1.0.1 + 10.0.1 + 4.0.0 + 2.1.1 2.6.0-beta1-61924-08 + 1.4.0 + 3.2.0 + 1.1.7 + 1.1.7 + 1.2.4 + 1.1.92 + 1.0.0 + 4.4.0 + 1.4.0 + 4.4.0 + 4.4.3 + 4.4.1 + 5.2.0 + 3.1.1 + 4.4.0-preview3-25519-03 + 4.4.0 + 4.4.0 + 1.5.0 + 4.4.0 + 4.3.0 + 4.4.0 + 4.4.0 + 4.4.0 + 4.8.0 + 4.4.0 + 4.4.0 + 9.0.1 + 8.1.4 + 2.0.1 + 2.3.1 + 2.2.0 + 2.2.0 + 2.3.1 + 2.3.1 + 2.2.0 - - - - - KRB2004 - MicrosoftCodeAnalysisToolingPackageVersion - - - - KRB2004 - MicrosoftCodeAnalysisCommonToolingPackageVersion - - - - KRB2004 - MicrosoftCodeAnalysisCSharpToolingPackageVersion - - - - KRB2004 - MicrosoftCodeAnalysisCSharpWorkspacesToolingPackageVersion - - - - KRB2004 - MicrosoftCodeAnalysisVisualBasicToolingPackageVersion - - - - KRB2004 - MicrosoftCodeAnalysisVisualBasicWorkspacesToolingPackageVersion - - - - KRB2004 - MicrosoftCodeAnalysisWorkspacesCommonToolingPackageVersion - - - - - - - - - - $(KoreBuildVersion) - $(KoreBuildVersion) - - - - - - - - - - - - - - - - - KRB2004 - RuntimeFrameworkVersion - netcoreapp1.0 - - - KRB2004 - MicrosoftNETCoreApp10PackageVersion - - - KRB2004 - RuntimeFrameworkVersion - netcoreapp1.1 - - - KRB2004 - MicrosoftNETCoreApp11PackageVersion - - - - KRB2004 - DotNetCliTool_MicrosoftNETCoreApp20PackageVersion - netcoreapp2.0 - - - - - - - - - - - - - - - - KRB2004 - - - - KRB2004 - - - - KRB2004 - - - - KRB2004 - - - - - - - - - - - - - - - - - - - - - - - - - NETStandardLibrary20PackageVersion - - - - - KRB2004 - NewtonsoftJsonToolingPackageVersion - - - - KRB2004 - NewtonsoftJsonRuntimePackageVersion - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KRB2004 - XunitAssertStablePackageVersion - - - - KRB2004 - - - - XunitRunnerVisualStudioPackageVersion - - - - KRB2004 - XunitStablePackageVersion - - - - KRB2004 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/external-dependencies.props b/build/external-dependencies.props new file mode 100644 index 0000000000..d99e28ae37 --- /dev/null +++ b/build/external-dependencies.props @@ -0,0 +1,407 @@ + + + + + + + + + false + + false + + false + + false + + false + + false + + + + + + + + + + + + + + + + + + + + + + MicrosoftCodeAnalysisToolingPackageVersion + + + + MicrosoftCodeAnalysisCommonToolingPackageVersion + + + + MicrosoftCodeAnalysisCSharpToolingPackageVersion + + + + MicrosoftCodeAnalysisCSharpWorkspacesToolingPackageVersion + + + + MicrosoftCodeAnalysisVisualBasicToolingPackageVersion + + + + MicrosoftCodeAnalysisVisualBasicWorkspacesToolingPackageVersion + + + + MicrosoftCodeAnalysisWorkspacesCommonToolingPackageVersion + + + + + + + + + + + + + + + + + + + + + RuntimeFrameworkVersion + netcoreapp2.0 + + + MicrosoftNETCoreApp20PackageVersion + + + RuntimeFrameworkVersion + netcoreapp1.0 + + + MicrosoftNETCoreApp10PackageVersion + + + RuntimeFrameworkVersion + netcoreapp1.1 + + + MicrosoftNETCoreApp11PackageVersion + + + + DotNetCliTool_MicrosoftNETCoreApp20PackageVersion + netcoreapp2.0 + + + + + + + + + + + + + + + + + + + + + + NETStandardLibrary20PackageVersion + + + + + NewtonsoftJsonToolingPackageVersion + + + + NewtonsoftJsonRuntimePackageVersion + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + XunitAssertStablePackageVersion + + + + + XunitRunnerVisualStudioPackageVersion + + + + XunitStablePackageVersion + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/repo.props b/build/repo.props index b6984598fb..8e580fac82 100644 --- a/build/repo.props +++ b/build/repo.props @@ -13,7 +13,8 @@ FeedCredential="$(DotNetAssetRootAccessTokenSuffix)" /> - + + diff --git a/build/repo.targets b/build/repo.targets index 8b6e77531f..f59d7b8e7d 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -17,7 +17,7 @@ $(IntermediateDir)sources.g.props $(IntermediateDir)branding.g.props - $(PrepareDependsOn);VerifyPackageArtifactConfig;PrepareOutputPath + $(PrepareDependsOn);VerifyPackageArtifactConfig;VerifyExternalDependencyConfig;PrepareOutputPath $(CleanDependsOn);CleanArtifacts;CleanUniverseArtifacts $(RestoreDependsOn);InstallDotNet $(CompileDependsOn);BuildRepositories @@ -212,6 +212,14 @@ Condition="'%(PackageArtifact.Category)' != 'ship' AND '%(PackageArtifact.LZMATools)' == 'true' " /> + + + + + + diff --git a/build/tasks/AnalyzeBuildGraph.cs b/build/tasks/AnalyzeBuildGraph.cs index 550bca775f..03157b410e 100644 --- a/build/tasks/AnalyzeBuildGraph.cs +++ b/build/tasks/AnalyzeBuildGraph.cs @@ -98,12 +98,6 @@ namespace RepoTasks { dependencyMap[dep.ItemSpec] = versions = new List(); } - else if (dep.GetMetadata("NoWarn") == null || dep.GetMetadata("NoWarn").IndexOf("KRB" + KoreBuildErrors.MultipleExternalDependencyVersions) < 0) - { - Log.LogKoreBuildWarning( - KoreBuildErrors.MultipleExternalDependencyVersions, - message: $"Multiple versions of external dependency '{dep.ItemSpec}' are defined. In most cases, there should only be one version of external dependencies."); - } versions.Add(dep.GetMetadata("Version")); } diff --git a/build/tasks/Utilities/KoreBuildErrors.cs b/build/tasks/Utilities/KoreBuildErrors.cs index f21bde3436..8386f9cf7f 100644 --- a/build/tasks/Utilities/KoreBuildErrors.cs +++ b/build/tasks/Utilities/KoreBuildErrors.cs @@ -15,7 +15,6 @@ namespace RepoTasks.Utilities public const int RepoVersionDoesNotMatchProjectVersion = 2001; public const int RepoPackageVersionDoesNotMatchProjectPackageVersion = 2002; public const int DuplicatePackageReference = 2003; - public const int MultipleExternalDependencyVersions = 2004; // NuGet errors public const int InvalidNuspecFile = 4001; diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 6a9feb52e1..ac67116891 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,5 +1,6 @@ +