Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update SDK to preview 1 release #98476

Merged
merged 10 commits into from
Feb 28, 2024
Merged

Update SDK to preview 1 release #98476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8349ea2
Update SDK to preview 1 release
am11 Feb 15, 2024
fb73d66
Merge branch 'main' into feature/update-sdk
ViktorHofer Feb 26, 2024
a3aadd6
Merge branch 'main' into feature/update-sdk
akoeplinger Feb 26, 2024
fc982a4
Update runtime-prereqs.proj
ViktorHofer Feb 27, 2024
bf90d5c
Update runtime-prereqs.proj
ViktorHofer Feb 27, 2024
88050b0
Update global-build.yml
ViktorHofer Feb 27, 2024
844dca5
Update global-build.yml
ViktorHofer Feb 27, 2024
b83a973
Update DotNetBuild.props
ViktorHofer Feb 27, 2024
12e1c48
Fix getting test list from "dotnet test"
akoeplinger Feb 27, 2024
401363d
Update PackageInstaller.cs
ViktorHofer Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions eng/DotNetBuild.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
<_hostArch>$(_hostRid.Substring($(_hostRidPlatformIndex)).TrimStart('-'))</_hostArch>

<LogVerbosity Condition="'$(LogVerbosity)' == ''">minimal</LogVerbosity>

<!-- When using the inner clone functionality in the repo build, copy the sources
directly as source-link doesn't support local path clones anymore. -->
<CopySrcInsteadOfClone>true</CopySrcInsteadOfClone>
</PropertyGroup>

<PropertyGroup Label="ShortStacks">
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
11 changes: 7 additions & 4 deletions src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestSuite.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,20 +81,23 @@
BeforeTargets="CopyTestZipForHelix"
DependsOnTargets="_GenerateRunSettingsFile">

<Exec Command="&quot;$(DotNetTool)&quot; test --no-build -s $(RunSettingsFilePath) -t --nologo -v:q" ConsoleToMSBuild="true">
<Exec Command="&quot;$(DotNetTool)&quot; test --no-build -s $(RunSettingsFilePath) -t --nologo -v:q -p:VsTestUseMSBuildOutput=false" ConsoleToMSBuild="true">
<Output TaskParameter="ConsoleOutput" ItemName="_ListOfTestsLines" />
</Exec>

<PropertyGroup>
<_Regex>^ *(DebuggerTests[^\($]+)</_Regex>
</PropertyGroup>
<ItemGroup>
<_TestLines0 Include="$([System.Text.RegularExpressions.Regex]::Match('%(_ListOfTestsLines.Identity)', $(_Regex)))" />
<TestClassName Include="$([System.IO.Path]::GetFileNameWithoutExtension(%(_TestLines0.Identity)))" />
<_TestLines0 Include="$([System.Text.RegularExpressions.Regex]::Match('%(_ListOfTestsLines.Identity)', '$(_Regex)'))" />
<TestClassName Include="$([System.IO.Path]::GetFileNameWithoutExtension('%(_TestLines0.Identity)'))" />
</ItemGroup>

<Error Text="No DebuggerTests test classes found!" Condition="'@(TestClassName)' == ''" />

<WriteLinesToFile File="$(TestArchiveTestsDir)$(MSBuildProjectName).tests.list"
Lines="@(TestClassName->Distinct())" />
Lines="@(TestClassName->Distinct())"
Overwrite="true" />
</Target>

<!-- Copy of `GenerateRunSettingsFile` from eng/testing/runsettings.targets -->
Expand Down
4 changes: 2 additions & 2 deletions src/mono/sample/wasm/blazor-frame/blazor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

<ItemGroup>
<!-- TODO un-pin this when it's possible -->
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0-alpha.1.24061.8" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0-alpha.1.24061.8" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0-preview.1.24081.5" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0-preview.1.24081.5" PrivateAssets="all" />
</ItemGroup>

</Project>
15 changes: 12 additions & 3 deletions src/tasks/WorkloadBuildTasks/PackageInstaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,18 @@ private bool InstallActual(PackageReference[] references, bool stopOnMissing)

Directory.CreateDirectory(projecDir);

File.WriteAllText(Path.Combine(projecDir, "Directory.Build.props"), "<Project />");
File.WriteAllText(Path.Combine(projecDir, "Directory.Packages.props"), "<Project />");
File.WriteAllText(Path.Combine(projecDir, "Directory.Build.targets"), "<Project />");
File.WriteAllText(Path.Combine(projecDir, "Directory.Build.props"), """
<Project>

<!-- This is an empty Directory.Build.props file to prevent projects which reside
under this directory to use any of the repository local settings. -->
<PropertyGroup>
<ImportDirectoryPackagesProps>false</ImportDirectoryPackagesProps>
<ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
</PropertyGroup>

</Project>
""");
File.WriteAllText(projectPath, GenerateProject(references));
File.WriteAllText(Path.Combine(projecDir, "nuget.config"), _nugetConfigContents);

Expand Down
Loading