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

[main] Update dependencies from dotnet/arcade #46021

Merged
merged 20 commits into from
Jan 24, 2025
+19,139 −942
Merged

[main] Update dependencies from dotnet/arcade #46021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
dfd4b57
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jan 16, 2025
c878e33
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jan 17, 2025
186d9b8
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jan 18, 2025
ced45e7
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jan 21, 2025
1d6d17b
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jan 22, 2025
297f495
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jan 23, 2025
1146174
Update .NET SDK version in global.json
ViktorHofer Jan 23, 2025
b4f7945
Delete src/SourceBuild/patches/arcade/0001-Use-hardlinks-during-local…
ViktorHofer Jan 23, 2025
bd0621b
Delete src/SourceBuild/patches/arcade/0002-copy-symbols-files-with-ha…
ViktorHofer Jan 23, 2025
983e25b
Update .NET SDK version in global.json again
ViktorHofer Jan 23, 2025
0bee536
[Blazor] Only bring assets package when the app contains .razor files
javiercn Jan 23, 2025
61c50cf
Update baselines
javiercn Jan 23, 2025
e47e112
Remove fingerprints from blazor.server.js and blazor.web.js
javiercn Jan 23, 2025
7854937
Fix tests
javiercn Jan 23, 2025
990add7
Update baselines
javiercn Jan 23, 2025
a0fccf0
Update tests
ViktorHofer Jan 23, 2025
e6d7e84
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jan 24, 2025
c7e2db4
Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-5…
v-wuzhai Jan 24, 2025
6e8c00c
Delete src/SourceBuild/patches/arcade/0001-set-rid-for-project-for-li…
ViktorHofer Jan 24, 2025
842f73e
wpf templates are still behind
ViktorHofer Jan 24, 2025
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
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,34 +604,34 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25072.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25073.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2ac4034732f0dbb9781beae751cf15b65aff1bcd</Sha>
<Sha>ba09eddf11e81ff604c3118eddb86517cfcd4969</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25072.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25073.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2ac4034732f0dbb9781beae751cf15b65aff1bcd</Sha>
<Sha>ba09eddf11e81ff604c3118eddb86517cfcd4969</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25072.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25073.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2ac4034732f0dbb9781beae751cf15b65aff1bcd</Sha>
<Sha>ba09eddf11e81ff604c3118eddb86517cfcd4969</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25072.2">
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25073.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2ac4034732f0dbb9781beae751cf15b65aff1bcd</Sha>
<Sha>ba09eddf11e81ff604c3118eddb86517cfcd4969</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25072.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25073.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2ac4034732f0dbb9781beae751cf15b65aff1bcd</Sha>
<Sha>ba09eddf11e81ff604c3118eddb86517cfcd4969</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25072.2">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25073.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2ac4034732f0dbb9781beae751cf15b65aff1bcd</Sha>
<Sha>ba09eddf11e81ff604c3118eddb86517cfcd4969</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25072.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25073.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2ac4034732f0dbb9781beae751cf15b65aff1bcd</Sha>
<Sha>ba09eddf11e81ff604c3118eddb86517cfcd4969</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-alpha.1.25072.13">
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,10 +267,10 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25072.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25072.2</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25072.2</MicrosoftDotNetXliffTasksVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25072.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25073.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25073.5</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25073.5</MicrosoftDotNetXliffTasksVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25073.5</MicrosoftDotNetXUnitExtensionsVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sourcelink -->
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "10.0.100-alpha.1.24573.1",
"dotnet": "10.0.100-alpha.1.25073.3",
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)"
Expand All @@ -17,8 +17,8 @@
"cmake": "latest"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25072.2",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25072.2",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25073.5",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25073.5",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
}
Expand Down
150 changes: 0 additions & 150 deletions src/SourceBuild/patches/arcade/0001-set-rid-for-project-for-live-runtime.patch
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public class ProcessFrameworkReferences : TaskBase

public bool UsingMicrosoftNETSdkWebAssembly { get; set; }

public bool UsingMicrosoftNETSdkRazor { get; set; }
public bool RequiresAspNetWebAssets { get; set; }

[Required]
public string NETCoreSdkRuntimeIdentifier { get; set; }
Expand Down Expand Up @@ -502,7 +502,7 @@ protected override void ExecuteCore()
AddToolPack(ToolPackType.WebAssemblySdk, _normalizedTargetFrameworkVersion, packagesToDownload, implicitPackageReferences);
}

if (UsingMicrosoftNETSdkRazor && _normalizedTargetFrameworkVersion.Major >= 10)
if (RequiresAspNetWebAssets && _normalizedTargetFrameworkVersion.Major >= 10)
{
if (AddToolPack(ToolPackType.AspNetCore, _normalizedTargetFrameworkVersion, packagesToDownload, implicitPackageReferences) is not ToolPackSupport.Supported)
{
Expand Down
3 changes: 2 additions & 1 deletion .../Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.FrameworkReferenceResolution.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<PropertyGroup>
<EnableTargetingPackDownload Condition="'$(EnableTargetingPackDownload)' == ''">true</EnableTargetingPackDownload>
<EnableRuntimePackDownload Condition="'$(EnableRuntimePackDownload)' == ''">true</EnableRuntimePackDownload>
<RequiresAspNetWebAssets Condition="'$(RequiresAspNetWebAssets)' == ''">false</RequiresAspNetWebAssets>
</PropertyGroup>

<PropertyGroup>
Expand Down Expand Up @@ -136,7 +137,7 @@ Copyright (c) .NET Foundation. All rights reserved.
KnownWebAssemblySdkPacks="@(KnownWebAssemblySdkPack)"
KnownAspNetCorePacks="@(KnownAspNetCorePack)"
UsingMicrosoftNETSdkWebAssembly="$(UsingMicrosoftNETSdkWebAssembly)"
UsingMicrosoftNETSdkRazor="$(UsingMicrosoftNETSdkRazor)"
RequiresAspNetWebAssets="$(RequiresAspNetWebAssets)"
NETCoreSdkRuntimeIdentifier="$(NETCoreSdkRuntimeIdentifier)"
NETCoreSdkPortableRuntimeIdentifier="$(NETCoreSdkPortableRuntimeIdentifier)"
NetCoreRoot="$(NetCoreRoot)"
Expand Down
5 changes: 5 additions & 0 deletions src/WebSdk/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.ProjectSystem.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,9 @@ Copyright (c) .NET Foundation. All rights reserved.
</When>
</Choose>

<Target Name="ResolveRequiredWebAssets" BeforeTargets="ProcessFrameworkReferences">
<PropertyGroup>
<RequiresAspNetWebAssets Condition="'$(RequiresAspNetWebAssets)' == '' and @(Content->AnyHaveMetadataValue(Extension, .razor))">true</RequiresAspNetWebAssets>
</PropertyGroup>
</Target>
</Project>
3 changes: 1 addition & 2 deletions test/EndToEnd.Tests/ProjectBuildTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,8 +410,7 @@ private static string DetectExpectedDefaultFramework(string template = "")
if (latestMajorVersion == 10)
{
// TODO: This block need to be updated when every template updates their default tfm.
// Currently winforms updated their default templates target but not others.
if (template.StartsWith("winforms") || template.StartsWith("wpf"))
if (template.StartsWith("wpf"))
{
return $"net9.0";
}
Expand Down
Loading
Loading