microsoft
/
Oryx
зеркало из https://github.com/microsoft/Oryx.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Snehapar/1583653 add support for dotnet 6.0.8 and 3.1.28 images and sdks (#1523) 

* Added 6.0.8 sdks and runtime versions

* Added constants for 6.0.8 sdks and runtime

* Added sdks and runtime for 3.1.28

* Added constatns for dotnet 3.1.28

* Added runtime tag in constants.yaml

* Added Paul's change

* Updated runtime tag

* Added sdk versions for 3.1.28 and 6.0.8 for all debian flavors

* Updated runtime tag in constants.yaml

* Generated constants

* Modified test to use dev storage account for dynamic installation

* Modified unit test

* Added 6.0.8 sdks and runtime versions

* Added constants for 6.0.8 sdks and runtime

* Added sdks and runtime for 3.1.28

* Added constatns for dotnet 3.1.28

* Added runtime tag in constants.yaml

* Updated runtime tag

* Added sdk versions for 3.1.28 and 6.0.8 for all debian flavors

* Updated runtime tag in constants.yaml

* Generated constants

* Modified test to use dev storage account for dynamic installation

* Modified unit test

* Modified unit test to remove whitespace

* Updated runtime tag in constants.yaml

* Added dotnet 6.0.400 sdk to bullseye\versionsTobuild.txt

* Updated runtime tag

* Modified buildscript to pull sdks from dev storage account

* Deleted stretch/versionsToBuild.txt

* Added versionsToBuild.txt back - without dotnet 6.0.8 sdk
This commit is contained in:
snehapar9 2022-08-23 23:32:18 -07:00 коммит произвёл GitHub
Родитель 031ab11e96
Коммит a245a058aa
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
13 изменённых файлов: 59 добавлений и 35 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

