diff --git a/eng/SignCheckExclusionsFile.txt b/eng/SignCheckExclusionsFile.txt deleted file mode 100644 index f41753338155eb..00000000000000 --- a/eng/SignCheckExclusionsFile.txt +++ /dev/null @@ -1,15 +0,0 @@ -;; Exclusions for SignCheck. Corresponds to info in Signing.props. -;; Format: https://github.com/dotnet/arcade/blob/397316e195639450b6c76bfeb9823b40bee72d6d/src/SignCheck/Microsoft.SignCheck/Verification/Exclusion.cs#L23-L35 -;; -;; This issue tracks a way to implement exclusions via Signing.props and avoid this extra file: https://github.com/dotnet/arcade/issues/2888 - -;; The apphost and comhost are template files, modified by the SDK to produce the executable for FDE -;; and SCD apps. If they are signed, the file that the SDK produces has an invalid signature and -;; can't be signed again. More info at https://github.com/dotnet/core-setup/pull/7549. -*apphost.exe;;Template, DO-NOT-SIGN, https://github.com/dotnet/core-setup/pull/7549 -*singlefilehost.exe;;Template, DO-NOT-SIGN, https://github.com/dotnet/core-setup/pull/7549 -*comhost.dll;;Template, DO-NOT-SIGN, https://github.com/dotnet/core-setup/pull/7549 -*apphosttemplateapphostexe.exe;;Template, DO-NOT-SIGN, https://github.com/dotnet/core-setup/pull/7549 -*comhosttemplatecomhostdll.dll;;Template, DO-NOT-SIGN, https://github.com/dotnet/core-setup/pull/7549 -*staticapphosttemplateapphostexe.exe;;Template, DO-NOT-SIGN, https://github.com/dotnet/core-setup/pull/7549 -*dotnet.js;;Workaround, https://github.com/dotnet/core-eng/issues/9933 \ No newline at end of file diff --git a/eng/Version.Details.props b/eng/Version.Details.props index aa1fc141196d4c..24a854e1ad8989 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -1 +1,237 @@ - + + + + + + 10.0.0-preview.6.25302.1 + + 4.9.0-rc2.21473.1 + + 19.1.0-alpha.1.25167.1 + 19.1.0-alpha.1.25167.1 + 19.1.0-alpha.1.25167.1 + 19.1.0-alpha.1.25167.1 + 19.1.0-alpha.1.25167.1 + 19.1.0-alpha.1.25167.1 + 19.1.0-alpha.1.25167.1 + 19.1.0-alpha.1.25167.1 + 19.1.0-alpha.1.25167.1 + 19.1.0-alpha.1.25167.1 + 19.1.0-alpha.1.25167.1 + 19.1.0-alpha.1.25167.1 + 19.1.0-alpha.1.25167.1 + 19.1.0-alpha.1.25167.1 + 19.1.0-alpha.1.25167.1 + 19.1.0-alpha.1.25167.1 + 19.1.0-alpha.1.25167.1 + 19.1.0-alpha.1.25167.1 + 19.1.0-alpha.1.25167.1 + 19.1.0-alpha.1.25167.1 + 19.1.0-alpha.1.25167.1 + 19.1.0-alpha.1.25167.1 + 19.1.0-alpha.1.25167.1 + 19.1.0-alpha.1.25167.1 + 19.1.0-alpha.1.25167.1 + 19.1.0-alpha.1.25167.1 + 19.1.0-alpha.1.25167.1 + 19.1.0-alpha.1.25167.1 + 19.1.0-alpha.1.25167.1 + + 5.0.0-2.25406.102 + 5.0.0-2.25406.102 + 5.0.0-2.25406.102 + 10.0.0-preview.25406.102 + 10.0.100-rc.1.25406.102 + 10.0.0-beta.25406.102 + 10.0.0-beta.25406.102 + 10.0.0-beta.25406.102 + 10.0.0-beta.25406.102 + 10.0.0-beta.25406.102 + 10.0.0-beta.25406.102 + 10.0.0-beta.25406.102 + 10.0.0-beta.25406.102 + 0.11.5-alpha.25406.102 + 10.0.0-beta.25406.102 + 10.0.0-beta.25406.102 + 10.0.0-beta.25406.102 + 10.0.0-beta.25406.102 + 10.0.0-beta.25406.102 + 10.0.0-beta.25406.102 + 10.0.0-beta.25406.102 + 10.0.0-beta.25406.102 + 2.9.3-beta.25406.102 + 2.9.3-beta.25406.102 + 10.0.0-beta.25406.102 + 5.0.0-2.25406.102 + 10.0.0-rc.1.25406.102 + 10.0.100-rc.1.25406.102 + 10.0.0-rc.1.25406.102 + 10.0.0-rc.1.25406.102 + 7.0.0-preview.1.102 + 7.0.0-preview.1.102 + 7.0.0-preview.1.102 + 7.0.0-preview.1.102 + 10.0.0-rc.1.25406.102 + 2.0.0-rc.1.25406.102 + 10.0.0-rc.1.25406.102 + 10.0.0-rc.1.25406.102 + 10.0.0-rc.1.25406.102 + + 10.0.0-beta.25310.1 + 10.0.0-beta.25310.1 + 10.0.0-beta.25310.1 + 10.0.0-beta.25310.1 + 10.0.0-beta.25310.1 + 10.0.0-beta.25310.1 + 10.0.0-beta.25310.1 + 10.0.0-beta.25310.1 + 10.0.0-beta.25310.1 + 10.0.0-beta.25310.1 + 10.0.0-beta.25310.1 + 10.0.0-beta.25310.1 + 10.0.0-beta.25310.1 + 10.0.0-beta.25310.1 + 10.0.0-beta.25310.1 + + 10.0.0-prerelease.25330.2 + 10.0.0-prerelease.25330.2 + 10.0.0-prerelease.25330.2 + + 1.0.0-prerelease.25363.1 + 1.0.0-prerelease.25363.1 + 1.0.0-prerelease.25363.1 + 1.0.0-prerelease.25363.1 + 1.0.0-prerelease.25363.1 + 1.0.0-prerelease.25363.1 + + 10.0.0-alpha.0.25302.2 + + 10.0.0-alpha.1.25169.1 + 10.0.0-alpha.1.25169.1 + 10.0.0-alpha.1.25169.1 + 10.0.0-alpha.1.25169.1 + 10.0.0-alpha.1.25169.1 + 10.0.0-alpha.1.25169.1 + 10.0.0-alpha.1.25169.1 + 10.0.0-alpha.1.25169.1 + + + + + $(MicrosoftNETCoreRuntimeICUTransportPackageVersion) + + $(SystemServiceModelPrimitivesPackageVersion) + + $(runtimelinuxarm64MicrosoftNETCoreRuntimeJITToolsPackageVersion) + $(runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMLibclangPackageVersion) + $(runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkPackageVersion) + $(runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsPackageVersion) + $(runtimelinuxmuslarm64MicrosoftNETCoreRuntimeJITToolsPackageVersion) + $(runtimelinuxmuslarm64MicrosoftNETCoreRuntimeMonoLLVMLibclangPackageVersion) + $(runtimelinuxmuslarm64MicrosoftNETCoreRuntimeMonoLLVMSdkPackageVersion) + $(runtimelinuxmuslarm64MicrosoftNETCoreRuntimeMonoLLVMToolsPackageVersion) + $(runtimelinuxmuslx64MicrosoftNETCoreRuntimeJITToolsPackageVersion) + $(runtimelinuxmuslx64MicrosoftNETCoreRuntimeMonoLLVMLibclangPackageVersion) + $(runtimelinuxmuslx64MicrosoftNETCoreRuntimeMonoLLVMSdkPackageVersion) + $(runtimelinuxmuslx64MicrosoftNETCoreRuntimeMonoLLVMToolsPackageVersion) + $(runtimelinuxx64MicrosoftNETCoreRuntimeJITToolsPackageVersion) + $(runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMLibclangPackageVersion) + $(runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkPackageVersion) + $(runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsPackageVersion) + $(runtimeosxarm64MicrosoftNETCoreRuntimeJITToolsPackageVersion) + $(runtimeosxarm64MicrosoftNETCoreRuntimeMonoLLVMLibclangPackageVersion) + $(runtimeosxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkPackageVersion) + $(runtimeosxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsPackageVersion) + $(runtimeosxx64MicrosoftNETCoreRuntimeJITToolsPackageVersion) + $(runtimeosxx64MicrosoftNETCoreRuntimeMonoLLVMLibclangPackageVersion) + $(runtimeosxx64MicrosoftNETCoreRuntimeMonoLLVMSdkPackageVersion) + $(runtimeosxx64MicrosoftNETCoreRuntimeMonoLLVMToolsPackageVersion) + $(runtimewinarm64MicrosoftNETCoreRuntimeJITToolsPackageVersion) + $(runtimewinx64MicrosoftNETCoreRuntimeJITToolsPackageVersion) + $(runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMLibclangPackageVersion) + $(runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkPackageVersion) + $(runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsPackageVersion) + + $(MicrosoftCodeAnalysisPackageVersion) + $(MicrosoftCodeAnalysisAnalyzersPackageVersion) + $(MicrosoftCodeAnalysisCSharpPackageVersion) + $(MicrosoftCodeAnalysisNetAnalyzersPackageVersion) + $(MicrosoftDotNetApiCompatTaskPackageVersion) + $(MicrosoftDotNetArcadeSdkPackageVersion) + $(MicrosoftDotNetBuildTasksArchivesPackageVersion) + $(MicrosoftDotNetBuildTasksFeedPackageVersion) + $(MicrosoftDotNetBuildTasksInstallersPackageVersion) + $(MicrosoftDotNetBuildTasksPackagingPackageVersion) + $(MicrosoftDotNetBuildTasksTargetFrameworkPackageVersion) + $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) + $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) + $(MicrosoftDotNetCecilPackageVersion) + $(MicrosoftDotNetCodeAnalysisPackageVersion) + $(MicrosoftDotNetGenAPIPackageVersion) + $(MicrosoftDotNetGenFacadesPackageVersion) + $(MicrosoftDotNetHelixSdkPackageVersion) + $(MicrosoftDotNetPackageTestingPackageVersion) + $(MicrosoftDotNetRemoteExecutorPackageVersion) + $(MicrosoftDotNetSharedFrameworkSdkPackageVersion) + $(MicrosoftDotNetXliffTasksPackageVersion) + $(MicrosoftDotNetXUnitAssertPackageVersion) + $(MicrosoftDotNetXUnitConsoleRunnerPackageVersion) + $(MicrosoftDotNetXUnitExtensionsPackageVersion) + $(MicrosoftNetCompilersToolsetPackageVersion) + $(MicrosoftNETSdkILPackageVersion) + $(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion) + $(MicrosoftNETCoreAppRefPackageVersion) + $(MicrosoftNETCoreILAsmPackageVersion) + $(NuGetFrameworksPackageVersion) + $(NuGetPackagingPackageVersion) + $(NuGetProjectModelPackageVersion) + $(NuGetVersioningPackageVersion) + $(runtimenativeSystemIOPortsPackageVersion) + $(SystemCommandLinePackageVersion) + $(SystemReflectionMetadataPackageVersion) + $(SystemReflectionMetadataLoadContextPackageVersion) + $(SystemTextJsonPackageVersion) + + $(MicrosoftDotNetCilStripSourcesPackageVersion) + $(MicrosoftNETHostModelTestDataPackageVersion) + $(SystemComponentModelTypeConverterTestDataPackageVersion) + $(SystemDataCommonTestDataPackageVersion) + $(SystemDrawingCommonTestDataPackageVersion) + $(SystemFormatsTarTestDataPackageVersion) + $(SystemIOCompressionTestDataPackageVersion) + $(SystemIOPackagingTestDataPackageVersion) + $(SystemNetTestDataPackageVersion) + $(SystemPrivateRuntimeUnicodeDataPackageVersion) + $(SystemRuntimeNumericsTestDataPackageVersion) + $(SystemRuntimeTimeZoneDataPackageVersion) + $(SystemSecurityCryptographyX509CertificatesTestDataPackageVersion) + $(SystemTextRegularExpressionsTestDataPackageVersion) + $(SystemWindowsExtensionsTestDataPackageVersion) + + $(MicrosoftDotNetXHarnessCLIPackageVersion) + $(MicrosoftDotNetXHarnessTestRunnersCommonPackageVersion) + $(MicrosoftDotNetXHarnessTestRunnersXunitPackageVersion) + + $(optimizationlinuxarm64MIBCRuntimePackageVersion) + $(optimizationlinuxx64MIBCRuntimePackageVersion) + $(optimizationPGOCoreCLRPackageVersion) + $(optimizationwindows_ntarm64MIBCRuntimePackageVersion) + $(optimizationwindows_ntx64MIBCRuntimePackageVersion) + $(optimizationwindows_ntx86MIBCRuntimePackageVersion) + + $(MicrosoftDotNetHotReloadUtilsGeneratorBuildToolPackageVersion) + + $(runtimelinuxarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion) + $(runtimelinuxmuslarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion) + $(runtimelinuxmuslx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion) + $(runtimelinuxx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion) + $(runtimeosxarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion) + $(runtimeosxx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion) + $(runtimewinarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion) + $(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion) + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1bf599917c4ec4..0be0731b741ec2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/dotnet/icu @@ -41,91 +41,91 @@ https://github.com/dotnet/llvm-project da5dd054a531e6fea65643b7e754285b73eab433 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 https://github.com/dotnet/runtime-assets @@ -263,33 +263,33 @@ https://github.com/dotnet/llvm-project da5dd054a531e6fea65643b7e754285b73eab433 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 https://github.com/dotnet/xharness @@ -303,9 +303,9 @@ https://github.com/dotnet/xharness feac80219b22c403d32df9b6bd61cbf78e1b9986 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -331,29 +331,29 @@ https://github.com/dotnet/runtime-assets 385d085eb055cabeaed3dde958a900e7b31cf6ce - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 30bc8f92be07c2c8c3a6addb946877260e042f63 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -365,21 +365,21 @@ - - https://github.com/NuGet/NuGet.Client - 8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8 + + https://github.com/dotnet/dotnet + 30bc8f92be07c2c8c3a6addb946877260e042f63 - - https://github.com/NuGet/NuGet.Client - 8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8 + + https://github.com/dotnet/dotnet + 30bc8f92be07c2c8c3a6addb946877260e042f63 - - https://github.com/NuGet/NuGet.Client - 8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8 + + https://github.com/dotnet/dotnet + 30bc8f92be07c2c8c3a6addb946877260e042f63 - - https://github.com/NuGet/NuGet.Client - 8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8 + + https://github.com/dotnet/dotnet + 30bc8f92be07c2c8c3a6addb946877260e042f63 https://github.com/dotnet/node diff --git a/eng/Versions.props b/eng/Versions.props index 97c86222f1c7c9..f5b3006345e00f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,4 +1,5 @@ + 10.0.0 @@ -33,20 +34,6 @@ - - - 10.0.0-preview.25367.101 - - 5.0.0-2.25367.101 - - 5.0.0-2.25367.101 - 5.0.0-2.25367.101 - 5.0.0-2.25367.101 - - 10.0.100-preview.7.25367.101 - - 10.0.0-beta.25367.101 - 10.0.0-beta.25367.101 - 10.0.0-beta.25367.101 - 10.0.0-beta.25367.101 - 2.9.3-beta.25367.101 - 10.0.0-beta.25367.101 - 2.9.3-beta.25367.101 - 10.0.0-beta.25367.101 - 10.0.0-beta.25367.101 - 10.0.0-beta.25367.101 - 10.0.0-beta.25367.101 - 10.0.0-beta.25367.101 - 10.0.0-beta.25367.101 - 10.0.0-beta.25367.101 - 10.0.0-beta.25367.101 - 10.0.0-beta.25367.101 6.0.0-preview.1.102 - 10.0.0-preview.7.25367.101 6.0.0 - - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 6.0.0 4.6.1 @@ -125,16 +89,12 @@ 8.0.0 8.0.1 5.0.0 - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 6.0.0 5.0.0 5.0.0 5.0.0 7.0.0 - 10.0.0-preview.7.25367.101 7.0.0 - 10.0.0-preview.7.25367.101 8.0.0 4.5.1 @@ -145,39 +105,9 @@ 8.0.0 8.0.0 4.5.4 - - 10.0.0-beta.25310.1 - 10.0.0-beta.25310.1 - 10.0.0-beta.25310.1 - 10.0.0-beta.25310.1 - 10.0.0-beta.25310.1 - 10.0.0-beta.25310.1 - 10.0.0-beta.25310.1 - 10.0.0-beta.25310.1 - 10.0.0-beta.25310.1 - 10.0.0-beta.25310.1 - 10.0.0-beta.25310.1 - 10.0.0-beta.25310.1 - 10.0.0-beta.25310.1 - 10.0.0-beta.25310.1 - 10.0.0-beta.25310.1 - - 10.0.0-prerelease.25330.2 - 10.0.0-prerelease.25330.2 - 10.0.0-prerelease.25330.2 - - 10.0.0-alpha.0.25302.2 - - 1.0.0-prerelease.25363.1 - 1.0.0-prerelease.25363.1 - 1.0.0-prerelease.25363.1 - 1.0.0-prerelease.25363.1 - 1.0.0-prerelease.25363.1 - 1.0.0-prerelease.25363.1 2.0.0 17.10.0-beta1.24272.1 - 2.0.0-beta7.25367.101 3.1.16 2.1.0 2.0.3 @@ -187,10 +117,6 @@ 17.8.3 17.8.3 17.8.3 - 6.2.4 - 6.2.4 - 6.2.4 - 6.2.4 7.0.412701 6.0 @@ -222,59 +148,22 @@ 17.0.46 9.0.0-preview-20241010.1 - - 0.11.5-alpha.25367.101 - - 10.0.0-preview.6.25302.1 2.4.8 9.0.0-alpha.1.24167.3 - - 19.1.0-alpha.1.25167.1 - 19.1.0-alpha.1.25167.1 - 19.1.0-alpha.1.25167.1 - 19.1.0-alpha.1.25167.1 - 19.1.0-alpha.1.25167.1 - 19.1.0-alpha.1.25167.1 - 19.1.0-alpha.1.25167.1 - 19.1.0-alpha.1.25167.1 - 19.1.0-alpha.1.25167.1 - 19.1.0-alpha.1.25167.1 - 19.1.0-alpha.1.25167.1 - 19.1.0-alpha.1.25167.1 - 19.1.0-alpha.1.25167.1 - 19.1.0-alpha.1.25167.1 - 19.1.0-alpha.1.25167.1 - 19.1.0-alpha.1.25167.1 - 19.1.0-alpha.1.25167.1 - 19.1.0-alpha.1.25167.1 - 19.1.0-alpha.1.25167.1 - 19.1.0-alpha.1.25167.1 - 19.1.0-alpha.1.25167.1 - 10.0.100-preview.7.25367.101 $(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion) 1.1.87-gba258badda 1.0.0-v3.14.0.5722 - - 19.1.0-alpha.1.25167.1 - 19.1.0-alpha.1.25167.1 - 19.1.0-alpha.1.25167.1 - 19.1.0-alpha.1.25167.1 - 19.1.0-alpha.1.25167.1 - 19.1.0-alpha.1.25167.1 - 19.1.0-alpha.1.25167.1 - 19.1.0-alpha.1.25167.1 3.1.7 1.0.406601 $(MicrosoftDotNetApiCompatTaskVersion) - 10.0.0-alpha.1.25169.1 10.0.0-preview.7.25359.101 $(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion) diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index 6badecba7bcc4d..d9013251542c73 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -20,6 +20,7 @@ parameters: artifacts: '' enableMicrobuild: false enableMicrobuildForMacAndLinux: false + microbuildUseESRP: true enablePublishBuildArtifacts: false enablePublishBuildAssets: false enablePublishTestResults: false @@ -128,6 +129,7 @@ jobs: parameters: enableMicrobuild: ${{ parameters.enableMicrobuild }} enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }} + microbuildUseESRP: ${{ parameters.microbuildUseESRP }} continueOnError: ${{ parameters.continueOnError }} - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml index bf35b78faa60e8..2f992b2c6eccbd 100644 --- a/eng/common/core-templates/jobs/jobs.yml +++ b/eng/common/core-templates/jobs/jobs.yml @@ -83,7 +83,6 @@ jobs: - template: /eng/common/core-templates/jobs/source-build.yml parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} - allCompletedJobId: Source_Build_Complete ${{ each parameter in parameters.sourceBuildParameters }}: ${{ parameter.key }}: ${{ parameter.value }} @@ -108,8 +107,6 @@ jobs: - ${{ if eq(parameters.publishBuildAssetsDependsOn, '') }}: - ${{ each job in parameters.jobs }}: - ${{ job.job }} - - ${{ if eq(parameters.enableSourceBuild, true) }}: - - Source_Build_Complete runAsPublic: ${{ parameters.runAsPublic }} publishAssetsImmediately: ${{ or(parameters.publishAssetsImmediately, parameters.isAssetlessBuild) }} diff --git a/eng/common/core-templates/jobs/source-build.yml b/eng/common/core-templates/jobs/source-build.yml index df24c948ba1279..d92860cba20874 100644 --- a/eng/common/core-templates/jobs/source-build.yml +++ b/eng/common/core-templates/jobs/source-build.yml @@ -2,12 +2,6 @@ parameters: # This template adds arcade-powered source-build to CI. A job is created for each platform, as # well as an optional server job that completes when all platform jobs complete. - # The name of the "join" job for all source-build platforms. If set to empty string, the job is - # not included. Existing repo pipelines can use this job depend on all source-build jobs - # completing without maintaining a separate list of every single job ID: just depend on this one - # server job. By default, not included. Recommended name if used: 'Source_Build_Complete'. - allCompletedJobId: '' - # See /eng/common/core-templates/job/source-build.yml jobNamePrefix: 'Source_Build' @@ -31,16 +25,6 @@ parameters: jobs: -- ${{ if ne(parameters.allCompletedJobId, '') }}: - - job: ${{ parameters.allCompletedJobId }} - displayName: Source-Build Complete - pool: server - dependsOn: - - ${{ each platform in parameters.platforms }}: - - ${{ parameters.jobNamePrefix }}_${{ platform.name }} - - ${{ if eq(length(parameters.platforms), 0) }}: - - ${{ parameters.jobNamePrefix }}_${{ parameters.defaultManagedPlatform.name }} - - ${{ each platform in parameters.platforms }}: - template: /eng/common/core-templates/job/source-build.yml parameters: diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index f3064a7834edca..da30e67bc34c95 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -4,8 +4,16 @@ parameters: # Enable install tasks for MicroBuild on Mac and Linux # Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT' enableMicrobuildForMacAndLinux: false + # Determines whether the ESRP service connection information should be passed to the signing plugin. + # This overlaps with _SignType to some degree. We only need the service connection for real signing. + # It's important that the service connection not be passed to the MicroBuildSigningPlugin task in this place. + # Doing so will cause the service connection to be authorized for the pipeline, which isn't allowed and won't work for non-prod. + # Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The + # variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough. + microbuildUseESRP: true # Location of the MicroBuild output folder microBuildOutputFolder: '$(Build.SourcesDirectory)' + continueOnError: false steps: @@ -21,19 +29,37 @@ steps: workingDirectory: ${{ parameters.microBuildOutputFolder }} condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + - script: | + REM Check if ESRP is disabled while SignType is real + if /I "${{ parameters.microbuildUseESRP }}"=="false" if /I "$(_SignType)"=="real" ( + echo Error: ESRP must be enabled when SignType is real. + exit /b 1 + ) + displayName: 'Validate ESRP usage (Windows)' + condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT')) + - script: | + # Check if ESRP is disabled while SignType is real + if [ "${{ parameters.microbuildUseESRP }}" = "false" ] && [ "$(_SignType)" = "real" ]; then + echo "Error: ESRP must be enabled when SignType is real." + exit 1 + fi + displayName: 'Validate ESRP usage (Non-Windows)' + condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + - task: MicroBuildSigningPlugin@4 displayName: Install MicroBuild plugin inputs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - ${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}: - azureSubscription: 'MicroBuild Signing Task (DevDiv)' - useEsrpCli: true - ${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}: - ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea - ${{ else }}: - ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca + ${{ if eq(parameters.microbuildUseESRP, true) }}: + ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}: + azureSubscription: 'MicroBuild Signing Task (DevDiv)' + useEsrpCli: true + ${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 40f0aa86128e48..996a5f9c872591 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -414,7 +414,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # Locate Visual Studio installation or download x-copy msbuild. $vsInfo = LocateVisualStudio $vsRequirements - if ($vsInfo -ne $null) { + if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) { # Ensure vsInstallDir has a trailing slash $vsInstallDir = Join-Path $vsInfo.installationPath "\" $vsMajorVersion = $vsInfo.installationVersion.Split('.')[0] diff --git a/global.json b/global.json index d661cf640771cb..b87adc9be7f315 100644 --- a/global.json +++ b/global.json @@ -1,18 +1,18 @@ { "sdk": { - "version": "10.0.100-preview.7.25322.101", + "version": "10.0.100-preview.7.25372.107", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "10.0.100-preview.7.25322.101" + "dotnet": "10.0.100-preview.7.25372.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25367.101", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25367.101", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25367.101", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25406.102", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25406.102", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25406.102", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "10.0.0-preview.7.25367.101" + "Microsoft.NET.Sdk.IL": "10.0.0-rc.1.25406.102" } } diff --git a/src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj b/src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj index bf1c08d49f25db..09f900900e1142 100644 --- a/src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj +++ b/src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj @@ -34,8 +34,13 @@ BeforeTargets="GetPackageFiles" Condition="'$(PackageTargetRuntime)' != ''"> + + <_ILCompilerFilesRoot>$(CoreCLRILCompilerDir) + <_ILCompilerFilesRoot Condition="'$(PackHostILCompiler)' == 'true'">$(CoreCLRCrossILCompilerDir) + + - + diff --git a/src/installer/pkg/projects/nativeaot-packages.proj b/src/installer/pkg/projects/nativeaot-packages.proj index 37d894266f25d0..3f69b1ac3118e5 100644 --- a/src/installer/pkg/projects/nativeaot-packages.proj +++ b/src/installer/pkg/projects/nativeaot-packages.proj @@ -5,7 +5,7 @@ - + diff --git a/src/libraries/Common/src/System/Security/Cryptography/CompositeMLDsaManaged.ECDsa.cs b/src/libraries/Common/src/System/Security/Cryptography/CompositeMLDsaManaged.ECDsa.cs index e4391c3ec87052..55e2448d538f62 100644 --- a/src/libraries/Common/src/System/Security/Cryptography/CompositeMLDsaManaged.ECDsa.cs +++ b/src/libraries/Common/src/System/Security/Cryptography/CompositeMLDsaManaged.ECDsa.cs @@ -223,7 +223,6 @@ internal override bool TryExportPrivateKey(Span destination, out int bytes throw new CryptographicException(); } - AsnWriter writer = new AsnWriter(AsnEncodingRules.DER); try diff --git a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatefulLinearCollectionShapeValidation.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatefulLinearCollectionShapeValidation.cs index e798e184b6bf76..bbc42b2f7a01de 100644 --- a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatefulLinearCollectionShapeValidation.cs +++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatefulLinearCollectionShapeValidation.cs @@ -22,9 +22,9 @@ public async Task ModeThatUsesManagedToUnmanagedShape_Missing_AllMethods_Reports { string source = """ using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedIn, typeof({|#0:MarshallerType<>|}))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedOut, typeof({|#1:MarshallerType<>|}))] [ContiguousCollectionMarshaller] @@ -35,9 +35,9 @@ struct MarshallerType string fixedSource = """ using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedIn, typeof(MarshallerType<>))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedOut, typeof(MarshallerType<>))] [ContiguousCollectionMarshaller] @@ -47,7 +47,7 @@ public void FromManaged(ManagedType managed) { throw new System.NotImplementedException(); } - + public nint ToUnmanaged() { throw new System.NotImplementedException(); @@ -88,9 +88,9 @@ public async Task ModeThatUsesManagedToUnmanagedShape_Missing_ContainerMethods_R { string source = """ using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedIn, typeof({|#0:MarshallerType<>|}))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedOut, typeof({|#1:MarshallerType<>|}))] [ContiguousCollectionMarshaller] @@ -104,9 +104,9 @@ public void Free() {} string fixedSource = """ using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedIn, typeof(MarshallerType<>))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedOut, typeof(MarshallerType<>))] [ContiguousCollectionMarshaller] @@ -115,12 +115,12 @@ struct MarshallerType public void FromManaged(ManagedType m) {} public nint ToUnmanaged() => default; public void Free() {} - + public System.ReadOnlySpan GetManagedValuesSource() { throw new System.NotImplementedException(); } - + public System.Span GetUnmanagedValuesDestination() { throw new System.NotImplementedException(); @@ -141,9 +141,9 @@ public async Task ModeThatUsesManagedToUnmanagedShape_Missing_GetManagedValuesSo string source = """ using System; using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedIn, typeof({|#0:MarshallerType<>|}))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedOut, typeof({|#1:MarshallerType<>|}))] [ContiguousCollectionMarshaller] @@ -159,9 +159,9 @@ public void Free() {} string fixedSource = """ using System; using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedIn, typeof(MarshallerType<>))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedOut, typeof(MarshallerType<>))] [ContiguousCollectionMarshaller] @@ -192,9 +192,9 @@ public async Task ModeThatUsesManagedToUnmanagedShape_Missing_GetUnmanagedValues string source = """ using System; using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedIn, typeof({|#0:MarshallerType<>|}))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedOut, typeof({|#1:MarshallerType<>|}))] [ContiguousCollectionMarshaller] @@ -210,9 +210,9 @@ public void Free() {} string fixedSource = """ using System; using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedIn, typeof(MarshallerType<>))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedOut, typeof(MarshallerType<>))] [ContiguousCollectionMarshaller] @@ -222,7 +222,7 @@ public void FromManaged(ManagedType m) {} public nint ToUnmanaged() => default; public void Free() {} public ReadOnlySpan GetManagedValuesSource() => default; - + public Span GetUnmanagedValuesDestination() { throw new NotImplementedException(); @@ -243,9 +243,9 @@ public async Task ModeThatUsesManagedToUnmanagedShape_DoesNotReportDiagnostic() string source = """ using System; using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedIn, typeof(MarshallerType<>))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedOut, typeof(MarshallerType<>))] [ContiguousCollectionMarshaller] @@ -270,9 +270,9 @@ public async Task ModeThatUsesManagedToUnmanagedShape_InvalidCollectionElementTy string source = """ using System; using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedIn, typeof({|#0:MarshallerType<>|}))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedOut, typeof({|#1:MarshallerType<>|}))] [ContiguousCollectionMarshaller] @@ -297,9 +297,9 @@ public async Task ModeThatUsesUnmanagedToManagedShape_Missing_AllMethods_Reports { string source = """ using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedOut, typeof({|#0:MarshallerType<>|}))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedIn, typeof({|#1:MarshallerType<>|}))] [ContiguousCollectionMarshaller] @@ -310,9 +310,9 @@ struct MarshallerType string fixedSource = """ using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedOut, typeof(MarshallerType<>))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedIn, typeof(MarshallerType<>))] [ContiguousCollectionMarshaller] @@ -327,17 +327,17 @@ public ManagedType ToManaged() { throw new System.NotImplementedException(); } - + public System.ReadOnlySpan GetUnmanagedValuesSource(int numElements) { throw new System.NotImplementedException(); } - + public System.Span GetManagedValuesDestination(int numElements) { throw new System.NotImplementedException(); } - + public void Free() { throw new System.NotImplementedException(); @@ -363,9 +363,9 @@ public async Task ModeThatUsesUnmanagedToManagedShape_Missing_ContainerMethods_R { string source = """ using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedOut, typeof({|#0:MarshallerType<>|}))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedIn, typeof({|#1:MarshallerType<>|}))] [ContiguousCollectionMarshaller] @@ -379,9 +379,9 @@ public void Free() {} string fixedSource = """ using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedOut, typeof(MarshallerType<>))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedIn, typeof(MarshallerType<>))] [ContiguousCollectionMarshaller] @@ -390,12 +390,12 @@ struct MarshallerType public void FromUnmanaged(int f) {} public ManagedType ToManaged() => default; public void Free() {} - + public System.ReadOnlySpan GetUnmanagedValuesSource(int numElements) { throw new System.NotImplementedException(); } - + public System.Span GetManagedValuesDestination(int numElements) { throw new System.NotImplementedException(); @@ -416,9 +416,9 @@ public async Task ModeThatUsesUnmanagedToManagedShape_Missing_GetUnmanagedValues string source = """ using System; using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedOut, typeof({|#0:MarshallerType<>|}))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedIn, typeof({|#1:MarshallerType<>|}))] [ContiguousCollectionMarshaller] @@ -434,9 +434,9 @@ public void Free() {} string fixedSource = """ using System; using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedOut, typeof(MarshallerType<>))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedIn, typeof(MarshallerType<>))] [ContiguousCollectionMarshaller] @@ -467,9 +467,9 @@ public async Task ModeThatUsesUnmanagedToManagedShape_Missing_GetManagedValuesDe string source = """ using System; using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedOut, typeof({|#0:MarshallerType<>|}))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedIn, typeof({|#1:MarshallerType<>|}))] [ContiguousCollectionMarshaller] @@ -485,9 +485,9 @@ public void Free() {} string fixedSource = """ using System; using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedOut, typeof(MarshallerType<>))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedIn, typeof(MarshallerType<>))] [ContiguousCollectionMarshaller] @@ -497,7 +497,7 @@ public void FromUnmanaged(int f) {} public ManagedType ToManaged() => default; public void Free() {} public ReadOnlySpan GetUnmanagedValuesSource(int numElements) => default; - + public Span GetManagedValuesDestination(int numElements) { throw new NotImplementedException(); @@ -518,9 +518,9 @@ public async Task ModeThatUsesUnmanagedToManagedShape_DoesNotReportDiagnostic() string source = """ using System; using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedOut, typeof(MarshallerType<>))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedIn, typeof(MarshallerType<>))] [ContiguousCollectionMarshaller] @@ -544,9 +544,9 @@ public async Task ModeThatUsesUnmanagedToManagedShape_InvalidCollectionElementTy string source = """ using System; using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedOut, typeof({|#0:MarshallerType<>|}))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedIn, typeof({|#1:MarshallerType<>|}))] [ContiguousCollectionMarshaller] @@ -572,9 +572,9 @@ public async Task CallerAllocatedBuffer_NoBufferSize_ReportsDiagnostic() string source = """ using System; using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedIn, typeof({|#0:MarshallerType<>|}))] [ContiguousCollectionMarshaller] struct MarshallerType @@ -590,9 +590,9 @@ public void Free() {} string fixedSource = """ using System; using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedIn, typeof(MarshallerType<>))] [ContiguousCollectionMarshaller] struct MarshallerType @@ -602,6 +602,7 @@ public void FromManaged(ManagedType m, Span buffer) {} public void Free() {} public ReadOnlySpan GetManagedValuesSource() => default; public Span GetUnmanagedValuesDestination() => default; + public static int BufferSize { get @@ -624,9 +625,9 @@ public async Task ModeThatUsesBidirectionalShape_DoesNotReportDiagnostic() string source = """ using System; using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedRef, typeof({|#0:MarshallerType<>|}))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedRef, typeof({|#1:MarshallerType<>|}))] [ContiguousCollectionMarshaller] @@ -653,9 +654,9 @@ public async Task ModeThatUsesBidirectionalShape_MismatchedManagedElementTypes_R string source = """ using System; using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedRef, typeof({|#0:MarshallerType<>|}))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedRef, typeof({|#1:MarshallerType<>|}))] [ContiguousCollectionMarshaller] @@ -684,7 +685,7 @@ public async Task ModeThatUsesBidirectionalShape_ArrayTarget_DoesNotReportDiagno string source = """ using System; using System.Runtime.InteropServices.Marshalling; - + [CustomMarshaller(typeof(CustomMarshallerAttribute.GenericPlaceholder[]), MarshalMode.ManagedToUnmanagedRef, typeof({|#0:MarshallerType<,>|}))] [CustomMarshaller(typeof(CustomMarshallerAttribute.GenericPlaceholder[]), MarshalMode.UnmanagedToManagedRef, typeof({|#1:MarshallerType<,>|}))] [ContiguousCollectionMarshaller] diff --git a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatefulValueShapeValidation.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatefulValueShapeValidation.cs index cb2c5d8caf10ec..89aeba8c926e5d 100644 --- a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatefulValueShapeValidation.cs +++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatefulValueShapeValidation.cs @@ -23,9 +23,9 @@ public async Task ModeThatUsesManagedToUnmanagedShape_Missing_AllMethods_Reports { string source = """ using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedIn, typeof({|#0:MarshallerType|}))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedOut, typeof({|#1:MarshallerType|}))] struct MarshallerType @@ -35,9 +35,9 @@ struct MarshallerType string fixedSource = """ using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedIn, typeof(MarshallerType))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedOut, typeof(MarshallerType))] struct MarshallerType @@ -75,9 +75,9 @@ public async Task ModeThatUsesUnmanagedToManagedShape_Missing_AllMethods_Reports { string source = """ using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedOut, typeof({|#0:MarshallerType|}))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedIn, typeof({|#1:MarshallerType|}))] struct MarshallerType @@ -87,9 +87,9 @@ struct MarshallerType string fixedSource = """ using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedOut, typeof(MarshallerType))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedIn, typeof(MarshallerType))] struct MarshallerType @@ -127,9 +127,9 @@ public async Task Overloaded_FromUnmanaged_ReportsDiagnostic() { string source = """ using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedOut, typeof({|#0:MarshallerType|}))] struct MarshallerType { @@ -150,9 +150,9 @@ public async Task ModeThatUsesBidirectionalShape_Missing_AllMethods_ReportsDiagn { string source = """ using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedRef, typeof({|#0:MarshallerType|}))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedRef, typeof({|#1:MarshallerType|}))] struct MarshallerType @@ -162,9 +162,9 @@ struct MarshallerType string fixedSource = """ using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedRef, typeof(MarshallerType))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedRef, typeof(MarshallerType))] struct MarshallerType @@ -183,12 +183,12 @@ public void FromUnmanaged(nint unmanaged) { throw new System.NotImplementedException(); } - + public ManagedType ToManaged() { throw new System.NotImplementedException(); } - + public void Free() { throw new System.NotImplementedException(); @@ -216,9 +216,9 @@ public async Task ModeThatUsesBidirectionalShape_MismatchedUnmanagedTypes_Report { string source = """ using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedRef, typeof({|#0:MarshallerType|}))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedRef, typeof({|#1:MarshallerType|}))] struct MarshallerType @@ -242,9 +242,9 @@ public async Task ModeThatUsesBidirectionalShape_DoesNotReportDiagnostic() { string source = """ using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedRef, typeof(MarshallerType))] [CustomMarshaller(typeof(ManagedType), MarshalMode.UnmanagedToManagedRef, typeof(MarshallerType))] struct MarshallerType @@ -266,9 +266,9 @@ public async Task ModeThatUsesElementMode_ReportsDiagnostic() { string source = """ using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ElementIn, typeof({|#0:MarshallerType|}))] [CustomMarshaller(typeof(ManagedType), MarshalMode.ElementRef, typeof({|#1:MarshallerType|}))] [CustomMarshaller(typeof(ManagedType), MarshalMode.ElementOut, typeof({|#2:MarshallerType|}))] @@ -294,9 +294,9 @@ public async Task DefaultMode_Missing_AllMethods_ReportsDiagnostic() { string source = """ using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.Default, typeof({|#0:MarshallerType|}))] struct MarshallerType { @@ -305,9 +305,9 @@ struct MarshallerType string fixedSource = """ using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.Default, typeof(MarshallerType))] struct MarshallerType { @@ -315,7 +315,7 @@ public void FromManaged(ManagedType managed) { throw new System.NotImplementedException(); } - + public nint ToUnmanaged() { throw new System.NotImplementedException(); @@ -325,12 +325,12 @@ public void FromUnmanaged(nint unmanaged) { throw new System.NotImplementedException(); } - + public ManagedType ToManaged() { throw new System.NotImplementedException(); } - + public void Free() { throw new System.NotImplementedException(); @@ -354,9 +354,9 @@ public async Task CallerAllocatedBuffer_NoBufferSize_ReportsDiagnostic() string source = """ using System; using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedIn, typeof({|#0:MarshallerType|}))] struct MarshallerType { @@ -371,9 +371,9 @@ public void Free() {} string fixedSource = """ using System; using System.Runtime.InteropServices.Marshalling; - + class ManagedType {} - + [CustomMarshaller(typeof(ManagedType), MarshalMode.ManagedToUnmanagedIn, typeof({|#0:MarshallerType|}))] struct MarshallerType { @@ -382,6 +382,7 @@ public void FromManaged(ManagedType m, Span b) {} public int ToUnmanaged() => default; public void Free() {} + public static int BufferSize { get diff --git a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatelessLinearCollectionShapeValidation.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatelessLinearCollectionShapeValidation.cs index b60bb78f2acc2b..fec16b2bc7ff7c 100644 --- a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatelessLinearCollectionShapeValidation.cs +++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatelessLinearCollectionShapeValidation.cs @@ -614,6 +614,7 @@ static class MarshallerType public static ReadOnlySpan GetManagedValuesSource(ManagedType m) => default; public static Span GetUnmanagedValuesDestination(nint unmanaged, int numElements) => default; + public static int BufferSize { get diff --git a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatelessValueShapeValidation.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatelessValueShapeValidation.cs index 35c90af32f81b2..7d94afb9985f79 100644 --- a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatelessValueShapeValidation.cs +++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatelessValueShapeValidation.cs @@ -363,6 +363,7 @@ class ManagedType {} static class MarshallerType { public static nint ConvertToUnmanaged(ManagedType m, Span b) => default; + public static int BufferSize { get diff --git a/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/UpgradeToGeneratedRegexAnalyzerTests.cs b/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/UpgradeToGeneratedRegexAnalyzerTests.cs index 1d87d6c6cc0009..c019531af8f9cf 100644 --- a/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/UpgradeToGeneratedRegexAnalyzerTests.cs +++ b/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/UpgradeToGeneratedRegexAnalyzerTests.cs @@ -86,7 +86,9 @@ public async Task TopLevelStatements(InvocationType invocationType) string test = @"using System.Text.RegularExpressions; var isMatch = [|" + ConstructRegexInvocation(invocationType, pattern: "\"\"") + @"|]" + isMatchInvocation + ";"; string fixedCode = @"using System.Text.RegularExpressions; -var isMatch = MyRegex().IsMatch(""""); partial class Program +var isMatch = MyRegex().IsMatch(""""); + +partial class Program { [GeneratedRegex("""")] private static partial Regex MyRegex(); @@ -552,7 +554,7 @@ public static IEnumerable MixedConstantTestData() foreach (InvocationType invocationType in new[] { InvocationType.Constructor, InvocationType.StaticMethods }) { string isMatchInvocation = invocationType == InvocationType.Constructor ? @".IsMatch("""")" : string.Empty; - + // Test both pattern and options as field constants (both should be preserved) yield return new object[] { @"using System.Text.RegularExpressions; @@ -685,7 +687,7 @@ public static IEnumerable StaticFieldConstantTestData() foreach (InvocationType invocationType in new[] { InvocationType.Constructor, InvocationType.StaticMethods }) { string isMatchInvocation = invocationType == InvocationType.Constructor ? @".IsMatch("""")" : string.Empty; - + // Test static field constants (should be preserved) yield return new object[] { @"using System.Text.RegularExpressions; @@ -1095,7 +1097,9 @@ public async Task TopLevelStatements_MultipleSourceFiles() }, FixedState = { - Sources = { "public class C { }", @"var r = MyRegex(); partial class Program + Sources = { "public class C { }", @"var r = MyRegex(); + +partial class Program { [System.Text.RegularExpressions.GeneratedRegex("""")] private static partial System.Text.RegularExpressions.Regex MyRegex(); diff --git a/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTestsBase.cs b/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTestsBase.cs index 4d1b08ac1e1d6b..1f26c39fe47a6a 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTestsBase.cs +++ b/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTestsBase.cs @@ -21,7 +21,8 @@ namespace Wasm.Build.Tests; public class WasmTemplateTestsBase : BuildTestBase { private readonly WasmSdkBasedProjectProvider _provider; - private readonly string _extraBuildArgsPublish = "-p:CompressionEnabled=false"; + private readonly string _extraBuildArgsBuild = "-p:WasmEnableHotReload=false"; + private readonly string _extraBuildArgsPublish = "-p:CompressionEnabled=false -p:WasmEnableHotReload=false"; protected readonly PublishOptions _defaultPublishOptions; protected readonly BuildOptions _defaultBuildOptions; protected const string DefaultRuntimeAssetsRelativePath = "./_framework/"; @@ -31,7 +32,7 @@ public WasmTemplateTestsBase(ITestOutputHelper output, SharedBuildPerTestClassFi { _provider = GetProvider(); _defaultPublishOptions = new PublishOptions(ExtraMSBuildArgs: _extraBuildArgsPublish); - _defaultBuildOptions = new BuildOptions(); + _defaultBuildOptions = new BuildOptions(ExtraMSBuildArgs: _extraBuildArgsBuild); } private Dictionary browserProgramReplacements = new Dictionary @@ -162,7 +163,13 @@ public virtual (string projectDir, string buildOutput) BuildProject( BuildOptions buildOptions, bool? isNativeBuild = null, bool? wasmFingerprintDotnetJs = null) => - BuildProjectCore(info, configuration, buildOptions, isNativeBuild, wasmFingerprintDotnetJs); + BuildProjectCore( + info, + configuration, + buildOptions with { ExtraMSBuildArgs = $"{_extraBuildArgsBuild} {buildOptions.ExtraMSBuildArgs}" }, + isNativeBuild, + wasmFingerprintDotnetJs + ); private (string projectDir, string buildOutput) BuildProjectCore( ProjectInfo info, diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-1.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-1.cs index bafaa5e022825b..57a44403aadc12 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-1.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-1.cs @@ -83,6 +83,7 @@ public class KNucleotide_1 { [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/118475")] public static int TestEntryPoint() { var helpers = new TestHarnessHelpers(bigInput: false); diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-9.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-9.cs index 89659ef89ee962..7d9de70b330e5d 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-9.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-9.cs @@ -8,7 +8,7 @@ /* The Computer Language Benchmarks Game http://benchmarksgame.alioth.debian.org/ - + submitted by Josh Goldfoot Modified to reduce memory and do more in parallel by Anthony Lloyd */ @@ -254,6 +254,7 @@ static string writeCount(Dictionary dictionary, string fragment, } [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/118475")] public static int TestEntryPoint() { var helpers = new TestHarnessHelpers(bigInput: false); diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-1.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-1.cs index b367b74c5494c3..4e611267aadc91 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-1.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-1.cs @@ -8,8 +8,8 @@ /* The Computer Language Benchmarks Game http://benchmarksgame.alioth.debian.org/ - * - * regex-dna program contributed by Isaac Gouy + * + * regex-dna program contributed by Isaac Gouy * converted from regex-dna program * */ @@ -24,6 +24,7 @@ namespace BenchmarksGame public class RegexRedux_1 { [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/118475")] public static int TestEntryPoint() { var helpers = new TestHarnessHelpers(bigInput: false); diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-5.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-5.cs index 7fd68c8c21b518..e3562c501a582f 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-5.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-5.cs @@ -38,6 +38,7 @@ static string regexCount(string s, string r) } [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/118475")] public static int TestEntryPoint() { var helpers = new TestHarnessHelpers(bigInput: false); diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-1.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-1.cs index a071691b550e12..04d844c9378c65 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-1.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-1.cs @@ -46,6 +46,7 @@ struct Index const byte Lf = (byte)'\n'; [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/118475")] public static int TestEntryPoint() { var helpers = new TestHarnessHelpers(bigInput: false); diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-6.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-6.cs index 9d5964c7e2fda1..ee9567208c1220 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-6.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-6.cs @@ -229,6 +229,7 @@ static void Writer() } [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/118475")] public static int TestEntryPoint() { var helpers = new TestHarnessHelpers(bigInput: false); diff --git a/src/tests/build.proj b/src/tests/build.proj index 76058cc5c5da24..ca195bf8041862 100644 --- a/src/tests/build.proj +++ b/src/tests/build.proj @@ -421,7 +421,7 @@ <_ConfigurationProperties>/p:TargetOS=$(TargetOS) /p:TargetArchitecture=$(TargetArchitecture) /p:Configuration=$(Configuration) /p:CrossBuild=$(CrossBuild) <_ConfigurationProperties Condition="'$(UseLocalAppHostPack)' == 'true'">$(_ConfigurationProperties) -p:EnableAppHostPackDownload=false -p:EnableTargetingPackDownload=false -p:EnableRuntimePackDownload=false <_ForceRestore Condition="'$(_ForceRestore)' == 'true'">-f - "$(DotNetTool)" restore $(_ForceRestore) -r $(RuntimeIdentifier) $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties) + "$(DotNetTool)" restore $(_ForceRestore) -r $(RuntimeIdentifier) $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true /p:RuntimeIdentifier=$(RuntimeIdentifier) $(_ConfigurationProperties) @@ -443,10 +443,10 @@ - -