From 916d6c98f1f4fc81d36facecb7c2331ca11ae288 Mon Sep 17 00:00:00 2001 From: Harry Li <110055355+harryli0108@users.noreply.github.com> Date: Tue, 3 Oct 2023 13:41:51 -0400 Subject: [PATCH] Harrli/dotnet8automator (#2174) * Adding prereleases for dotnet 8 in automator * Adding workitem link * Change GH token var name * Modified permissions for automator * Use personal access token instead * Added bookworm to dotnet automation * New DotNetCore Sdks 2023-09-30 (#2173) * Add new dotnet SDK versions * Add runtime build number --------- Co-authored-by: Oryx Team Co-authored-by: William Hernandez --------- Co-authored-by: Oryx Team Co-authored-by: William Hernandez --- .github/workflows/automationTemplate.yaml | 6 +++++- build/__dotNetCoreRunTimeVersions.sh | 10 +++++----- build/__dotNetCoreSdkVersions.sh | 2 +- build/constants.yaml | 12 ++++++------ build/tools/Automation/Constants.cs | 2 +- doc/supportedPlatformVersions.md | 5 +++++ .../dotnet/versions/bookworm/versionsToBuild.txt | 3 ++- .../dotnet/versions/bullseye/versionsToBuild.txt | 1 + platforms/dotnet/versions/buster/versionsToBuild.txt | 1 + .../dotnet/versions/focal-scm/versionsToBuild.txt | 1 + .../dotnet/versions/stretch/versionsToBuild.txt | 1 + .../DotNetCore/DotNetCoreRunTimeVersions.cs | 10 +++++----- .../DotNetCore/DotNetCoreSdkVersions.cs | 2 +- 13 files changed, 35 insertions(+), 21 deletions(-) diff --git a/.github/workflows/automationTemplate.yaml b/.github/workflows/automationTemplate.yaml index dd32195aba..e710751039 100644 --- a/.github/workflows/automationTemplate.yaml +++ b/.github/workflows/automationTemplate.yaml @@ -29,6 +29,10 @@ env: jobs: build: runs-on: ubuntu-latest + permissions: + actions: write + contents: write + pull-requests: write steps: - uses: actions/checkout@v3 @@ -75,7 +79,7 @@ jobs: with: branch: automation/add-new-${{ inputs.platformName }}-versions-${{ env.RELEASE_DATE }} title: New ${{ env.PLATFORM_NAME_CAMEL_CASE }} Sdks ${{ env.RELEASE_DATE }} - token: ${{ secrets.GH_TOKEN }} + token: ${{ secrets.PAT_TEMP }} - if: ${{ env.CANCEL_WORKFLOW == 0 }} diff --git a/build/__dotNetCoreRunTimeVersions.sh b/build/__dotNetCoreRunTimeVersions.sh index 7be8b99387..d0290a23f0 100644 --- a/build/__dotNetCoreRunTimeVersions.sh +++ b/build/__dotNetCoreRunTimeVersions.sh @@ -1,6 +1,6 @@ # This file was auto-generated from 'constants.yaml'. Changes may be overridden. -DOT_NET_CORE_RUNTIME_BASE_TAG='20230921.1' +DOT_NET_CORE_RUNTIME_BASE_TAG='20230930.2' NET_CORE_APP_10='1.0.16' NET_CORE_APP_11='1.1.13' NET_CORE_APP_20='2.0.9' @@ -30,7 +30,7 @@ NET_CORE_APP_70='7.0.9' NET_CORE_APP_70_SHA='09552e5ae6ac014dadf17545ff0a30ab32921075a31fb33e7be148c13078e30d097f592ffa1b8d306563aaa3f6302e40c5c0ba815c1473bbd5d72e3bef55d91e' ASPNET_CORE_APP_70='7.0.9' ASPNET_CORE_APP_70_SHA='aabf4fa5ca726dc52774e5d644800ef7477815b22a982b7a2752dec6569186aabca93d5386e195e7ead377144601a786ae6a5d76ff28435bdabfad495cfe554b' -NET_CORE_APP_80='8.0.0-preview.7.23375.6' -NET_CORE_APP_80_SHA='bfd8491550178b86a7a72fe06bdc82f0dd66771d5b60d7e4e1133cdde29f84bd57857d846722e027bd209db087123b2d12b2e23590d77991052269fa265814e1' -ASPNET_CORE_APP_80='8.0.0-preview.7.23375.9' -ASPNET_CORE_APP_80_SHA='b8c8a5cd579a8ee1e082363a73a05a745499365445f784e6ff87547f9acdbe8b7ba525140ef10555bc2802c13af131c2d568ec6af020bd0dd2fdf82d4c258442' +NET_CORE_APP_80='8.0.0-rc.1.23419.4' +NET_CORE_APP_80_SHA='53938ec3aa4353cfb760d22faa850821b54a53fdd864c4969f48caa6b718ba207162b04a196e85543947acb7d3e719982edad1420b76198562051846f51b1b5c' +ASPNET_CORE_APP_80='8.0.0-rc.1.23421.29' +ASPNET_CORE_APP_80_SHA='d5f9e7bffbf2b48b26a317dd1d78bc866973b4a2cda448cd7a7ee64c0ffaf98fa3c4b8584d32528026674bdfd99f602f0fdac8242176815705e080df83825efa' diff --git a/build/__dotNetCoreSdkVersions.sh b/build/__dotNetCoreSdkVersions.sh index bd48f48169..82a4cfc808 100644 --- a/build/__dotNetCoreSdkVersions.sh +++ b/build/__dotNetCoreSdkVersions.sh @@ -10,4 +10,4 @@ DOT_NET_50_SDK_VERSION='5.0.408' DOT_NET_60_SDK_VERSION='6.0.412' DOT_NET_60_RTM_SDK_VERSION='6-0-100-rtm-21527-11' DOT_NET_70_SDK_VERSION='7.0.306' -DOT_NET_80_SDK_VERSION='8.0.100-preview.7.23376.3' +DOT_NET_80_SDK_VERSION='8.0.100-rc.1.23463.5' diff --git a/build/constants.yaml b/build/constants.yaml index b771d331b0..88225c7b26 100644 --- a/build/constants.yaml +++ b/build/constants.yaml @@ -47,7 +47,7 @@ dot-net-60-sdk-version: 6.0.412 dot-net-60-rtm-sdk-version: 6-0-100-rtm-21527-11 dot-net-70-sdk-version: 7.0.306 - dot-net-80-sdk-version: 8.0.100-preview.7.23376.3 + dot-net-80-sdk-version: 8.0.100-rc.1.23463.5 runtime-versions: - 3.0-debian-buster - 3.1-debian-bullseye @@ -68,7 +68,7 @@ file-name-prefix: __ - name: dot-net-core-run-time-versions constants: - dot-net-core-runtime-base-tag: 20230921.1 + dot-net-core-runtime-base-tag: 20230930.2 net-core-app-10: 1.0.16 net-core-app-11: 1.1.13 net-core-app-20: 2.0.9 @@ -98,10 +98,10 @@ net-core-app-70-sha: 09552e5ae6ac014dadf17545ff0a30ab32921075a31fb33e7be148c13078e30d097f592ffa1b8d306563aaa3f6302e40c5c0ba815c1473bbd5d72e3bef55d91e aspnet-core-app-70: 7.0.9 aspnet-core-app-70-sha: aabf4fa5ca726dc52774e5d644800ef7477815b22a982b7a2752dec6569186aabca93d5386e195e7ead377144601a786ae6a5d76ff28435bdabfad495cfe554b - net-core-app-80: 8.0.0-preview.7.23375.6 - net-core-app-80-sha: bfd8491550178b86a7a72fe06bdc82f0dd66771d5b60d7e4e1133cdde29f84bd57857d846722e027bd209db087123b2d12b2e23590d77991052269fa265814e1 - aspnet-core-app-80: 8.0.0-preview.7.23375.9 - aspnet-core-app-80-sha: b8c8a5cd579a8ee1e082363a73a05a745499365445f784e6ff87547f9acdbe8b7ba525140ef10555bc2802c13af131c2d568ec6af020bd0dd2fdf82d4c258442 + net-core-app-80: 8.0.0-rc.1.23419.4 + net-core-app-80-sha: 53938ec3aa4353cfb760d22faa850821b54a53fdd864c4969f48caa6b718ba207162b04a196e85543947acb7d3e719982edad1420b76198562051846f51b1b5c + aspnet-core-app-80: 8.0.0-rc.1.23421.29 + aspnet-core-app-80-sha: d5f9e7bffbf2b48b26a317dd1d78bc866973b4a2cda448cd7a7ee64c0ffaf98fa3c4b8584d32528026674bdfd99f602f0fdac8242176815705e080df83825efa outputs: - type: csharp directory: src/BuildScriptGenerator/DotNetCore diff --git a/build/tools/Automation/Constants.cs b/build/tools/Automation/Constants.cs index 681fbc904c..01a470c275 100644 --- a/build/tools/Automation/Constants.cs +++ b/build/tools/Automation/Constants.cs @@ -15,6 +15,6 @@ public class Constants public const string VersionsToBuildTxtFileName = "versionsToBuild.txt"; public const string ConstantsYaml = "constants.yaml"; public static readonly HashSet DebianFlavors = new HashSet() - { "bullseye", "buster", "focal-scm", "stretch" }; + { "bookworm", "bullseye", "buster", "focal-scm", "stretch" }; } } diff --git a/doc/supportedPlatformVersions.md b/doc/supportedPlatformVersions.md index 52f3298738..6b31cd809e 100644 --- a/doc/supportedPlatformVersions.md +++ b/doc/supportedPlatformVersions.md @@ -6,6 +6,7 @@ - 8.0.100-preview.6.23330.14 - 8.0.100-preview.7.23376.3 +- 8.0.100-rc.1.23463.5 ### bullseye @@ -65,6 +66,7 @@ - 7.0.304 - 7.0.305 - 7.0.306 +- 8.0.100-rc.1.23463.5 ### buster @@ -142,6 +144,7 @@ - 7.0.304 - 7.0.305 - 7.0.306 +- 8.0.100-rc.1.23463.5 ### focal-scm @@ -219,6 +222,7 @@ - 7.0.304 - 7.0.305 - 7.0.306 +- 8.0.100-rc.1.23463.5 ### stretch @@ -332,6 +336,7 @@ - 7.0.304 - 7.0.305 - 7.0.306 +- 8.0.100-rc.1.23463.5 ## golang diff --git a/platforms/dotnet/versions/bookworm/versionsToBuild.txt b/platforms/dotnet/versions/bookworm/versionsToBuild.txt index 80d8f9fbbe..7eafd32428 100644 --- a/platforms/dotnet/versions/bookworm/versionsToBuild.txt +++ b/platforms/dotnet/versions/bookworm/versionsToBuild.txt @@ -1,4 +1,5 @@ # NOTE: Make sure to set the default version in 'defaultVersion.txt' file # version, sha, download url 8.0.100-preview.6.23330.14, ef568a1ecf6140237249544673a52dc496cff682d1a078e9309d195d78e632b3870b7fb23eb38cae7b0638c564f6aa340ca2e209c4ae4fbcddb84073138e8a08, -8.0.100-preview.7.23376.3, 8bc71a586382f0e264024707f2f3af9a2f675dd5d4fbdd4bced7ab207141fb74d7c6492dfd94373505962b8597ae379259d152e4ace93a65dad0f89600afecd8, \ No newline at end of file +8.0.100-preview.7.23376.3, 8bc71a586382f0e264024707f2f3af9a2f675dd5d4fbdd4bced7ab207141fb74d7c6492dfd94373505962b8597ae379259d152e4ace93a65dad0f89600afecd8, +8.0.100-rc.1.23463.5, ac941fd16fd7c328f7cc44b132b4253ddb2b6a6c152af5f43c71c6cd0d468c89b7276ebf6c08895dcb6e5e25f7cae83b6fbacb91cfcc4a61d49b5657a834a901, diff --git a/platforms/dotnet/versions/bullseye/versionsToBuild.txt b/platforms/dotnet/versions/bullseye/versionsToBuild.txt index 418e57cc92..ae5d3e7661 100644 --- a/platforms/dotnet/versions/bullseye/versionsToBuild.txt +++ b/platforms/dotnet/versions/bullseye/versionsToBuild.txt @@ -57,3 +57,4 @@ 7.0.304, f4b7d0cde432bd37f445363b3937ad483e5006794886941e43124de051475925b3cd11313b73d2cae481ee9b8f131394df0873451f6088ffdbe73f150b1ed727, 7.0.305, c63e6baf3760a9949089d78920531a1140f4f31fffe13069b2011c61c3d583d585f5ec8cca973b414fa35d48ccbfea9c1ec1c88222b53afd2af5974be3b5cb1b, 7.0.306, 62df9bca9492b3273830e098e787ec3664243989ac03550534599fc331693553660d3cf8bca655f2d1326070dbb7b20b04743eaba77fa9cc69f6f0fddfdebd06, +8.0.100-rc.1.23463.5, ac941fd16fd7c328f7cc44b132b4253ddb2b6a6c152af5f43c71c6cd0d468c89b7276ebf6c08895dcb6e5e25f7cae83b6fbacb91cfcc4a61d49b5657a834a901, diff --git a/platforms/dotnet/versions/buster/versionsToBuild.txt b/platforms/dotnet/versions/buster/versionsToBuild.txt index 7f3d12d08d..83b7b4dc92 100644 --- a/platforms/dotnet/versions/buster/versionsToBuild.txt +++ b/platforms/dotnet/versions/buster/versionsToBuild.txt @@ -75,3 +75,4 @@ 7.0.304, f4b7d0cde432bd37f445363b3937ad483e5006794886941e43124de051475925b3cd11313b73d2cae481ee9b8f131394df0873451f6088ffdbe73f150b1ed727, 7.0.305, c63e6baf3760a9949089d78920531a1140f4f31fffe13069b2011c61c3d583d585f5ec8cca973b414fa35d48ccbfea9c1ec1c88222b53afd2af5974be3b5cb1b, 7.0.306, 62df9bca9492b3273830e098e787ec3664243989ac03550534599fc331693553660d3cf8bca655f2d1326070dbb7b20b04743eaba77fa9cc69f6f0fddfdebd06, +8.0.100-rc.1.23463.5, ac941fd16fd7c328f7cc44b132b4253ddb2b6a6c152af5f43c71c6cd0d468c89b7276ebf6c08895dcb6e5e25f7cae83b6fbacb91cfcc4a61d49b5657a834a901, diff --git a/platforms/dotnet/versions/focal-scm/versionsToBuild.txt b/platforms/dotnet/versions/focal-scm/versionsToBuild.txt index 7f3d12d08d..83b7b4dc92 100644 --- a/platforms/dotnet/versions/focal-scm/versionsToBuild.txt +++ b/platforms/dotnet/versions/focal-scm/versionsToBuild.txt @@ -75,3 +75,4 @@ 7.0.304, f4b7d0cde432bd37f445363b3937ad483e5006794886941e43124de051475925b3cd11313b73d2cae481ee9b8f131394df0873451f6088ffdbe73f150b1ed727, 7.0.305, c63e6baf3760a9949089d78920531a1140f4f31fffe13069b2011c61c3d583d585f5ec8cca973b414fa35d48ccbfea9c1ec1c88222b53afd2af5974be3b5cb1b, 7.0.306, 62df9bca9492b3273830e098e787ec3664243989ac03550534599fc331693553660d3cf8bca655f2d1326070dbb7b20b04743eaba77fa9cc69f6f0fddfdebd06, +8.0.100-rc.1.23463.5, ac941fd16fd7c328f7cc44b132b4253ddb2b6a6c152af5f43c71c6cd0d468c89b7276ebf6c08895dcb6e5e25f7cae83b6fbacb91cfcc4a61d49b5657a834a901, diff --git a/platforms/dotnet/versions/stretch/versionsToBuild.txt b/platforms/dotnet/versions/stretch/versionsToBuild.txt index 3b7b4a4eaf..db0fe6e37e 100644 --- a/platforms/dotnet/versions/stretch/versionsToBuild.txt +++ b/platforms/dotnet/versions/stretch/versionsToBuild.txt @@ -67,3 +67,4 @@ 7.0.304, f4b7d0cde432bd37f445363b3937ad483e5006794886941e43124de051475925b3cd11313b73d2cae481ee9b8f131394df0873451f6088ffdbe73f150b1ed727, 7.0.305, c63e6baf3760a9949089d78920531a1140f4f31fffe13069b2011c61c3d583d585f5ec8cca973b414fa35d48ccbfea9c1ec1c88222b53afd2af5974be3b5cb1b, 7.0.306, 62df9bca9492b3273830e098e787ec3664243989ac03550534599fc331693553660d3cf8bca655f2d1326070dbb7b20b04743eaba77fa9cc69f6f0fddfdebd06, +8.0.100-rc.1.23463.5, ac941fd16fd7c328f7cc44b132b4253ddb2b6a6c152af5f43c71c6cd0d468c89b7276ebf6c08895dcb6e5e25f7cae83b6fbacb91cfcc4a61d49b5657a834a901, diff --git a/src/BuildScriptGenerator/DotNetCore/DotNetCoreRunTimeVersions.cs b/src/BuildScriptGenerator/DotNetCore/DotNetCoreRunTimeVersions.cs index 983455053f..ed544db521 100644 --- a/src/BuildScriptGenerator/DotNetCore/DotNetCoreRunTimeVersions.cs +++ b/src/BuildScriptGenerator/DotNetCore/DotNetCoreRunTimeVersions.cs @@ -4,7 +4,7 @@ namespace Microsoft.Oryx.BuildScriptGenerator.DotNetCore { public static class DotNetCoreRunTimeVersions { - public const string DotNetCoreRuntimeBaseTag = "20230921.1"; + public const string DotNetCoreRuntimeBaseTag = "20230930.2"; public const string NetCoreApp10 = "1.0.16"; public const string NetCoreApp11 = "1.1.13"; public const string NetCoreApp20 = "2.0.9"; @@ -34,9 +34,9 @@ public static class DotNetCoreRunTimeVersions public const string NetCoreApp70Sha = "09552e5ae6ac014dadf17545ff0a30ab32921075a31fb33e7be148c13078e30d097f592ffa1b8d306563aaa3f6302e40c5c0ba815c1473bbd5d72e3bef55d91e"; public const string AspnetCoreApp70 = "7.0.9"; public const string AspnetCoreApp70Sha = "aabf4fa5ca726dc52774e5d644800ef7477815b22a982b7a2752dec6569186aabca93d5386e195e7ead377144601a786ae6a5d76ff28435bdabfad495cfe554b"; - public const string NetCoreApp80 = "8.0.0-preview.7.23375.6"; - public const string NetCoreApp80Sha = "bfd8491550178b86a7a72fe06bdc82f0dd66771d5b60d7e4e1133cdde29f84bd57857d846722e027bd209db087123b2d12b2e23590d77991052269fa265814e1"; - public const string AspnetCoreApp80 = "8.0.0-preview.7.23375.9"; - public const string AspnetCoreApp80Sha = "b8c8a5cd579a8ee1e082363a73a05a745499365445f784e6ff87547f9acdbe8b7ba525140ef10555bc2802c13af131c2d568ec6af020bd0dd2fdf82d4c258442"; + public const string NetCoreApp80 = "8.0.0-rc.1.23419.4"; + public const string NetCoreApp80Sha = "53938ec3aa4353cfb760d22faa850821b54a53fdd864c4969f48caa6b718ba207162b04a196e85543947acb7d3e719982edad1420b76198562051846f51b1b5c"; + public const string AspnetCoreApp80 = "8.0.0-rc.1.23421.29"; + public const string AspnetCoreApp80Sha = "d5f9e7bffbf2b48b26a317dd1d78bc866973b4a2cda448cd7a7ee64c0ffaf98fa3c4b8584d32528026674bdfd99f602f0fdac8242176815705e080df83825efa"; } } \ No newline at end of file diff --git a/src/BuildScriptGenerator/DotNetCore/DotNetCoreSdkVersions.cs b/src/BuildScriptGenerator/DotNetCore/DotNetCoreSdkVersions.cs index d9de16e605..9d17d9e32c 100644 --- a/src/BuildScriptGenerator/DotNetCore/DotNetCoreSdkVersions.cs +++ b/src/BuildScriptGenerator/DotNetCore/DotNetCoreSdkVersions.cs @@ -16,7 +16,7 @@ public static class DotNetCoreSdkVersions public const string DotNet60SdkVersion = "6.0.412"; public const string DotNet60RtmSdkVersion = "6-0-100-rtm-21527-11"; public const string DotNet70SdkVersion = "7.0.306"; - public const string DotNet80SdkVersion = "8.0.100-preview.7.23376.3"; + public const string DotNet80SdkVersion = "8.0.100-rc.1.23463.5"; public static readonly List RuntimeVersions = new List { "3.0-debian-buster", "3.1-debian-bullseye", "3.1-debian-buster", "5.0-debian-buster", "6.0-debian-bullseye", "6.0-debian-buster", "7.0-debian-bullseye", "7.0-debian-buster", "8.0-debian-bookworm", "dynamic-debian-buster" }; } } \ No newline at end of file