18
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='20220810.1'
DOT_NET_CORE_RUNTIME_BASE_TAG='20220822.2'
NET_CORE_APP_10='1.0.16'
NET_CORE_APP_11='1.1.13'
NET_CORE_APP_20='2.0.9'
@ -14,18 +14,18 @@ NET_CORE_APP_30='3.0.3'
NET_CORE_APP_30_SHA='3d1f0ba2f293f43e087a8940a0f4736561f43b9f28bc5beda79a61f887e258543aea4dc71e88414a7c6e271dcda984a989afb62fc659a72223707a179cdde9c5'
ASPNET_CORE_APP_30='3.0.3'
ASPNET_CORE_APP_30_SHA='d88366ac20204c5acb4b80bc40396d608d6c067b25baeef54204e77dde48fb515bd463743745a0982ba8c9182fc751306a4e796f91060b2d013ffbea7d9a2dc8'
NET_CORE_APP_31='3.1.26'
NET_CORE_APP_31_SHA='03676885ec4d1f5ba184678a6b774f8e385abfff800a6bcee6f85557b39e9cdde500be49b5d6c956fc95cdfb9f33d31e467548bb498a52bc4fd639b3cb87c8d0'
ASPNET_CORE_APP_31='3.1.26'
ASPNET_CORE_APP_31_SHA='8bbf06012cdd2cff23c592e0d3c49d032d77add4dda8fba1d7ba73e6cc4ae97b1676908b14cdc7fc2fe723302e1efd27a44b48190a91d69c0e41bb5edb47501f'
NET_CORE_APP_31='3.1.28'
NET_CORE_APP_31_SHA='b0760d463b8935a14bc247899b692038ded7d476a0cf2ed262eaac8ee6840350b29738cd1ab4961ba93b05f1802e7aba6e3c5e27e06ec9cb5e244149c52adea4'
ASPNET_CORE_APP_31='3.1.28'
ASPNET_CORE_APP_31_SHA='fd66f9c0d0e9ed57abe5f81650c2ff49c694e05927e5280dbbdee1a9eb4299f0710bdc06ae0af0737c0a0584970b24d3eb952434b45ad8984fe3e37ca95cc1b1'
NET_CORE_APP_50='5.0.17'
NET_CORE_APP_50_SHA='a9c4784930a977abbc42aff1337dda06ec588c1ec4769a59f9fcab4d5df4fc9efe65f8e61e5433db078f67a94ea2dfe870c32c482a50d4c16283ffacacff4261'
ASPNET_CORE_APP_50='5.0.17'
ASPNET_CORE_APP_50_SHA='d8e87804e9e86273c6512785bd5a6f0e834ff3f4bbebc11c4fcdf16ab4fdfabd0d981a756955267c1aa9bbeec596de3728ce9b2e6415d2d80daef0d999a5df6d'
NET_CORE_APP_60='6.0.6'
NET_CORE_APP_60_SHA='4fe090f934f0ba4e64a63dfccbac97d49b19a913f2a7d73abe85efd604ee5577cefd65d6e0dc02086e9fa28be4ce2bbaecb33ea70d022714138ed54deea58c72'
ASPNET_CORE_APP_60='6.0.6'
ASPNET_CORE_APP_60_SHA='1a5c0f85820f0eb589700df94de6dbff45fe4089a37f1cd5b1fac33476a2cbd8d5c6f129e55b3716f5a7a2616f1a5a720c52238f21b28a510a3e5c8bcb8c516c'
NET_CORE_APP_60='6.0.8'
NET_CORE_APP_60_SHA='c776813bf87c25766b31a3a514d124d0526086ceea514a10f104d70ba435c91a6bd3c8bf10c6662b4df2b13ffcdf385518f3418e51d05cccec6a2cf2c26099de'
ASPNET_CORE_APP_60='6.0.8'
ASPNET_CORE_APP_60_SHA='b74676ca0d2f47a95533739fd36977bb1552890a81820ee51b29b3d6514398f0952362417bbb31fad4bdf031803cb3e8d2aaf065dfb154a78a1b471a536d4abd'
NET_CORE_APP_70='7.0.0-preview.7.22375.6'
NET_CORE_APP_70_SHA='9814a4e5a55b7137ec27b423ae4a557792af6cced035ab42876de012cb160adabbe054f043b61ed21a8385deb62075ab0a028f6599954ed3519ffe8cf824d30a'
ASPNET_CORE_APP_70='7.0.0-preview.7.22376.6'

4
build/__dotNetCoreSdkVersions.sh
Просмотреть файл

@ -4,9 +4,9 @@ DOT_NET_CORE_11_SDK_VERSION='1.1.14'
DOT_NET_CORE_21_SDK_VERSION='2.1.818'
DOT_NET_CORE_22_SDK_VERSION='2.2.207'
DOT_NET_CORE_30_SDK_VERSION='3.0.103'
DOT_NET_CORE_31_SDK_VERSION='3.1.420'
DOT_NET_CORE_31_SDK_VERSION='3.1.422'
DOT_NET_CORE_50_SDK_VERSION='5.0.302'
DOT_NET_50_SDK_VERSION='5.0.408'
DOT_NET_60_SDK_VERSION='6.0.301'
DOT_NET_60_SDK_VERSION='6.0.400'
DOT_NET_60_RTM_SDK_VERSION='6-0-100-rtm-21527-11'
DOT_NET_70_SDK_VERSION='7.0.100-preview.7.22377.5'

22
build/constants.yaml
Просмотреть файл

