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

Updated installer files from master to main. Added a nuget.config so that the table generator will build.

Browse source
This commit is contained in:
Marc Paine 2021-03-18 17:28:39 -07:00
parent 823c1dfceb
commit 4ffebc1dac
8 changed files with 207 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,8 +6,8 @@ open TableGenerator.Reference
open TableGenerator.Table
let inputBranches =
[ { GitBranchName = "master"
DisplayName = "Master<br>(6.0.x&nbsp;Runtime)"
[ { GitBranchName = "Main"
DisplayName = "Main<br>(6.0.x&nbsp;Runtime)"
AkaMsChannel = Some("6.0/daily") }
{ GitBranchName = "release/6.0.1xx-preview2"
DisplayName = "Release/6.0.1XX-preview2<br>(6.0.x&nbsp;Runtime)"
@ -32,12 +32,12 @@ let inputBranches =
let referentNotes = """Reference notes:
> **1**: Our Debian packages are put together slightly differently than the other OS specific installers. Instead of combining everything, we have separate component packages that depend on each other. If you're installing the SDK from the .deb file (via dpkg or similar), then you'll need to install the corresponding dependencies first:
> * [Host, Host FX Resolver, and Shared Framework](https://github.com/dotnet/runtime#daily-builds)
> * [ASP.NET Core Shared Framework](https://github.com/aspnet/AspNetCore/blob/master/docs/DailyBuilds.md)
> * [ASP.NET Core Shared Framework](https://github.com/aspnet/AspNetCore/blob/Main/docs/DailyBuilds.md)
.NET Core SDK 2.x downloads can be found here: [.NET Core SDK 2.x Installers and Binaries](Downloads2.x.md)"""
let sdksha2 =
"[sdk-shas-2.2.1XX]: https://github.com/dotnet/versions/tree/master/build-info/dotnet/product/cli/release/2.2#built-repositories"
"[sdk-shas-2.2.1XX]: https://github.com/dotnet/versions/tree/Main/build-info/dotnet/product/cli/release/2.2#built-repositories"
let wholeTable branches =
String.Join

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

@ -165,7 +165,7 @@ let formatTemplate (platform: String) (template: ReferenceTemplate) (branch: Bra
if branch.AkaMsChannel <> None then
let useLegacyAkaMsTemplate =
match getMajorMinor branch with
| Master -> false
| Main -> false
| MajorMinor { Major = major; Minor = _minor; Patch = patch } when major = 5 && patch < 300 -> true
| _ -> false
if useLegacyAkaMsTemplate then
@ -198,7 +198,7 @@ let osxX64ReferenceTemplate = formatTemplate "osx-x64" osxReferenceTemplate
let osxArm64ReferenceTemplate branch =
let format branch = formatTemplate "osx-arm64" osxReferenceTemplate branch
match getMajorMinor branch with
| Master -> format branch
| Main -> format branch
| MajorMinor { Major = major; Minor = _minor } when major >= 6 -> format branch
| _ -> None
@ -215,14 +215,14 @@ let linuxMuslx64ReferenceTemplate = formatTemplate "linux-musl-x64" linuxMuslRef
let linuxMuslArmReferenceTemplate branch =
let format branch = formatTemplate "linux-musl-arm" linuxMuslReferenceTemplate branch
match getMajorMinor branch with
| Master -> format branch
| Main -> format branch
| MajorMinor { Major = major; Minor = _minor; Patch = patch } when major >= 6 || (major >= 5 && patch >= 299) -> format branch
| _ -> None
let linuxMuslArm64ReferenceTemplate branch =
let format branch = formatTemplate "linux-musl-arm64" linuxMuslReferenceTemplate branch
match getMajorMinor branch with
| Master -> format branch
| Main -> format branch
| MajorMinor { Major = major; Minor = _minor; Patch = patch } when major >= 6 || (major >= 5 && patch >= 299) -> format branch
| _ -> None

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

@ -22,14 +22,14 @@ type BranchMajorMinorVersion =
Patch: int
Release: string}
type BranchMajorMinorVersionOrMaster =
| Master
type BranchMajorMinorVersionOrMain =
| Main
| MajorMinor of BranchMajorMinorVersion
| NoVersion
let getMajorMinor (branch: Branch): BranchMajorMinorVersionOrMaster =
match branch.GitBranchName = "master" with
| true -> Master
let getMajorMinor (branch: Branch): BranchMajorMinorVersionOrMain =
match branch.GitBranchName = "Main" with
| true -> Main
| _ ->
match branch.GitBranchName.IndexOf('/') with
| index when index < 0 -> NoVersion

10
tools/sdk-readme-table-generator/TableGenerator/Table.fs
View file

@ -41,7 +41,7 @@ let osxArm64Row branches =
let format branch = String.Format(osxDesktopArchTableTemplate, "osx-arm64", branchNameShorten branch)
let tableTemplateForThisArch branch =
match getMajorMinor branch with
| Master -> format branch
| Main -> format branch
| MajorMinor { Major = major; Minor = _minor } when major >= 6 -> format branch
| _ -> notAvailable
formRow "**macOS arm64**" tableTemplateForThisArch branches
@ -64,7 +64,7 @@ let rhel6Row branches =
let tableTemplateForThisArch branch =
match getMajorMinor branch with
| NoVersion -> notAvailable
| Master -> notAvailable
| Main -> notAvailable
| MajorMinor { Major = major; Minor = minor } when major >= 5 -> notAvailable
| _ -> String.Format(linuxArmTableTemplate, "rhel-6", branchNameShorten branch)
formRow "**RHEL 6**" tableTemplateForThisArch branches
@ -78,7 +78,7 @@ let linuxMuslRowArm branches =
let format branch = String.Format(linuxArmTableTemplate, "linux-musl-arm", branchNameShorten branch)
let tableTemplateForThisArch branch =
match getMajorMinor branch with
| Master -> format branch
| Main -> format branch
| MajorMinor { Major = major; Minor = _minor; Patch = patch } when major >= 6 || (major >= 5 && patch >= 299) -> format branch
| _ -> notAvailable
formRow "**Linux-musl-arm**" tableTemplateForThisArch branches
@ -87,7 +87,7 @@ let linuxMuslRowArm64 branches =
let format branch = String.Format(linuxArmTableTemplate, "linux-musl-arm64", branchNameShorten branch)
let tableTemplateForThisArch branch =
match getMajorMinor branch with
| Master -> format branch
| Main -> format branch
| MajorMinor { Major = major; Minor = _minor; Patch = patch } when major >= 6 || (major >= 5 && patch >= 299) -> format branch
| _ -> notAvailable
formRow "**Linux-musl-arm64**" tableTemplateForThisArch branches
@ -99,7 +99,7 @@ let windowsArmRow branches =
let tableTemplateForThisArch branch =
match getMajorMinor branch with
| NoVersion -> notAvailable
| Master -> notAvailable
| Main -> notAvailable
| MajorMinor { Major = major; Minor = minor } when ( major >= 5) -> notAvailable
| _ -> String.Format(tableTemplate, branchNameShorten branch)
formRow "**Windows arm**" tableTemplateForThisArch branches