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

New DotNetCore Sdks 2024-02-22 (#2361) 

* [create-pull-request] automated change

* Add runtime build number

* remove focal-scm and stretch from dotnet update

* revert base image

* Update base tag for dotnetcore | 8

* fix test cases

---------

Co-authored-by: william-msft <william-msft@users.noreply.github.com>
Co-authored-by: William Hernandez <williamhe@microsoft.com>
Co-authored-by: Akshay Kumar <kumaraksh@microsoft.com>
This commit is contained in:
Harry Li 2024-03-09 07:14:10 -08:00 коммит произвёл GitHub
Родитель 4644e4c8c5
Коммит 0d24db3f1a
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
12 изменённых файлов: 29 добавлений и 22 удалений
Показать статистику Скачать 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='20240124.1'
DOT_NET_CORE_RUNTIME_BASE_TAG='20240308.1'
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.14'
NET_CORE_APP_70_SHA='02fd66ef2059d124d9c4f3fbfd0d5b0375b83610cdf51a2972567e4bdaf1d55e532478533509ec2408c371e7fdd6efea8e9b9aec9eb5cd703e8e5d2814ef319b'
ASPNET_CORE_APP_70='7.0.14'
ASPNET_CORE_APP_70_SHA='00f55556cb580d81bf0059a61a642ed8b405452d55e94460c03a0edec9a4f608fd78561560e5fc5bf6e42fb1f45420eba75f8d102d8bd46686379dab7ffde6f6'
NET_CORE_APP_80='8.0.1'
NET_CORE_APP_80_SHA='cbd03325280ff93cd0edab71c5564a50bb2423980f63d04602914db917c9c811a0068d848cab07d82e3260bff6684ad7cffacc2f449c06fc0b0aa8f845c399b6'
ASPNET_CORE_APP_80='8.0.1'
ASPNET_CORE_APP_80_SHA='64eecc0fc50f8c68205123355c43eae5ee29b7f6061a260315818960153fdf25f2bb25a51dd3f051e2362e228c032f2d0b9e7b6b476ac52141c17cfd8de0bfd2'
NET_CORE_APP_80='8.0.2'
NET_CORE_APP_80_SHA='f30f72f55b9e97e36107f920e932477183867726a963ea0d4d151f291981877ba253a7175614c60b386b6a37f9192d97d7402dafdad2529369f512698cb9d1dd'
ASPNET_CORE_APP_80='8.0.2'
ASPNET_CORE_APP_80_SHA='c8d4f9ad45cc97570ac607c0d14064da6c1215ef864afd73688ec7470af774f80504a937cbb5aadbb0083250122aae361770d2bca68f30ac7b62b4717bee6fca'

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

@ -10,4 +10,4 @@ DOT_NET_50_SDK_VERSION='5.0.408'
DOT_NET_60_SDK_VERSION='6.0.417'
DOT_NET_60_RTM_SDK_VERSION='6-0-100-rtm-21527-11'
DOT_NET_70_SDK_VERSION='7.0.404'
DOT_NET_80_SDK_VERSION='8.0.101'
DOT_NET_80_SDK_VERSION='8.0.201'

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

@ -47,7 +47,7 @@
dot-net-60-sdk-version: 6.0.417
dot-net-60-rtm-sdk-version: 6-0-100-rtm-21527-11
dot-net-70-sdk-version: 7.0.404
dot-net-80-sdk-version: 8.0.101
dot-net-80-sdk-version: 8.0.201
runtime-versions:
- 3.0-debian-buster
- 3.1-debian-bullseye
@ -69,7 +69,7 @@
file-name-prefix: __
- name: dot-net-core-run-time-versions
constants:
dot-net-core-runtime-base-tag: 20240124.1
dot-net-core-runtime-base-tag: 20240308.1
net-core-app-10: 1.0.16
net-core-app-11: 1.1.13
net-core-app-20: 2.0.9
@ -99,10 +99,10 @@
net-core-app-70-sha: 02fd66ef2059d124d9c4f3fbfd0d5b0375b83610cdf51a2972567e4bdaf1d55e532478533509ec2408c371e7fdd6efea8e9b9aec9eb5cd703e8e5d2814ef319b
aspnet-core-app-70: 7.0.14
aspnet-core-app-70-sha: 00f55556cb580d81bf0059a61a642ed8b405452d55e94460c03a0edec9a4f608fd78561560e5fc5bf6e42fb1f45420eba75f8d102d8bd46686379dab7ffde6f6
net-core-app-80: 8.0.1
net-core-app-80-sha: cbd03325280ff93cd0edab71c5564a50bb2423980f63d04602914db917c9c811a0068d848cab07d82e3260bff6684ad7cffacc2f449c06fc0b0aa8f845c399b6
aspnet-core-app-80: 8.0.1
aspnet-core-app-80-sha: 64eecc0fc50f8c68205123355c43eae5ee29b7f6061a260315818960153fdf25f2bb25a51dd3f051e2362e228c032f2d0b9e7b6b476ac52141c17cfd8de0bfd2
net-core-app-80: 8.0.2
net-core-app-80-sha: f30f72f55b9e97e36107f920e932477183867726a963ea0d4d151f291981877ba253a7175614c60b386b6a37f9192d97d7402dafdad2529369f512698cb9d1dd
aspnet-core-app-80: 8.0.2
aspnet-core-app-80-sha: c8d4f9ad45cc97570ac607c0d14064da6c1215ef864afd73688ec7470af774f80504a937cbb5aadbb0083250122aae361770d2bca68f30ac7b62b4717bee6fca
outputs:
- type: csharp
directory: src/BuildScriptGenerator/DotNetCore

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

@ -21,6 +21,7 @@
- 8.0.100-rc.2.23502.2
- 8.0.100
- 8.0.101
- 8.0.201
### bullseye
@ -96,6 +97,7 @@
- 8.0.100-rc.2.23502.2
- 8.0.100
- 8.0.101
- 8.0.201
### buster
@ -183,6 +185,7 @@
- 8.0.100-rc.2.23502.2
- 8.0.100
- 8.0.101
- 8.0.201
### focal-scm

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

@ -18,3 +18,4 @@
8.0.100-rc.2.23502.2, 45f09e7b031f4cf5b4dcead240fe47e2e3731d97d22aa96d3a02a087322658606cc22792053c3784c44f15d7c9bad0ac9dbda90def7b4e197f2955dca9a5bb6c,
8.0.100, 13905ea20191e70baeba50b0e9bbe5f752a7c34587878ee104744f9fb453bfe439994d38969722bdae7f60ee047d75dda8636f3ab62659450e9cd4024f38b2a5, https://dotnetcli.blob.core.windows.net/dotnet-private/Internal/8.0.0/dotnet-sdk-8.0.100-linux-x64.tar.gz,
8.0.101, 26df0151a3a59c4403b52ba0f0df61eaa904110d897be604f19dcaa27d50860c82296733329cb4a3cf20a2c2e518e8f5d5f36dfb7931bf714a45e46b11487c9a,
8.0.201, 310cf54f595698435b533931b12f86d49f89d27243cf7c87a5b926e0c676b80e869aa58aaff17b5095536c432f377c67d92bf0ca8941b9d891d4b3879637d488,

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

@ -73,3 +73,4 @@
8.0.100-rc.2.23502.2, 45f09e7b031f4cf5b4dcead240fe47e2e3731d97d22aa96d3a02a087322658606cc22792053c3784c44f15d7c9bad0ac9dbda90def7b4e197f2955dca9a5bb6c,
8.0.100, 13905ea20191e70baeba50b0e9bbe5f752a7c34587878ee104744f9fb453bfe439994d38969722bdae7f60ee047d75dda8636f3ab62659450e9cd4024f38b2a5, https://dotnetcli.blob.core.windows.net/dotnet-private/Internal/8.0.0/dotnet-sdk-8.0.100-linux-x64.tar.gz,
8.0.101, 26df0151a3a59c4403b52ba0f0df61eaa904110d897be604f19dcaa27d50860c82296733329cb4a3cf20a2c2e518e8f5d5f36dfb7931bf714a45e46b11487c9a,
8.0.201, 310cf54f595698435b533931b12f86d49f89d27243cf7c87a5b926e0c676b80e869aa58aaff17b5095536c432f377c67d92bf0ca8941b9d891d4b3879637d488,

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

@ -85,3 +85,4 @@
8.0.100-rc.2.23502.2, 45f09e7b031f4cf5b4dcead240fe47e2e3731d97d22aa96d3a02a087322658606cc22792053c3784c44f15d7c9bad0ac9dbda90def7b4e197f2955dca9a5bb6c,
8.0.100, 13905ea20191e70baeba50b0e9bbe5f752a7c34587878ee104744f9fb453bfe439994d38969722bdae7f60ee047d75dda8636f3ab62659450e9cd4024f38b2a5, https://dotnetcli.blob.core.windows.net/dotnet-private/Internal/8.0.0/dotnet-sdk-8.0.100-linux-x64.tar.gz,
8.0.101, 26df0151a3a59c4403b52ba0f0df61eaa904110d897be604f19dcaa27d50860c82296733329cb4a3cf20a2c2e518e8f5d5f36dfb7931bf714a45e46b11487c9a,
8.0.201, 310cf54f595698435b533931b12f86d49f89d27243cf7c87a5b926e0c676b80e869aa58aaff17b5095536c432f377c67d92bf0ca8941b9d891d4b3879637d488,

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

@ -90,4 +90,4 @@
8.0.100-rc.1.23463.5, ac941fd16fd7c328f7cc44b132b4253ddb2b6a6c152af5f43c71c6cd0d468c89b7276ebf6c08895dcb6e5e25f7cae83b6fbacb91cfcc4a61d49b5657a834a901,
8.0.100-rc.2.23502.2, 45f09e7b031f4cf5b4dcead240fe47e2e3731d97d22aa96d3a02a087322658606cc22792053c3784c44f15d7c9bad0ac9dbda90def7b4e197f2955dca9a5bb6c,
8.0.100, 13905ea20191e70baeba50b0e9bbe5f752a7c34587878ee104744f9fb453bfe439994d38969722bdae7f60ee047d75dda8636f3ab62659450e9cd4024f38b2a5, https://dotnetcli.blob.core.windows.net/dotnet-private/Internal/8.0.0/dotnet-sdk-8.0.100-linux-x64.tar.gz,
8.0.101, 26df0151a3a59c4403b52ba0f0df61eaa904110d897be604f19dcaa27d50860c82296733329cb4a3cf20a2c2e518e8f5d5f36dfb7931bf714a45e46b11487c9a,
8.0.101, 26df0151a3a59c4403b52ba0f0df61eaa904110d897be604f19dcaa27d50860c82296733329cb4a3cf20a2c2e518e8f5d5f36dfb7931bf714a45e46b11487c9a,

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

@ -82,4 +82,4 @@
8.0.100-rc.1.23463.5, ac941fd16fd7c328f7cc44b132b4253ddb2b6a6c152af5f43c71c6cd0d468c89b7276ebf6c08895dcb6e5e25f7cae83b6fbacb91cfcc4a61d49b5657a834a901,
8.0.100-rc.2.23502.2, 45f09e7b031f4cf5b4dcead240fe47e2e3731d97d22aa96d3a02a087322658606cc22792053c3784c44f15d7c9bad0ac9dbda90def7b4e197f2955dca9a5bb6c,
8.0.100, 13905ea20191e70baeba50b0e9bbe5f752a7c34587878ee104744f9fb453bfe439994d38969722bdae7f60ee047d75dda8636f3ab62659450e9cd4024f38b2a5, https://dotnetcli.blob.core.windows.net/dotnet-private/Internal/8.0.0/dotnet-sdk-8.0.100-linux-x64.tar.gz,
8.0.101, 26df0151a3a59c4403b52ba0f0df61eaa904110d897be604f19dcaa27d50860c82296733329cb4a3cf20a2c2e518e8f5d5f36dfb7931bf714a45e46b11487c9a,
8.0.101, 26df0151a3a59c4403b52ba0f0df61eaa904110d897be604f19dcaa27d50860c82296733329cb4a3cf20a2c2e518e8f5d5f36dfb7931bf714a45e46b11487c9a,

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

@ -4,7 +4,7 @@ namespace Microsoft.Oryx.BuildScriptGenerator.DotNetCore
{
public static class DotNetCoreRunTimeVersions
{
public const string DotNetCoreRuntimeBaseTag = "20240124.1";
public const string DotNetCoreRuntimeBaseTag = "20240308.1";
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 @@ namespace Microsoft.Oryx.BuildScriptGenerator.DotNetCore
public const string NetCoreApp70Sha = "02fd66ef2059d124d9c4f3fbfd0d5b0375b83610cdf51a2972567e4bdaf1d55e532478533509ec2408c371e7fdd6efea8e9b9aec9eb5cd703e8e5d2814ef319b";
public const string AspnetCoreApp70 = "7.0.14";
public const string AspnetCoreApp70Sha = "00f55556cb580d81bf0059a61a642ed8b405452d55e94460c03a0edec9a4f608fd78561560e5fc5bf6e42fb1f45420eba75f8d102d8bd46686379dab7ffde6f6";
public const string NetCoreApp80 = "8.0.1";
public const string NetCoreApp80Sha = "cbd03325280ff93cd0edab71c5564a50bb2423980f63d04602914db917c9c811a0068d848cab07d82e3260bff6684ad7cffacc2f449c06fc0b0aa8f845c399b6";
public const string AspnetCoreApp80 = "8.0.1";
public const string AspnetCoreApp80Sha = "64eecc0fc50f8c68205123355c43eae5ee29b7f6061a260315818960153fdf25f2bb25a51dd3f051e2362e228c032f2d0b9e7b6b476ac52141c17cfd8de0bfd2";
public const string NetCoreApp80 = "8.0.2";
public const string NetCoreApp80Sha = "f30f72f55b9e97e36107f920e932477183867726a963ea0d4d151f291981877ba253a7175614c60b386b6a37f9192d97d7402dafdad2529369f512698cb9d1dd";
public const string AspnetCoreApp80 = "8.0.2";
public const string AspnetCoreApp80Sha = "c8d4f9ad45cc97570ac607c0d14064da6c1215ef864afd73688ec7470af774f80504a937cbb5aadbb0083250122aae361770d2bca68f30ac7b62b4717bee6fca";
}
}

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

@ -16,7 +16,7 @@ namespace Microsoft.Oryx.BuildScriptGenerator.DotNetCore
public const string DotNet60SdkVersion = "6.0.417";
public const string DotNet60RtmSdkVersion = "6-0-100-rtm-21527-11";
public const string DotNet70SdkVersion = "7.0.404";
public const string DotNet80SdkVersion = "8.0.101";
public const string DotNet80SdkVersion = "8.0.201";
public static readonly List<string> RuntimeVersions = new List<string> { "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-bullseye", "8.0-debian-bookworm", "dynamic-debian-buster" };
}
}

5
tests/Oryx.BuildImage.Tests/Node/NodeJsSampleAppsOtherTests.cs
Просмотреть файл

@ -992,8 +992,9 @@ namespace Microsoft.Oryx.BuildImage.Tests
},
result.GetDebugInfo());
}
[Fact, Trait("category", "ltsversions")]
[Fact(Skip = "https://msazure.visualstudio.com/Antares/_workitems/edit/27122108")]
[Trait("category", "ltsversions")]
public void CanBuildAndRunNodeApp_WithWorkspace_UsingYarn2ForBuild()
{
// Arrange