@ -38,10 +38,10 @@
dot-net-core-21-sdk-version: 2.1.818
dot-net-core-22-sdk-version: 2.2.207
dot-net-core-30-sdk-version: 3.0.103
dot-net-core-31-sdk-version: 3.1.420
dot-net-core-31-sdk-version: 3.1.422
dot-net-core-50-sdk-version: 5.0.302
dot-net-50-sdk-version: 5.0.408
dot-net-60-sdk-version: 6.0.301
dot-net-60-sdk-version: 6.0.400
dot-net-60-rtm-sdk-version: 6-0-100-rtm-21527-11
dot-net-70-sdk-version: 7.0.100-preview.7.22377.5
# Ensure that the below list of runtime versions are sorted in ascending order
@ -55,7 +55,7 @@
file-name-prefix: __
- name: dot-net-core-run-time-versions
constants:
dot-net-core-runtime-base-tag: 20220810.1
dot-net-core-runtime-base-tag: 20220822.2
net-core-app-10: 1.0.16
net-core-app-11: 1.1.13
@ -74,20 +74,20 @@
aspnet-core-app-30: 3.0.3
aspnet-core-app-30-sha: d88366ac20204c5acb4b80bc40396d608d6c067b25baeef54204e77dde48fb515bd463743745a0982ba8c9182fc751306a4e796f91060b2d013ffbea7d9a2dc8
net-core-app-31: 3.1.26
net-core-app-31-sha: 03676885ec4d1f5ba184678a6b774f8e385abfff800a6bcee6f85557b39e9cdde500be49b5d6c956fc95cdfb9f33d31e467548bb498a52bc4fd639b3cb87c8d0
aspnet-core-app-31: 3.1.26
aspnet-core-app-31-sha: 8bbf06012cdd2cff23c592e0d3c49d032d77add4dda8fba1d7ba73e6cc4ae97b1676908b14cdc7fc2fe723302e1efd27a44b48190a91d69c0e41bb5edb47501f
net-core-app-31: 3.1.28
net-core-app-31-sha: b0760d463b8935a14bc247899b692038ded7d476a0cf2ed262eaac8ee6840350b29738cd1ab4961ba93b05f1802e7aba6e3c5e27e06ec9cb5e244149c52adea4
aspnet-core-app-31: 3.1.28
aspnet-core-app-31-sha: fd66f9c0d0e9ed57abe5f81650c2ff49c694e05927e5280dbbdee1a9eb4299f0710bdc06ae0af0737c0a0584970b24d3eb952434b45ad8984fe3e37ca95cc1b1
net-core-app-50: 5.0.17
net-core-app-50-sha: a9c4784930a977abbc42aff1337dda06ec588c1ec4769a59f9fcab4d5df4fc9efe65f8e61e5433db078f67a94ea2dfe870c32c482a50d4c16283ffacacff4261
aspnet-core-app-50: 5.0.17
aspnet-core-app-50-sha: d8e87804e9e86273c6512785bd5a6f0e834ff3f4bbebc11c4fcdf16ab4fdfabd0d981a756955267c1aa9bbeec596de3728ce9b2e6415d2d80daef0d999a5df6d
net-core-app-60: 6.0.6
net-core-app-60-sha: 4fe090f934f0ba4e64a63dfccbac97d49b19a913f2a7d73abe85efd604ee5577cefd65d6e0dc02086e9fa28be4ce2bbaecb33ea70d022714138ed54deea58c72
aspnet-core-app-60: 6.0.6
aspnet-core-app-60-sha: 1a5c0f85820f0eb589700df94de6dbff45fe4089a37f1cd5b1fac33476a2cbd8d5c6f129e55b3716f5a7a2616f1a5a720c52238f21b28a510a3e5c8bcb8c516c
net-core-app-60: 6.0.8
net-core-app-60-sha: c776813bf87c25766b31a3a514d124d0526086ceea514a10f104d70ba435c91a6bd3c8bf10c6662b4df2b13ffcdf385518f3418e51d05cccec6a2cf2c26099de
aspnet-core-app-60: 6.0.8
aspnet-core-app-60-sha: b74676ca0d2f47a95533739fd36977bb1552890a81820ee51b29b3d6514398f0952362417bbb31fad4bdf031803cb3e8d2aaf065dfb154a78a1b471a536d4abd
net-core-app-70: 7.0.0-preview.7.22375.6
net-core-app-70-sha: 9814a4e5a55b7137ec27b423ae4a557792af6cced035ab42876de012cb160adabbe054f043b61ed21a8385deb62075ab0a028f6599954ed3519ffe8cf824d30a

