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/windowsdesktop #44922

Merged
merged 3 commits into from
Nov 20, 2024
Merged

[main] Update dependencies from dotnet/windowsdesktop #44922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d619cc
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Nov 18, 2024
d9df0e9
Update wpf.proj
ViktorHofer Nov 20, 2024
3b43583
Update Directory.Build.targets
ViktorHofer Nov 20, 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
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 @@ -258,26 +258,26 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>55eee324653e01cf28809d02b25a5b0894b58d22</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-alpha.1.24563.2">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-alpha.1.24568.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>283bd6a3f37196bacde89cb76c5157593021cc59</Sha>
<Sha>fed5f2a4e66fe00be8d108e8e153ec3bed34941e</Sha>
<SourceBuildTarball RepoName="windowsdesktop" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-alpha.1.24563.2">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-alpha.1.24568.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>283bd6a3f37196bacde89cb76c5157593021cc59</Sha>
<Sha>fed5f2a4e66fe00be8d108e8e153ec3bed34941e</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-alpha.1.24563.2">
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-alpha.1.24568.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>283bd6a3f37196bacde89cb76c5157593021cc59</Sha>
<Sha>fed5f2a4e66fe00be8d108e8e153ec3bed34941e</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-alpha.1.24563.2">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-alpha.1.24568.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>283bd6a3f37196bacde89cb76c5157593021cc59</Sha>
<Sha>fed5f2a4e66fe00be8d108e8e153ec3bed34941e</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-alpha.1.24563.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-alpha.1.24568.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>cbaeca87f0bd676b1ecd869338cf78b22f5295f7</Sha>
<Sha>d73dd1dbd908398cef7f50e57812e55b90ed3676</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-alpha.2.24563.16">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
Expand Down Expand Up @@ -394,13 +394,13 @@
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-alpha.1.24560.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-alpha.1.24566.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>fae358b66661ccf60d44119bf2e0cc87ce8c75d4</Sha>
<Sha>98c761f4d9863f99cdb48ac9e87feef01d5c595e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="10.0.0-alpha.1.24563.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="10.0.0-alpha.1.24568.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>cbaeca87f0bd676b1ecd869338cf78b22f5295f7</Sha>
<Sha>d73dd1dbd908398cef7f50e57812e55b90ed3676</Sha>
</Dependency>
<Dependency Name="Microsoft.Web.Xdt" Version="9.0.0-preview.24522.2">
<Uri>https://github.com/dotnet/xdt</Uri>
Expand Down
12 changes: 6 additions & 6 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-alpha.1.24560.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-alpha.1.24566.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/test-templates -->
Expand Down Expand Up @@ -157,9 +157,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24563.2</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24563.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.24563.2</MicrosoftWindowsDesktopAppRefPackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24568.1</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24568.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.24568.1</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/nuget/nuget.client -->
Expand Down Expand Up @@ -258,8 +258,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/wpf -->
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-alpha.1.24563.1</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-alpha.1.24563.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-alpha.1.24568.1</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-alpha.1.24568.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup Label="Template versions">
<!-- 10.0 Template versions -->
Expand Down
21 changes: 13 additions & 8 deletions src/SourceBuild/content/repo-projects/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
<RepoArtifactsShippingPackagesDir Condition="'$(ReferenceOnlyRepoArtifacts)' == 'true'">$(ReferencePackagesDir)</RepoArtifactsShippingPackagesDir>
<RepoArtifactsNonShippingPackagesDir Condition="'$(ReferenceOnlyRepoArtifacts)' != 'true'">$([MSBuild]::NormalizeDirectory('$(ArtifactsNonShippingPackagesDir)', '$(RepositoryName)'))</RepoArtifactsNonShippingPackagesDir>
<RepoArtifactsNonShippingPackagesDir Condition="'$(ReferenceOnlyRepoArtifacts)' == 'true'">$(ReferencePackagesDir)</RepoArtifactsNonShippingPackagesDir>

<RepoArtifactsDir>$([MSBuild]::NormalizeDirectory('$(ProjectDirectory)', 'artifacts'))</RepoArtifactsDir>
<RepoArtifactsPackageCache>$([MSBuild]::NormalizeDirectory('$(RepoArtifactsDir)', 'sb', 'package-cache'))</RepoArtifactsPackageCache>

