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

Address feedback

Browse source
This commit is contained in:
Michelle McDaniel 2021-03-02 07:19:31 -08:00
parent f6593a76ec
commit 4e8ff8d04a
3 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
tools/sdk-readme-table-generator/TableGenerator/Program.fs
View file

@ -8,32 +8,25 @@ open TableGenerator.Table
let inputBranches = let inputBranches =
[ { GitBranchName = "master" [ { GitBranchName = "master"
DisplayName = "Master<br>(6.0.x&nbsp;Runtime)" DisplayName = "Master<br>(6.0.x&nbsp;Runtime)"
AkaMsChannel = Some("6.0/daily") AkaMsChannel = Some("6.0/daily") }
UseLegacyAkaMsTemplate = false }
{ GitBranchName = "release/6.0.1xx-preview2" { GitBranchName = "release/6.0.1xx-preview2"
DisplayName = "Release/6.0.1XX-preview2<br>(6.0.x&nbsp;Runtime)" DisplayName = "Release/6.0.1XX-preview2<br>(6.0.x&nbsp;Runtime)"
AkaMsChannel = Some("6.0.1XX-preview2/daily") AkaMsChannel = Some("6.0.1XX-preview2/daily") }
UseLegacyAkaMsTemplate = false }
{ GitBranchName = "release/5.0.3xx" { GitBranchName = "release/5.0.3xx"
DisplayName = "Release/5.0.3XX<br>(5.0 Runtime)" DisplayName = "Release/5.0.3XX<br>(5.0 Runtime)"
AkaMsChannel = Some("5.0.3xx/daily") AkaMsChannel = Some("5.0.3xx/daily") }
UseLegacyAkaMsTemplate = false }
{ GitBranchName = "release/5.0.2xx" { GitBranchName = "release/5.0.2xx"
DisplayName = "Release/5.0.2XX<br>(5.0 Runtime)" DisplayName = "Release/5.0.2XX<br>(5.0 Runtime)"
AkaMsChannel = Some("5.0.2xx/daily") AkaMsChannel = Some("5.0.2xx/daily") }
UseLegacyAkaMsTemplate = true }
{ GitBranchName = "release/5.0.1xx-rtm" { GitBranchName = "release/5.0.1xx-rtm"
DisplayName = "5.0.100 RTM<br>(5.0 Runtime)" DisplayName = "5.0.100 RTM<br>(5.0 Runtime)"
AkaMsChannel = Some("net5/5.0.1xx/daily") AkaMsChannel = Some("net5/5.0.1xx/daily") }
UseLegacyAkaMsTemplate = true }
{ GitBranchName = "release/3.1.4xx" { GitBranchName = "release/3.1.4xx"
DisplayName = "Release/3.1.4XX<br>(3.1.x Runtime)" DisplayName = "Release/3.1.4XX<br>(3.1.x Runtime)"
AkaMsChannel = None AkaMsChannel = None }
UseLegacyAkaMsTemplate = false }
{ GitBranchName = "release/3.1.1xx" { GitBranchName = "release/3.1.1xx"
DisplayName = "Release/3.1.1XX<br>(3.1.x Runtime)" DisplayName = "Release/3.1.1XX<br>(3.1.x Runtime)"
AkaMsChannel = None AkaMsChannel = None }]
UseLegacyAkaMsTemplate = false }]
let referentNotes = """Reference notes: let referentNotes = """Reference notes:

7
tools/sdk-readme-table-generator/TableGenerator/Reference.fs
View file

@ -163,7 +163,12 @@ let winMuslReferenceTemplate: ReferenceTemplate = {
let formatTemplate (platform: String) (template: ReferenceTemplate) (branch: Branch): Option<string> = let formatTemplate (platform: String) (template: ReferenceTemplate) (branch: Branch): Option<string> =
if branch.AkaMsChannel <> None then if branch.AkaMsChannel <> None then
if branch.UseLegacyAkaMsTemplate then let useLegacyAkaMsTemplate =
match getMajorMinor branch with
| Master -> false
| MajorMinor { Major = major; Minor = _minor; Patch = patch } when major = 5 && patch < 300 -> true
| _ -> false
if useLegacyAkaMsTemplate then
Some (String.Format(template.AkaMSLegacyTemplate, Some (String.Format(template.AkaMSLegacyTemplate,
platform, // 0 - win-x64 platform, // 0 - win-x64
(branchNameShorten branch), // 1 - 5.0.1xx-preview2 (branchNameShorten branch), // 1 - 5.0.1xx-preview2

3
tools/sdk-readme-table-generator/TableGenerator/Shared.fs
View file

@ -6,8 +6,7 @@ open System
type Branch = type Branch =
{ GitBranchName: string { GitBranchName: string
DisplayName: string DisplayName: string
AkaMsChannel: string option AkaMsChannel: string option }
UseLegacyAkaMsTemplate: bool }
type ReferenceTemplate = type ReferenceTemplate =
{ AkaMSTemplate: string { AkaMSTemplate: string