7
doc/supportedPlatformVersions.md
Просмотреть файл

@ -15,6 +15,7 @@
- 3.1.417
- 3.1.419
- 3.1.420
- 3.1.422
### buster
@ -36,6 +37,7 @@
- 3.1.417
- 3.1.419
- 3.1.420
- 3.1.422
- 5.0.100
- 5.0.102
- 5.0.103
@ -61,6 +63,7 @@
- 6.0.201
- 6.0.300
- 6.0.301
- 6.0.400
- 7.0.100-preview.1.22110.4
- 7.0.100-preview.5.22307.18
- 7.0.100-preview.6.22352.1
@ -86,6 +89,7 @@
- 3.1.417
- 3.1.419
- 3.1.420
- 3.1.422
- 5.0.100
- 5.0.102
- 5.0.103
@ -111,6 +115,7 @@
- 6.0.201
- 6.0.300
- 6.0.301
- 6.0.400
- 7.0.100-preview.1.22110.4
- 7.0.100-preview.5.22307.18
- 7.0.100-preview.6.22352.1
@ -169,6 +174,7 @@
- 3.1.417
- 3.1.419
- 3.1.420
- 3.1.422
- 5.0.100-preview.1.20155.7
- 5.0.100-preview.2.20176.6
- 5.0.100-preview.3.20216.6
@ -205,6 +211,7 @@
- 6.0.201
- 6.0.300
- 6.0.301
- 6.0.400
- 7.0.100-preview.1.22110.4
- 7.0.100-preview.5.22307.18
- 7.0.100-preview.6.22352.1

2
platforms/dotnet/versions/bullseye/versionsToBuild.txt
Просмотреть файл

@ -11,6 +11,7 @@
3.1.417, 8eb1002ad829ddd17638b942d3f8da24ad71ccab268a92a1fa6af6a65d86a4ab7f885f663ea9c68127bb356462bce125222ec4f04dc928005cbbbb1a8658f107,
3.1.419, 957d9561b346226806270a969a302217dec2a5e4853225d73fbf85f20f6107137ac5678a6ffdf5c170a72f5ef93e3defe3218970bc20d97a4f880d5c7577376f,
3.1.420, b3bdd964182f9edc3c2976541e657fcc43b0eaf9bc97197597c7ecb8b784d79e3efb9e0405c84e1dcb434cf4cd38ddc4af628c5df486c3d7ae8a23e5254796e3,
3.1.422, 690759982b12cce7a06ed22b9311ec3b375b8de8600bd647c0257c866d2f9c99d7c9add4a506f4c6c37ef01db85c0f7862d9ae3de0d11e9bec60958bd1b3b72c,
6.0.100-preview.1.21103.13, 86f591c70c73732030210e8e7ce39b7b4e4a680098862e340a4a8726bcb3f981f0748baec0fce8c5c4a8615670a72ab92bfad8d0dc0a305401bbc5864116996a,
6.0.100-preview.2.21155.3, 90d9b6070f7732dcf75f5a09a4f10f9b23c835a3bb144e0c3f1fa451cadd3d49c9781973b180f70a4d2798358a7c00f3c0b9b3bf35326fe4c94e470e84ac8c35,
@ -26,6 +27,7 @@
6.0.201, a4d96b6ca2abb7d71cc2c64282f9bd07cedc52c03d8d6668346ae0cd33a9a670d7185ab0037c8f0ecd6c212141038ed9ea9b19a188d1df2aae10b2683ce818ce,
6.0.300, 52d720e90cfb889a92d605d64e6d0e90b96209e1bd7eab00dab1d567017d7a5a4ff4adbc55aff4cffcea4b1bf92bb8d351859d00d8eb65059eec5e449886c938,
6.0.301, 2f434ea4860ee637e9cf19991a80e1febb1105531dd96b4fbc728d538ca0ab202a0bdff128fd13b269fac3ba3bc9d5f9c49039a6e0d7d32751e8a2bb6d790446,
6.0.400, 8decbba0a6b09501daede52cbb5a9ae9e5f31ade201918c03efcd1b4cc345ec934f88321704ec3beb1f90f2204934be7259c76f66d9204cbdd15933582602763,
7.0.100-preview.1.22110.4, 54488a911172f059e3823d6bf52e1fa87305eb09e84d97f81a40e0815fc8a73a480b149023283f557a672ef0341f022b8ca16ebec92264ee16a56fac8f35e2e2,
7.0.100-preview.5.22307.18, 691c0d8917bc9848a08707b7fa22da05228dad0ba6335ff06c6d80f9a95349307572ff45c0b088d9fc199c40a1784ff314e1a8735d0366bd3aa06eb8dfa2b7d5,

