diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props index 53d03c7f4dd1d..a6350c7fea93f 100644 --- a/eng/DotNetBuild.props +++ b/eng/DotNetBuild.props @@ -21,6 +21,10 @@ <_hostArch>$(_hostRid.Substring($(_hostRidPlatformIndex)).TrimStart('-')) minimal + + + true diff --git a/global.json b/global.json index 5adb3a5b87fcb..94d857f14a9af 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "9.0.100-alpha.1.23615.4", + "version": "9.0.100-preview.1.24101.2", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "9.0.100-alpha.1.23615.4" + "dotnet": "9.0.100-preview.1.24101.2" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24112.1", diff --git a/src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestSuite.csproj b/src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestSuite.csproj index 87cfb17bbc047..7283603a955e1 100644 --- a/src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestSuite.csproj +++ b/src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestSuite.csproj @@ -81,7 +81,7 @@ BeforeTargets="CopyTestZipForHelix" DependsOnTargets="_GenerateRunSettingsFile"> - + @@ -89,12 +89,15 @@ <_Regex>^ *(DebuggerTests[^\($]+) - <_TestLines0 Include="$([System.Text.RegularExpressions.Regex]::Match('%(_ListOfTestsLines.Identity)', $(_Regex)))" /> - + <_TestLines0 Include="$([System.Text.RegularExpressions.Regex]::Match('%(_ListOfTestsLines.Identity)', '$(_Regex)'))" /> + + + + Lines="@(TestClassName->Distinct())" + Overwrite="true" /> diff --git a/src/mono/sample/wasm/blazor-frame/blazor.csproj b/src/mono/sample/wasm/blazor-frame/blazor.csproj index 5592718e07144..3061f77e83ac3 100644 --- a/src/mono/sample/wasm/blazor-frame/blazor.csproj +++ b/src/mono/sample/wasm/blazor-frame/blazor.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/src/tasks/WorkloadBuildTasks/PackageInstaller.cs b/src/tasks/WorkloadBuildTasks/PackageInstaller.cs index 0d2f5db329065..a1b8583bd6e13 100644 --- a/src/tasks/WorkloadBuildTasks/PackageInstaller.cs +++ b/src/tasks/WorkloadBuildTasks/PackageInstaller.cs @@ -54,9 +54,18 @@ private bool InstallActual(PackageReference[] references, bool stopOnMissing) Directory.CreateDirectory(projecDir); - File.WriteAllText(Path.Combine(projecDir, "Directory.Build.props"), ""); - File.WriteAllText(Path.Combine(projecDir, "Directory.Packages.props"), ""); - File.WriteAllText(Path.Combine(projecDir, "Directory.Build.targets"), ""); + File.WriteAllText(Path.Combine(projecDir, "Directory.Build.props"), """ + + + + + false + false + + + +"""); File.WriteAllText(projectPath, GenerateProject(references)); File.WriteAllText(Path.Combine(projecDir, "nuget.config"), _nugetConfigContents);