diff --git a/build/external-dependencies.props b/build/external-dependencies.props index f0261d2212..8f8858d98c 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -129,7 +129,7 @@ - + diff --git a/build/tasks/AddMetapackageReferences.cs b/build/tasks/AddMetapackageReferences.cs index 57a9675061..3cb11666ab 100644 --- a/build/tasks/AddMetapackageReferences.cs +++ b/build/tasks/AddMetapackageReferences.cs @@ -89,7 +89,10 @@ namespace RepoTasks continue; } - var packageVersionValue = GetDependencyVersion(dependencyVersionType, packageName, packageVersion); + var packageVersionValue = + Enum.TryParse(package.GetMetadata("MetapackageVersionRangeType"), out var packageVersionType) + ? GetDependencyVersion(packageVersionType, packageName, packageVersion) + : GetDependencyVersion(dependencyVersionType, packageName, packageVersion); Log.LogMessage(MessageImportance.High, $" - Package: {packageName} Version: {packageVersionValue}"); diff --git a/build/tools/templates/Archive/Archive.csproj b/build/tools/templates/Archive/Archive.csproj deleted file mode 100644 index e2843be0e0..0000000000 --- a/build/tools/templates/Archive/Archive.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - netcoreapp2.1 - false - true - true - - - - - - -