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

Snehapar/1599029 add support for dotnet7 rc1 (#1568) 

* Added dotnet 7 rc1

* generated constants

* Added runtime tag

* Added final stretch constant

* Updated final stretch constant name

* Reverted NetCore7PreviewMvcApp version back

* Fixed test failing for github-actions-stretch image during dynamic installation

* Updated final stretch dontnet 7 version

* Fixed SupportedVersionAndImageNameData for dotnet 7 stretch runtime version
This commit is contained in:
snehapar9 2022-09-20 15:11:06 -07:00 коммит произвёл GitHub
Родитель 056bbe2874
Коммит 7a99e64133
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
12 изменённых файлов: 42 добавлений и 23 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
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='20220822.2'
DOT_NET_CORE_RUNTIME_BASE_TAG='20220915.1'
NET_CORE_APP_10='1.0.16'
NET_CORE_APP_11='1.1.13'
NET_CORE_APP_20='2.0.9'
@ -26,7 +26,7 @@ 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'
ASPNET_CORE_APP_70_SHA='7d4861a28a42df31a7e2c740d17e1b0eb78e860a2ccdb25eec754a2098593a3adac00687294209d847a8fa618019a2d1b1d5fdd3f9aea37ffdc19164c862c558'
NET_CORE_APP_70='7.0.0-rc.1.22426.10'
NET_CORE_APP_70_SHA='62145fdaf182581cec5ba6bbafd66e3bb2df28379311f13e6849371a88cc2f428db3663f96ad006bbf4411eba609d486036d3b2aa1e3d86eee53216aec543fc1'
ASPNET_CORE_APP_70='7.0.0-rc.1.22427.2'
ASPNET_CORE_APP_70_SHA='101898d0921f21c7895a1e015064a5aa5f1ca92bd31bd0d30fb9981e3c4383f14ea25464289e4ef29bf55fea1e2096e4b07bce71c948992a76c5ff0f7005b415'

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

@ -9,4 +9,4 @@ DOT_NET_CORE_50_SDK_VERSION='5.0.302'
DOT_NET_50_SDK_VERSION='5.0.408'
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'
DOT_NET_70_SDK_VERSION='7.0.100-rc.1.22431.12'

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

@ -6,3 +6,6 @@ FINAL_STRETCH_ASPNET_CORE_APP_31_RUN_TIME_VERSION='3.1.26'
FINAL_STRETCH_DOT_NET_60_SDK_VERSION='6.0.301'
FINAL_STRETCH_DOT_NET_CORE_APP_60_RUN_TIME_VERSION='6.0.6'
FINAL_STRETCH_ASPNET_CORE_APP_60_RUN_TIME_VERSION='6.0.6'
FINAL_STRETCH_DOT_NET_70_SDK_VERSION='7.0.100-preview.7.22377.5'
FINAL_STRETCH_DOT_NET_CORE_APP_70_RUN_TIME_VERSION='7.0.0-preview.7.22375.6'
FINAL_STRETCH_ASPNET_CORE_APP_70_RUN_TIME_VERSION='7.0.0-preview.7.22376.6'

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

@ -43,7 +43,7 @@
dot-net-50-sdk-version: 5.0.408
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
dot-net-70-sdk-version: 7.0.100-rc.1.22431.12
# Ensure that the below list of runtime versions are sorted in ascending order
runtime-versions: [1.0, 1.1, 2.0, 2.1, 2.2, 3.0, 3.1, 5.0, 6.0, 7.0]
outputs:
@ -55,7 +55,7 @@
file-name-prefix: __
- name: dot-net-core-run-time-versions
constants:
dot-net-core-runtime-base-tag: 20220822.2
dot-net-core-runtime-base-tag: 20220915.1
net-core-app-10: 1.0.16
net-core-app-11: 1.1.13
@ -89,10 +89,10 @@
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
aspnet-core-app-70-sha: 7d4861a28a42df31a7e2c740d17e1b0eb78e860a2ccdb25eec754a2098593a3adac00687294209d847a8fa618019a2d1b1d5fdd3f9aea37ffdc19164c862c558
net-core-app-70: 7.0.0-rc.1.22426.10
net-core-app-70-sha: 62145fdaf182581cec5ba6bbafd66e3bb2df28379311f13e6849371a88cc2f428db3663f96ad006bbf4411eba609d486036d3b2aa1e3d86eee53216aec543fc1
aspnet-core-app-70: 7.0.0-rc.1.22427.2
aspnet-core-app-70-sha: 101898d0921f21c7895a1e015064a5aa5f1ca92bd31bd0d30fb9981e3c4383f14ea25464289e4ef29bf55fea1e2096e4b07bce71c948992a76c5ff0f7005b415
outputs:
- type: csharp
directory: src/BuildScriptGenerator/DotNetCore
@ -109,6 +109,10 @@
final-stretch-dot-net-60-sdk-version: 6.0.301
final-stretch-dot-net-core-app-60-run-time-version: 6.0.6
final-stretch-aspnet-core-app-60-run-time-version: 6.0.6
final-stretch-dot-net-70-sdk-version: 7.0.100-preview.7.22377.5
final-stretch-dot-net-core-app-70-run-time-version: 7.0.0-preview.7.22375.6
final-stretch-aspnet-core-app-70-run-time-version: 7.0.0-preview.7.22376.6
outputs:
- type: csharp
directory: src/BuildScriptGenerator

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

@ -35,6 +35,7 @@
- 7.0.100-preview.5.22307.18
- 7.0.100-preview.6.22352.1
- 7.0.100-preview.7.22377.5
- 7.0.100-rc.1.22431.12
### buster
@ -87,6 +88,7 @@
- 7.0.100-preview.5.22307.18
- 7.0.100-preview.6.22352.1
- 7.0.100-preview.7.22377.5
- 7.0.100-rc.1.22431.12
### focal-scm
@ -139,6 +141,7 @@
- 7.0.100-preview.5.22307.18
- 7.0.100-preview.6.22352.1
- 7.0.100-preview.7.22377.5
- 7.0.100-rc.1.22431.12
### stretch

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

@ -33,5 +33,6 @@
7.0.100-preview.5.22307.18, 691c0d8917bc9848a08707b7fa22da05228dad0ba6335ff06c6d80f9a95349307572ff45c0b088d9fc199c40a1784ff314e1a8735d0366bd3aa06eb8dfa2b7d5,
7.0.100-preview.6.22352.1, e49a2119021e4069f1193898536cc59628336e656f2f7e49d454a593a330d8e437acf2f4efb70925bc16a9c900c2e49f4a6c2fb5f69e696b09a91ebccd2c9307,
7.0.100-preview.7.22377.5, c16d452dbe4f097b75d304c8bc19892017847768bf2e8a0a72fafd6d6b46c3dd77e0c251b80c245197f47fdeafc2c18db255af8a1a5c30be982de19129874390
7.0.100-rc.1.22431.12, 7ecebf284bd1546e1575b9561f4e64bbb8d69680a7bbda6f06ff6fbf687d3a6c653b0e6a6c569241455c6f83620f0ddbe193ca5cd52384ac062c8565dd22b859,
# NOTE: Make sure to set the default version in 'defaultVersion.txt' file

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

@ -96,6 +96,8 @@
7.0.100-preview.6.22352.1, e49a2119021e4069f1193898536cc59628336e656f2f7e49d454a593a330d8e437acf2f4efb70925bc16a9c900c2e49f4a6c2fb5f69e696b09a91ebccd2c9307,
7.0.100-preview.7.22377.5, c16d452dbe4f097b75d304c8bc19892017847768bf2e8a0a72fafd6d6b46c3dd77e0c251b80c245197f47fdeafc2c18db255af8a1a5c30be982de19129874390
7.0.100-preview.7.22377.5, c16d452dbe4f097b75d304c8bc19892017847768bf2e8a0a72fafd6d6b46c3dd77e0c251b80c245197f47fdeafc2c18db255af8a1a5c30be982de19129874390,
7.0.100-rc.1.22431.12, 7ecebf284bd1546e1575b9561f4e64bbb8d69680a7bbda6f06ff6fbf687d3a6c653b0e6a6c569241455c6f83620f0ddbe193ca5cd52384ac062c8565dd22b859,
# NOTE: Make sure to set the default version in 'defaultVersion.txt' file

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

@ -96,6 +96,9 @@
7.0.100-preview.6.22352.1, e49a2119021e4069f1193898536cc59628336e656f2f7e49d454a593a330d8e437acf2f4efb70925bc16a9c900c2e49f4a6c2fb5f69e696b09a91ebccd2c9307,
7.0.100-preview.7.22377.5, c16d452dbe4f097b75d304c8bc19892017847768bf2e8a0a72fafd6d6b46c3dd77e0c251b80c245197f47fdeafc2c18db255af8a1a5c30be982de19129874390
7.0.100-preview.7.22377.5, c16d452dbe4f097b75d304c8bc19892017847768bf2e8a0a72fafd6d6b46c3dd77e0c251b80c245197f47fdeafc2c18db255af8a1a5c30be982de19129874390,
7.0.100-rc.1.22431.12, 7ecebf284bd1546e1575b9561f4e64bbb8d69680a7bbda6f06ff6fbf687d3a6c653b0e6a6c569241455c6f83620f0ddbe193ca5cd52384ac062c8565dd22b859,
# NOTE: Make sure to set the default version in 'defaultVersion.txt' file

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

@ -4,7 +4,7 @@ namespace Microsoft.Oryx.BuildScriptGenerator.DotNetCore
{
public static class DotNetCoreRunTimeVersions
{
public const string DotNetCoreRuntimeBaseTag = "20220822.2";
public const string DotNetCoreRuntimeBaseTag = "20220915.1";
public const string NetCoreApp10 = "1.0.16";
public const string NetCoreApp11 = "1.1.13";
public const string NetCoreApp20 = "2.0.9";
@ -30,9 +30,9 @@ namespace Microsoft.Oryx.BuildScriptGenerator.DotNetCore
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";
public const string AspnetCoreApp70Sha = "7d4861a28a42df31a7e2c740d17e1b0eb78e860a2ccdb25eec754a2098593a3adac00687294209d847a8fa618019a2d1b1d5fdd3f9aea37ffdc19164c862c558";
public const string NetCoreApp70 = "7.0.0-rc.1.22426.10";
public const string NetCoreApp70Sha = "62145fdaf182581cec5ba6bbafd66e3bb2df28379311f13e6849371a88cc2f428db3663f96ad006bbf4411eba609d486036d3b2aa1e3d86eee53216aec543fc1";
public const string AspnetCoreApp70 = "7.0.0-rc.1.22427.2";
public const string AspnetCoreApp70Sha = "101898d0921f21c7895a1e015064a5aa5f1ca92bd31bd0d30fb9981e3c4383f14ea25464289e4ef29bf55fea1e2096e4b07bce71c948992a76c5ff0f7005b415";
}
}

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

@ -15,7 +15,7 @@ namespace Microsoft.Oryx.BuildScriptGenerator.DotNetCore
public const string DotNet50SdkVersion = "5.0.408";
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 const string DotNet70SdkVersion = "7.0.100-rc.1.22431.12";
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" };
}
}