<!-- Pass location for packages -->
<BuildArgs>$(BuildArgs) /p:SourceBuiltShippingPackagesDir=$(RepoArtifactsShippingPackagesDir)</BuildArgs>
<!-- Trim the trailing slash as it breaks argument parsing on Windows if this is the last argument. -->
Expand Down Expand Up @@ -557,7 +561,7 @@
<Target Name="CopyInnerBuildRestoredPackages"
Condition="'$(IsUtilityProject)' != 'true' and '$(DotNetBuildSourceOnly)' == 'true'">
<ItemGroup>
<_InnerPackageCacheFiles Include="$(ProjectDirectory)artifacts/sb/package-cache/**/*" />
<_InnerPackageCacheFiles Include="$(RepoArtifactsPackageCache)**/*" />
</ItemGroup>

<!-- Retries can be necessary due to file locking when parallel builds are enabled and multiple repos
Expand All @@ -572,11 +576,11 @@

<Target Name="MoveDotNetBuildLogs"
Condition="'$(IsUtilityProject)' != 'true' and
Exists('$(ProjectDirectory)artifacts')">
Exists('$(RepoArtifactsDir)')">
<ItemGroup>
<LogFilesToMove Include="$(ProjectDirectory)artifacts/**/*.log" />
<LogFilesToMove Include="$(ProjectDirectory)artifacts/**/*.binlog" />
<PrebuiltReportsToMove Include="$(ProjectDirectory)artifacts/sb/prebuilt-report/*" />
<LogFilesToMove Include="$(RepoArtifactsDir)**/*.log" />
<LogFilesToMove Include="$(RepoArtifactsDir)**/*.binlog" />
<PrebuiltReportsToMove Include="$(RepoArtifactsDir)sb/prebuilt-report/*" />
</ItemGroup>

<!-- Move the build logs -->
Expand All @@ -595,7 +599,7 @@
Outputs="$(BaseIntermediateOutputPath)CleanupRepo.complete"
Condition="'$(IsUtilityProject)' != 'true' and
'$(CleanWhileBuilding)' == 'true' and
Exists('$(ProjectDirectory)artifacts')">
Exists('$(RepoArtifactsDir)')">
<!--
Some repositories (WinForms) use source generators that open files manually and keep file handles open on the compiler server (CsWin32).
These source generators are written incorrectly (a source generator should never do IO itself),
Expand All @@ -604,6 +608,7 @@
Don't fail the build when shutdown returns a failure.
-->
<Exec Command="$(DotnetTool) build-server shutdown --vbcscompiler"
EnvironmentVariables="NUGET_PACKAGES=$(RepoArtifactsPackageCache)"
IgnoreStandardErrorWarningFormat="true"
IgnoreExitCode="true" />

Expand All @@ -612,7 +617,7 @@
</PropertyGroup>

<ItemGroup>
<ObjFilesToCopy Include="$(ProjectDirectory)artifacts/**/project.assets.json" />
<ObjFilesToCopy Include="$(RepoArtifactsDir)**/project.assets.json" />
</ItemGroup>

<!-- Make a copy of project.assets.json files -->
Expand All @@ -621,7 +626,7 @@
Condition="'@(ObjFilesToCopy)' != ''" />

<ItemGroup>
<DirsToDelete Include="$([System.IO.Directory]::GetDirectories('$(ProjectDirectory)artifacts'))" />
<DirsToDelete Include="$([System.IO.Directory]::GetDirectories('$(RepoArtifactsDir)'))" />

<DirsToDeleteWithTrailingSeparator Include="$([MSBuild]::EnsureTrailingSlash('%(DirsToDelete.Identity)'))" />
<DirsToDeleteWithTrailingSeparator Remove="$(BuildObjDir)" />
Expand Down
2 changes: 1 addition & 1 deletion src/SourceBuild/content/repo-projects/wpf.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg)</BuildArgs>
<!-- TODO setting Platform shouldn't be necesary: https://github.com/dotnet/source-build/issues/4314 -->
<BuildArgs>$(BuildArgs) /p:Platform=$(TargetArchitecture)</BuildArgs>
<BuildArgs>$(BuildArgs) /p:BuildWithNetFrameworkHostedCompiler=false</BuildArgs>
<BuildArgs>$(BuildArgs) /p:BuildWithNetFrameworkHostedCompiler=true</BuildArgs>
Copy link
Member

@jjonescz jjonescz Nov 20, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, let's see if this works, I guess there was a reason this was disabled previously.

One reason might be that the toolset compiler was previously downloaded via PackageReference so it didn't work with CPM (but now it uses PackageDownload).

But also in wpf .net framework builds (which generate wpftmp projects), the toolset compiler doesn't work (PackageDownload is broken there). Not sure if that's relevant here.

Copy link
Member

@ViktorHofer ViktorHofer Nov 20, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess there was a reason this was disabled previously.

That was before we had the build-server shutdown support for the framework hosted compiler. CI green so thinks look good.

</PropertyGroup>

<ItemGroup>
Expand Down