diff --git a/build/__dotNetCoreRunTimeVersions.sh b/build/__dotNetCoreRunTimeVersions.sh index a05ab5cf25..ff371ba6ff 100644 --- a/build/__dotNetCoreRunTimeVersions.sh +++ b/build/__dotNetCoreRunTimeVersions.sh @@ -3,7 +3,7 @@ NET_CORE_APP_10='1.0.16' NET_CORE_APP_11='1.1.14' NET_CORE_APP_20='2.0.9' -NET_CORE_APP_21='2.1.12' -NET_CORE_APP_22='2.2.6' +NET_CORE_APP_21='2.1.13' +NET_CORE_APP_22='2.2.7' NET_CORE_APP_30='3.0.0' -NET_CORE_APP_30_PREVIEW_NAME='3.0.0-preview9-19423-09' +NET_CORE_APP_30_PREVIEW_NAME='3.0.0-rc1-19456-20' diff --git a/build/__dotNetCoreSdkVersions.sh b/build/__dotNetCoreSdkVersions.sh index be236358bb..6209058900 100644 --- a/build/__dotNetCoreSdkVersions.sh +++ b/build/__dotNetCoreSdkVersions.sh @@ -2,10 +2,10 @@ DOT_NET_CORE_11_SDK_VERSION='1.1.14' DOT_NET_CORE_11_SDK_SHA512='E36AA4B278B936E1E2989B5E556F4EC3AEF2CB1EBB5ABD1BD6011D511873FC3E72101D035CF4DAF1563C7A3C43C193863D38CBF24288D375DD143AB42AFAE524' -DOT_NET_CORE_21_SDK_VERSION='2.1.801' -DOT_NET_CORE_21_SDK_SHA512='5781C6E254270803D9BB2C29B1555FB9DB258BF99BA2EFA2B457CA28226C70D6305C9B7C141CBF49ADE4915E136FAE941727ADFC60373E4822C52BF0E92C451B' -DOT_NET_CORE_22_SDK_VERSION='2.2.401' -DOT_NET_CORE_22_SDK_SHA512='08E1FCAFA4F898C80FF5E88EEB40C7497B4F5651AF3B8EC85F65A3DAA2F1509A766D833477358D3FF83D179E014034AB0C48120847EF24736C8D1A5B67FEC10B' -DOT_NET_CORE_30_SDK_VERSION_PREVIEW_NAME='3.0.100-preview9-014004' +DOT_NET_CORE_21_SDK_VERSION='2.1.802' +DOT_NET_CORE_21_SDK_SHA512='8601EC68FA8978C5A08A696CC69F5E0AA9DABF274BADE40E2FD9DED2E563F2CC7A1CB418A95C9B52E1FA9B6C4A30993BE68CB3B6BBDA4598C57B37EC9CE992AD' +DOT_NET_CORE_22_SDK_VERSION='2.2.402' +DOT_NET_CORE_22_SDK_SHA512='81937DE0874EE837E3B42E36D1CF9E04BD9DEFF6BA60D0162AE7CA9336A78F733E624136D27F559728DF3F681A72A669869BF91D02DB47C5331398C0CFDA9B44' +DOT_NET_CORE_30_SDK_VERSION_PREVIEW_NAME='3.0.100-rc1-014190' DOT_NET_CORE_30_SDK_VERSION='3.0.100' -DOT_NET_CORE_30_SDK_SHA512='B4E4580250F172C7B14CBCE96D2DE54D13A0B312ED71F86986CC53A9392491347E83CDEFC2805A23BD652FC2CC0658C2E74FC8C05212C3983C19E2ADBC1FE9A3' +DOT_NET_CORE_30_SDK_SHA512='24CFE258849579399B93AC81813BDDDADD1D1C546E3EB5DAE7586263F157A4B3DE3223E6A54B5458ECD103E4C70499CAECC330B57570302E378A2203EADDE671' diff --git a/build/constants.yaml b/build/constants.yaml index 41f0eb2371..caaf298fea 100644 --- a/build/constants.yaml +++ b/build/constants.yaml @@ -16,15 +16,15 @@ constants: dot-net-core-11-sdk-version: 1.1.14 dot-net-core-11-sdk-sha512: E36AA4B278B936E1E2989B5E556F4EC3AEF2CB1EBB5ABD1BD6011D511873FC3E72101D035CF4DAF1563C7A3C43C193863D38CBF24288D375DD143AB42AFAE524 - dot-net-core-21-sdk-version: 2.1.801 - dot-net-core-21-sdk-sha512: 5781C6E254270803D9BB2C29B1555FB9DB258BF99BA2EFA2B457CA28226C70D6305C9B7C141CBF49ADE4915E136FAE941727ADFC60373E4822C52BF0E92C451B - dot-net-core-22-sdk-version: 2.2.401 - dot-net-core-22-sdk-sha512: 08E1FCAFA4F898C80FF5E88EEB40C7497B4F5651AF3B8EC85F65A3DAA2F1509A766D833477358D3FF83D179E014034AB0C48120847EF24736C8D1A5B67FEC10B + dot-net-core-21-sdk-version: 2.1.802 + dot-net-core-21-sdk-sha512: 8601EC68FA8978C5A08A696CC69F5E0AA9DABF274BADE40E2FD9DED2E563F2CC7A1CB418A95C9B52E1FA9B6C4A30993BE68CB3B6BBDA4598C57B37EC9CE992AD + dot-net-core-22-sdk-version: 2.2.402 + dot-net-core-22-sdk-sha512: 81937DE0874EE837E3B42E36D1CF9E04BD9DEFF6BA60D0162AE7CA9336A78F733E624136D27F559728DF3F681A72A669869BF91D02DB47C5331398C0CFDA9B44 # Since preview names of .NET Core break the semver norms, it does not work well with the code # that we depend on for semantic version checks, so having two constants here. - dot-net-core-30-sdk-version-preview-name: 3.0.100-preview9-014004 + dot-net-core-30-sdk-version-preview-name: 3.0.100-rc1-014190 dot-net-core-30-sdk-version: 3.0.100 - dot-net-core-30-sdk-sha512: B4E4580250F172C7B14CBCE96D2DE54D13A0B312ED71F86986CC53A9392491347E83CDEFC2805A23BD652FC2CC0658C2E74FC8C05212C3983C19E2ADBC1FE9A3 + dot-net-core-30-sdk-sha512: 24CFE258849579399B93AC81813BDDDADD1D1C546E3EB5DAE7586263F157A4B3DE3223E6A54B5458ECD103E4C70499CAECC330B57570302E378A2203EADDE671 outputs: - type: csharp directory: src/BuildScriptGenerator/DotNetCore @@ -37,10 +37,10 @@ net-core-app-10: 1.0.16 net-core-app-11: 1.1.14 net-core-app-20: 2.0.9 - net-core-app-21: 2.1.12 - net-core-app-22: 2.2.6 + net-core-app-21: 2.1.13 + net-core-app-22: 2.2.7 net-core-app-30: 3.0.0 - net-core-app-30-preview-name: 3.0.0-preview9-19423-09 + net-core-app-30-preview-name: 3.0.0-rc1-19456-20 outputs: - type: csharp directory: src/BuildScriptGenerator/DotNetCore diff --git a/images/runtime/dotnetcore/dotnetCoreVersions.txt b/images/runtime/dotnetcore/dotnetCoreVersions.txt index 83906a7a7a..405fb78327 100644 --- a/images/runtime/dotnetcore/dotnetCoreVersions.txt +++ b/images/runtime/dotnetcore/dotnetCoreVersions.txt @@ -1,2 +1,2 @@ -2.2, mcr.microsoft.com/dotnet/core/aspnet:2.2.6 -3.0, mcr.microsoft.com/dotnet/core/aspnet:3.0.0-preview9 \ No newline at end of file +2.2, mcr.microsoft.com/dotnet/core/aspnet:2.2.7 +3.0, mcr.microsoft.com/dotnet/core/aspnet:3.0.0-rc1 \ No newline at end of file diff --git a/images/runtime/dotnetcore/dotnetCoreVersionsWithCurlUpdate.txt b/images/runtime/dotnetcore/dotnetCoreVersionsWithCurlUpdate.txt index 0d07ccca83..bb4449adca 100644 --- a/images/runtime/dotnetcore/dotnetCoreVersionsWithCurlUpdate.txt +++ b/images/runtime/dotnetcore/dotnetCoreVersionsWithCurlUpdate.txt @@ -1,4 +1,4 @@ 1.0, mcr.microsoft.com/dotnet/core/runtime:1.0.16 1.1, mcr.microsoft.com/dotnet/core/runtime:1.1.13 2.0, microsoft/aspnetcore:2.0.9 -2.1, mcr.microsoft.com/dotnet/core/aspnet:2.1.12 \ No newline at end of file +2.1, mcr.microsoft.com/dotnet/core/aspnet:2.1.13 \ No newline at end of file diff --git a/src/BuildScriptGenerator/DotNetCore/DotNetCoreRunTimeVersions.cs b/src/BuildScriptGenerator/DotNetCore/DotNetCoreRunTimeVersions.cs index 6ec4b3c64b..4d77371737 100644 --- a/src/BuildScriptGenerator/DotNetCore/DotNetCoreRunTimeVersions.cs +++ b/src/BuildScriptGenerator/DotNetCore/DotNetCoreRunTimeVersions.cs @@ -7,9 +7,9 @@ public static class DotNetCoreRunTimeVersions public const string NetCoreApp10 = "1.0.16"; public const string NetCoreApp11 = "1.1.14"; public const string NetCoreApp20 = "2.0.9"; - public const string NetCoreApp21 = "2.1.12"; - public const string NetCoreApp22 = "2.2.6"; + public const string NetCoreApp21 = "2.1.13"; + public const string NetCoreApp22 = "2.2.7"; public const string NetCoreApp30 = "3.0.0"; - public const string NetCoreApp30PreviewName = "3.0.0-preview9-19423-09"; + public const string NetCoreApp30PreviewName = "3.0.0-rc1-19456-20"; } } \ No newline at end of file diff --git a/src/BuildScriptGenerator/DotNetCore/DotNetCoreSdkVersions.cs b/src/BuildScriptGenerator/DotNetCore/DotNetCoreSdkVersions.cs index 4839f54249..74951ae3ae 100644 --- a/src/BuildScriptGenerator/DotNetCore/DotNetCoreSdkVersions.cs +++ b/src/BuildScriptGenerator/DotNetCore/DotNetCoreSdkVersions.cs @@ -6,12 +6,12 @@ public static class DotNetCoreSdkVersions { public const string DotNetCore11SdkVersion = "1.1.14"; public const string DotNetCore11SdkSha512 = "E36AA4B278B936E1E2989B5E556F4EC3AEF2CB1EBB5ABD1BD6011D511873FC3E72101D035CF4DAF1563C7A3C43C193863D38CBF24288D375DD143AB42AFAE524"; - public const string DotNetCore21SdkVersion = "2.1.801"; - public const string DotNetCore21SdkSha512 = "5781C6E254270803D9BB2C29B1555FB9DB258BF99BA2EFA2B457CA28226C70D6305C9B7C141CBF49ADE4915E136FAE941727ADFC60373E4822C52BF0E92C451B"; - public const string DotNetCore22SdkVersion = "2.2.401"; - public const string DotNetCore22SdkSha512 = "08E1FCAFA4F898C80FF5E88EEB40C7497B4F5651AF3B8EC85F65A3DAA2F1509A766D833477358D3FF83D179E014034AB0C48120847EF24736C8D1A5B67FEC10B"; - public const string DotNetCore30SdkVersionPreviewName = "3.0.100-preview9-014004"; + public const string DotNetCore21SdkVersion = "2.1.802"; + public const string DotNetCore21SdkSha512 = "8601EC68FA8978C5A08A696CC69F5E0AA9DABF274BADE40E2FD9DED2E563F2CC7A1CB418A95C9B52E1FA9B6C4A30993BE68CB3B6BBDA4598C57B37EC9CE992AD"; + public const string DotNetCore22SdkVersion = "2.2.402"; + public const string DotNetCore22SdkSha512 = "81937DE0874EE837E3B42E36D1CF9E04BD9DEFF6BA60D0162AE7CA9336A78F733E624136D27F559728DF3F681A72A669869BF91D02DB47C5331398C0CFDA9B44"; + public const string DotNetCore30SdkVersionPreviewName = "3.0.100-rc1-014190"; public const string DotNetCore30SdkVersion = "3.0.100"; - public const string DotNetCore30SdkSha512 = "B4E4580250F172C7B14CBCE96D2DE54D13A0B312ED71F86986CC53A9392491347E83CDEFC2805A23BD652FC2CC0658C2E74FC8C05212C3983C19E2ADBC1FE9A3"; + public const string DotNetCore30SdkSha512 = "24CFE258849579399B93AC81813BDDDADD1D1C546E3EB5DAE7586263F157A4B3DE3223E6A54B5458ECD103E4C70499CAECC330B57570302E378A2203EADDE671"; } } \ No newline at end of file