3
src/BuildScriptGenerator/FinalStretchVersions.cs
Просмотреть файл

@ -10,5 +10,8 @@ namespace Microsoft.Oryx.BuildScriptGenerator.Common
public const string FinalStretchDotNet60SdkVersion = "6.0.301";
public const string FinalStretchDotNetCoreApp60RunTimeVersion = "6.0.6";
public const string FinalStretchAspnetCoreApp60RunTimeVersion = "6.0.6";
public const string FinalStretchDotNet70SdkVersion = "7.0.100-preview.7.22377.5";
public const string FinalStretchDotNetCoreApp70RunTimeVersion = "7.0.0-preview.7.22375.6";
public const string FinalStretchAspnetCoreApp70RunTimeVersion = "7.0.0-preview.7.22376.6";
}
}

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

@ -68,7 +68,7 @@ namespace Microsoft.Oryx.BuildImage.Tests
[InlineData(NetCoreApp21WebApp, "2.1")]
[InlineData(NetCoreApp31MvcApp, "3.1")]
[InlineData(NetCoreApp50MvcApp, "5.0")]
[InlineData(NetCore7PreviewMvcApp, "7.0.0-preview.7.22375.6")]
[InlineData(NetCore7PreviewMvcApp, "7.0.0-rc.1.22426.10")]
public void BuildsApplication_ByDynamicallyInstallingSDKs_CliBuster(
string appName,
string runtimeVersion)
@ -569,8 +569,8 @@ namespace Microsoft.Oryx.BuildImage.Tests
NetCore6PreviewWebApp,
imageHelper.GetGitHubActionsBuildImage());
data.Add(
DotNetCoreRunTimeVersions.NetCoreApp70,
DotNetCoreSdkVersions.DotNet70SdkVersion,
FinalStretchVersions.FinalStretchDotNetCoreApp70RunTimeVersion,
FinalStretchVersions.FinalStretchDotNet70SdkVersion,
NetCore7PreviewMvcApp,
imageHelper.GetGitHubActionsBuildImage());