Fix update-dependencies

Update all core-setup dependencies.
Fix the app to get its shared framework from stage0 instead of what is currently checked in to the repo (which my mis-match when many builds of core-setup come out at a time).
This commit is contained in:
Eric Erhardt 2017-04-21 13:04:19 -05:00
parent eabf8e69af
commit 7b04142ddd
2 changed files with 5 additions and 2 deletions

View file

@ -81,7 +81,10 @@ namespace Microsoft.DotNet.Scripts
private static IEnumerable<IDependencyUpdater> GetUpdaters() private static IEnumerable<IDependencyUpdater> GetUpdaters()
{ {
yield return CreateRegexUpdater(Path.Combine("build", "DependencyVersions.props"), "CLI_SharedFrameworkVersion", "Microsoft.NETCore.App"); string dependencyVersionsPath = Path.Combine("build", "DependencyVersions.props");
yield return CreateRegexUpdater(dependencyVersionsPath, "CLI_SharedFrameworkVersion", "Microsoft.NETCore.App");
yield return CreateRegexUpdater(dependencyVersionsPath, "PlatformAbstractionsVersion", "Microsoft.DotNet.PlatformAbstractions");
yield return CreateRegexUpdater(dependencyVersionsPath, "DependencyModelVersion", "Microsoft.Extensions.DependencyModel");
} }
private static IDependencyUpdater CreateRegexUpdater(string repoRelativePath, string propertyName, string packageId) private static IDependencyUpdater CreateRegexUpdater(string repoRelativePath, string propertyName, string packageId)

View file

@ -5,6 +5,7 @@
<Description>Updates the repos dependencies</Description> <Description>Updates the repos dependencies</Description>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>$(CliTargetFramework)</TargetFramework> <TargetFramework>$(CliTargetFramework)</TargetFramework>
<DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -12,7 +13,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NETCore.App" Version="$(CLI_SharedFrameworkVersion)" />
<PackageReference Include="Microsoft.DotNet.VersionTools" Version="$(VersionToolsVersion)" /> <PackageReference Include="Microsoft.DotNet.VersionTools" Version="$(VersionToolsVersion)" />
</ItemGroup> </ItemGroup>