diff --git a/Directory.Build.props b/Directory.Build.props
index ad711a667cb0ca..c70eaf929cf18f 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -64,14 +64,21 @@
Microsoft.NETCore.App
.NET $(NetCoreAppCurrentVersion)
net$(NetCoreAppCurrentVersion)
+
+ $(NetCoreAppCurrent)
+
+ $(NetCoreAppPrevious)
net10.0
- $(NetCoreAppCurrent)
+
+
+
+ $(NetCoreAppMinimum)
+ $(NetCoreAppToolCurrent)
10.0
net$(AspNetCoreAppCurrentVersion)
@@ -133,9 +142,9 @@
$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoAOTCompiler', '$(TasksConfiguration)', '$(NetCoreAppToolCurrent)'))
$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoTargetsTasks', '$(TasksConfiguration)', '$(NetCoreAppToolCurrent)'))
$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'TestExclusionListTasks', '$(TasksConfiguration)', '$(NetCoreAppToolCurrent)'))
- $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'installer.tasks', '$(TasksConfiguration)', '$(NetCoreAppToolCurrent)', 'installer.tasks.dll'))
- $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'Crossgen2Tasks', '$(TasksConfiguration)', '$(NetCoreAppToolCurrent)', 'Microsoft.NET.CrossGen.props'))
- $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'Crossgen2Tasks', '$(TasksConfiguration)', '$(NetCoreAppToolCurrent)', 'Microsoft.NET.CrossGen.targets'))
+ $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'installer.tasks', '$(TasksConfiguration)', 'installer.tasks.dll'))
+ $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'Crossgen2Tasks', '$(TasksConfiguration)', 'Microsoft.NET.CrossGen.props'))
+ $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'Crossgen2Tasks', '$(TasksConfiguration)', 'Microsoft.NET.CrossGen.targets'))
$([MSBuild]::NormalizePath('$(AppleAppBuilderDir)', 'AppleAppBuilder.dll'))
$([MSBuild]::NormalizePath('$(AndroidAppBuilderDir)', 'AndroidAppBuilder.dll'))
$([MSBuild]::NormalizePath('$(MobileBuildTasksDir)', 'MobileBuildTasks.dll'))
diff --git a/Directory.Build.targets b/Directory.Build.targets
index c89bc354683465..193a0cd7065bd9 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -38,19 +38,7 @@
$([MSBuild]::NormalizeDirectory('$(NetCoreAppCurrentTestHostPath)', 'shared', '$(MicrosoftNetCoreAppFrameworkName)', '$(ProductVersion)'))
-
-
- %(RuntimePackRuntimeIdentifiers);$(NETCoreSdkRuntimeIdentifier)
-
-
- %(Crossgen2RuntimeIdentifiers);$(NETCoreSdkRuntimeIdentifier)
-
@@ -108,13 +96,6 @@
true
-
-
- $(SystemReflectionMetadataLoadContextVersion)
- $(SystemTextJsonVersion)
-
-
@@ -216,6 +197,4 @@
-
-
diff --git a/eng/Version.Details.props b/eng/Version.Details.props
index c95473be6c9009..d73d3bb8d89170 100644
--- a/eng/Version.Details.props
+++ b/eng/Version.Details.props
@@ -10,75 +10,75 @@ This file should be imported by eng/Versions.props
4.9.0-rc2.21473.1
- 19.1.0-alpha.1.25574.1
- 19.1.0-alpha.1.25574.1
- 19.1.0-alpha.1.25574.1
- 19.1.0-alpha.1.25574.1
- 19.1.0-alpha.1.25574.1
- 19.1.0-alpha.1.25574.1
- 19.1.0-alpha.1.25574.1
- 19.1.0-alpha.1.25574.1
- 19.1.0-alpha.1.25574.1
- 19.1.0-alpha.1.25574.1
- 19.1.0-alpha.1.25574.1
- 19.1.0-alpha.1.25574.1
- 19.1.0-alpha.1.25574.1
- 19.1.0-alpha.1.25574.1
- 19.1.0-alpha.1.25574.1
- 19.1.0-alpha.1.25574.1
- 19.1.0-alpha.1.25574.1
- 19.1.0-alpha.1.25574.1
- 19.1.0-alpha.1.25574.1
- 19.1.0-alpha.1.25574.1
- 19.1.0-alpha.1.25574.1
- 19.1.0-alpha.1.25574.1
- 19.1.0-alpha.1.25574.1
- 19.1.0-alpha.1.25574.1
- 19.1.0-alpha.1.25574.1
- 19.1.0-alpha.1.25574.1
- 19.1.0-alpha.1.25574.1
- 19.1.0-alpha.1.25574.1
- 19.1.0-alpha.1.25574.1
+ 19.1.0-alpha.1.25625.2
+ 19.1.0-alpha.1.25625.2
+ 19.1.0-alpha.1.25625.2
+ 19.1.0-alpha.1.25625.2
+ 19.1.0-alpha.1.25625.2
+ 19.1.0-alpha.1.25625.2
+ 19.1.0-alpha.1.25625.2
+ 19.1.0-alpha.1.25625.2
+ 19.1.0-alpha.1.25625.2
+ 19.1.0-alpha.1.25625.2
+ 19.1.0-alpha.1.25625.2
+ 19.1.0-alpha.1.25625.2
+ 19.1.0-alpha.1.25625.2
+ 19.1.0-alpha.1.25625.2
+ 19.1.0-alpha.1.25625.2
+ 19.1.0-alpha.1.25625.2
+ 19.1.0-alpha.1.25625.2
+ 19.1.0-alpha.1.25625.2
+ 19.1.0-alpha.1.25625.2
+ 19.1.0-alpha.1.25625.2
+ 19.1.0-alpha.1.25625.2
+ 19.1.0-alpha.1.25625.2
+ 19.1.0-alpha.1.25625.2
+ 19.1.0-alpha.1.25625.2
+ 19.1.0-alpha.1.25625.2
+ 19.1.0-alpha.1.25625.2
+ 19.1.0-alpha.1.25625.2
+ 19.1.0-alpha.1.25625.2
+ 19.1.0-alpha.1.25625.2
- 5.3.0-1.25619.109
- 5.3.0-1.25619.109
- 5.3.0-1.25619.109
- 11.0.100-alpha.1.25619.109
- 11.0.100-alpha.1.25619.109
- 11.0.0-beta.25619.109
- 11.0.0-beta.25619.109
- 11.0.0-beta.25619.109
- 11.0.0-beta.25619.109
- 11.0.0-beta.25619.109
- 11.0.0-beta.25619.109
- 11.0.0-beta.25619.109
- 11.0.0-beta.25619.109
- 0.11.5-alpha.25619.109
- 11.0.0-beta.25619.109
- 11.0.0-beta.25619.109
- 11.0.0-beta.25619.109
- 11.0.0-beta.25619.109
- 11.0.0-beta.25619.109
- 11.0.0-beta.25619.109
- 11.0.0-beta.25619.109
- 11.0.0-beta.25619.109
- 2.9.3-beta.25619.109
- 2.9.3-beta.25619.109
- 11.0.0-beta.25619.109
- 5.3.0-1.25619.109
- 11.0.0-alpha.1.25619.109
- 11.0.100-alpha.1.25619.109
- 11.0.0-alpha.1.25619.109
- 11.0.0-alpha.1.25619.109
- 7.3.0-preview.1.12009
- 7.3.0-preview.1.12009
- 7.3.0-preview.1.12009
- 7.3.0-preview.1.12009
- 11.0.0-alpha.1.25619.109
- 3.0.0-alpha.1.25619.109
- 11.0.0-alpha.1.25619.109
- 11.0.0-alpha.1.25619.109
- 11.0.0-alpha.1.25619.109
+ 5.4.0-2.26062.101
+ 5.4.0-2.26062.101
+ 5.4.0-2.26062.101
+ 11.0.100-alpha.1.26062.101
+ 11.0.100-alpha.1.26062.101
+ 11.0.0-beta.26062.101
+ 11.0.0-beta.26062.101
+ 11.0.0-beta.26062.101
+ 11.0.0-beta.26062.101
+ 11.0.0-beta.26062.101
+ 11.0.0-beta.26062.101
+ 11.0.0-beta.26062.101
+ 11.0.0-beta.26062.101
+ 0.11.5-alpha.26062.101
+ 11.0.0-beta.26062.101
+ 11.0.0-beta.26062.101
+ 11.0.0-beta.26062.101
+ 11.0.0-beta.26062.101
+ 11.0.0-beta.26062.101
+ 11.0.0-beta.26062.101
+ 11.0.0-beta.26062.101
+ 11.0.0-beta.26062.101
+ 2.9.3-beta.26062.101
+ 2.9.3-beta.26062.101
+ 11.0.0-beta.26062.101
+ 5.4.0-2.26062.101
+ 11.0.0-alpha.1.26062.101
+ 11.0.100-alpha.1.26062.101
+ 11.0.0-alpha.1.26062.101
+ 11.0.0-alpha.1.26062.101
+ 7.3.0-preview.1.6301
+ 7.3.0-preview.1.6301
+ 7.3.0-preview.1.6301
+ 7.3.0-preview.1.6301
+ 11.0.0-alpha.1.26062.101
+ 3.0.0-alpha.1.26062.101
+ 11.0.0-alpha.1.26062.101
+ 11.0.0-alpha.1.26062.101
+ 11.0.0-alpha.1.26062.101
11.0.0-beta.26059.1
11.0.0-beta.26059.1
@@ -110,14 +110,14 @@ This file should be imported by eng/Versions.props
11.0.0-alpha.0.25625.1
- 11.0.0-alpha.1.25607.1
- 11.0.0-alpha.1.25607.1
- 11.0.0-alpha.1.25607.1
- 11.0.0-alpha.1.25607.1
- 11.0.0-alpha.1.25607.1
- 11.0.0-alpha.1.25607.1
- 11.0.0-alpha.1.25607.1
- 11.0.0-alpha.1.25607.1
+ 11.0.0-alpha.1.25628.1
+ 11.0.0-alpha.1.25628.1
+ 11.0.0-alpha.1.25628.1
+ 11.0.0-alpha.1.25628.1
+ 11.0.0-alpha.1.25628.1
+ 11.0.0-alpha.1.25628.1
+ 11.0.0-alpha.1.25628.1
+ 11.0.0-alpha.1.25628.1
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b31924812f3a4c..1ee461ff50dde8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,5 +1,5 @@
-
+
https://github.com/dotnet/icu
@@ -9,123 +9,123 @@
https://github.com/dotnet/wcf
7f504aabb1988e9a093c1e74d8040bd52feb2f01
-
+
https://github.com/dotnet/llvm-project
- a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9
+ 90a3b767fd10543cbaed7308406e0059dec0ffb7
-
+
https://github.com/dotnet/llvm-project
- a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9
+ 90a3b767fd10543cbaed7308406e0059dec0ffb7
-
+
https://github.com/dotnet/llvm-project
- a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9
+ 90a3b767fd10543cbaed7308406e0059dec0ffb7
-
+
https://github.com/dotnet/llvm-project
- a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9
+ 90a3b767fd10543cbaed7308406e0059dec0ffb7
-
+
https://github.com/dotnet/llvm-project
- a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9
+ 90a3b767fd10543cbaed7308406e0059dec0ffb7
-
+
https://github.com/dotnet/llvm-project
- a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9
+ 90a3b767fd10543cbaed7308406e0059dec0ffb7
-
+
https://github.com/dotnet/llvm-project
- a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9
+ 90a3b767fd10543cbaed7308406e0059dec0ffb7
-
+
https://github.com/dotnet/llvm-project
- a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9
+ 90a3b767fd10543cbaed7308406e0059dec0ffb7
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
https://github.com/dotnet/runtime-assets
@@ -179,117 +179,117 @@
https://github.com/dotnet/runtime-assets
fd342f922435b2725113b5226c7e25fcf830a149
-
+
https://github.com/dotnet/llvm-project
- a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9
+ 90a3b767fd10543cbaed7308406e0059dec0ffb7
-
+
https://github.com/dotnet/llvm-project
- a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9
+ 90a3b767fd10543cbaed7308406e0059dec0ffb7
-
+
https://github.com/dotnet/llvm-project
- a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9
+ 90a3b767fd10543cbaed7308406e0059dec0ffb7
-
+
https://github.com/dotnet/llvm-project
- a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9
+ 90a3b767fd10543cbaed7308406e0059dec0ffb7
-
+
https://github.com/dotnet/llvm-project
- a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9
+ 90a3b767fd10543cbaed7308406e0059dec0ffb7
-
+
https://github.com/dotnet/llvm-project
- a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9
+ 90a3b767fd10543cbaed7308406e0059dec0ffb7
-
+
https://github.com/dotnet/llvm-project
- a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9
+ 90a3b767fd10543cbaed7308406e0059dec0ffb7
-
+
https://github.com/dotnet/llvm-project
- a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9
+ 90a3b767fd10543cbaed7308406e0059dec0ffb7
-
+
https://github.com/dotnet/llvm-project
- a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9
+ 90a3b767fd10543cbaed7308406e0059dec0ffb7
-
+
https://github.com/dotnet/llvm-project
- a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9
+ 90a3b767fd10543cbaed7308406e0059dec0ffb7
-
+
https://github.com/dotnet/llvm-project
- a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9
+ 90a3b767fd10543cbaed7308406e0059dec0ffb7
-
+
https://github.com/dotnet/llvm-project
- a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9
+ 90a3b767fd10543cbaed7308406e0059dec0ffb7
-
+
https://github.com/dotnet/llvm-project
- a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9
+ 90a3b767fd10543cbaed7308406e0059dec0ffb7
-
+
https://github.com/dotnet/llvm-project
- a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9
+ 90a3b767fd10543cbaed7308406e0059dec0ffb7
-
+
https://github.com/dotnet/llvm-project
- a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9
+ 90a3b767fd10543cbaed7308406e0059dec0ffb7
-
+
https://github.com/dotnet/llvm-project
- a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9
+ 90a3b767fd10543cbaed7308406e0059dec0ffb7
-
+
https://github.com/dotnet/llvm-project
- a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9
+ 90a3b767fd10543cbaed7308406e0059dec0ffb7
-
+
https://github.com/dotnet/llvm-project
- a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9
+ 90a3b767fd10543cbaed7308406e0059dec0ffb7
-
+
https://github.com/dotnet/llvm-project
- a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9
+ 90a3b767fd10543cbaed7308406e0059dec0ffb7
-
+
https://github.com/dotnet/llvm-project
- a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9
+ 90a3b767fd10543cbaed7308406e0059dec0ffb7
-
+
https://github.com/dotnet/llvm-project
- a504aeb8ef551dbd01b94df9af22f4cfa2bf90d9
+ 90a3b767fd10543cbaed7308406e0059dec0ffb7
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
https://github.com/dotnet/xharness
@@ -303,9 +303,9 @@
https://github.com/dotnet/xharness
3df2923500447ee925d59f026c81720c7a9b4e4b
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
@@ -331,29 +331,29 @@
https://github.com/dotnet/runtime-assets
fd342f922435b2725113b5226c7e25fcf830a149
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
@@ -365,53 +365,53 @@
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/dotnet
- 5661a2c0a84a3fd32916395b254ce50e5ad7e9fe
+ 7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f
-
+
https://github.com/dotnet/node
- fbf55e071a07059e86b5b7e259c200d889701170
+ 0f3a9cd731b411ea93b239ef3cfff3ca5624ef1d
-
+
https://github.com/dotnet/node
- fbf55e071a07059e86b5b7e259c200d889701170
+ 0f3a9cd731b411ea93b239ef3cfff3ca5624ef1d
-
+
https://github.com/dotnet/node
- fbf55e071a07059e86b5b7e259c200d889701170
+ 0f3a9cd731b411ea93b239ef3cfff3ca5624ef1d
-
+
https://github.com/dotnet/node
- fbf55e071a07059e86b5b7e259c200d889701170
+ 0f3a9cd731b411ea93b239ef3cfff3ca5624ef1d
-
+
https://github.com/dotnet/node
- fbf55e071a07059e86b5b7e259c200d889701170
+ 0f3a9cd731b411ea93b239ef3cfff3ca5624ef1d
-
+
https://github.com/dotnet/node
- fbf55e071a07059e86b5b7e259c200d889701170
+ 0f3a9cd731b411ea93b239ef3cfff3ca5624ef1d
-
+
https://github.com/dotnet/node
- fbf55e071a07059e86b5b7e259c200d889701170
+ 0f3a9cd731b411ea93b239ef3cfff3ca5624ef1d
-
+
https://github.com/dotnet/node
- fbf55e071a07059e86b5b7e259c200d889701170
+ 0f3a9cd731b411ea93b239ef3cfff3ca5624ef1d
https://github.com/dotnet/runtime-assets
diff --git a/eng/common/core-templates/steps/install-microbuild-impl.yml b/eng/common/core-templates/steps/install-microbuild-impl.yml
index b9e0143ee92adc..da22beb3f60c3c 100644
--- a/eng/common/core-templates/steps/install-microbuild-impl.yml
+++ b/eng/common/core-templates/steps/install-microbuild-impl.yml
@@ -18,7 +18,7 @@ parameters:
type: boolean
steps:
-- ${{ if eq(parameters.enablePreviewMicrobuild, 'true') }}:
+- ${{ if eq(parameters.enablePreviewMicrobuild, true) }}:
- task: MicroBuildSigningPluginPreview@4
displayName: Install Preview MicroBuild plugin
inputs: ${{ parameters.microbuildTaskInputs }}
diff --git a/eng/common/core-templates/steps/source-index-stage1-publish.yml b/eng/common/core-templates/steps/source-index-stage1-publish.yml
index ac019e2d033713..3ad83b8c3075e3 100644
--- a/eng/common/core-templates/steps/source-index-stage1-publish.yml
+++ b/eng/common/core-templates/steps/source-index-stage1-publish.yml
@@ -14,8 +14,8 @@ steps:
workingDirectory: $(Agent.TempDirectory)
- script: |
- $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
- $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
+ $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.sourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
+ $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.sourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
displayName: "Source Index: Download netsourceindex Tools"
# Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
workingDirectory: $(Agent.TempDirectory)
diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh
index 64b87d0bcc3cec..11f81cbd40d4a9 100755
--- a/eng/common/native/install-dependencies.sh
+++ b/eng/common/native/install-dependencies.sh
@@ -27,7 +27,7 @@ case "$os" in
libssl-dev libkrb5-dev pigz cpio
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
- elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos"]; then
+ elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos" ]; then
pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)"
$pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
elif [ "$ID" = "amzn" ]; then
diff --git a/eng/native/ijw/getRefPackFolderFromSdk.ps1 b/eng/native/ijw/getRefPackFolderFromSdk.ps1
index 1b59248cb42adf..f4ebd3fec9d92d 100644
--- a/eng/native/ijw/getRefPackFolderFromSdk.ps1
+++ b/eng/native/ijw/getRefPackFolderFromSdk.ps1
@@ -14,14 +14,17 @@ $dotnetSdkVersion = $GlobalJson.tools.dotnet
$sdkBundledVersionsFile = "$dotnetRoot/sdk/$dotnetSdkVersion/Microsoft.NETCoreSdk.BundledVersions.props"
$refPackVersion = Select-Xml -Path $sdkBundledVersionsFile -XPath "/Project/PropertyGroup/BundledNETCoreAppPackageVersion" | %{$_.Node.InnerText}
-$refPackTfmVersion = Select-Xml -Path $sdkBundledVersionsFile -XPath "/Project/PropertyGroup/BundledNETCoreAppTargetFrameworkVersion" | %{$_.Node.InnerText}
-$refPackPath = "$dotnetRoot/packs/Microsoft.NETCore.App.Ref/$refPackVersion/ref/net$refPackTfmVersion"
+# The actual path to assemblies is defined by the information in data/FrameworkList.xml, but we don't need to read that. Instead just find the path to System.Runtime.dll and use its folder.
+$refPackBase = "$dotnetRoot/packs/Microsoft.NETCore.App.Ref/$refPackVersion/ref"
+$systemRuntimeDll = Get-ChildItem -Path $refPackBase -Recurse -Filter "System.Runtime.dll" | Select-Object -First 1
-if (-not (Test-Path $refPackPath))
+if (-not $systemRuntimeDll)
{
Write-Error "Reference assemblies not found in the SDK folder. Did the SDK layout change? Did the SDK change how it describes the bundled runtime version?"
exit 1
}
+$refPackPath = Split-Path $systemRuntimeDll.FullName -Parent
+
Write-Output "refPackPath=$refPackPath"
diff --git a/eng/pruning.targets b/eng/pruning.targets
deleted file mode 100644
index 845e99f7e1bfee..00000000000000
--- a/eng/pruning.targets
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- true
- 10.0
-
-
-
-
-
-
-
diff --git a/eng/testing/linker/project.csproj.template b/eng/testing/linker/project.csproj.template
index 2a4bbd96f9c179..bee554760c7e94 100644
--- a/eng/testing/linker/project.csproj.template
+++ b/eng/testing/linker/project.csproj.template
@@ -85,7 +85,6 @@
-
diff --git a/global.json b/global.json
index 493c6d392f86d1..9f7a4aae95a271 100644
--- a/global.json
+++ b/global.json
@@ -1,18 +1,18 @@
{
"sdk": {
- "version": "10.0.100",
+ "version": "11.0.100-alpha.1.25618.104",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
- "dotnet": "10.0.100"
+ "dotnet": "11.0.100-alpha.1.25618.104"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25619.109",
- "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25619.109",
- "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.25619.109",
+ "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26062.101",
+ "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26062.101",
+ "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26062.101",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
- "Microsoft.NET.Sdk.IL": "11.0.0-alpha.1.25619.109"
+ "Microsoft.NET.Sdk.IL": "11.0.0-alpha.1.26062.101"
}
}
diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props
index 569fb48bc9e151..e405de20604849 100644
--- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props
+++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props
@@ -3,7 +3,7 @@
ilc
true
Exe
- $(NetCoreAppToolCurrent)
+ net$(BundledNETCoreAppTargetFrameworkVersion)
8002,NU1701
x64;x86
AnyCPU
diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.props b/src/coreclr/tools/aot/crossgen2/crossgen2.props
index b74447d55797bd..3b38dc88c8bfa4 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.props
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.props
@@ -1,7 +1,7 @@
- $(NetCoreAppToolCurrent)
+ net$(BundledNETCoreAppTargetFrameworkVersion)
crossgen2
true
Exe
diff --git a/src/coreclr/tools/cdac-build-tool/cdac-build-tool.csproj b/src/coreclr/tools/cdac-build-tool/cdac-build-tool.csproj
index 976fbb4141e1d1..53c2345bc43826 100644
--- a/src/coreclr/tools/cdac-build-tool/cdac-build-tool.csproj
+++ b/src/coreclr/tools/cdac-build-tool/cdac-build-tool.csproj
@@ -5,7 +5,7 @@
Exe
enable
AnyCPU
- $(NetCoreAppToolCurrent)
+ net$(BundledNETCoreAppTargetFrameworkVersion)
true
$(RuntimeBinDir)/cdac-build-tool
true
diff --git a/src/installer/tests/Assets/Projects/Directory.Build.targets b/src/installer/tests/Assets/Projects/Directory.Build.targets
index 958885653537bb..e83a44b684bb36 100644
--- a/src/installer/tests/Assets/Projects/Directory.Build.targets
+++ b/src/installer/tests/Assets/Projects/Directory.Build.targets
@@ -1,6 +1,5 @@
-
diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj
index 05591d87aad651..5c80805b82c88b 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj
@@ -15,10 +15,9 @@
-
+
+
+
diff --git a/src/libraries/System.Numerics.Tensors/Directory.Build.props b/src/libraries/System.Numerics.Tensors/Directory.Build.props
new file mode 100644
index 00000000000000..8190aeb79e17a5
--- /dev/null
+++ b/src/libraries/System.Numerics.Tensors/Directory.Build.props
@@ -0,0 +1,8 @@
+
+
+
+
+ $(NoWarn);CS8631
+
+
diff --git a/src/libraries/System.Private.CoreLib/src/System/IO/SharedMemoryManager.Unix.cs b/src/libraries/System.Private.CoreLib/src/System/IO/SharedMemoryManager.Unix.cs
index 3f27641c23ab60..28e1ff19751257 100644
--- a/src/libraries/System.Private.CoreLib/src/System/IO/SharedMemoryManager.Unix.cs
+++ b/src/libraries/System.Private.CoreLib/src/System/IO/SharedMemoryManager.Unix.cs
@@ -156,9 +156,10 @@ public SharedMemoryProcessDataHeader(SharedMemoryId id, SafeFileHandle fileHandl
{
created = false;
- AutoReleaseFileLock placeholderAutoReleaseLock = new AutoReleaseFileLock(new SafeFileHandle());
-
- creationDeletionLockFileHandle = placeholderAutoReleaseLock;
+ // If we don't create the shared memory file, the caller won't need to hold the creation/deletion lock file handle.
+ // Return a placeholder to simplify the caller's logic and allow them to always dispose of the handle
+ // when the return value is non-null.
+ creationDeletionLockFileHandle = new AutoReleaseFileLock(new SafeFileHandle());
SharedMemoryId id = new(name, isUserScope);
nuint sharedDataUsedByteCount = (nuint)sizeof(SharedMemorySharedDataHeader) + sharedMemoryDataSize;
@@ -173,7 +174,7 @@ public SharedMemoryProcessDataHeader(SharedMemoryId id, SafeFileHandle fileHandl
return processDataHeader;
}
- creationDeletionLockFileHandle = SharedMemoryManager.Instance.AcquireCreationDeletionLockForId(id);
+ using AutoReleaseFileLock creationDeletionLock = SharedMemoryManager.Instance.AcquireCreationDeletionLockForId(id);
string sessionDirectory = Path.Combine(
SharedMemoryHelpers.SharedFilesPath,
@@ -276,11 +277,12 @@ public SharedMemoryProcessDataHeader(SharedMemoryId id, SafeFileHandle fileHandl
}
}
- if (!createdFile)
+ if (createdFile)
{
- creationDeletionLockFileHandle.Dispose();
- // Reset to the placeholder value to avoid returning a pre-disposed lock.
- creationDeletionLockFileHandle = placeholderAutoReleaseLock;
+ // If we created the file, then the caller still has more work to do to initialize the shared memory data.
+ // Transfer the creation/deletion lock file handle to the caller to hold while they do that work.
+ creationDeletionLock.SuppressRelease();
+ creationDeletionLockFileHandle = new AutoReleaseFileLock(creationDeletionLock.FileHandle);
}
processDataHeader = new SharedMemoryProcessDataHeader(
@@ -325,7 +327,7 @@ public void DecrementRefCount()
private void Close()
{
- SharedMemoryManager.Instance.VerifyCreationDeletionProcessLockIsLocked();
+ SharedMemoryManager.Instance.VerifyCreationDeletionProcessLockIsLocked();
SharedMemoryManager.Instance.RemoveProcessDataHeader(this);
using AutoReleaseFileLock autoReleaseFileLock = SharedMemoryManager.Instance.AcquireCreationDeletionLockForId(_id);
@@ -711,6 +713,8 @@ internal unsafe ref struct AutoReleaseFileLock(SafeFileHandle fd)
{
private bool _suppressed;
+ public readonly SafeFileHandle FileHandle = fd;
+
public void SuppressRelease()
{
_suppressed = true;
@@ -718,9 +722,9 @@ public void SuppressRelease()
public void Dispose()
{
- if (!_suppressed && !fd.IsInvalid)
+ if (!_suppressed && !FileHandle.IsInvalid)
{
- Interop.Sys.FLock(fd, Interop.Sys.LockOperations.LOCK_UN);
+ Interop.Sys.FLock(FileHandle, Interop.Sys.LockOperations.LOCK_UN);
}
}
}
@@ -787,7 +791,7 @@ public AutoReleaseFileLock AcquireCreationDeletionLockForId(SharedMemoryId id)
}
}
- bool acquired = SharedMemoryHelpers.TryAcquireFileLock(fd, nonBlocking: true, exclusive: true);
+ bool acquired = SharedMemoryHelpers.TryAcquireFileLock(fd, nonBlocking: false, exclusive: true);
Debug.Assert(acquired);
return new AutoReleaseFileLock(fd);
diff --git a/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj b/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj
index f34b39521b7ac5..1c49223375914e 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj
+++ b/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj
@@ -24,7 +24,7 @@
-
+
diff --git a/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj b/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj
index 4cc6527709d176..cdd090c8abb79f 100644
--- a/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj
+++ b/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj
@@ -10,9 +10,8 @@
$(NoWarn);CA1822;IDE0060
- true
-
- false
+ true
+ false
true
diff --git a/src/libraries/externals.csproj b/src/libraries/externals.csproj
index 43f4cc099eb125..cc2e5a1ea47fa5 100644
--- a/src/libraries/externals.csproj
+++ b/src/libraries/externals.csproj
@@ -1,4 +1,4 @@
-
+
true
$(NetCoreAppCurrent)
diff --git a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs
index 64b7c72447a5fb..7d7d73ae4d758f 100644
--- a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs
+++ b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs
@@ -30,7 +30,6 @@ public abstract class BuildTestBase : IClassFixture
+ {
+ string tfm = Path.GetFileName(dir);
+ return tfm.StartsWith("net", StringComparison.OrdinalIgnoreCase) && !tfm.StartsWith("net4", StringComparison.OrdinalIgnoreCase);
+ });
+
+ if (string.IsNullOrEmpty(tasksDir))
+ throw new DirectoryNotFoundException($"Could not find any valid TFM directories in {tasksBaseDir} : {string.Join(", ", taskDirectories)}");
string? taskPath = Directory.EnumerateFiles(tasksDir, "WasmAppBuilder.dll", SearchOption.AllDirectories)
.FirstOrDefault();
if (string.IsNullOrEmpty(taskPath))
throw new FileNotFoundException($"Could not find WasmAppBuilder.dll in {tasksDir}");
- _testOutput.WriteLine ("Using WasmAppBuilder.dll from {0}", taskPath);
+ _testOutput.WriteLine("Using WasmAppBuilder.dll from {0}", taskPath);
string AddAssembly(string assemblyLocation, string name) => $"";
string frameworkDir = Path.Combine(GetBinFrameworkDir(config, isPublish));
diff --git a/src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj b/src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj
index 48c5aed0156fc8..3b88e4a33e5e0a 100644
--- a/src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj
+++ b/src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj
@@ -1,9 +1,12 @@
- $(NetCoreAppToolCurrent)
+ net$(BundledNETCoreAppTargetFrameworkVersion)
$(NoWarn);CA1050;CA1852;CA1861;CA2249;IDE0059;IDE0060;IDE0074
annotations
+ false
+
+ $([System.IO.Path]::GetDirectoryName('$(BundledRuntimeIdentifierGraphFile)'))\
@@ -19,14 +22,14 @@
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -35,4 +38,5 @@
Link="Microsoft.NET.CrossGen.props"
CopyToOutputDirectory="PreserveNewest" />
+
diff --git a/src/tasks/installer.tasks/installer.tasks.csproj b/src/tasks/installer.tasks/installer.tasks.csproj
index 7a5c800baf89b1..4f081553e0de87 100644
--- a/src/tasks/installer.tasks/installer.tasks.csproj
+++ b/src/tasks/installer.tasks/installer.tasks.csproj
@@ -1,16 +1,20 @@
- $(NetCoreAppToolCurrent)
+ net$(BundledNETCoreAppTargetFrameworkVersion)
disable
false
false
+ false
+
+ $([System.IO.Path]::GetDirectoryName('$(BundledRuntimeIdentifierGraphFile)'))\
+
-
-
-
+
+
+
diff --git a/src/tools/illink/src/linker/CompatibilitySuppressions.xml b/src/tools/illink/src/linker/CompatibilitySuppressions.xml
index cb817767134546..1834d95fe9f446 100644
--- a/src/tools/illink/src/linker/CompatibilitySuppressions.xml
+++ b/src/tools/illink/src/linker/CompatibilitySuppressions.xml
@@ -1,4 +1,4 @@
-
+