4
platforms/dotnet/versions/buster/versionsToBuild.txt
Просмотреть файл

@ -36,6 +36,8 @@
3.1.420, b3bdd964182f9edc3c2976541e657fcc43b0eaf9bc97197597c7ecb8b784d79e3efb9e0405c84e1dcb434cf4cd38ddc4af628c5df486c3d7ae8a23e5254796e3,
3.1.422, 690759982b12cce7a06ed22b9311ec3b375b8de8600bd647c0257c866d2f9c99d7c9add4a506f4c6c37ef01db85c0f7862d9ae3de0d11e9bec60958bd1b3b72c,
5.0.100, BEC37BFB327C45CC01FD843EF93B22B556F753B04724BBA501622DF124E7E144C303A4D7E931B5DBADBD4F7B39E5ADB8F601CB6293E317AD46D8FE7D52AA9A09,
5.0.102, 0ce2d5365ca39808fb71baec4584d4ec786491c3735543dc93244604ea97e242377d0987cd8b1e529258dee68f203b5780559201e7ea6d84487d6d8d433329b3,
@ -86,6 +88,8 @@
6.0.301, 2f434ea4860ee637e9cf19991a80e1febb1105531dd96b4fbc728d538ca0ab202a0bdff128fd13b269fac3ba3bc9d5f9c49039a6e0d7d32751e8a2bb6d790446,
6.0.400, 8decbba0a6b09501daede52cbb5a9ae9e5f31ade201918c03efcd1b4cc345ec934f88321704ec3beb1f90f2204934be7259c76f66d9204cbdd15933582602763,
7.0.100-preview.1.22110.4, 54488a911172f059e3823d6bf52e1fa87305eb09e84d97f81a40e0815fc8a73a480b149023283f557a672ef0341f022b8ca16ebec92264ee16a56fac8f35e2e2,
7.0.100-preview.5.22307.18, 691c0d8917bc9848a08707b7fa22da05228dad0ba6335ff06c6d80f9a95349307572ff45c0b088d9fc199c40a1784ff314e1a8735d0366bd3aa06eb8dfa2b7d5,

4
platforms/dotnet/versions/focal-scm/versionsToBuild.txt
Просмотреть файл

