This repository has been archived by the owner on Apr 20, 2023. It is now read-only.
Fixing 'Channel' and 'BranchName': "release/2.1.4xx" to "master" #9362
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
peterhuene
approved these changes
May 29, 2018
dsplaisted
approved these changes
May 29, 2018
There was a problem hiding this comment.
We should really be calculating the information in BranchInfo.props dynamically, otherwise we will continue to get this wrong.
We can't do that for the README.md file, but if we were calculating the Channel and BranchName dynamically, then we could have a test that ensured that README.md was up-to-date.
|
We should probably have a validation job (possibly a MicroBuild job, to parity what Roslyn has). That job can trivially validate things like that publish branch or created packages matching the branch that GitHub pulls down. It also avoids the problem of building from sources that don't have branch info or that weren't checked out via Git. |
|
@tannergooding @johnbeisner Can one of you file an issue to improve things here? IE either calculating these properties dynamically, or validating that they are correct in a validation job. |
|
git rev-parse --abbrev-ref HEAD |
livarcocc
added a commit
to livarcocc/cli-1
that referenced
this pull request
Jun 8, 2018
* master: (31 commits) Updating signing project to use new intermediate directory (int). Update runtimeconfig.json doc for 2.1 (dotnet#9382) Shortening the path to the intermediate folder by renaming it to int. fix typo (dotnet#9364) Updating asp.net to 2.2.0 as well. Updating the build and tests to work with the 2.2.0 runtime. Simplified combining dictionaries in Telemetry Fixing 'Channel' and 'BranchName': "release/2.1.4xx" to "master" (dotnet#9362) Fix extraction of folders (dotnet#9335) Update Sha256Hasher.cs Fix relative path tool path (dotnet#9330) Insert updated SDK from 2.1.4xx branch MSBuild 15.8.60 Fix crash when user home directory cannot be determined. Make `CliFolderPathCalculator` a static class. Don't add the ReleaseSuffix to the branding on the CLI when DropSuffix is set to true. Add retry when Directory.Move (dotnet#9313) Override new SdkResult public properties Add reference to Microsoft.Build.NuGetSdkResolver Disable crossgen for MSBuild inline-task refs ... README.md build/BranchInfo.props build/BundledTemplates.props build/DependencyVersions.props build/Version.props src/redist/redist.csproj test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj
dotnet-maestro-bot
pushed a commit
to dotnet-maestro-bot/cli
that referenced
this pull request
Aug 7, 2018
…e_master_cli * 'master' of /Users/livarcocc/Documents/git/cli: (1063 commits) Updating signing project to use new intermediate directory (int). Update runtimeconfig.json doc for 2.1 (dotnet#9382) Shortening the path to the intermediate folder by renaming it to int. fix typo (dotnet#9364) Updating asp.net to 2.2.0 as well. Updating the build and tests to work with the 2.2.0 runtime. Simplified combining dictionaries in Telemetry Fixing 'Channel' and 'BranchName': "release/2.1.4xx" to "master" (dotnet#9362) Fix extraction of folders (dotnet#9335) Update Sha256Hasher.cs Fix relative path tool path (dotnet#9330) Insert updated SDK from 2.1.4xx branch MSBuild 15.8.60 Fix crash when user home directory cannot be determined. Make `CliFolderPathCalculator` a static class. Don't add the ReleaseSuffix to the branding on the CLI when DropSuffix is set to true. Add retry when Directory.Move (dotnet#9313) Override new SdkResult public properties Add reference to Microsoft.Build.NuGetSdkResolver Disable crossgen for MSBuild inline-task refs ...
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixing 'Channel' and 'BranchName': "release/2.1.4xx" to "master" - also the readme