diff --git a/NuGet.config b/NuGet.config
index 798a7d0e55e65..f64ae4985405f 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -10,6 +10,9 @@
+
+
+
diff --git a/eng/Publishing.props b/eng/Publishing.props
index 920e79cbbd2f7..8b796225f8274 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -1,6 +1,7 @@
-
+
- 3
+ true
-
\ No newline at end of file
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index cfcc7ab255260..25a1ae7d7e28d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,8 +1,8 @@
-
+
https://github.com/dotnet/icu
- 0a6b6dc4153f52a42dad0cf275e969c2bfaad1a2
+ b62077d90972117ad4663128962914864b19ad05
https://github.com/dotnet/msquic
@@ -10,15 +10,15 @@
https://github.com/dotnet/emsdk
- 925c59b436d60b9cd6b5df54c3f9be13a9512c95
+ ee3546a41338fd3c82167b62d7ff989934c6cb01
https://github.com/dotnet/emsdk
- 925c59b436d60b9cd6b5df54c3f9be13a9512c95
+ ee3546a41338fd3c82167b62d7ff989934c6cb01
https://github.com/dotnet/emsdk
- 925c59b436d60b9cd6b5df54c3f9be13a9512c95
+ ee3546a41338fd3c82167b62d7ff989934c6cb01
https://github.com/dotnet/wcf
@@ -102,49 +102,49 @@
https://github.com/microsoft/vstest
140434f7109d357d0158ade9e5164a4861513965
-
+
https://github.com/dotnet/runtime-assets
- 982dfbc57db3a7ccd49e671ab1ca9779cc7070e5
+ 883c47a740b678482efd9dfee6da38ac108fbca9
-
+
https://github.com/dotnet/runtime-assets
- 982dfbc57db3a7ccd49e671ab1ca9779cc7070e5
+ 883c47a740b678482efd9dfee6da38ac108fbca9
-
+
https://github.com/dotnet/runtime-assets
- 982dfbc57db3a7ccd49e671ab1ca9779cc7070e5
+ 883c47a740b678482efd9dfee6da38ac108fbca9
-
+
https://github.com/dotnet/runtime-assets
- 982dfbc57db3a7ccd49e671ab1ca9779cc7070e5
+ 883c47a740b678482efd9dfee6da38ac108fbca9
-
+
https://github.com/dotnet/runtime-assets
- 982dfbc57db3a7ccd49e671ab1ca9779cc7070e5
+ 883c47a740b678482efd9dfee6da38ac108fbca9
-
+
https://github.com/dotnet/runtime-assets
- 982dfbc57db3a7ccd49e671ab1ca9779cc7070e5
+ 883c47a740b678482efd9dfee6da38ac108fbca9
-
+
https://github.com/dotnet/runtime-assets
- 982dfbc57db3a7ccd49e671ab1ca9779cc7070e5
+ 883c47a740b678482efd9dfee6da38ac108fbca9
-
+
https://github.com/dotnet/runtime-assets
- 982dfbc57db3a7ccd49e671ab1ca9779cc7070e5
+ 883c47a740b678482efd9dfee6da38ac108fbca9
-
+
https://github.com/dotnet/runtime-assets
- 982dfbc57db3a7ccd49e671ab1ca9779cc7070e5
+ 883c47a740b678482efd9dfee6da38ac108fbca9
-
+
https://github.com/dotnet/runtime-assets
- 982dfbc57db3a7ccd49e671ab1ca9779cc7070e5
+ 883c47a740b678482efd9dfee6da38ac108fbca9
-
+
https://github.com/dotnet/runtime-assets
- 982dfbc57db3a7ccd49e671ab1ca9779cc7070e5
+ 883c47a740b678482efd9dfee6da38ac108fbca9
https://github.com/dotnet/llvm-project
@@ -242,13 +242,13 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
d50065944d8b41d804448a7056351481d583ad3d
-
+
https://github.com/dotnet/hotreload-utils
- 453eb973df8f81461022c8a428c717ed87129055
+ 0d7d008228ffdfeb200fdf8039419a7c019eff50
-
+
https://github.com/dotnet/runtime-assets
- 982dfbc57db3a7ccd49e671ab1ca9779cc7070e5
+ 883c47a740b678482efd9dfee6da38ac108fbca9
https://github.com/dotnet/roslyn-analyzers
diff --git a/eng/Versions.props b/eng/Versions.props
index 6c0439aee6e9c..31cd7e023c036 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -108,18 +108,18 @@
4.5.0
6.0.0-rc.1.21415.6
- 6.0.0-beta.23512.1
- 6.0.0-beta.23512.1
- 6.0.0-beta.23512.1
- 6.0.0-beta.23512.1
- 6.0.0-beta.23512.1
- 6.0.0-beta.23512.1
- 6.0.0-beta.23512.1
- 6.0.0-beta.23512.1
- 6.0.0-beta.23512.1
- 6.0.0-beta.23512.1
- 6.0.0-beta.23512.1
- 6.0.0-beta.23512.1
+ 6.0.0-beta.24124.1
+ 6.0.0-beta.24124.1
+ 6.0.0-beta.24124.1
+ 6.0.0-beta.24124.1
+ 6.0.0-beta.24124.1
+ 6.0.0-beta.24124.1
+ 6.0.0-beta.24124.1
+ 6.0.0-beta.24124.1
+ 6.0.0-beta.24124.1
+ 6.0.0-beta.24124.1
+ 6.0.0-beta.24124.1
+ 6.0.0-beta.24124.1
1.0.0-prerelease.21416.5
1.0.0-prerelease.21416.5
@@ -138,14 +138,14 @@
16.10.0
$(MicrosoftBuildVersion)
4.7.2
- 6.7.0
+ 6.7.1
6.2.2
1.0.1-prerelease-00006
17.4.0-preview-20220707-01
6.0.0-prerelease.23531.3
6.0.0-prerelease.23531.3
- 6.0.0-alpha.0.23518.4
+ 6.0.0-alpha.0.24115.1
6.0.0-alpha.0.23367.3
2.4.2-pre.9
2.4.2
@@ -163,7 +163,7 @@
6.0.100-1.21459.1
$(MicrosoftNETILLinkTasksVersion)
- 6.0.0-rtm.23512.2
+ 6.0.0-rtm.24114.3
6.0.0-servicing.22205.1
diff --git a/src/coreclr/vm/win32threadpool.h b/src/coreclr/vm/win32threadpool.h
index 20aeccce7f4e5..77f245c7fd998 100644
--- a/src/coreclr/vm/win32threadpool.h
+++ b/src/coreclr/vm/win32threadpool.h
@@ -752,17 +752,23 @@ class ThreadpoolMgr
#ifndef TARGET_UNIX
if (CPUGroupInfo::CanEnableThreadUseAllCpuGroups())
- processorNumber = CPUGroupInfo::CalculateCurrentProcessorNumber();
+ {
+ // The current processor number may not be within the total number of active processors determined at
+ // initialization time.
+ processorNumber = CPUGroupInfo::CalculateCurrentProcessorNumber() % CPUGroupInfo::GetNumActiveProcessors();
+ }
else
+ {
// Turns out GetCurrentProcessorNumber can return a value greater than the number of processors reported by
// GetSystemInfo, if we're running in WOW64 on a machine with >32 processors.
- processorNumber = GetCurrentProcessorNumber()%NumberOfProcessors;
+ processorNumber = GetCurrentProcessorNumber() % g_SystemInfo.dwNumberOfProcessors;
+ }
#else // !TARGET_UNIX
if (PAL_HasGetCurrentProcessorNumber())
{
// On linux, GetCurrentProcessorNumber which uses sched_getcpu() can return a value greater than the number
// of processors reported by sysconf(_SC_NPROCESSORS_ONLN) when using OpenVZ kernel.
- processorNumber = GetCurrentProcessorNumber()%NumberOfProcessors;
+ processorNumber = GetCurrentProcessorNumber() % PAL_GetTotalCpuCount();
}
#endif // !TARGET_UNIX
return pRecycledListPerProcessor[processorNumber][memType];
diff --git a/src/installer/prepare-artifacts.proj b/src/installer/prepare-artifacts.proj
index a4476a5d1e9d1..2de1d3b43d3a2 100644
--- a/src/installer/prepare-artifacts.proj
+++ b/src/installer/prepare-artifacts.proj
@@ -23,6 +23,8 @@
+
+
@@ -56,6 +58,16 @@
+
+
+
+ DotNetReleaseShipping=true
+
+
+
$(AdditionalRuntimeIdentifiers);$(OutputRID)
- 12
+ 13
true
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
index 809c62872a898..a1397baaf8fde 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
@@ -1570,6 +1570,461 @@
"any",
"base"
],
+ "alpine.3.19": [
+ "alpine.3.19",
+ "alpine.3.18",
+ "alpine.3.17",
+ "alpine.3.16",
+ "alpine.3.15",
+ "alpine.3.14",
+ "alpine.3.13",
+ "alpine.3.12",
+ "alpine.3.11",
+ "alpine.3.10",
+ "alpine.3.9",
+ "alpine.3.8",
+ "alpine.3.7",
+ "alpine.3.6",
+ "alpine",
+ "linux-musl",
+ "linux",
+ "unix",
+ "any",
+ "base"
+ ],
+ "alpine.3.19-arm": [
+ "alpine.3.19-arm",
+ "alpine.3.19",
+ "alpine.3.18-arm",
+ "alpine.3.18",
+ "alpine.3.17-arm",
+ "alpine.3.17",
+ "alpine.3.16-arm",
+ "alpine.3.16",
+ "alpine.3.15-arm",
+ "alpine.3.15",
+ "alpine.3.14-arm",
+ "alpine.3.14",
+ "alpine.3.13-arm",
+ "alpine.3.13",
+ "alpine.3.12-arm",
+ "alpine.3.12",
+ "alpine.3.11-arm",
+ "alpine.3.11",
+ "alpine.3.10-arm",
+ "alpine.3.10",
+ "alpine.3.9-arm",
+ "alpine.3.9",
+ "alpine.3.8-arm",
+ "alpine.3.8",
+ "alpine.3.7-arm",
+ "alpine.3.7",
+ "alpine.3.6-arm",
+ "alpine.3.6",
+ "alpine-arm",
+ "alpine",
+ "linux-musl-arm",
+ "linux-musl",
+ "linux-arm",
+ "linux",
+ "unix-arm",
+ "unix",
+ "any",
+ "base"
+ ],
+ "alpine.3.19-arm64": [
+ "alpine.3.19-arm64",
+ "alpine.3.19",
+ "alpine.3.18-arm64",
+ "alpine.3.18",
+ "alpine.3.17-arm64",
+ "alpine.3.17",
+ "alpine.3.16-arm64",
+ "alpine.3.16",
+ "alpine.3.15-arm64",
+ "alpine.3.15",
+ "alpine.3.14-arm64",
+ "alpine.3.14",
+ "alpine.3.13-arm64",
+ "alpine.3.13",
+ "alpine.3.12-arm64",
+ "alpine.3.12",
+ "alpine.3.11-arm64",
+ "alpine.3.11",
+ "alpine.3.10-arm64",
+ "alpine.3.10",
+ "alpine.3.9-arm64",
+ "alpine.3.9",
+ "alpine.3.8-arm64",
+ "alpine.3.8",
+ "alpine.3.7-arm64",
+ "alpine.3.7",
+ "alpine.3.6-arm64",
+ "alpine.3.6",
+ "alpine-arm64",
+ "alpine",
+ "linux-musl-arm64",
+ "linux-musl",
+ "linux-arm64",
+ "linux",
+ "unix-arm64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "alpine.3.19-s390x": [
+ "alpine.3.19-s390x",
+ "alpine.3.19",
+ "alpine.3.18-s390x",
+ "alpine.3.18",
+ "alpine.3.17-s390x",
+ "alpine.3.17",
+ "alpine.3.16-s390x",
+ "alpine.3.16",
+ "alpine.3.15-s390x",
+ "alpine.3.15",
+ "alpine.3.14-s390x",
+ "alpine.3.14",
+ "alpine.3.13-s390x",
+ "alpine.3.13",
+ "alpine.3.12-s390x",
+ "alpine.3.12",
+ "alpine.3.11-s390x",
+ "alpine.3.11",
+ "alpine.3.10-s390x",
+ "alpine.3.10",
+ "alpine.3.9-s390x",
+ "alpine.3.9",
+ "alpine.3.8-s390x",
+ "alpine.3.8",
+ "alpine.3.7-s390x",
+ "alpine.3.7",
+ "alpine.3.6-s390x",
+ "alpine.3.6",
+ "alpine-s390x",
+ "alpine",
+ "linux-musl-s390x",
+ "linux-musl",
+ "linux-s390x",
+ "linux",
+ "unix-s390x",
+ "unix",
+ "any",
+ "base"
+ ],
+ "alpine.3.19-x64": [
+ "alpine.3.19-x64",
+ "alpine.3.19",
+ "alpine.3.18-x64",
+ "alpine.3.18",
+ "alpine.3.17-x64",
+ "alpine.3.17",
+ "alpine.3.16-x64",
+ "alpine.3.16",
+ "alpine.3.15-x64",
+ "alpine.3.15",
+ "alpine.3.14-x64",
+ "alpine.3.14",
+ "alpine.3.13-x64",
+ "alpine.3.13",
+ "alpine.3.12-x64",
+ "alpine.3.12",
+ "alpine.3.11-x64",
+ "alpine.3.11",
+ "alpine.3.10-x64",
+ "alpine.3.10",
+ "alpine.3.9-x64",
+ "alpine.3.9",
+ "alpine.3.8-x64",
+ "alpine.3.8",
+ "alpine.3.7-x64",
+ "alpine.3.7",
+ "alpine.3.6-x64",
+ "alpine.3.6",
+ "alpine-x64",
+ "alpine",
+ "linux-musl-x64",
+ "linux-musl",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "alpine.3.19-x86": [
+ "alpine.3.19-x86",
+ "alpine.3.19",
+ "alpine.3.18-x86",
+ "alpine.3.18",
+ "alpine.3.17-x86",
+ "alpine.3.17",
+ "alpine.3.16-x86",
+ "alpine.3.16",
+ "alpine.3.15-x86",
+ "alpine.3.15",
+ "alpine.3.14-x86",
+ "alpine.3.14",
+ "alpine.3.13-x86",
+ "alpine.3.13",
+ "alpine.3.12-x86",
+ "alpine.3.12",
+ "alpine.3.11-x86",
+ "alpine.3.11",
+ "alpine.3.10-x86",
+ "alpine.3.10",
+ "alpine.3.9-x86",
+ "alpine.3.9",
+ "alpine.3.8-x86",
+ "alpine.3.8",
+ "alpine.3.7-x86",
+ "alpine.3.7",
+ "alpine.3.6-x86",
+ "alpine.3.6",
+ "alpine-x86",
+ "alpine",
+ "linux-musl-x86",
+ "linux-musl",
+ "linux-x86",
+ "linux",
+ "unix-x86",
+ "unix",
+ "any",
+ "base"
+ ],
+ "alpine.3.20": [
+ "alpine.3.20",
+ "alpine.3.19",
+ "alpine.3.18",
+ "alpine.3.17",
+ "alpine.3.16",
+ "alpine.3.15",
+ "alpine.3.14",
+ "alpine.3.13",
+ "alpine.3.12",
+ "alpine.3.11",
+ "alpine.3.10",
+ "alpine.3.9",
+ "alpine.3.8",
+ "alpine.3.7",
+ "alpine.3.6",
+ "alpine",
+ "linux-musl",
+ "linux",
+ "unix",
+ "any",
+ "base"
+ ],
+ "alpine.3.20-arm": [
+ "alpine.3.20-arm",
+ "alpine.3.20",
+ "alpine.3.19-arm",
+ "alpine.3.19",
+ "alpine.3.18-arm",
+ "alpine.3.18",
+ "alpine.3.17-arm",
+ "alpine.3.17",
+ "alpine.3.16-arm",
+ "alpine.3.16",
+ "alpine.3.15-arm",
+ "alpine.3.15",
+ "alpine.3.14-arm",
+ "alpine.3.14",
+ "alpine.3.13-arm",
+ "alpine.3.13",
+ "alpine.3.12-arm",
+ "alpine.3.12",
+ "alpine.3.11-arm",
+ "alpine.3.11",
+ "alpine.3.10-arm",
+ "alpine.3.10",
+ "alpine.3.9-arm",
+ "alpine.3.9",
+ "alpine.3.8-arm",
+ "alpine.3.8",
+ "alpine.3.7-arm",
+ "alpine.3.7",
+ "alpine.3.6-arm",
+ "alpine.3.6",
+ "alpine-arm",
+ "alpine",
+ "linux-musl-arm",
+ "linux-musl",
+ "linux-arm",
+ "linux",
+ "unix-arm",
+ "unix",
+ "any",
+ "base"
+ ],
+ "alpine.3.20-arm64": [
+ "alpine.3.20-arm64",
+ "alpine.3.20",
+ "alpine.3.19-arm64",
+ "alpine.3.19",
+ "alpine.3.18-arm64",
+ "alpine.3.18",
+ "alpine.3.17-arm64",
+ "alpine.3.17",
+ "alpine.3.16-arm64",
+ "alpine.3.16",
+ "alpine.3.15-arm64",
+ "alpine.3.15",
+ "alpine.3.14-arm64",
+ "alpine.3.14",
+ "alpine.3.13-arm64",
+ "alpine.3.13",
+ "alpine.3.12-arm64",
+ "alpine.3.12",
+ "alpine.3.11-arm64",
+ "alpine.3.11",
+ "alpine.3.10-arm64",
+ "alpine.3.10",
+ "alpine.3.9-arm64",
+ "alpine.3.9",
+ "alpine.3.8-arm64",
+ "alpine.3.8",
+ "alpine.3.7-arm64",
+ "alpine.3.7",
+ "alpine.3.6-arm64",
+ "alpine.3.6",
+ "alpine-arm64",
+ "alpine",
+ "linux-musl-arm64",
+ "linux-musl",
+ "linux-arm64",
+ "linux",
+ "unix-arm64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "alpine.3.20-s390x": [
+ "alpine.3.20-s390x",
+ "alpine.3.20",
+ "alpine.3.19-s390x",
+ "alpine.3.19",
+ "alpine.3.18-s390x",
+ "alpine.3.18",
+ "alpine.3.17-s390x",
+ "alpine.3.17",
+ "alpine.3.16-s390x",
+ "alpine.3.16",
+ "alpine.3.15-s390x",
+ "alpine.3.15",
+ "alpine.3.14-s390x",
+ "alpine.3.14",
+ "alpine.3.13-s390x",
+ "alpine.3.13",
+ "alpine.3.12-s390x",
+ "alpine.3.12",
+ "alpine.3.11-s390x",
+ "alpine.3.11",
+ "alpine.3.10-s390x",
+ "alpine.3.10",
+ "alpine.3.9-s390x",
+ "alpine.3.9",
+ "alpine.3.8-s390x",
+ "alpine.3.8",
+ "alpine.3.7-s390x",
+ "alpine.3.7",
+ "alpine.3.6-s390x",
+ "alpine.3.6",
+ "alpine-s390x",
+ "alpine",
+ "linux-musl-s390x",
+ "linux-musl",
+ "linux-s390x",
+ "linux",
+ "unix-s390x",
+ "unix",
+ "any",
+ "base"
+ ],
+ "alpine.3.20-x64": [
+ "alpine.3.20-x64",
+ "alpine.3.20",
+ "alpine.3.19-x64",
+ "alpine.3.19",
+ "alpine.3.18-x64",
+ "alpine.3.18",
+ "alpine.3.17-x64",
+ "alpine.3.17",
+ "alpine.3.16-x64",
+ "alpine.3.16",
+ "alpine.3.15-x64",
+ "alpine.3.15",
+ "alpine.3.14-x64",
+ "alpine.3.14",
+ "alpine.3.13-x64",
+ "alpine.3.13",
+ "alpine.3.12-x64",
+ "alpine.3.12",
+ "alpine.3.11-x64",
+ "alpine.3.11",
+ "alpine.3.10-x64",
+ "alpine.3.10",
+ "alpine.3.9-x64",
+ "alpine.3.9",
+ "alpine.3.8-x64",
+ "alpine.3.8",
+ "alpine.3.7-x64",
+ "alpine.3.7",
+ "alpine.3.6-x64",
+ "alpine.3.6",
+ "alpine-x64",
+ "alpine",
+ "linux-musl-x64",
+ "linux-musl",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "alpine.3.20-x86": [
+ "alpine.3.20-x86",
+ "alpine.3.20",
+ "alpine.3.19-x86",
+ "alpine.3.19",
+ "alpine.3.18-x86",
+ "alpine.3.18",
+ "alpine.3.17-x86",
+ "alpine.3.17",
+ "alpine.3.16-x86",
+ "alpine.3.16",
+ "alpine.3.15-x86",
+ "alpine.3.15",
+ "alpine.3.14-x86",
+ "alpine.3.14",
+ "alpine.3.13-x86",
+ "alpine.3.13",
+ "alpine.3.12-x86",
+ "alpine.3.12",
+ "alpine.3.11-x86",
+ "alpine.3.11",
+ "alpine.3.10-x86",
+ "alpine.3.10",
+ "alpine.3.9-x86",
+ "alpine.3.9",
+ "alpine.3.8-x86",
+ "alpine.3.8",
+ "alpine.3.7-x86",
+ "alpine.3.7",
+ "alpine.3.6-x86",
+ "alpine.3.6",
+ "alpine-x86",
+ "alpine",
+ "linux-musl-x86",
+ "linux-musl",
+ "linux-x86",
+ "linux",
+ "unix-x86",
+ "unix",
+ "any",
+ "base"
+ ],
"alpine.3.6": [
"alpine.3.6",
"alpine",
@@ -10802,4 +11257,4 @@
"any",
"base"
]
-}
\ No newline at end of file
+}
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
index ac8a62325fbfd..32ba949a6f806 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
@@ -350,6 +350,76 @@
"alpine.3.17-x86"
]
},
+ "alpine.3.19": {
+ "#import": [
+ "alpine.3.18"
+ ]
+ },
+ "alpine.3.19-arm": {
+ "#import": [
+ "alpine.3.19",
+ "alpine.3.18-arm"
+ ]
+ },
+ "alpine.3.19-arm64": {
+ "#import": [
+ "alpine.3.19",
+ "alpine.3.18-arm64"
+ ]
+ },
+ "alpine.3.19-s390x": {
+ "#import": [
+ "alpine.3.19",
+ "alpine.3.18-s390x"
+ ]
+ },
+ "alpine.3.19-x64": {
+ "#import": [
+ "alpine.3.19",
+ "alpine.3.18-x64"
+ ]
+ },
+ "alpine.3.19-x86": {
+ "#import": [
+ "alpine.3.19",
+ "alpine.3.18-x86"
+ ]
+ },
+ "alpine.3.20": {
+ "#import": [
+ "alpine.3.19"
+ ]
+ },
+ "alpine.3.20-arm": {
+ "#import": [
+ "alpine.3.20",
+ "alpine.3.19-arm"
+ ]
+ },
+ "alpine.3.20-arm64": {
+ "#import": [
+ "alpine.3.20",
+ "alpine.3.19-arm64"
+ ]
+ },
+ "alpine.3.20-s390x": {
+ "#import": [
+ "alpine.3.20",
+ "alpine.3.19-s390x"
+ ]
+ },
+ "alpine.3.20-x64": {
+ "#import": [
+ "alpine.3.20",
+ "alpine.3.19-x64"
+ ]
+ },
+ "alpine.3.20-x86": {
+ "#import": [
+ "alpine.3.20",
+ "alpine.3.19-x86"
+ ]
+ },
"alpine.3.6": {
"#import": [
"alpine"
@@ -4331,4 +4401,4 @@
]
}
}
-}
\ No newline at end of file
+}
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
index 71f41149bc93b..06ca771082ec3 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
@@ -16,7 +16,7 @@
linux-musl
x64;x86;arm;arm64;s390x
- 3.6;3.7;3.8;3.9;3.10;3.11;3.12;3.13;3.14;3.15;3.16;3.17;3.18
+ 3.6;3.7;3.8;3.9;3.10;3.11;3.12;3.13;3.14;3.15;3.16;3.17;3.18;3.19;3.20
diff --git a/src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj b/src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj
index 0e13d0d42f37e..a86115b820874 100644
--- a/src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj
+++ b/src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj
@@ -5,7 +5,7 @@
false
true
- true
+ false
8
$(NoWarn);NU5128
diff --git a/src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/entrypoints.c b/src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/entrypoints.c
index db75e90b3a436..2a1b138e4b51f 100644
--- a/src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/entrypoints.c
+++ b/src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/entrypoints.c
@@ -63,6 +63,7 @@ static const Entry s_cryptoAppleNative[] =
DllImportEntry(AppleCryptoNative_RsaGenerateKey)
DllImportEntry(AppleCryptoNative_RsaDecryptOaep)
DllImportEntry(AppleCryptoNative_RsaDecryptPkcs)
+ DllImportEntry(AppleCryptoNative_RsaDecryptRaw)
DllImportEntry(AppleCryptoNative_RsaEncryptOaep)
DllImportEntry(AppleCryptoNative_RsaEncryptPkcs)
DllImportEntry(AppleCryptoNative_RsaSignaturePrimitive)
diff --git a/src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_rsa.c b/src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_rsa.c
index a9aece35fb0f5..1746828d5b0d7 100644
--- a/src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_rsa.c
+++ b/src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_rsa.c
@@ -134,6 +134,13 @@ int32_t AppleCryptoNative_RsaDecryptOaep(SecKeyRef privateKey,
privateKey, pbData, cbData, pDecryptedOut, pErrorOut, mgfAlgorithm, SecKeyCreateDecryptedData);
}
+int32_t AppleCryptoNative_RsaDecryptRaw(
+ SecKeyRef privateKey, uint8_t* pbData, int32_t cbData, CFDataRef* pDecryptedOut, CFErrorRef* pErrorOut)
+{
+ return RsaPrimitive(
+ privateKey, pbData, cbData, pDecryptedOut, pErrorOut, kSecKeyAlgorithmRSAEncryptionRaw, SecKeyCreateDecryptedData);
+}
+
int32_t AppleCryptoNative_RsaDecryptPkcs(
SecKeyRef privateKey, uint8_t* pbData, int32_t cbData, CFDataRef* pDecryptedOut, CFErrorRef* pErrorOut)
{
diff --git a/src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_rsa.h b/src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_rsa.h
index 253fdae78e4b3..34a350f80f9bc 100644
--- a/src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_rsa.h
+++ b/src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_rsa.h
@@ -31,6 +31,14 @@ PALEXPORT int32_t AppleCryptoNative_RsaDecryptOaep(SecKeyRef privateKey,
CFDataRef* pDecryptedOut,
CFErrorRef* pErrorOut);
+/*
+Decrypt the contents of pbData using the provided privateKey without validating or removing padding.
+
+Follows pal_seckey return conventions.
+*/
+PALEXPORT int32_t AppleCryptoNative_RsaDecryptRaw(
+ SecKeyRef privateKey, uint8_t* pbData, int32_t cbData, CFDataRef* pDecryptedOut, CFErrorRef* pErrorOut);
+
/*
Decrypt the contents of pbData using the provided privateKey under PKCS#1 padding.
diff --git a/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.net461.cs b/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.net461.cs
index 9fa292c50bbb7..ff36e7ac84125 100644
--- a/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.net461.cs
+++ b/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.net461.cs
@@ -50,3 +50,5 @@
[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.ResourceType))]
[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.SecurityInfos))]
[assembly: TypeForwardedTo(typeof(System.Security.AccessControl.SystemAcl))]
+[assembly: TypeForwardedTo(typeof(System.Security.Policy.Evidence))]
+[assembly: TypeForwardedTo(typeof(System.Security.Policy.EvidenceBase))]
diff --git a/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj b/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj
index 90ad8ce8968f2..6a6304598900b 100644
--- a/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj
+++ b/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj
@@ -4,8 +4,8 @@
$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows
true
- false
- 0
+ true
+ 1
Provides base classes that enable managing access and audit control lists on securable objects.
Commonly Used Types:
diff --git a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj
index 951f229ed4e62..3bb3f45e43cd3 100644
--- a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj
+++ b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj
@@ -8,7 +8,7 @@
true
false
- 3
+ 4
Provides support for PKCS and CMS algorithms.
Commonly Used Types:
diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/src/Resources/Strings.resx b/src/libraries/System.Security.Cryptography.X509Certificates/src/Resources/Strings.resx
index a5624952731d8..f16b13441fbf2 100644
--- a/src/libraries/System.Security.Cryptography.X509Certificates/src/Resources/Strings.resx
+++ b/src/libraries/System.Security.Cryptography.X509Certificates/src/Resources/Strings.resx
@@ -193,6 +193,9 @@
Object identifier (OID) is unknown.
+
+ Padding is invalid and cannot be removed.
+
Specified padding mode is not valid for this algorithm.