mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reenable UpdateVersionsRepo

Browse source 
Now that https://github.com/dotnet/buildtools/issues/1547 is fixed.
This commit is contained in:
Eric Erhardt 2017-06-23 08:53:04 -05:00
parent f4d884a03d
commit 6119a29f83
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/DependencyVersions.props
View file

@ -41,7 +41,7 @@
<!-- infrastructure and test only dependencies --> <!-- infrastructure and test only dependencies -->
<PropertyGroup> <PropertyGroup>
<VersionToolsVersion>1.0.27-prerelease-01611-04</VersionToolsVersion> <VersionToolsVersion>1.0.27-prerelease-01723-01</VersionToolsVersion>
<DotnetDebToolVersion>2.0.0-preview2-25331-01</DotnetDebToolVersion> <DotnetDebToolVersion>2.0.0-preview2-25331-01</DotnetDebToolVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

5
build/publish/FinishBuild.targets
View file

@ -54,9 +54,8 @@
CommitHash="$(CommitHash)" CommitHash="$(CommitHash)"
Coherent="$(Coherent)" /> Coherent="$(Coherent)" />
<!-- Uncomment the line below when https://github.com/dotnet/buildtools/issues/1547 gets fixed. --> <UpdateVersionsRepo BranchName="$(BranchName)"
<!-- <UpdateVersionsRepo BranchName="$(BranchName)"
PackagesDirectory="$(PackagesDirectory)" PackagesDirectory="$(PackagesDirectory)"
GitHubPassword="$(GITHUB_PASSWORD)" /> --> GitHubPassword="$(GITHUB_PASSWORD)" />
</Target> </Target>
</Project> </Project>

3
build_projects/update-dependencies/Config.cs
View file

@ -82,7 +82,8 @@ namespace Microsoft.DotNet.Scripts
private static string GetDefaultCoreSetupVersionFragment() private static string GetDefaultCoreSetupVersionFragment()
{ {
string coreSetupChannel = GetRepoMSBuildPropValue("BundledRuntimes.props", "CoreSetupChannel") ?? "master"; // by default, the current core-setup branch should match the current cli branch name
string coreSetupChannel = Instance.GitHubUpstreamBranch;
return $"dotnet/core-setup/{coreSetupChannel}"; return $"dotnet/core-setup/{coreSetupChannel}";
} }