@ -36,6 +36,8 @@
3.1.420, b3bdd964182f9edc3c2976541e657fcc43b0eaf9bc97197597c7ecb8b784d79e3efb9e0405c84e1dcb434cf4cd38ddc4af628c5df486c3d7ae8a23e5254796e3,
3.1.422, 690759982b12cce7a06ed22b9311ec3b375b8de8600bd647c0257c866d2f9c99d7c9add4a506f4c6c37ef01db85c0f7862d9ae3de0d11e9bec60958bd1b3b72c,
5.0.100, BEC37BFB327C45CC01FD843EF93B22B556F753B04724BBA501622DF124E7E144C303A4D7E931B5DBADBD4F7B39E5ADB8F601CB6293E317AD46D8FE7D52AA9A09,
5.0.102, 0ce2d5365ca39808fb71baec4584d4ec786491c3735543dc93244604ea97e242377d0987cd8b1e529258dee68f203b5780559201e7ea6d84487d6d8d433329b3,
@ -86,6 +88,8 @@
6.0.301, 2f434ea4860ee637e9cf19991a80e1febb1105531dd96b4fbc728d538ca0ab202a0bdff128fd13b269fac3ba3bc9d5f9c49039a6e0d7d32751e8a2bb6d790446,
6.0.400, 8decbba0a6b09501daede52cbb5a9ae9e5f31ade201918c03efcd1b4cc345ec934f88321704ec3beb1f90f2204934be7259c76f66d9204cbdd15933582602763,
7.0.100-preview.1.22110.4, 54488a911172f059e3823d6bf52e1fa87305eb09e84d97f81a40e0815fc8a73a480b149023283f557a672ef0341f022b8ca16ebec92264ee16a56fac8f35e2e2,
7.0.100-preview.5.22307.18, 691c0d8917bc9848a08707b7fa22da05228dad0ba6335ff06c6d80f9a95349307572ff45c0b088d9fc199c40a1784ff314e1a8735d0366bd3aa06eb8dfa2b7d5,

18
src/BuildScriptGenerator/DotNetCore/DotNetCoreRunTimeVersions.cs
Просмотреть файл

