diff options
author | Davis Goodin <dagood@microsoft.com> | 2019-07-02 22:15:18 +0300 |
---|---|---|
committer | Davis Goodin <dagood@microsoft.com> | 2019-07-02 22:15:18 +0300 |
commit | da4a19ae1b0a37e0e8c4d461df375bec3af90c68 (patch) | |
tree | 69ba4009ec411a563849629f5aa6756ea3d0cf4d /tools-local | |
parent | dec26d5d96d6787a446bfe7f9ff2cc865d099997 (diff) | |
parent | a420d0c5d7d706e975a2b2dee25b0d903c4b4a16 (diff) |
Merge 'master' into dev/arcade-migration
# Conflicts:
# build.proj
# eng/Versions.props
Commit migrated from https://github.com/dotnet/core-setup/commit/457e30a2ddde823477f245f3bde4e38a765b8332
Diffstat (limited to 'tools-local')
-rw-r--r-- | tools-local/regenerate-readme-table.proj | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tools-local/regenerate-readme-table.proj b/tools-local/regenerate-readme-table.proj index 0478b0a7a2d..5b6b261e907 100644 --- a/tools-local/regenerate-readme-table.proj +++ b/tools-local/regenerate-readme-table.proj @@ -12,8 +12,6 @@ <Branches Include="Release/3.0.X" Abbr="3.0.X" /> <Branches Include="Release/2.2.X" Abbr="2.2.X" /> <Branches Include="Release/2.1.X" Abbr="2.1.X" /> - <Branches Include="Release/1.1.X" Abbr="1.1.X" /> - <Branches Include="Release/1.0.X" Abbr="preview" /> <Platforms Include="Windows (x64)" Abbr="win-x64" /> <Platforms Include="Windows (x86)" Abbr="win-x86" /> @@ -32,8 +30,6 @@ <Platforms Include="CentOS 7 (x64)" Abbr="centos-7" /> <Platforms Include="RHEL 6" Abbr="rhel-6" /> <Platforms Include="RHEL 7.2 (x64)" Abbr="rhel7" /> - <Platforms Include="Fedora 23 (x64)" Abbr="fedora-23" /> - <Platforms Include="Fedora 24 (x64)" Abbr="fedora-24" /> <Platforms Include="Fedora 27 (x64)" Abbr="fedora-27" /> <Platforms Include="SLES 12 (x64)" Abbr="sles-12" /> <Platforms Include="OpenSUSE 42 (x64)" Abbr="OpenSUSE-42" /> |