diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index d2091cfc6d0c..dd79acf55eff 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"microsoft.dotnet.helix.jobmonitor": {
- "version": "11.0.0-beta.26427.10",
+ "version": "11.0.0-beta.26451.109",
"commands": [
"dotnet-helix-job-monitor"
]
diff --git a/NuGet.config b/NuGet.config
index 0a892e592f7e..ee6b916736f9 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -25,6 +25,8 @@
+
+
diff --git a/documentation/general/UpdateToNewTargetFramework.md b/documentation/general/UpdateToNewTargetFramework.md
index da275fb7842c..ec4047737d94 100644
--- a/documentation/general/UpdateToNewTargetFramework.md
+++ b/documentation/general/UpdateToNewTargetFramework.md
@@ -50,6 +50,11 @@ Define version-specific properties for those values. While `N-1` is prerelease,
exact available package versions. After `N-1` releases, replace temporary pins with
`(N-1).0.$(VersionFeature...)` and remove the temporary follow-up comment.
+While `N-1` is still the current TFM, keep its generated metadata aligned with the live
+packs bundled in the SDK. Activate the frozen values only after the netN targeting packs
+become current; otherwise the SDK advertises pack versions that are not installed and
+isolated-source restores fail.
+
Do not leave the previous TFM bound to live `Microsoft*PackageVersion` properties. Those
properties will advance to netN when new dependencies flow.
diff --git a/eng/Version.Details.props b/eng/Version.Details.props
index 5d0fbfc037ae..0ebb96bbaa6b 100644
--- a/eng/Version.Details.props
+++ b/eng/Version.Details.props
@@ -5,138 +5,137 @@ This file should be imported by eng/Versions.props
-->
-
- 11.0.0-beta.26427.10
2.1.0
11.0.0-preview.5.26272.112
11.0.0-preview.5.26272.112
11.0.0-preview.5.26272.112
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.1.0-preview.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 18.11.0-1.26410.101
- 18.11.0-1.26410.101
- 7.11.0-rc.41101
- 18.11.0-1.26410.101
- 11.0.100-rc.1.26410.101
- 5.11.0-1.26410.101
- 5.11.0-1.26410.101
- 5.11.0-1.26410.101
- 5.11.0-1.26410.101
- 5.11.0-1.26410.101
- 5.11.0-1.26410.101
- 5.11.0-1.26410.101
- 5.11.0-1.26410.101
- 5.11.0-1.26410.101
- 11.1.0-preview.26410.101
- 5.11.0-1.26410.101
- 5.11.0-1.26410.101
- 2.0.0-preview.1.26410.101
- 3.0.0-rc.1.26410.101
- 11.0.0-beta.26410.101
- 11.0.0-beta.26410.101
- 11.0.0-beta.26410.101
- 11.0.0-beta.26410.101
- 11.0.0-beta.26410.101
- 11.0.0-beta.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-beta.26410.101
- 11.0.0-beta.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 15.2.101-rc1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 5.11.0-1.26410.101
- 5.11.0-1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-preview.7.26360.111
- 11.1.0-preview.26410.101
- 11.0.0-rc.1.26410.101
- 18.11.0-preview-26410-101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.100-rc.1.26410.101
- 11.0.100-rc.1.26410.101
- 11.0.100-rc.1.26410.101
- 11.0.100-rc.1.26410.101
- 11.0.100-rc.1.26410.101
- 18.11.0-preview-26410-101
- 18.11.0-preview-26410-101
- 3.3.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 7.11.0-rc.41101
- 7.11.0-rc.41101
- 7.11.0-rc.41101
- 7.11.0-rc.41101
- 7.11.0-rc.41101
- 7.11.0-rc.41101
- 7.11.0-rc.41101
- 7.11.0-rc.41101
- 7.11.0-rc.41101
- 7.11.0-rc.41101
- 7.11.0-rc.41101
- 7.11.0-rc.41101
- 7.11.0-rc.41101
- 7.11.0-rc.41101
- 7.11.0-rc.41101
- 7.11.0-rc.41101
- 11.0.0-rc.1.26410.101
- 3.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
- 11.0.0-rc.1.26410.101
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.1.0-preview.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 18.12.0-1.26451.109
+ 18.12.0-1.26451.109
+ 7.11.0-rc.45209
+ 18.12.0-1.26451.109
+ 11.0.100-rc.1.26451.109
+ 5.12.0-1.26451.109
+ 5.12.0-1.26451.109
+ 5.12.0-1.26451.109
+ 5.12.0-1.26451.109
+ 5.12.0-1.26451.109
+ 5.12.0-1.26451.109
+ 5.12.0-1.26451.109
+ 5.12.0-1.26451.109
+ 5.12.0-1.26451.109
+ 11.1.0-preview.26451.109
+ 5.12.0-1.26451.109
+ 5.12.0-1.26451.109
+ 2.0.0-preview.1.26451.109
+ 3.0.0-rc.1.26451.109
+ 11.0.0-beta.26451.109
+ 11.0.0-beta.26451.109
+ 11.0.0-beta.26451.109
+ 11.0.0-beta.26451.109
+ 11.0.0-beta.26451.109
+ 11.0.0-beta.26451.109
+ 11.0.0-beta.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-beta.26451.109
+ 11.0.0-beta.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 15.2.101-rc1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 5.12.0-1.26451.109
+ 5.12.0-1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.1.0-preview.26451.109
+ 11.0.0-rc.1.26451.109
+ 18.12.0-preview-26451-109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.100-rc.1.26451.109
+ 11.0.100-rc.1.26451.109
+ 11.0.100-rc.1.26451.109
+ 11.0.100-rc.1.26451.109
+ 11.0.100-rc.1.26451.109
+ 18.12.0-preview-26451-109
+ 18.12.0-preview-26451-109
+ 3.3.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 7.11.0-rc.45209
+ 7.11.0-rc.45209
+ 7.11.0-rc.45209
+ 7.11.0-rc.45209
+ 7.11.0-rc.45209
+ 7.11.0-rc.45209
+ 7.11.0-rc.45209
+ 7.11.0-rc.45209
+ 7.11.0-rc.45209
+ 7.11.0-rc.45209
+ 7.11.0-rc.45209
+ 7.11.0-rc.45209
+ 7.11.0-rc.45209
+ 7.11.0-rc.45209
+ 7.11.0-rc.45209
+ 7.11.0-rc.45209
+ 11.0.0-rc.1.26451.109
+ 3.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
+ 11.0.0-rc.1.26451.109
2.4.0-preview.26429.4
2.3.0-preview.26330.8
@@ -145,8 +144,6 @@ This file should be imported by eng/Versions.props
-
- $(MicrosoftDotNetHelixJobMonitorPackageVersion)
$(NETStandardLibraryRefPackageVersion)
@@ -197,6 +194,7 @@ This file should be imported by eng/Versions.props
$(MicrosoftDotNetBuildTasksInstallersPackageVersion)
$(MicrosoftDotNetBuildTasksTemplatingPackageVersion)
$(MicrosoftDotNetBuildTasksWorkloadsPackageVersion)
+ $(MicrosoftDotNetHelixJobMonitorPackageVersion)
$(MicrosoftDotNetHelixSdkPackageVersion)
$(MicrosoftDotNetSignToolPackageVersion)
$(MicrosoftDotNetWebItemTemplates110PackageVersion)
@@ -222,7 +220,7 @@ This file should be imported by eng/Versions.props
$(MicrosoftNetCompilersToolsetFrameworkPackageVersion)
$(MicrosoftNETHostModelPackageVersion)
$(MicrosoftNETILLinkTasksPackageVersion)
- $(MicrosoftNETRuntimeEmscripten506Cachewinx64PackageVersion)
+ $(MicrosoftNETRuntimeEmscriptenInternalPackageVersion)
$(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion)
$(MicrosoftNETSdkWindowsDesktopPackageVersion)
$(MicrosoftNETTestSdkPackageVersion)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c40901232898..adb735461714 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,26 +1,26 @@
-
+
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
@@ -28,174 +28,174 @@
https://github.com/dotnet/core-setup
7d57652f33493fa022125b7f63aad0d70c52d810
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
https://github.com/dotnet/dotnet
@@ -242,304 +242,304 @@
https://github.com/dotnet/dotnet
85ca690954a6f5e988d523dec249b57b84d1ad0d
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 50dbab4de210e882172b07934e9666313b7065f1
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
- https://github.com/dotnet/arcade
- 2cdfe99944d984749c8bdfc7d8d6a2589ed15d6d
+
+ https://github.com/dotnet/dotnet
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
-
+
https://github.com/dotnet/dotnet
- 64a29867c5c5c8e0babc9e31313cf3b6e50f0193
+ f2b969981e123579eb8a779dc05aa8138569dff9
+ <_NET110RuntimePackVersion Condition="'$(_NETCoreAppTargetFrameworkVersion)' == '11.0'">$(MicrosoftNETCoreAppRuntimePackageVersion)
+ <_NET110TargetingPackVersion Condition="'$(_NETCoreAppTargetFrameworkVersion)' == '11.0'">$(MicrosoftNETCoreAppRefPackageVersion)
+ <_WindowsDesktop110RuntimePackVersion Condition="'$(_NETCoreAppTargetFrameworkVersion)' == '11.0'">$(MicrosoftWindowsDesktopAppRuntimePackageVersion)
+ <_WindowsDesktop110TargetingPackVersion Condition="'$(_NETCoreAppTargetFrameworkVersion)' == '11.0'">$(MicrosoftWindowsDesktopAppRefPackageVersion)
+ <_AspNet110RuntimePackVersion Condition="'$(_NETCoreAppTargetFrameworkVersion)' == '11.0'">$(MicrosoftAspNetCoreAppRuntimePackageVersion)
+ <_AspNet110TargetingPackVersion Condition="'$(_NETCoreAppTargetFrameworkVersion)' == '11.0'">$(MicrosoftAspNetCoreAppRefPackageVersion)
+
<_NET100RuntimePackVersion>10.0.$(VersionFeature100)
<_NET100TargetingPackVersion>10.0.$(VersionFeature100)
<_WindowsDesktop100RuntimePackVersion>10.0.$(VersionFeature100)
@@ -171,6 +179,14 @@
<_NETCoreSdkBeingBuiltIsPreview Condition=" '$(DotNetFinalVersionKind)' == 'release' ">false
+
+
+ <_NET110RuntimePackVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)
+ <_NET110TargetingPackVersion>$(MicrosoftNETCoreAppRefPackageVersion)
+ <_AspNet110RuntimePackVersion>$(MicrosoftAspNetCoreAppRuntimePackageVersion)
+ <_AspNet110TargetingPackVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)
+
+
+
+
+
+
+
@@ -441,15 +466,19 @@
openbsd-arm64;
" />
+
+
+
+
-
-
-
+
@@ -498,6 +527,12 @@
openbsd-arm64;
" />
+
+
+
+
+
-
+
eng/Version.Details.xml;
+ src/Layout/redist/targets/GenerateBundledVersions.targets;
test/Microsoft.NET.TestFramework/**;
test/Microsoft.NET.TestFramework.MSTest/**
diff --git a/test/Microsoft.NET.Sdk.Razor.Tests/MvcBuildIntegrationTest50.cs b/test/Microsoft.NET.Sdk.Razor.Tests/MvcBuildIntegrationTest50.cs
index 0074265906ed..adb029fc9c32 100644
--- a/test/Microsoft.NET.Sdk.Razor.Tests/MvcBuildIntegrationTest50.cs
+++ b/test/Microsoft.NET.Sdk.Razor.Tests/MvcBuildIntegrationTest50.cs
@@ -46,6 +46,7 @@ void VerifyError(TestAsset projectDirectory)
}
[TestMethod]
+ [Ignore("https://github.com/dotnet/roslyn/issues/85132")]
public void IncrementalBuild_WithP2P_WorksWhenBuildProjectReferencesIsDisabled()
{
// Simulates building the same way VS does by setting BuildProjectReferences=false.
diff --git a/test/Microsoft.NET.Sdk.Razor.Tool.Tests/TagHelperJsonSerializationTest.cs b/test/Microsoft.NET.Sdk.Razor.Tool.Tests/TagHelperJsonSerializationTest.cs
index cb7479eb54e5..81e5df938110 100644
--- a/test/Microsoft.NET.Sdk.Razor.Tool.Tests/TagHelperJsonSerializationTest.cs
+++ b/test/Microsoft.NET.Sdk.Razor.Tool.Tests/TagHelperJsonSerializationTest.cs
@@ -5,6 +5,7 @@
using System.Text.Json;
using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Components;
using Microsoft.NET.Sdk.Razor.Tool.Json;
namespace Microsoft.NET.Sdk.Razor.Tool
@@ -58,6 +59,35 @@ public void RoundTrip_SimpleTagHelper_PreservesData()
Assert.AreEqual("test-tag", roundTripped[0].TagMatchingRules[0].TagName);
}
+ [TestMethod]
+ public void RoundTrip_AssetPathMetadata_PreservesData()
+ {
+ var json = """
+ [
+ {
+ "Flags": 1,
+ "Name": "AssetPathTagHelper",
+ "AssemblyName": "TestAssembly",
+ "TypeName": "TestNamespace.AssetPathTagHelper",
+ "MetadataKind": 8,
+ "Metadata": {
+ "Element": "img",
+ "Attribute": "src"
+ }
+ }
+ ]
+ """;
+
+ var deserialized = Deserialize(json);
+ var reserialized = Serialize(deserialized);
+ var roundTripped = Deserialize(reserialized);
+
+ Assert.ContainsSingle(roundTripped);
+ var metadata = (AssetPathMetadata)roundTripped[0].Metadata;
+ Assert.AreEqual("img", metadata.Element);
+ Assert.AreEqual("src", metadata.Attribute);
+ }
+
[TestMethod]
public void RoundTrip_TagHelperWithBoundAttributes_PreservesData()
{
diff --git a/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/ScopedCssIntegrationTests.cs b/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/ScopedCssIntegrationTests.cs
index 013ccd581f44..f0372c6fc1f2 100644
--- a/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/ScopedCssIntegrationTests.cs
+++ b/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/ScopedCssIntegrationTests.cs
@@ -549,6 +549,7 @@ public class ScopedCssCompatibilityIntegrationTest : IsolatedNuGetPackageFolderA
{
protected override string RestoreNugetPackagePath => Path.Combine(nameof(ScopedCssCompatibilityIntegrationTest), ".nuget");
[TestMethod]
+ [Ignore("https://github.com/dotnet/roslyn/issues/85132")]
public void ScopedCss_IsBackwardsCompatible_WithPreviousVersions()
{
var testAsset = "RazorAppWithPackageAndP2PReference";
diff --git a/test/dotnet-aot.Tests/AotIntegrationTests.cs b/test/dotnet-aot.Tests/AotIntegrationTests.cs
index 5af9f26be270..94341881d432 100644
--- a/test/dotnet-aot.Tests/AotIntegrationTests.cs
+++ b/test/dotnet-aot.Tests/AotIntegrationTests.cs
@@ -368,6 +368,13 @@ public void AotRun_NoBuildSyntheticCache_LaunchesAndConservativelyFallsBack()
string testDirectory = TestPathUtility.ResolveTempPrefixLink(
Path.Join(Path.GetTempPath(), $"dotnet-aot-run-file-{Guid.NewGuid():N}"));
Directory.CreateDirectory(testDirectory);
+ string? nugetConfigPath = Environment.GetEnvironmentVariable("DOTNET_AOT_TEST_NUGET_CONFIG");
+ if (string.IsNullOrEmpty(nugetConfigPath) || !File.Exists(nugetConfigPath))
+ {
+ Assert.Inconclusive("DOTNET_AOT_TEST_NUGET_CONFIG must identify the NuGet configuration for cached run-file integration setup.");
+ }
+ File.Copy(nugetConfigPath, Path.Join(testDirectory, "NuGet.config"));
+
string entryPointPath = Path.Join(testDirectory, "Program.cs");
File.WriteAllText(entryPointPath, """
if (Environment.GetEnvironmentVariable("REPORT_PROFILE") == "1")
diff --git a/test/dotnet-aot.Tests/run-aot-tests.ps1 b/test/dotnet-aot.Tests/run-aot-tests.ps1
index 6ed1f6382383..b0edd4d05449 100644
--- a/test/dotnet-aot.Tests/run-aot-tests.ps1
+++ b/test/dotnet-aot.Tests/run-aot-tests.ps1
@@ -173,6 +173,7 @@ $environment = @{
DOTNET_AOT_SDK_DIR = $sdkDirectory
DOTNET_AOT_TEST_DN_PATH = $dnPath
DOTNET_AOT_TEST_MANAGED_TEST_MODULE = $managedTestModule
+ DOTNET_AOT_TEST_NUGET_CONFIG = [System.IO.Path]::Combine($repoRoot, "NuGet.config")
DOTNET_AOT_TEST_SDK_DIRECTORY = $sdkDirectory
DOTNET_HOST_PATH = $dotnet
DOTNET_ROOT = [System.IO.Path]::Combine($repoRoot, ".dotnet")
diff --git a/test/dotnet-aot.Tests/run-aot-tests.sh b/test/dotnet-aot.Tests/run-aot-tests.sh
index 2b6d72589515..7fb21f54adc2 100644
--- a/test/dotnet-aot.Tests/run-aot-tests.sh
+++ b/test/dotnet-aot.Tests/run-aot-tests.sh
@@ -140,6 +140,7 @@ if [[ -z "$MANAGED_TEST_MODULE" ]]; then
exit 1
fi
export DOTNET_AOT_TEST_MANAGED_TEST_MODULE="$MANAGED_TEST_MODULE"
+export DOTNET_AOT_TEST_NUGET_CONFIG="$REPO_ROOT/NuGet.config"
export DOTNET_AOT_SDK_DIR="$SDK_DIRECTORY"
export DOTNET_AOT_LIBRARY_DIR="$AOT_PUBLISH_DIR"
export DOTNET_HOST_PATH="$DOTNET"