@ -4,7 +4,7 @@ namespace Microsoft.Oryx.BuildScriptGenerator.DotNetCore
{
public static class DotNetCoreRunTimeVersions
{
public const string DotNetCoreRuntimeBaseTag = "20220810.1";
public const string DotNetCoreRuntimeBaseTag = "20220822.2";
public const string NetCoreApp10 = "1.0.16";
public const string NetCoreApp11 = "1.1.13";
public const string NetCoreApp20 = "2.0.9";
@ -18,18 +18,18 @@ namespace Microsoft.Oryx.BuildScriptGenerator.DotNetCore
public const string NetCoreApp30Sha = "3d1f0ba2f293f43e087a8940a0f4736561f43b9f28bc5beda79a61f887e258543aea4dc71e88414a7c6e271dcda984a989afb62fc659a72223707a179cdde9c5";
public const string AspnetCoreApp30 = "3.0.3";
public const string AspnetCoreApp30Sha = "d88366ac20204c5acb4b80bc40396d608d6c067b25baeef54204e77dde48fb515bd463743745a0982ba8c9182fc751306a4e796f91060b2d013ffbea7d9a2dc8";
public const string NetCoreApp31 = "3.1.26";
public const string NetCoreApp31Sha = "03676885ec4d1f5ba184678a6b774f8e385abfff800a6bcee6f85557b39e9cdde500be49b5d6c956fc95cdfb9f33d31e467548bb498a52bc4fd639b3cb87c8d0";
public const string AspnetCoreApp31 = "3.1.26";
public const string AspnetCoreApp31Sha = "8bbf06012cdd2cff23c592e0d3c49d032d77add4dda8fba1d7ba73e6cc4ae97b1676908b14cdc7fc2fe723302e1efd27a44b48190a91d69c0e41bb5edb47501f";
public const string NetCoreApp31 = "3.1.28";
public const string NetCoreApp31Sha = "b0760d463b8935a14bc247899b692038ded7d476a0cf2ed262eaac8ee6840350b29738cd1ab4961ba93b05f1802e7aba6e3c5e27e06ec9cb5e244149c52adea4";
public const string AspnetCoreApp31 = "3.1.28";
public const string AspnetCoreApp31Sha = "fd66f9c0d0e9ed57abe5f81650c2ff49c694e05927e5280dbbdee1a9eb4299f0710bdc06ae0af0737c0a0584970b24d3eb952434b45ad8984fe3e37ca95cc1b1";
public const string NetCoreApp50 = "5.0.17";
public const string NetCoreApp50Sha = "a9c4784930a977abbc42aff1337dda06ec588c1ec4769a59f9fcab4d5df4fc9efe65f8e61e5433db078f67a94ea2dfe870c32c482a50d4c16283ffacacff4261";
public const string AspnetCoreApp50 = "5.0.17";
public const string AspnetCoreApp50Sha = "d8e87804e9e86273c6512785bd5a6f0e834ff3f4bbebc11c4fcdf16ab4fdfabd0d981a756955267c1aa9bbeec596de3728ce9b2e6415d2d80daef0d999a5df6d";
public const string NetCoreApp60 = "6.0.6";
public const string NetCoreApp60Sha = "4fe090f934f0ba4e64a63dfccbac97d49b19a913f2a7d73abe85efd604ee5577cefd65d6e0dc02086e9fa28be4ce2bbaecb33ea70d022714138ed54deea58c72";
public const string AspnetCoreApp60 = "6.0.6";
public const string AspnetCoreApp60Sha = "1a5c0f85820f0eb589700df94de6dbff45fe4089a37f1cd5b1fac33476a2cbd8d5c6f129e55b3716f5a7a2616f1a5a720c52238f21b28a510a3e5c8bcb8c516c";
public const string NetCoreApp60 = "6.0.8";
public const string NetCoreApp60Sha = "c776813bf87c25766b31a3a514d124d0526086ceea514a10f104d70ba435c91a6bd3c8bf10c6662b4df2b13ffcdf385518f3418e51d05cccec6a2cf2c26099de";
public const string AspnetCoreApp60 = "6.0.8";
public const string AspnetCoreApp60Sha = "b74676ca0d2f47a95533739fd36977bb1552890a81820ee51b29b3d6514398f0952362417bbb31fad4bdf031803cb3e8d2aaf065dfb154a78a1b471a536d4abd";
public const string NetCoreApp70 = "7.0.0-preview.7.22375.6";
public const string NetCoreApp70Sha = "9814a4e5a55b7137ec27b423ae4a557792af6cced035ab42876de012cb160adabbe054f043b61ed21a8385deb62075ab0a028f6599954ed3519ffe8cf824d30a";
public const string AspnetCoreApp70 = "7.0.0-preview.7.22376.6";

4
src/BuildScriptGenerator/DotNetCore/DotNetCoreSdkVersions.cs
Просмотреть файл

@ -10,10 +10,10 @@ namespace Microsoft.Oryx.BuildScriptGenerator.DotNetCore
public const string DotNetCore21SdkVersion = "2.1.818";
public const string DotNetCore22SdkVersion = "2.2.207";
public const string DotNetCore30SdkVersion = "3.0.103";
public const string DotNetCore31SdkVersion = "3.1.420";
public const string DotNetCore31SdkVersion = "3.1.422";
public const string DotNetCore50SdkVersion = "5.0.302";
public const string DotNet50SdkVersion = "5.0.408";
public const string DotNet60SdkVersion = "6.0.301";
public const string DotNet60SdkVersion = "6.0.400";
public const string DotNet60RtmSdkVersion = "6-0-100-rtm-21527-11";
public const string DotNet70SdkVersion = "7.0.100-preview.7.22377.5";
public static readonly List<string> RuntimeVersions = new List<string> { "1.0", "1.1", "2.0", "2.1", "2.2", "3.0", "3.1", "5.0", "6.0", "7.0" };

2
tests/Oryx.BuildImage.Tests/DotNetCore/DotNetCoreSampleAppsTest.cs
Просмотреть файл

@ -848,6 +848,8 @@ namespace Microsoft.Oryx.BuildImage.Tests
var appDir = volume.ContainerDir;
var appOutputDir = "/tmp/blazor-wasm-output";
var script = new ShellScriptBuilder()
.SetEnvironmentVariable(SdkStorageConstants.SdkStorageBaseUrlKeyName,
SdkStorageConstants.DevSdkStorageBaseUrl)
.AddBuildCommand(
$"{appDir}/MessageFunction -o {appOutputDir} --apptype functions --platform dotnet " +
$"--platform-version 3.1")

1
tests/Oryx.Integration.Tests/DotNetCore/DotNetCoreRuntimeVersion31Tests.cs
Просмотреть файл

@ -173,6 +173,7 @@ namespace Microsoft.Oryx.Integration.Tests
var appOutputDir = appOutputDirVolume.ContainerDir;
var expectedFileInOutputDir = Guid.NewGuid().ToString("N");
var buildImageScript = new ShellScriptBuilder()
.AddDefaultTestEnvironmentVariables()
.AddCommand(
$"oryx build {appDir} -i /tmp/int --platform {DotNetCoreConstants.PlatformName} " +
$"--platform-version {dotnetcoreVersion} -o {appOutputDir}")

3
tests/Oryx.Integration.Tests/DotNetCore/DotNetCoreRuntimeVersion60Tests.cs
Просмотреть файл

@ -265,6 +265,7 @@ namespace Microsoft.Oryx.Integration.Tests
var appOutputDir = appOutputDirVolume.ContainerDir;
var startupCommand = $"./{NetCoreApp60MvcApp}";
var buildImageScript = new ShellScriptBuilder()
.AddDefaultTestEnvironmentVariables()
.AddCommand($"oryx build {appDir} -i /tmp/int -o {appOutputDir} " +
$"--platform {DotNetCoreConstants.PlatformName} " +
$"--platform-version {dotnetcoreVersion}")
@ -312,6 +313,7 @@ namespace Microsoft.Oryx.Integration.Tests
var appOutputDirVolume = CreateAppOutputDirVolume();
var appOutputDir = appOutputDirVolume.ContainerDir;
var buildImageScript = new ShellScriptBuilder()
.AddDefaultTestEnvironmentVariables()
.AddCommand(
$"oryx build {appDir} -i /tmp/int --platform {DotNetCoreConstants.PlatformName} " +
$"--platform-version {dotnetcoreVersion} " +
@ -361,6 +363,7 @@ namespace Microsoft.Oryx.Integration.Tests
var appOutputDir = appOutputDirVolume.ContainerDir;
var expectedFileInOutputDir = Guid.NewGuid().ToString("N");
var buildImageScript = new ShellScriptBuilder()
.AddDefaultTestEnvironmentVariables()
.AddCommand(
$"oryx build {appDir} -i /tmp/int --platform {DotNetCoreConstants.PlatformName} " +
$"--platform-version {dotnetcoreVersion} -o {appOutputDir}")

5
tests/Oryx.RuntimeImage.Tests/DotNetCore/DotnetCoreImageVersionsTest.cs
Просмотреть файл

@ -4,6 +4,7 @@
// --------------------------------------------------------------------------------------------
using System;
using System.Linq;
using Microsoft.Oryx.BuildScriptGenerator.DotNetCore;
using Microsoft.Oryx.Tests.Common;
using Xunit;
@ -111,12 +112,12 @@ namespace Microsoft.Oryx.RuntimeImage.Tests
});
// Assert
var actualOutput = result.StdOut.ReplaceNewLine();
var actualOutput = string.Join("", result.StdOut.ReplaceNewLine().Where(c => !char.IsWhiteSpace(c)));
RunAsserts(
() =>
{
Assert.True(result.IsSuccess);
Assert.Contains(expectedOutput, actualOutput);
Assert.Contains(string.Join("", expectedOutput.Where(c => !char.IsWhiteSpace(c))), actualOutput);
},
result.GetDebugInfo());
}